@crypticdot/defituna-client 3.5.12 → 3.6.0

package/dist/index.cjs

@@ -40,11 +40,11 @@ __export(index_exports, {
   COLLECT_REWARD_ORCA_DISCRIMINATOR: () => COLLECT_REWARD_ORCA_DISCRIMINATOR,
   COMPUTED_AMOUNT: () => COMPUTED_AMOUNT,
   CREATE_MARKET_DISCRIMINATOR: () => CREATE_MARKET_DISCRIMINATOR,
-  CREATE_MARKET_V2_DISCRIMINATOR: () => CREATE_MARKET_V2_DISCRIMINATOR,
+  CREATE_MARKET_PERMISSIONLESS_DISCRIMINATOR: () => CREATE_MARKET_PERMISSIONLESS_DISCRIMINATOR,
   CREATE_PRICE_UPDATE_DISCRIMINATOR: () => CREATE_PRICE_UPDATE_DISCRIMINATOR,
   CREATE_TUNA_CONFIG_DISCRIMINATOR: () => CREATE_TUNA_CONFIG_DISCRIMINATOR,
   CREATE_VAULT_DISCRIMINATOR: () => CREATE_VAULT_DISCRIMINATOR,
-  CREATE_VAULT_V2_DISCRIMINATOR: () => CREATE_VAULT_V2_DISCRIMINATOR,
+  CREATE_VAULT_PERMISSIONLESS_DISCRIMINATOR: () => CREATE_VAULT_PERMISSIONLESS_DISCRIMINATOR,
   DECREASE_TUNA_LP_POSITION_FUSION_DISCRIMINATOR: () => DECREASE_TUNA_LP_POSITION_FUSION_DISCRIMINATOR,
   DECREASE_TUNA_LP_POSITION_ORCA_DISCRIMINATOR: () => DECREASE_TUNA_LP_POSITION_ORCA_DISCRIMINATOR,
   DEFAULT_ADDRESS: () => DEFAULT_ADDRESS,
@@ -213,10 +213,10 @@ __export(index_exports, {
   createAddressLookupTableForMarketInstructions: () => createAddressLookupTableForMarketInstructions,
   createAddressLookupTableInstructions: () => createAddressLookupTableInstructions,
   createMarketInstruction: () => createMarketInstruction,
-  createMarketV2Instruction: () => createMarketV2Instruction,
+  createMarketPermissionlessInstruction: () => createMarketPermissionlessInstruction,
   createTunaConfigInstruction: () => createTunaConfigInstruction,
   createVaultInstructions: () => createVaultInstructions,
-  createVaultV2Instructions: () => createVaultV2Instructions,
+  createVaultPermissionlessInstructions: () => createVaultPermissionlessInstructions,
   decodeLendingPosition: () => decodeLendingPosition,
   decodeMarket: () => decodeMarket,
   decodeTunaConfig: () => decodeTunaConfig,
@@ -314,11 +314,11 @@ __export(index_exports, {
   getCreateMarketInstructionDataCodec: () => getCreateMarketInstructionDataCodec,
   getCreateMarketInstructionDataDecoder: () => getCreateMarketInstructionDataDecoder,
   getCreateMarketInstructionDataEncoder: () => getCreateMarketInstructionDataEncoder,
-  getCreateMarketV2DiscriminatorBytes: () => getCreateMarketV2DiscriminatorBytes,
-  getCreateMarketV2Instruction: () => getCreateMarketV2Instruction,
-  getCreateMarketV2InstructionDataCodec: () => getCreateMarketV2InstructionDataCodec,
-  getCreateMarketV2InstructionDataDecoder: () => getCreateMarketV2InstructionDataDecoder,
-  getCreateMarketV2InstructionDataEncoder: () => getCreateMarketV2InstructionDataEncoder,
+  getCreateMarketPermissionlessDiscriminatorBytes: () => getCreateMarketPermissionlessDiscriminatorBytes,
+  getCreateMarketPermissionlessInstruction: () => getCreateMarketPermissionlessInstruction,
+  getCreateMarketPermissionlessInstructionDataCodec: () => getCreateMarketPermissionlessInstructionDataCodec,
+  getCreateMarketPermissionlessInstructionDataDecoder: () => getCreateMarketPermissionlessInstructionDataDecoder,
+  getCreateMarketPermissionlessInstructionDataEncoder: () => getCreateMarketPermissionlessInstructionDataEncoder,
   getCreatePriceUpdateDiscriminatorBytes: () => getCreatePriceUpdateDiscriminatorBytes,
   getCreatePriceUpdateInstruction: () => getCreatePriceUpdateInstruction,
   getCreatePriceUpdateInstructionDataCodec: () => getCreatePriceUpdateInstructionDataCodec,
@@ -334,11 +334,11 @@ __export(index_exports, {
   getCreateVaultInstructionDataCodec: () => getCreateVaultInstructionDataCodec,
   getCreateVaultInstructionDataDecoder: () => getCreateVaultInstructionDataDecoder,
   getCreateVaultInstructionDataEncoder: () => getCreateVaultInstructionDataEncoder,
-  getCreateVaultV2DiscriminatorBytes: () => getCreateVaultV2DiscriminatorBytes,
-  getCreateVaultV2Instruction: () => getCreateVaultV2Instruction,
-  getCreateVaultV2InstructionDataCodec: () => getCreateVaultV2InstructionDataCodec,
-  getCreateVaultV2InstructionDataDecoder: () => getCreateVaultV2InstructionDataDecoder,
-  getCreateVaultV2InstructionDataEncoder: () => getCreateVaultV2InstructionDataEncoder,
+  getCreateVaultPermissionlessDiscriminatorBytes: () => getCreateVaultPermissionlessDiscriminatorBytes,
+  getCreateVaultPermissionlessInstruction: () => getCreateVaultPermissionlessInstruction,
+  getCreateVaultPermissionlessInstructionDataCodec: () => getCreateVaultPermissionlessInstructionDataCodec,
+  getCreateVaultPermissionlessInstructionDataDecoder: () => getCreateVaultPermissionlessInstructionDataDecoder,
+  getCreateVaultPermissionlessInstructionDataEncoder: () => getCreateVaultPermissionlessInstructionDataEncoder,
   getDecreaseTunaLpPositionFusionDiscriminatorBytes: () => getDecreaseTunaLpPositionFusionDiscriminatorBytes,
   getDecreaseTunaLpPositionFusionInstruction: () => getDecreaseTunaLpPositionFusionInstruction,
   getDecreaseTunaLpPositionFusionInstructionDataCodec: () => getDecreaseTunaLpPositionFusionInstructionDataCodec,
@@ -371,7 +371,6 @@ __export(index_exports, {
   getLendingPositionEncoder: () => getLendingPositionEncoder,
   getLendingPositionSize: () => getLendingPositionSize,
   getLendingVaultAddress: () => getLendingVaultAddress,
-  getLendingVaultV2Address: () => getLendingVaultV2Address,
   getLiquidateTunaLpPositionFusionDiscriminatorBytes: () => getLiquidateTunaLpPositionFusionDiscriminatorBytes,
   getLiquidateTunaLpPositionFusionInstruction: () => getLiquidateTunaLpPositionFusionInstruction,
   getLiquidateTunaLpPositionFusionInstructionDataCodec: () => getLiquidateTunaLpPositionFusionInstructionDataCodec,
@@ -683,11 +682,11 @@ __export(index_exports, {
   parseCollectFeesOrcaInstruction: () => parseCollectFeesOrcaInstruction,
   parseCollectRewardOrcaInstruction: () => parseCollectRewardOrcaInstruction,
   parseCreateMarketInstruction: () => parseCreateMarketInstruction,
-  parseCreateMarketV2Instruction: () => parseCreateMarketV2Instruction,
+  parseCreateMarketPermissionlessInstruction: () => parseCreateMarketPermissionlessInstruction,
   parseCreatePriceUpdateInstruction: () => parseCreatePriceUpdateInstruction,
   parseCreateTunaConfigInstruction: () => parseCreateTunaConfigInstruction,
   parseCreateVaultInstruction: () => parseCreateVaultInstruction,
-  parseCreateVaultV2Instruction: () => parseCreateVaultV2Instruction,
+  parseCreateVaultPermissionlessInstruction: () => parseCreateVaultPermissionlessInstruction,
   parseDecreaseTunaLpPositionFusionInstruction: () => parseDecreaseTunaLpPositionFusionInstruction,
   parseDecreaseTunaLpPositionOrcaInstruction: () => parseDecreaseTunaLpPositionOrcaInstruction,
   parseDepositInstruction: () => parseDepositInstruction,
@@ -1031,7 +1030,8 @@ function getMarketEncoder() {
       ["vaultB", (0, import_kit9.getAddressEncoder)()],
       ["badDebtA", (0, import_kit9.getU64Encoder)()],
       ["badDebtB", (0, import_kit9.getU64Encoder)()],
-      ["reserved", (0, import_kit9.fixEncoderSize)((0, import_kit9.getBytesEncoder)(), 111)]
+      ["authority", (0, import_kit9.getAddressEncoder)()],
+      ["reserved", (0, import_kit9.fixEncoderSize)((0, import_kit9.getBytesEncoder)(), 79)]
     ]),
     (value) => ({ ...value, discriminator: MARKET_DISCRIMINATOR })
   );
@@ -1064,7 +1064,8 @@ function getMarketDecoder() {
     ["vaultB", (0, import_kit9.getAddressDecoder)()],
     ["badDebtA", (0, import_kit9.getU64Decoder)()],
     ["badDebtB", (0, import_kit9.getU64Decoder)()],
-    ["reserved", (0, import_kit9.fixDecoderSize)((0, import_kit9.getBytesDecoder)(), 111)]
+    ["authority", (0, import_kit9.getAddressDecoder)()],
+    ["reserved", (0, import_kit9.fixDecoderSize)((0, import_kit9.getBytesDecoder)(), 79)]
   ]);
 }
 function getMarketCodec() {
@@ -1531,8 +1532,9 @@ function getVaultEncoder() {
       ["supplyLimit", (0, import_kit14.getU64Encoder)()],
       ["oraclePriceUpdate", (0, import_kit14.getAddressEncoder)()],
       ["pythOracleFeedId", (0, import_kit14.getAddressEncoder)()],
-      ["id", (0, import_kit14.getU32Encoder)()],
-      ["reserved", (0, import_kit14.fixEncoderSize)((0, import_kit14.getBytesEncoder)(), 180)]
+      ["authority", (0, import_kit14.getAddressEncoder)()],
+      ["market", (0, import_kit14.getAddressEncoder)()],
+      ["reserved", (0, import_kit14.fixEncoderSize)((0, import_kit14.getBytesEncoder)(), 120)]
     ]),
     (value) => ({ ...value, discriminator: VAULT_DISCRIMINATOR })
   );
@@ -1553,8 +1555,9 @@ function getVaultDecoder() {
     ["supplyLimit", (0, import_kit14.getU64Decoder)()],
     ["oraclePriceUpdate", (0, import_kit14.getAddressDecoder)()],
     ["pythOracleFeedId", (0, import_kit14.getAddressDecoder)()],
-    ["id", (0, import_kit14.getU32Decoder)()],
-    ["reserved", (0, import_kit14.fixDecoderSize)((0, import_kit14.getBytesDecoder)(), 180)]
+    ["authority", (0, import_kit14.getAddressDecoder)()],
+    ["market", (0, import_kit14.getAddressDecoder)()],
+    ["reserved", (0, import_kit14.fixDecoderSize)((0, import_kit14.getBytesDecoder)(), 120)]
   ]);
 }
 function getVaultCodec() {
@@ -1683,11 +1686,11 @@ var TunaInstruction = /* @__PURE__ */ ((TunaInstruction2) => {
   TunaInstruction2[TunaInstruction2["CollectFeesOrca"] = 6] = "CollectFeesOrca";
   TunaInstruction2[TunaInstruction2["CollectRewardOrca"] = 7] = "CollectRewardOrca";
   TunaInstruction2[TunaInstruction2["CreateMarket"] = 8] = "CreateMarket";
-  TunaInstruction2[TunaInstruction2["CreateMarketV2"] = 9] = "CreateMarketV2";
+  TunaInstruction2[TunaInstruction2["CreateMarketPermissionless"] = 9] = "CreateMarketPermissionless";
   TunaInstruction2[TunaInstruction2["CreatePriceUpdate"] = 10] = "CreatePriceUpdate";
   TunaInstruction2[TunaInstruction2["CreateTunaConfig"] = 11] = "CreateTunaConfig";
   TunaInstruction2[TunaInstruction2["CreateVault"] = 12] = "CreateVault";
-  TunaInstruction2[TunaInstruction2["CreateVaultV2"] = 13] = "CreateVaultV2";
+  TunaInstruction2[TunaInstruction2["CreateVaultPermissionless"] = 13] = "CreateVaultPermissionless";
   TunaInstruction2[TunaInstruction2["DecreaseTunaLpPositionFusion"] = 14] = "DecreaseTunaLpPositionFusion";
   TunaInstruction2[TunaInstruction2["DecreaseTunaLpPositionOrca"] = 15] = "DecreaseTunaLpPositionOrca";
   TunaInstruction2[TunaInstruction2["Deposit"] = 16] = "Deposit";
@@ -1822,11 +1825,11 @@ function identifyTunaInstruction(instruction) {
   if ((0, import_kit15.containsBytes)(
     data,
     (0, import_kit15.fixEncoderSize)((0, import_kit15.getBytesEncoder)(), 8).encode(
-      new Uint8Array([193, 18, 155, 62, 161, 124, 80, 25])
+      new Uint8Array([72, 192, 190, 142, 105, 151, 2, 80])
     ),
     0
   )) {
-    return 9 /* CreateMarketV2 */;
+    return 9 /* CreateMarketPermissionless */;
   }
   if ((0, import_kit15.containsBytes)(
     data,
@@ -1858,11 +1861,11 @@ function identifyTunaInstruction(instruction) {
   if ((0, import_kit15.containsBytes)(
     data,
     (0, import_kit15.fixEncoderSize)((0, import_kit15.getBytesEncoder)(), 8).encode(
-      new Uint8Array([149, 224, 90, 50, 87, 159, 31, 221])
+      new Uint8Array([85, 69, 196, 28, 252, 85, 47, 3])
     ),
     0
   )) {
-    return 13 /* CreateVaultV2 */;
+    return 13 /* CreateVaultPermissionless */;
   }
   if ((0, import_kit15.containsBytes)(
     data,
@@ -3706,47 +3709,48 @@ function parseCreateMarketInstruction(instruction) {
   };
 }
 
-// src/generated/instructions/createMarketV2.ts
+// src/generated/instructions/createMarketPermissionless.ts
 var import_kit27 = require("@solana/kit");
-var CREATE_MARKET_V2_DISCRIMINATOR = new Uint8Array([
-  193,
-  18,
-  155,
-  62,
-  161,
-  124,
-  80,
-  25
+var CREATE_MARKET_PERMISSIONLESS_DISCRIMINATOR = new Uint8Array([
+  72,
+  192,
+  190,
+  142,
+  105,
+  151,
+  2,
+  80
 ]);
-function getCreateMarketV2DiscriminatorBytes() {
+function getCreateMarketPermissionlessDiscriminatorBytes() {
   return (0, import_kit27.fixEncoderSize)((0, import_kit27.getBytesEncoder)(), 8).encode(
-    CREATE_MARKET_V2_DISCRIMINATOR
+    CREATE_MARKET_PERMISSIONLESS_DISCRIMINATOR
   );
 }
-function getCreateMarketV2InstructionDataEncoder() {
+function getCreateMarketPermissionlessInstructionDataEncoder() {
   return (0, import_kit27.transformEncoder)(
     (0, import_kit27.getStructEncoder)([
       ["discriminator", (0, import_kit27.fixEncoderSize)((0, import_kit27.getBytesEncoder)(), 8)],
-      ["addressLookupTable", (0, import_kit27.getAddressEncoder)()],
-      ["maxLeverage", (0, import_kit27.getU32Encoder)()]
+      ["addressLookupTable", (0, import_kit27.getAddressEncoder)()]
     ]),
-    (value) => ({ ...value, discriminator: CREATE_MARKET_V2_DISCRIMINATOR })
+    (value) => ({
+      ...value,
+      discriminator: CREATE_MARKET_PERMISSIONLESS_DISCRIMINATOR
+    })
   );
 }
-function getCreateMarketV2InstructionDataDecoder() {
+function getCreateMarketPermissionlessInstructionDataDecoder() {
   return (0, import_kit27.getStructDecoder)([
     ["discriminator", (0, import_kit27.fixDecoderSize)((0, import_kit27.getBytesDecoder)(), 8)],
-    ["addressLookupTable", (0, import_kit27.getAddressDecoder)()],
-    ["maxLeverage", (0, import_kit27.getU32Decoder)()]
+    ["addressLookupTable", (0, import_kit27.getAddressDecoder)()]
   ]);
 }
-function getCreateMarketV2InstructionDataCodec() {
+function getCreateMarketPermissionlessInstructionDataCodec() {
   return (0, import_kit27.combineCodec)(
-    getCreateMarketV2InstructionDataEncoder(),
-    getCreateMarketV2InstructionDataDecoder()
+    getCreateMarketPermissionlessInstructionDataEncoder(),
+    getCreateMarketPermissionlessInstructionDataDecoder()
   );
 }
-function getCreateMarketV2Instruction(input, config) {
+function getCreateMarketPermissionlessInstruction(input, config) {
   const programAddress = config?.programAddress ?? TUNA_PROGRAM_ADDRESS;
   const originalAccounts = {
     authority: { value: input.authority ?? null, isWritable: true },
@@ -3774,13 +3778,13 @@ function getCreateMarketV2Instruction(input, config) {
       getAccountMeta(accounts.systemProgram)
     ],
     programAddress,
-    data: getCreateMarketV2InstructionDataEncoder().encode(
+    data: getCreateMarketPermissionlessInstructionDataEncoder().encode(
       args
     )
   };
   return instruction;
 }
-function parseCreateMarketV2Instruction(instruction) {
+function parseCreateMarketPermissionlessInstruction(instruction) {
   if (instruction.accounts.length < 7) {
     throw new Error("Not enough accounts");
   }
@@ -3801,7 +3805,9 @@ function parseCreateMarketV2Instruction(instruction) {
       pool: getNextAccount(),
       systemProgram: getNextAccount()
     },
-    data: getCreateMarketV2InstructionDataDecoder().decode(instruction.data)
+    data: getCreateMarketPermissionlessInstructionDataDecoder().decode(
+      instruction.data
+    )
   };
 }
 
@@ -4096,55 +4102,50 @@ function parseCreateVaultInstruction(instruction) {
   };
 }
 
-// src/generated/instructions/createVaultV2.ts
+// src/generated/instructions/createVaultPermissionless.ts
 var import_kit31 = require("@solana/kit");
-var CREATE_VAULT_V2_DISCRIMINATOR = new Uint8Array([
-  149,
-  224,
-  90,
-  50,
-  87,
-  159,
-  31,
-  221
+var CREATE_VAULT_PERMISSIONLESS_DISCRIMINATOR = new Uint8Array([
+  85,
+  69,
+  196,
+  28,
+  252,
+  85,
+  47,
+  3
 ]);
-function getCreateVaultV2DiscriminatorBytes() {
+function getCreateVaultPermissionlessDiscriminatorBytes() {
   return (0, import_kit31.fixEncoderSize)((0, import_kit31.getBytesEncoder)(), 8).encode(
-    CREATE_VAULT_V2_DISCRIMINATOR
+    CREATE_VAULT_PERMISSIONLESS_DISCRIMINATOR
   );
 }
-function getCreateVaultV2InstructionDataEncoder() {
+function getCreateVaultPermissionlessInstructionDataEncoder() {
   return (0, import_kit31.transformEncoder)(
     (0, import_kit31.getStructEncoder)([
       ["discriminator", (0, import_kit31.fixEncoderSize)((0, import_kit31.getBytesEncoder)(), 8)],
-      ["id", (0, import_kit31.getU32Encoder)()],
-      ["interestRate", (0, import_kit31.getU64Encoder)()],
-      ["supplyLimit", (0, import_kit31.getU64Encoder)()],
-      ["oraclePriceUpdate", (0, import_kit31.getAddressEncoder)()],
-      ["pythOracleFeedId", (0, import_kit31.getAddressEncoder)()],
-      ["allowUnsafeTokenExtensions", (0, import_kit31.getBooleanEncoder)()]
+      ["market", (0, import_kit31.getAddressEncoder)()],
+      ["interestRate", (0, import_kit31.getU64Encoder)()]
     ]),
-    (value) => ({ ...value, discriminator: CREATE_VAULT_V2_DISCRIMINATOR })
+    (value) => ({
+      ...value,
+      discriminator: CREATE_VAULT_PERMISSIONLESS_DISCRIMINATOR
+    })
   );
 }
-function getCreateVaultV2InstructionDataDecoder() {
+function getCreateVaultPermissionlessInstructionDataDecoder() {
   return (0, import_kit31.getStructDecoder)([
     ["discriminator", (0, import_kit31.fixDecoderSize)((0, import_kit31.getBytesDecoder)(), 8)],
-    ["id", (0, import_kit31.getU32Decoder)()],
-    ["interestRate", (0, import_kit31.getU64Decoder)()],
-    ["supplyLimit", (0, import_kit31.getU64Decoder)()],
-    ["oraclePriceUpdate", (0, import_kit31.getAddressDecoder)()],
-    ["pythOracleFeedId", (0, import_kit31.getAddressDecoder)()],
-    ["allowUnsafeTokenExtensions", (0, import_kit31.getBooleanDecoder)()]
+    ["market", (0, import_kit31.getAddressDecoder)()],
+    ["interestRate", (0, import_kit31.getU64Decoder)()]
   ]);
 }
-function getCreateVaultV2InstructionDataCodec() {
+function getCreateVaultPermissionlessInstructionDataCodec() {
   return (0, import_kit31.combineCodec)(
-    getCreateVaultV2InstructionDataEncoder(),
-    getCreateVaultV2InstructionDataDecoder()
+    getCreateVaultPermissionlessInstructionDataEncoder(),
+    getCreateVaultPermissionlessInstructionDataDecoder()
   );
 }
-function getCreateVaultV2Instruction(input, config) {
+function getCreateVaultPermissionlessInstruction(input, config) {
   const programAddress = config?.programAddress ?? TUNA_PROGRAM_ADDRESS;
   const originalAccounts = {
     authority: { value: input.authority ?? null, isWritable: true },
@@ -4175,13 +4176,13 @@ function getCreateVaultV2Instruction(input, config) {
       getAccountMeta(accounts.systemProgram)
     ],
     programAddress,
-    data: getCreateVaultV2InstructionDataEncoder().encode(
+    data: getCreateVaultPermissionlessInstructionDataEncoder().encode(
       args
     )
   };
   return instruction;
 }
-function parseCreateVaultV2Instruction(instruction) {
+function parseCreateVaultPermissionlessInstruction(instruction) {
   if (instruction.accounts.length < 7) {
     throw new Error("Not enough accounts");
   }
@@ -4202,7 +4203,9 @@ function parseCreateVaultV2Instruction(instruction) {
       tokenProgram: getNextAccount(),
       systemProgram: getNextAccount()
     },
-    data: getCreateVaultV2InstructionDataDecoder().decode(instruction.data)
+    data: getCreateVaultPermissionlessInstructionDataDecoder().decode(
+      instruction.data
+    )
   };
 }
 
@@ -10090,7 +10093,6 @@ function parseWithdrawInstruction(instruction) {
 
 // src/pda.ts
 var import_kit79 = require("@solana/kit");
-var import_kit80 = require("@solana/kit");
 
 // src/consts.ts
 var import_kit78 = require("@solana/kit");
@@ -10123,51 +10125,45 @@ var MAX_SQRT_PRICE = 79226673515401279992447579055n;
 
 // src/pda.ts
 async function getTunaConfigAddress() {
-  return await (0, import_kit80.getProgramDerivedAddress)({
+  return await (0, import_kit79.getProgramDerivedAddress)({
     programAddress: TUNA_PROGRAM_ADDRESS,
     seeds: ["tuna_config"]
   });
 }
 async function getMarketAddress(pool) {
-  return await (0, import_kit80.getProgramDerivedAddress)({
+  return await (0, import_kit79.getProgramDerivedAddress)({
     programAddress: TUNA_PROGRAM_ADDRESS,
-    seeds: ["market", (0, import_kit80.getAddressEncoder)().encode(pool)]
+    seeds: ["market", (0, import_kit79.getAddressEncoder)().encode(pool)]
   });
 }
-async function getLendingVaultAddress(mint) {
-  return await (0, import_kit80.getProgramDerivedAddress)({
+async function getLendingVaultAddress(mint, market) {
+  return await (0, import_kit79.getProgramDerivedAddress)({
     programAddress: TUNA_PROGRAM_ADDRESS,
-    seeds: ["vault", (0, import_kit80.getAddressEncoder)().encode(mint)]
-  });
-}
-async function getLendingVaultV2Address(mint, id) {
-  return await (0, import_kit80.getProgramDerivedAddress)({
-    programAddress: TUNA_PROGRAM_ADDRESS,
-    seeds: ["vault", (0, import_kit80.getAddressEncoder)().encode(mint), (0, import_kit79.getU32Encoder)().encode(id)]
+    seeds: market ? ["vault", (0, import_kit79.getAddressEncoder)().encode(mint), (0, import_kit79.getAddressEncoder)().encode(market)] : ["vault", (0, import_kit79.getAddressEncoder)().encode(mint)]
   });
 }
 async function getLendingPositionAddress(authority, mintOrVault) {
-  return await (0, import_kit80.getProgramDerivedAddress)({
+  return await (0, import_kit79.getProgramDerivedAddress)({
     programAddress: TUNA_PROGRAM_ADDRESS,
-    seeds: ["lending_position", (0, import_kit80.getAddressEncoder)().encode(authority), (0, import_kit80.getAddressEncoder)().encode(mintOrVault)]
+    seeds: ["lending_position", (0, import_kit79.getAddressEncoder)().encode(authority), (0, import_kit79.getAddressEncoder)().encode(mintOrVault)]
   });
 }
 async function getTunaLpPositionAddress(positionMint) {
-  return await (0, import_kit80.getProgramDerivedAddress)({
+  return await (0, import_kit79.getProgramDerivedAddress)({
     programAddress: TUNA_PROGRAM_ADDRESS,
-    seeds: ["tuna_position", (0, import_kit80.getAddressEncoder)().encode(positionMint)]
+    seeds: ["tuna_position", (0, import_kit79.getAddressEncoder)().encode(positionMint)]
   });
 }
 async function getTunaSpotPositionAddress(authority, pool) {
-  return await (0, import_kit80.getProgramDerivedAddress)({
+  return await (0, import_kit79.getProgramDerivedAddress)({
     programAddress: TUNA_PROGRAM_ADDRESS,
-    seeds: ["tuna_spot_position", (0, import_kit80.getAddressEncoder)().encode(authority), (0, import_kit80.getAddressEncoder)().encode(pool)]
+    seeds: ["tuna_spot_position", (0, import_kit79.getAddressEncoder)().encode(authority), (0, import_kit79.getAddressEncoder)().encode(pool)]
   });
 }
 async function getTunaPriceUpdateAddress(mint) {
-  return await (0, import_kit80.getProgramDerivedAddress)({
+  return await (0, import_kit79.getProgramDerivedAddress)({
     programAddress: TUNA_PROGRAM_ADDRESS,
-    seeds: ["tuna_price_update", (0, import_kit80.getAddressEncoder)().encode(mint)]
+    seeds: ["tuna_price_update", (0, import_kit79.getAddressEncoder)().encode(mint)]
   });
 }
 async function getPythPriceUpdateAccountAddress(shardId, priceFeedId) {
@@ -10183,23 +10179,23 @@ async function getPythPriceUpdateAccountAddress(shardId, priceFeedId) {
   }
   const shardBuffer = Buffer.alloc(2);
   shardBuffer.writeUint16LE(shardId, 0);
-  return await (0, import_kit80.getProgramDerivedAddress)({
+  return await (0, import_kit79.getProgramDerivedAddress)({
     programAddress: DEFAULT_PUSH_ORACLE_PROGRAM_ID,
     seeds: [shardBuffer, priceFeedId]
   });
 }
 
 // src/gpa/tunaLpPosition.ts
-var import_kit82 = require("@solana/kit");
+var import_kit81 = require("@solana/kit");
 
 // src/gpa/utils.ts
-var import_kit81 = require("@solana/kit");
+var import_kit80 = require("@solana/kit");
 async function fetchDecodedProgramAccounts(rpc, programAddress, filters, decoder) {
   const accountInfos = await rpc.getProgramAccounts(programAddress, {
     encoding: "base64",
     filters
   }).send();
-  const encoder = (0, import_kit81.getBase64Encoder)();
+  const encoder = (0, import_kit80.getBase64Encoder)();
   const datas = accountInfos.map((x) => encoder.encode(x.account.data[0]));
   const decoded = datas.map((x) => decoder.decode(x));
   return decoded.map((data, i) => ({
@@ -10215,7 +10211,7 @@ function tunaLpPositionAuthorityFilter(address8) {
   return {
     memcmp: {
       offset: 11n,
-      bytes: (0, import_kit82.getBase58Decoder)().decode((0, import_kit82.getAddressEncoder)().encode(address8)),
+      bytes: (0, import_kit81.getBase58Decoder)().decode((0, import_kit81.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
@@ -10224,7 +10220,7 @@ function tunaLpPositionPoolFilter(address8) {
   return {
     memcmp: {
       offset: 43n,
-      bytes: (0, import_kit82.getBase58Decoder)().decode((0, import_kit82.getAddressEncoder)().encode(address8)),
+      bytes: (0, import_kit81.getBase58Decoder)().decode((0, import_kit81.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
@@ -10233,7 +10229,7 @@ function tunaLpPositionMintAFilter(address8) {
   return {
     memcmp: {
       offset: 75n,
-      bytes: (0, import_kit82.getBase58Decoder)().decode((0, import_kit82.getAddressEncoder)().encode(address8)),
+      bytes: (0, import_kit81.getBase58Decoder)().decode((0, import_kit81.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
@@ -10242,7 +10238,7 @@ function tunaLpPositionMintBFilter(address8) {
   return {
     memcmp: {
       offset: 107n,
-      bytes: (0, import_kit82.getBase58Decoder)().decode((0, import_kit82.getAddressEncoder)().encode(address8)),
+      bytes: (0, import_kit81.getBase58Decoder)().decode((0, import_kit81.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
@@ -10251,7 +10247,7 @@ function tunaLpPositionMintFilter(address8) {
   return {
     memcmp: {
       offset: 139n,
-      bytes: (0, import_kit82.getBase58Decoder)().decode((0, import_kit82.getAddressEncoder)().encode(address8)),
+      bytes: (0, import_kit81.getBase58Decoder)().decode((0, import_kit81.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
@@ -10260,13 +10256,13 @@ function tunaLpPositionMarketMakerFilter(marketMaker) {
   return {
     memcmp: {
       offset: 277n,
-      bytes: (0, import_kit82.getBase58Decoder)().decode((0, import_kit82.getI8Encoder)().encode(marketMaker)),
+      bytes: (0, import_kit81.getBase58Decoder)().decode((0, import_kit81.getI8Encoder)().encode(marketMaker)),
       encoding: "base58"
     }
   };
 }
 async function fetchAllTunaLpPositionWithFilter(rpc, ...filters) {
-  const discriminator = (0, import_kit82.getBase58Decoder)().decode(TUNA_LP_POSITION_DISCRIMINATOR);
+  const discriminator = (0, import_kit81.getBase58Decoder)().decode(TUNA_LP_POSITION_DISCRIMINATOR);
   const discriminatorFilter = {
     memcmp: {
       offset: 0n,
@@ -10283,12 +10279,12 @@ async function fetchAllTunaLpPositionWithFilter(rpc, ...filters) {
 }
 
 // src/gpa/tunaSpotPosition.ts
-var import_kit83 = require("@solana/kit");
+var import_kit82 = require("@solana/kit");
 function tunaSpotPositionAuthorityFilter(address8) {
   return {
     memcmp: {
       offset: 11n,
-      bytes: (0, import_kit83.getBase58Decoder)().decode((0, import_kit83.getAddressEncoder)().encode(address8)),
+      bytes: (0, import_kit82.getBase58Decoder)().decode((0, import_kit82.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
@@ -10297,7 +10293,7 @@ function tunaSpotPositionPoolFilter(address8) {
   return {
     memcmp: {
       offset: 43n,
-      bytes: (0, import_kit83.getBase58Decoder)().decode((0, import_kit83.getAddressEncoder)().encode(address8)),
+      bytes: (0, import_kit82.getBase58Decoder)().decode((0, import_kit82.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
@@ -10306,7 +10302,7 @@ function tunaSpotPositionMintAFilter(address8) {
   return {
     memcmp: {
       offset: 75n,
-      bytes: (0, import_kit83.getBase58Decoder)().decode((0, import_kit83.getAddressEncoder)().encode(address8)),
+      bytes: (0, import_kit82.getBase58Decoder)().decode((0, import_kit82.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
@@ -10315,13 +10311,13 @@ function tunaSpotPositionMintBFilter(address8) {
   return {
     memcmp: {
       offset: 107n,
-      bytes: (0, import_kit83.getBase58Decoder)().decode((0, import_kit83.getAddressEncoder)().encode(address8)),
+      bytes: (0, import_kit82.getBase58Decoder)().decode((0, import_kit82.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
 }
 async function fetchAllTunaSpotPositionWithFilter(rpc, ...filters) {
-  const discriminator = (0, import_kit83.getBase58Decoder)().decode(TUNA_SPOT_POSITION_DISCRIMINATOR);
+  const discriminator = (0, import_kit82.getBase58Decoder)().decode(TUNA_SPOT_POSITION_DISCRIMINATOR);
   const discriminatorFilter = {
     memcmp: {
       offset: 0n,
@@ -10338,12 +10334,12 @@ async function fetchAllTunaSpotPositionWithFilter(rpc, ...filters) {
 }
 
 // src/gpa/lendingPosition.ts
-var import_kit84 = require("@solana/kit");
+var import_kit83 = require("@solana/kit");
 function lendingPositionAuthorityFilter(address8) {
   return {
     memcmp: {
       offset: 11n,
-      bytes: (0, import_kit84.getBase58Decoder)().decode((0, import_kit84.getAddressEncoder)().encode(address8)),
+      bytes: (0, import_kit83.getBase58Decoder)().decode((0, import_kit83.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
@@ -10352,7 +10348,7 @@ function lendingPositionMintFilter(address8) {
   return {
     memcmp: {
       offset: 43n,
-      bytes: (0, import_kit84.getBase58Decoder)().decode((0, import_kit84.getAddressEncoder)().encode(address8)),
+      bytes: (0, import_kit83.getBase58Decoder)().decode((0, import_kit83.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
@@ -10361,13 +10357,13 @@ function lendingPositionVaultFilter(address8) {
   return {
     memcmp: {
       offset: 91n,
-      bytes: (0, import_kit84.getBase58Decoder)().decode((0, import_kit84.getAddressEncoder)().encode(address8)),
+      bytes: (0, import_kit83.getBase58Decoder)().decode((0, import_kit83.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
 }
 async function fetchAllLendingPositionWithFilter(rpc, ...filters) {
-  const discriminator = (0, import_kit84.getBase58Decoder)().decode(LENDING_POSITION_DISCRIMINATOR);
+  const discriminator = (0, import_kit83.getBase58Decoder)().decode(LENDING_POSITION_DISCRIMINATOR);
   const discriminatorFilter = {
     memcmp: {
       offset: 0n,
@@ -10384,9 +10380,9 @@ async function fetchAllLendingPositionWithFilter(rpc, ...filters) {
 }
 
 // src/gpa/market.ts
-var import_kit85 = require("@solana/kit");
+var import_kit84 = require("@solana/kit");
 async function fetchAllMarketWithFilter(rpc, ...filters) {
-  const discriminator = (0, import_kit85.getBase58Decoder)().decode(MARKET_DISCRIMINATOR);
+  const discriminator = (0, import_kit84.getBase58Decoder)().decode(MARKET_DISCRIMINATOR);
   const discriminatorFilter = {
     memcmp: {
       offset: 0n,
@@ -10488,11 +10484,11 @@ var FusionUtils = class {
 };
 
 // src/utils/token.ts
-var import_kit86 = require("@solana/kit");
+var import_kit85 = require("@solana/kit");
 var import_system = require("@solana-program/system");
 var import_token = require("@solana-program/token");
 var import_token_2022 = require("@solana-program/token-2022");
-var NATIVE_MINT = (0, import_kit86.address)("So11111111111111111111111111111111111111112");
+var NATIVE_MINT = (0, import_kit85.address)("So11111111111111111111111111111111111111112");
 async function getCreateAtaInstruction(mint, owner, payer, tokenProgram = import_token.TOKEN_PROGRAM_ADDRESS) {
   const ata = (await (0, import_token.findAssociatedTokenPda)({
     mint,
@@ -10574,7 +10570,7 @@ async function createAddressLookupTableInstructions(authority, addresses, recent
 // src/txbuilder/increaseTunaLpPositionOrca.ts
 var import_whirlpools_client2 = require("@orca-so/whirlpools-client");
 var import_whirlpools_core2 = require("@orca-so/whirlpools-core");
-var import_kit87 = require("@solana/kit");
+var import_kit86 = require("@solana/kit");
 var import_memo = require("@solana-program/memo");
 var import_token_20222 = require("@solana-program/token-2022");
 var import_assert = __toESM(require("assert"), 1);
@@ -10587,13 +10583,12 @@ async function increaseTunaLpPositionOrcaInstructions(rpc, authority, positionMi
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const whirlpool = await (0, import_whirlpools_client2.fetchMaybeWhirlpool)(rpc, tunaPosition.data.pool);
   if (!whirlpool.exists) throw new Error("Whirlpool account not found");
-  const [vaultA, vaultB] = await fetchAllVault(rpc, [
-    (await getLendingVaultAddress(whirlpool.data.tokenMintA))[0],
-    (await getLendingVaultAddress(whirlpool.data.tokenMintB))[0]
-  ]);
   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 marketAddress = (await getMarketAddress(tunaPosition.data.pool))[0];
+  const market = await fetchMarket(rpc, marketAddress);
+  const [vaultA, vaultB] = await fetchAllVault(rpc, [market.data.vaultA, market.data.vaultB]);
   const createUserAtaAInstructions = await getCreateAtaInstructions(
     rpc,
     authority,
@@ -10731,16 +10726,16 @@ async function increaseTunaLpPositionOrcaInstruction(authority, tunaPosition, tu
     tunaPosition.data.tickUpperIndex
   );
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit87.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit87.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit87.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit87.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit87.AccountRole.WRITABLE },
-    { address: lowerTickArrayAddress, role: import_kit87.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit87.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultA, role: import_kit87.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultB, role: import_kit87.AccountRole.WRITABLE },
-    { address: orcaOracleAddress, role: import_kit87.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit86.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit86.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit86.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit86.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit86.AccountRole.WRITABLE },
+    { address: lowerTickArrayAddress, role: import_kit86.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit86.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultA, role: import_kit86.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultB, role: import_kit86.AccountRole.WRITABLE },
+    { address: orcaOracleAddress, role: import_kit86.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -10788,7 +10783,7 @@ async function increaseTunaLpPositionOrcaInstruction(authority, tunaPosition, tu
 // src/txbuilder/increaseTunaLpPositionFusion.ts
 var import_fusionamm_client2 = require("@crypticdot/fusionamm-client");
 var import_fusionamm_core3 = require("@crypticdot/fusionamm-core");
-var import_kit88 = require("@solana/kit");
+var import_kit87 = require("@solana/kit");
 var import_memo2 = require("@solana-program/memo");
 var import_token_20223 = require("@solana-program/token-2022");
 var import_assert2 = __toESM(require("assert"), 1);
@@ -10801,13 +10796,12 @@ async function increaseTunaLpPositionFusionInstructions(rpc, authority, position
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const fusionPool = await (0, import_fusionamm_client2.fetchMaybeFusionPool)(rpc, tunaPosition.data.pool);
   if (!fusionPool.exists) throw new Error("FusionPool account not found");
-  const [vaultA, vaultB] = await fetchAllVault(rpc, [
-    (await getLendingVaultAddress(fusionPool.data.tokenMintA))[0],
-    (await getLendingVaultAddress(fusionPool.data.tokenMintB))[0]
-  ]);
   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 marketAddress = (await getMarketAddress(tunaPosition.data.pool))[0];
+  const market = await fetchMarket(rpc, marketAddress);
+  const [vaultA, vaultB] = await fetchAllVault(rpc, [market.data.vaultA, market.data.vaultB]);
   const createUserAtaAInstructions = await getCreateAtaInstructions(
     rpc,
     authority,
@@ -10950,15 +10944,15 @@ async function increaseTunaLpPositionFusionInstruction(authority, tunaPosition,
     tunaPosition.data.tickUpperIndex
   );
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit88.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit88.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit88.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit88.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit88.AccountRole.WRITABLE },
-    { address: lowerTickArrayAddress, role: import_kit88.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit88.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultA, role: import_kit88.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultB, role: import_kit88.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit87.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit87.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit87.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit87.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit87.AccountRole.WRITABLE },
+    { address: lowerTickArrayAddress, role: import_kit87.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit87.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultA, role: import_kit87.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultB, role: import_kit87.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -11096,7 +11090,7 @@ async function closeTunaLpPositionFusionInstruction(rpc, authority, positionMint
 
 // src/txbuilder/collectAndCompoundFeesOrca.ts
 var import_whirlpools_client4 = require("@orca-so/whirlpools-client");
-var import_kit89 = require("@solana/kit");
+var import_kit88 = require("@solana/kit");
 var import_memo3 = require("@solana-program/memo");
 var import_token_20226 = require("@solana-program/token-2022");
 var import_assert5 = __toESM(require("assert"), 1);
@@ -11107,10 +11101,9 @@ async function collectAndCompoundFeesOrcaInstructions(rpc, authority, positionMi
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const whirlpool = await (0, import_whirlpools_client4.fetchMaybeWhirlpool)(rpc, tunaPosition.data.pool);
   if (!whirlpool.exists) throw new Error("Whirlpool account not found");
-  const [vaultA, vaultB] = await fetchAllVault(rpc, [
-    (await getLendingVaultAddress(whirlpool.data.tokenMintA))[0],
-    (await getLendingVaultAddress(whirlpool.data.tokenMintB))[0]
-  ]);
+  const marketAddress = (await getMarketAddress(tunaPosition.data.pool))[0];
+  const market = await fetchMarket(rpc, marketAddress);
+  const [vaultA, vaultB] = await fetchAllVault(rpc, [market.data.vaultA, market.data.vaultB]);
   const [mintA, mintB] = await (0, import_token_20226.fetchAllMaybeMint)(rpc, [whirlpool.data.tokenMintA, whirlpool.data.tokenMintB]);
   (0, import_assert5.default)(mintA.exists, "Token A account not found");
   (0, import_assert5.default)(mintB.exists, "Token B account not found");
@@ -11194,16 +11187,16 @@ async function collectAndCompoundFeesOrcaInstruction(authority, tunaConfig, tuna
     tunaPosition.data.tickUpperIndex
   );
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit89.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit89.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit89.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit89.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit89.AccountRole.WRITABLE },
-    { address: lowerTickArrayAddress, role: import_kit89.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit89.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultA, role: import_kit89.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultB, role: import_kit89.AccountRole.WRITABLE },
-    { address: orcaOracleAddress, role: import_kit89.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit88.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit88.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit88.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit88.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit88.AccountRole.WRITABLE },
+    { address: lowerTickArrayAddress, role: import_kit88.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit88.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultA, role: import_kit88.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultB, role: import_kit88.AccountRole.WRITABLE },
+    { address: orcaOracleAddress, role: import_kit88.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -11248,7 +11241,7 @@ async function collectAndCompoundFeesOrcaInstruction(authority, tunaConfig, tuna
 
 // src/txbuilder/collectAndCompoundFeesFusion.ts
 var import_fusionamm_client4 = require("@crypticdot/fusionamm-client");
-var import_kit90 = require("@solana/kit");
+var import_kit89 = require("@solana/kit");
 var import_memo4 = require("@solana-program/memo");
 var import_token_20227 = require("@solana-program/token-2022");
 var import_assert6 = __toESM(require("assert"), 1);
@@ -11259,10 +11252,9 @@ async function collectAndCompoundFeesFusionInstructions(rpc, authority, position
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const fusionPool = await (0, import_fusionamm_client4.fetchMaybeFusionPool)(rpc, tunaPosition.data.pool);
   if (!fusionPool.exists) throw new Error("FusionPool account not found");
-  const [vaultA, vaultB] = await fetchAllVault(rpc, [
-    (await getLendingVaultAddress(fusionPool.data.tokenMintA))[0],
-    (await getLendingVaultAddress(fusionPool.data.tokenMintB))[0]
-  ]);
+  const marketAddress = (await getMarketAddress(tunaPosition.data.pool))[0];
+  const market = await fetchMarket(rpc, marketAddress);
+  const [vaultA, vaultB] = await fetchAllVault(rpc, [market.data.vaultA, market.data.vaultB]);
   const [mintA, mintB] = await (0, import_token_20227.fetchAllMaybeMint)(rpc, [fusionPool.data.tokenMintA, fusionPool.data.tokenMintB]);
   (0, import_assert6.default)(mintA.exists, "Token A account not found");
   (0, import_assert6.default)(mintB.exists, "Token B account not found");
@@ -11345,15 +11337,15 @@ async function collectAndCompoundFeesFusionInstruction(authority, tunaConfig, tu
     tunaPosition.data.tickUpperIndex
   );
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit90.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit90.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit90.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit90.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit90.AccountRole.WRITABLE },
-    { address: lowerTickArrayAddress, role: import_kit90.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit90.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultA, role: import_kit90.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultB, role: import_kit90.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit89.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit89.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit89.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit89.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit89.AccountRole.WRITABLE },
+    { address: lowerTickArrayAddress, role: import_kit89.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit89.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultA, role: import_kit89.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultB, role: import_kit89.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -11397,7 +11389,7 @@ async function collectAndCompoundFeesFusionInstruction(authority, tunaConfig, tu
 
 // src/txbuilder/collectFeesOrca.ts
 var import_whirlpools_client5 = require("@orca-so/whirlpools-client");
-var import_kit91 = require("@solana/kit");
+var import_kit90 = require("@solana/kit");
 var import_memo5 = require("@solana-program/memo");
 var import_token_20228 = require("@solana-program/token-2022");
 var import_assert7 = __toESM(require("assert"), 1);
@@ -11473,10 +11465,10 @@ async function collectFeesOrcaInstruction(authority, tunaPosition, mintA, mintB,
     tunaPosition.data.tickUpperIndex
   );
   const remainingAccounts = [
-    { address: lowerTickArrayAddress, role: import_kit91.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit91.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultA, role: import_kit91.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultB, role: import_kit91.AccountRole.WRITABLE }
+    { address: lowerTickArrayAddress, role: import_kit90.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit90.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultA, role: import_kit90.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultB, role: import_kit90.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -11511,7 +11503,7 @@ async function collectFeesOrcaInstruction(authority, tunaPosition, mintA, mintB,
 
 // src/txbuilder/collectFeesFusion.ts
 var import_fusionamm_client5 = require("@crypticdot/fusionamm-client");
-var import_kit92 = require("@solana/kit");
+var import_kit91 = require("@solana/kit");
 var import_memo6 = require("@solana-program/memo");
 var import_token_20229 = require("@solana-program/token-2022");
 var import_assert8 = __toESM(require("assert"), 1);
@@ -11587,10 +11579,10 @@ async function collectFeesFusionInstruction(authority, tunaPosition, mintA, mint
     tunaPosition.data.tickUpperIndex
   );
   const remainingAccounts = [
-    { address: lowerTickArrayAddress, role: import_kit92.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit92.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultA, role: import_kit92.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultB, role: import_kit92.AccountRole.WRITABLE }
+    { address: lowerTickArrayAddress, role: import_kit91.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit91.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultA, role: import_kit91.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultB, role: import_kit91.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -11653,14 +11645,6 @@ var import_memo7 = require("@solana-program/memo");
 var import_token_202210 = require("@solana-program/token-2022");
 async function depositInstructions(rpc, authority, mintAddress, vaultAddress, amount) {
   const instructions = [];
-  if (!mintAddress && !vaultAddress) {
-    throw new Error("Mint or vault address must be provided.");
-  }
-  if (vaultAddress && !mintAddress) {
-    const vault = await fetchMaybeVault(rpc, vaultAddress);
-    if (!vault.exists) throw new Error("Vault account not found");
-    mintAddress = vault.data.mint;
-  }
   const mint = await (0, import_token_202210.fetchMaybeMint)(rpc, mintAddress);
   if (!mint.exists) throw new Error("Mint account not found");
   const createUserAtaInstructions = await getCreateAtaInstructions(
@@ -11726,7 +11710,7 @@ async function openLendingPositionAndDepositInstructions(rpc, authority, mintAdd
 // src/txbuilder/closeActiveTunaLpPositionOrca.ts
 var import_whirlpools_client6 = require("@orca-so/whirlpools-client");
 var import_whirlpools_core3 = require("@orca-so/whirlpools-core");
-var import_kit93 = require("@solana/kit");
+var import_kit92 = require("@solana/kit");
 var import_token_202211 = require("@solana-program/token-2022");
 var import_assert9 = __toESM(require("assert"), 1);
 async function closeActiveTunaLpPositionOrcaInstructions(rpc, authority, positionMint, args) {
@@ -11735,10 +11719,9 @@ async function closeActiveTunaLpPositionOrcaInstructions(rpc, authority, positio
   const orcaPosition = await (0, import_whirlpools_client6.fetchPosition)(rpc, (await (0, import_whirlpools_client6.getPositionAddress)(positionMint))[0]);
   const whirlpool = await (0, import_whirlpools_client6.fetchMaybeWhirlpool)(rpc, tunaPosition.data.pool);
   if (!whirlpool.exists) throw new Error("Whirlpool account not found");
-  const [vaultA, vaultB] = await fetchAllVault(rpc, [
-    (await getLendingVaultAddress(whirlpool.data.tokenMintA))[0],
-    (await getLendingVaultAddress(whirlpool.data.tokenMintB))[0]
-  ]);
+  const marketAddress = (await getMarketAddress(tunaPosition.data.pool))[0];
+  const market = await fetchMarket(rpc, marketAddress);
+  const [vaultA, vaultB] = await fetchAllVault(rpc, [market.data.vaultA, market.data.vaultB]);
   const [mintA, mintB, ...rewardMints] = await (0, import_token_202211.fetchAllMaybeMint)(rpc, [
     whirlpool.data.tokenMintA,
     whirlpool.data.tokenMintB,
@@ -11747,7 +11730,7 @@ async function closeActiveTunaLpPositionOrcaInstructions(rpc, authority, positio
   const allMints = [mintA, mintB, ...rewardMints];
   (0, import_assert9.default)(mintA.exists, "Token A account not found");
   (0, import_assert9.default)(mintB.exists, "Token B account not found");
-  (0, import_kit93.assertAccountsExist)(rewardMints);
+  (0, import_kit92.assertAccountsExist)(rewardMints);
   const lowerTickArrayStartIndex = (0, import_whirlpools_core3.getTickArrayStartTickIndex)(
     tunaPosition.data.tickLowerIndex,
     whirlpool.data.tickSpacing
@@ -11853,10 +11836,9 @@ async function closeActiveTunaLpPositionFusionInstructions(rpc, authority, posit
   const fusionPosition = await (0, import_fusionamm_client6.fetchPosition)(rpc, (await (0, import_fusionamm_client6.getPositionAddress)(positionMint))[0]);
   const fusionPool = await (0, import_fusionamm_client6.fetchMaybeFusionPool)(rpc, tunaPosition.data.pool);
   if (!fusionPool.exists) throw new Error("Whirlpool account not found");
-  const [vaultA, vaultB] = await fetchAllVault(rpc, [
-    (await getLendingVaultAddress(fusionPool.data.tokenMintA))[0],
-    (await getLendingVaultAddress(fusionPool.data.tokenMintB))[0]
-  ]);
+  const marketAddress = (await getMarketAddress(tunaPosition.data.pool))[0];
+  const market = await fetchMarket(rpc, marketAddress);
+  const [vaultA, vaultB] = await fetchAllVault(rpc, [market.data.vaultA, market.data.vaultB]);
   const [mintA, mintB] = await (0, import_token_202212.fetchAllMaybeMint)(rpc, [fusionPool.data.tokenMintA, fusionPool.data.tokenMintB]);
   const allMints = [mintA, mintB];
   (0, import_assert10.default)(mintA.exists, "Token A account not found");
@@ -11923,7 +11905,7 @@ async function closeActiveTunaLpPositionFusionInstructions(rpc, authority, posit
 
 // src/txbuilder/modifyTunaSpotPositionOrca.ts
 var import_whirlpools_client7 = require("@orca-so/whirlpools-client");
-var import_kit94 = require("@solana/kit");
+var import_kit93 = 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"), 1);
@@ -11943,10 +11925,9 @@ async function modifyTunaSpotPositionOrcaInstructions(rpc, authority, poolAddres
   const [mintA, mintB] = await (0, import_token_202213.fetchAllMaybeMint)(rpc, [pool.data.tokenMintA, pool.data.tokenMintB]);
   (0, import_assert11.default)(mintA.exists, "Token A account not found");
   (0, import_assert11.default)(mintB.exists, "Token B account not found");
-  const [vaultA, vaultB] = await fetchAllVault(rpc, [
-    (await getLendingVaultAddress(pool.data.tokenMintA))[0],
-    (await getLendingVaultAddress(pool.data.tokenMintB))[0]
-  ]);
+  const marketAddress = (await getMarketAddress(poolAddress))[0];
+  const market = await fetchMarket(rpc, marketAddress);
+  const [vaultA, vaultB] = await fetchAllVault(rpc, [market.data.vaultA, market.data.vaultB]);
   let hasDirectlyTransferredTokensA = false;
   let hasDirectlyTransferredTokensB = false;
   if (tunaPosition.exists) {
@@ -12050,14 +12031,14 @@ async function modifyTunaSpotPositionOrcaInstruction(authority, tunaConfig, mint
   }))[0];
   const swapTickArrays = await OrcaUtils.getSwapTickArrayAddresses(pool);
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit94.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit94.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit94.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit94.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit94.AccountRole.WRITABLE },
-    { address: pool.data.tokenVaultA, role: import_kit94.AccountRole.WRITABLE },
-    { address: pool.data.tokenVaultB, role: import_kit94.AccountRole.WRITABLE },
-    { address: orcaOracleAddress, role: import_kit94.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit93.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit93.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit93.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit93.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit93.AccountRole.WRITABLE },
+    { address: pool.data.tokenVaultA, role: import_kit93.AccountRole.WRITABLE },
+    { address: pool.data.tokenVaultB, role: import_kit93.AccountRole.WRITABLE },
+    { address: orcaOracleAddress, role: import_kit93.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -12100,7 +12081,7 @@ async function modifyTunaSpotPositionOrcaInstruction(authority, tunaConfig, mint
 
 // src/txbuilder/modifyTunaSpotPositionFusion.ts
 var import_fusionamm_client7 = require("@crypticdot/fusionamm-client");
-var import_kit95 = require("@solana/kit");
+var import_kit94 = 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"), 1);
@@ -12120,10 +12101,9 @@ async function modifyTunaSpotPositionFusionInstructions(rpc, authority, poolAddr
   const [mintA, mintB] = await (0, import_token_202214.fetchAllMaybeMint)(rpc, [pool.data.tokenMintA, pool.data.tokenMintB]);
   (0, import_assert12.default)(mintA.exists, "Token A account not found");
   (0, import_assert12.default)(mintB.exists, "Token B account not found");
-  const [vaultA, vaultB] = await fetchAllVault(rpc, [
-    (await getLendingVaultAddress(pool.data.tokenMintA))[0],
-    (await getLendingVaultAddress(pool.data.tokenMintB))[0]
-  ]);
+  const marketAddress = (await getMarketAddress(poolAddress))[0];
+  const market = await fetchMarket(rpc, marketAddress);
+  const [vaultA, vaultB] = await fetchAllVault(rpc, [market.data.vaultA, market.data.vaultB]);
   let hasDirectlyTransferredTokensA = false;
   let hasDirectlyTransferredTokensB = false;
   if (tunaPosition.exists) {
@@ -12226,13 +12206,13 @@ async function modifyTunaSpotPositionFusionInstruction(authority, tunaConfig, mi
   }))[0];
   const swapTickArrays = await FusionUtils.getSwapTickArrayAddresses(pool);
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit95.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit95.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit95.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit95.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit95.AccountRole.WRITABLE },
-    { address: pool.data.tokenVaultA, role: import_kit95.AccountRole.WRITABLE },
-    { address: pool.data.tokenVaultB, role: import_kit95.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit94.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit94.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit94.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit94.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit94.AccountRole.WRITABLE },
+    { address: pool.data.tokenVaultA, role: import_kit94.AccountRole.WRITABLE },
+    { address: pool.data.tokenVaultB, role: import_kit94.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -12276,6 +12256,7 @@ async function modifyTunaSpotPositionFusionInstruction(authority, tunaConfig, mi
 var import_fusionamm_client8 = require("@crypticdot/fusionamm-client");
 
 // ../../node_modules/.pnpm/@crypticdot+jupiter-solana-client@1.0.0_fastestsmallesttextencoderdecoder@1.0.22_typesc_c15ee540b6a974c893a6f86bc9defff2/node_modules/@crypticdot/jupiter-solana-client/dist/index.mjs
+var import_kit95 = require("@solana/kit");
 var import_kit96 = require("@solana/kit");
 var import_kit97 = require("@solana/kit");
 var import_kit98 = require("@solana/kit");
@@ -12309,7 +12290,6 @@ var import_kit125 = require("@solana/kit");
 var import_kit126 = require("@solana/kit");
 var import_kit127 = require("@solana/kit");
 var import_kit128 = require("@solana/kit");
-var import_kit129 = require("@solana/kit");
 var TOKEN_LEDGER_DISCRIMINATOR = new Uint8Array([
   156,
   247,
@@ -12552,10 +12532,7 @@ async function modifyTunaSpotPositionJupiterInstructions(rpc, authority, poolAdd
   const [mintA, mintB] = await (0, import_token_202215.fetchAllMaybeMint)(rpc, [pool.data.tokenMintA, pool.data.tokenMintB]);
   (0, import_assert13.default)(mintA.exists, "Token A account not found");
   (0, import_assert13.default)(mintB.exists, "Token B account not found");
-  const [vaultA, vaultB] = await fetchAllVault(rpc, [
-    (await getLendingVaultAddress(mintA.address))[0],
-    (await getLendingVaultAddress(mintB.address))[0]
-  ]);
+  const [vaultA, vaultB] = await fetchAllVault(rpc, [market.data.vaultA, market.data.vaultB]);
   const createUserAtaAInstructions = await getCreateAtaInstructions(
     rpc,
     authority,
@@ -12731,11 +12708,11 @@ async function createMarketInstruction(authority, pool, vaultA, vaultB, args) {
   });
 }
 
-// src/txbuilder/createMarketV2.ts
-async function createMarketV2Instruction(authority, pool, vaultA, vaultB, args) {
+// src/txbuilder/createMarketPermissionless.ts
+async function createMarketPermissionlessInstruction(authority, pool, vaultA, vaultB, args) {
   const tunaConfig = (await getTunaConfigAddress())[0];
   const marketAddress = (await getMarketAddress(pool))[0];
-  return getCreateMarketV2Instruction({
+  return getCreateMarketPermissionlessInstruction({
     authority,
     tunaConfig,
     market: marketAddress,
@@ -12784,9 +12761,9 @@ async function createVaultInstructions(authority, mint, args) {
   ];
 }
 
-// src/txbuilder/createVaultV2.ts
+// src/txbuilder/createVaultPermissionless.ts
 var import_token_202218 = require("@solana-program/token-2022");
-async function createVaultV2Instructions(authority, vault, mint, args) {
+async function createVaultPermissionlessInstructions(authority, vault, mint, args) {
   const tunaConfig = (await getTunaConfigAddress())[0];
   const vaultAta = (await (0, import_token_202218.findAssociatedTokenPda)({
     owner: vault,
@@ -12795,7 +12772,7 @@ async function createVaultV2Instructions(authority, vault, mint, args) {
   }))[0];
   return [
     await getCreateAtaInstruction(mint.address, vault, authority, mint.programAddress),
-    getCreateVaultV2Instruction({
+    getCreateVaultPermissionlessInstruction({
       authority,
       mint: mint.address,
       vault,
@@ -12809,7 +12786,7 @@ async function createVaultV2Instructions(authority, vault, mint, args) {
 
 // src/txbuilder/liquidateTunaLpPositionOrca.ts
 var import_whirlpools_client9 = require("@orca-so/whirlpools-client");
-var import_kit130 = require("@solana/kit");
+var import_kit129 = require("@solana/kit");
 var import_memo11 = require("@solana-program/memo");
 var import_token_202219 = require("@solana-program/token-2022");
 async function liquidateTunaLpPositionOrcaInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, decreasePercent) {
@@ -12896,16 +12873,16 @@ async function liquidateTunaLpPositionOrcaInstruction(authority, tunaPosition, t
     tunaPosition.data.tickUpperIndex
   );
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit130.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit130.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit130.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit130.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit130.AccountRole.WRITABLE },
-    { address: lowerTickArrayAddress, role: import_kit130.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit130.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultA, role: import_kit130.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultB, role: import_kit130.AccountRole.WRITABLE },
-    { address: orcaOracleAddress, role: import_kit130.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit129.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit129.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit129.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit129.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit129.AccountRole.WRITABLE },
+    { address: lowerTickArrayAddress, role: import_kit129.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit129.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultA, role: import_kit129.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultB, role: import_kit129.AccountRole.WRITABLE },
+    { address: orcaOracleAddress, role: import_kit129.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -12950,7 +12927,7 @@ async function liquidateTunaLpPositionOrcaInstruction(authority, tunaPosition, t
 
 // src/txbuilder/liquidateTunaLpPositionFusion.ts
 var import_fusionamm_client9 = require("@crypticdot/fusionamm-client");
-var import_kit131 = require("@solana/kit");
+var import_kit130 = require("@solana/kit");
 var import_memo12 = require("@solana-program/memo");
 var import_token_202220 = require("@solana-program/token-2022");
 async function liquidateTunaLpPositionFusionInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, decreasePercent) {
@@ -13036,15 +13013,15 @@ async function liquidateTunaLpPositionFusionInstruction(authority, tunaPosition,
     tunaPosition.data.tickUpperIndex
   );
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit131.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit131.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit131.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit131.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit131.AccountRole.WRITABLE },
-    { address: lowerTickArrayAddress, role: import_kit131.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit131.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultA, role: import_kit131.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultB, role: import_kit131.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit130.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit130.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit130.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit130.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit130.AccountRole.WRITABLE },
+    { address: lowerTickArrayAddress, role: import_kit130.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit130.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultA, role: import_kit130.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultB, role: import_kit130.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -13088,7 +13065,7 @@ async function liquidateTunaLpPositionFusionInstruction(authority, tunaPosition,
 
 // src/txbuilder/liquidateTunaSpotPositionFusion.ts
 var import_fusionamm_client10 = require("@crypticdot/fusionamm-client");
-var import_kit132 = require("@solana/kit");
+var import_kit131 = require("@solana/kit");
 var import_memo13 = require("@solana-program/memo");
 var import_token_202221 = require("@solana-program/token-2022");
 async function liquidateTunaSpotPositionFusionInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, decreasePercent) {
@@ -13179,13 +13156,13 @@ async function liquidateTunaSpotPositionFusionInstruction(authority, tunaPositio
   }))[0];
   const swapTickArrays = await FusionUtils.getSwapTickArrayAddresses(fusionPool);
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit132.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit132.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit132.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit132.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit132.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultA, role: import_kit132.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultB, role: import_kit132.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit131.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit131.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit131.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit131.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit131.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultA, role: import_kit131.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultB, role: import_kit131.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -13371,7 +13348,7 @@ async function liquidateTunaSpotPositionJupiterInstruction(authority, tunaPositi
 
 // src/txbuilder/liquidateTunaSpotPositionOrca.ts
 var import_whirlpools_client10 = require("@orca-so/whirlpools-client");
-var import_kit133 = require("@solana/kit");
+var import_kit132 = require("@solana/kit");
 var import_memo15 = require("@solana-program/memo");
 var import_token_202223 = require("@solana-program/token-2022");
 async function liquidateTunaSpotPositionOrcaInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, decreasePercent) {
@@ -13463,14 +13440,14 @@ async function liquidateTunaSpotPositionOrcaInstruction(authority, tunaPosition,
   }))[0];
   const swapTickArrays = await OrcaUtils.getSwapTickArrayAddresses(whirlpool);
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit133.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit133.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit133.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit133.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit133.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultA, role: import_kit133.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultB, role: import_kit133.AccountRole.WRITABLE },
-    { address: orcaOracleAddress, role: import_kit133.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit132.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit132.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit132.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit132.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit132.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultA, role: import_kit132.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultB, role: import_kit132.AccountRole.WRITABLE },
+    { address: orcaOracleAddress, role: import_kit132.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -13514,7 +13491,7 @@ async function liquidateTunaSpotPositionOrcaInstruction(authority, tunaPosition,
 
 // src/txbuilder/openTunaLpPositionOrca.ts
 var import_whirlpools_client11 = require("@orca-so/whirlpools-client");
-var import_kit134 = require("@solana/kit");
+var import_kit133 = require("@solana/kit");
 var import_token_202224 = require("@solana-program/token-2022");
 var import_assert15 = __toESM(require("assert"), 1);
 async function openTunaLpPositionOrcaInstruction(rpc, authority, positionMint, whirlpoolAddress, args) {
@@ -13587,75 +13564,75 @@ function getOpenTunaLpPositionOrcaInstructionWithEphemeralSigner(input) {
     accounts: [
       {
         address: input.authority.address,
-        role: import_kit134.AccountRole.WRITABLE_SIGNER
+        role: import_kit133.AccountRole.WRITABLE_SIGNER
       },
       {
         address: input.mintA,
-        role: import_kit134.AccountRole.READONLY
+        role: import_kit133.AccountRole.READONLY
       },
       {
         address: input.mintB,
-        role: import_kit134.AccountRole.READONLY
+        role: import_kit133.AccountRole.READONLY
       },
       {
         address: input.tokenProgramA,
-        role: import_kit134.AccountRole.READONLY
+        role: import_kit133.AccountRole.READONLY
       },
       {
         address: input.tokenProgramB,
-        role: import_kit134.AccountRole.READONLY
+        role: import_kit133.AccountRole.READONLY
       },
       {
         address: input.market,
-        role: import_kit134.AccountRole.READONLY
+        role: import_kit133.AccountRole.READONLY
       },
       {
         address: input.tunaPosition,
-        role: import_kit134.AccountRole.WRITABLE
+        role: import_kit133.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionMint,
-        role: import_kit134.AccountRole.WRITABLE_SIGNER
+        role: import_kit133.AccountRole.WRITABLE_SIGNER
       },
       {
         address: input.tunaPositionAta,
-        role: import_kit134.AccountRole.WRITABLE
+        role: import_kit133.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionAtaA,
-        role: import_kit134.AccountRole.WRITABLE
+        role: import_kit133.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionAtaB,
-        role: import_kit134.AccountRole.WRITABLE
+        role: import_kit133.AccountRole.WRITABLE
       },
       {
         address: input.whirlpoolProgram,
-        role: import_kit134.AccountRole.READONLY
+        role: import_kit133.AccountRole.READONLY
       },
       {
         address: input.whirlpool,
-        role: import_kit134.AccountRole.READONLY
+        role: import_kit133.AccountRole.READONLY
       },
       {
         address: input.orcaPosition,
-        role: import_kit134.AccountRole.WRITABLE
+        role: import_kit133.AccountRole.WRITABLE
       },
       {
         address: input.metadataUpdateAuth,
-        role: import_kit134.AccountRole.READONLY
+        role: import_kit133.AccountRole.READONLY
       },
       {
         address: input.token2022Program,
-        role: import_kit134.AccountRole.READONLY
+        role: import_kit133.AccountRole.READONLY
       },
       {
-        address: input.systemProgram ?? (0, import_kit134.address)("11111111111111111111111111111111"),
-        role: import_kit134.AccountRole.READONLY
+        address: input.systemProgram ?? (0, import_kit133.address)("11111111111111111111111111111111"),
+        role: import_kit133.AccountRole.READONLY
       },
       {
         address: input.associatedTokenProgram,
-        role: import_kit134.AccountRole.READONLY
+        role: import_kit133.AccountRole.READONLY
       }
     ],
     programAddress: TUNA_PROGRAM_ADDRESS,
@@ -13666,7 +13643,7 @@ function getOpenTunaLpPositionOrcaInstructionWithEphemeralSigner(input) {
 // src/txbuilder/openTunaLpPositionFusion.ts
 var import_fusionamm_client11 = require("@crypticdot/fusionamm-client");
 var import_fusionamm_client12 = require("@crypticdot/fusionamm-client");
-var import_kit135 = require("@solana/kit");
+var import_kit134 = require("@solana/kit");
 var import_token_202225 = require("@solana-program/token-2022");
 var import_assert16 = __toESM(require("assert"), 1);
 async function openTunaLpPositionFusionInstruction(rpc, authority, positionMint, fusionPoolAddress, args) {
@@ -13739,75 +13716,75 @@ function getOpenTunaLpPositionFusionInstructionWithEphemeralSigner(input) {
     accounts: [
       {
         address: input.authority.address,
-        role: import_kit135.AccountRole.WRITABLE_SIGNER
+        role: import_kit134.AccountRole.WRITABLE_SIGNER
       },
       {
         address: input.mintA,
-        role: import_kit135.AccountRole.READONLY
+        role: import_kit134.AccountRole.READONLY
       },
       {
         address: input.mintB,
-        role: import_kit135.AccountRole.READONLY
+        role: import_kit134.AccountRole.READONLY
       },
       {
         address: input.tokenProgramA,
-        role: import_kit135.AccountRole.READONLY
+        role: import_kit134.AccountRole.READONLY
       },
       {
         address: input.tokenProgramB,
-        role: import_kit135.AccountRole.READONLY
+        role: import_kit134.AccountRole.READONLY
       },
       {
         address: input.market,
-        role: import_kit135.AccountRole.READONLY
+        role: import_kit134.AccountRole.READONLY
       },
       {
         address: input.tunaPosition,
-        role: import_kit135.AccountRole.WRITABLE
+        role: import_kit134.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionMint,
-        role: import_kit135.AccountRole.WRITABLE_SIGNER
+        role: import_kit134.AccountRole.WRITABLE_SIGNER
       },
       {
         address: input.tunaPositionAta,
-        role: import_kit135.AccountRole.WRITABLE
+        role: import_kit134.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionAtaA,
-        role: import_kit135.AccountRole.WRITABLE
+        role: import_kit134.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionAtaB,
-        role: import_kit135.AccountRole.WRITABLE
+        role: import_kit134.AccountRole.WRITABLE
       },
       {
         address: input.fusionammProgram,
-        role: import_kit135.AccountRole.READONLY
+        role: import_kit134.AccountRole.READONLY
       },
       {
         address: input.fusionPool,
-        role: import_kit135.AccountRole.READONLY
+        role: import_kit134.AccountRole.READONLY
       },
       {
         address: input.fusionPosition,
-        role: import_kit135.AccountRole.WRITABLE
+        role: import_kit134.AccountRole.WRITABLE
       },
       {
         address: input.metadataUpdateAuth,
-        role: import_kit135.AccountRole.READONLY
+        role: import_kit134.AccountRole.READONLY
       },
       {
         address: input.token2022Program,
-        role: import_kit135.AccountRole.READONLY
+        role: import_kit134.AccountRole.READONLY
       },
       {
-        address: input.systemProgram ?? (0, import_kit135.address)("11111111111111111111111111111111"),
-        role: import_kit135.AccountRole.READONLY
+        address: input.systemProgram ?? (0, import_kit134.address)("11111111111111111111111111111111"),
+        role: import_kit134.AccountRole.READONLY
       },
       {
         address: input.associatedTokenProgram,
-        role: import_kit135.AccountRole.READONLY
+        role: import_kit134.AccountRole.READONLY
       }
     ],
     programAddress: TUNA_PROGRAM_ADDRESS,
@@ -13820,7 +13797,7 @@ function getOpenTunaLpPositionFusionInstructionWithEphemeralSigner(input) {
 // src/txbuilder/openAndIncreaseTunaLpPositionOrca.ts
 var import_whirlpools_client12 = require("@orca-so/whirlpools-client");
 var import_whirlpools_core4 = require("@orca-so/whirlpools-core");
-var import_kit136 = require("@solana/kit");
+var import_kit135 = require("@solana/kit");
 var import_sysvars = require("@solana/sysvars");
 var import_memo16 = require("@solana-program/memo");
 var import_token_202226 = require("@solana-program/token-2022");
@@ -13848,10 +13825,9 @@ async function openAndIncreaseTunaLpPositionOrcaInstructions(rpc, authority, pos
   const [mintA, mintB] = await (0, import_token_202226.fetchAllMaybeMint)(rpc, [whirlpool.data.tokenMintA, whirlpool.data.tokenMintB]);
   (0, import_assert17.default)(mintA.exists, "Token A account not found");
   (0, import_assert17.default)(mintB.exists, "Token B account not found");
-  const [vaultA, vaultB] = await fetchAllVault(rpc, [
-    (await getLendingVaultAddress(whirlpool.data.tokenMintA))[0],
-    (await getLendingVaultAddress(whirlpool.data.tokenMintB))[0]
-  ]);
+  const marketAddress = (await getMarketAddress(whirlpoolAddress))[0];
+  const market = await fetchMarket(rpc, marketAddress);
+  const [vaultA, vaultB] = await fetchAllVault(rpc, [market.data.vaultA, market.data.vaultB]);
   const createUserAtaAInstructions = await getCreateAtaInstructions(
     rpc,
     authority,
@@ -13932,7 +13908,7 @@ async function openAndIncreaseTunaLpPositionOrcaInstructions(rpc, authority, pos
   cleanupInstructions.push(...createUserAtaBInstructions.cleanup);
   return {
     instructions,
-    initializationCost: (0, import_kit136.lamports)(nonRefundableRent)
+    initializationCost: (0, import_kit135.lamports)(nonRefundableRent)
   };
 }
 async function openAndIncreaseTunaLpPositionOrcaInstruction(authority, positionMint, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, args) {
@@ -13990,16 +13966,16 @@ async function openAndIncreaseTunaLpPositionOrcaInstruction(authority, positionM
   const lowerTickArrayAddress = await OrcaUtils.getTickArrayAddressFromTickIndex(whirlpool, args.tickLowerIndex);
   const upperTickArrayAddress = await OrcaUtils.getTickArrayAddressFromTickIndex(whirlpool, args.tickUpperIndex);
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit136.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit136.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit136.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit136.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit136.AccountRole.WRITABLE },
-    { address: lowerTickArrayAddress, role: import_kit136.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit136.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultA, role: import_kit136.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultB, role: import_kit136.AccountRole.WRITABLE },
-    { address: orcaOracleAddress, role: import_kit136.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit135.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit135.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit135.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit135.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit135.AccountRole.WRITABLE },
+    { address: lowerTickArrayAddress, role: import_kit135.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit135.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultA, role: import_kit135.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultB, role: import_kit135.AccountRole.WRITABLE },
+    { address: orcaOracleAddress, role: import_kit135.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -14084,123 +14060,123 @@ function getOpenAndIncreaseTunaLpPositionOrcaInstructionWithEphemeralSigner(inpu
     accounts: [
       {
         address: input.authority.address,
-        role: import_kit136.AccountRole.WRITABLE_SIGNER
+        role: import_kit135.AccountRole.WRITABLE_SIGNER
       },
       {
         address: input.tunaConfig,
-        role: import_kit136.AccountRole.READONLY
+        role: import_kit135.AccountRole.READONLY
       },
       {
         address: input.mintA,
-        role: import_kit136.AccountRole.READONLY
+        role: import_kit135.AccountRole.READONLY
       },
       {
         address: input.mintB,
-        role: import_kit136.AccountRole.READONLY
+        role: import_kit135.AccountRole.READONLY
       },
       {
         address: input.market,
-        role: import_kit136.AccountRole.WRITABLE
+        role: import_kit135.AccountRole.WRITABLE
       },
       {
         address: input.vaultA,
-        role: import_kit136.AccountRole.WRITABLE
+        role: import_kit135.AccountRole.WRITABLE
       },
       {
         address: input.vaultB,
-        role: import_kit136.AccountRole.WRITABLE
+        role: import_kit135.AccountRole.WRITABLE
       },
       {
         address: input.vaultAAta,
-        role: import_kit136.AccountRole.WRITABLE
+        role: import_kit135.AccountRole.WRITABLE
       },
       {
         address: input.vaultBAta,
-        role: import_kit136.AccountRole.WRITABLE
+        role: import_kit135.AccountRole.WRITABLE
       },
       {
         address: input.tunaPosition,
-        role: import_kit136.AccountRole.WRITABLE
+        role: import_kit135.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionMint,
-        role: import_kit136.AccountRole.WRITABLE
+        role: import_kit135.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionAta,
-        role: import_kit136.AccountRole.WRITABLE
+        role: import_kit135.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionAtaA,
-        role: import_kit136.AccountRole.WRITABLE
+        role: import_kit135.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionAtaB,
-        role: import_kit136.AccountRole.WRITABLE
+        role: import_kit135.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionOwnerAtaA,
-        role: import_kit136.AccountRole.WRITABLE
+        role: import_kit135.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionOwnerAtaB,
-        role: import_kit136.AccountRole.WRITABLE
+        role: import_kit135.AccountRole.WRITABLE
       },
       {
         address: input.feeRecipientAtaA,
-        role: import_kit136.AccountRole.WRITABLE
+        role: import_kit135.AccountRole.WRITABLE
       },
       {
         address: input.feeRecipientAtaB,
-        role: import_kit136.AccountRole.WRITABLE
+        role: import_kit135.AccountRole.WRITABLE
       },
       {
         address: input.oraclePriceUpdateA,
-        role: import_kit136.AccountRole.READONLY
+        role: import_kit135.AccountRole.READONLY
       },
       {
         address: input.oraclePriceUpdateB,
-        role: import_kit136.AccountRole.READONLY
+        role: import_kit135.AccountRole.READONLY
       },
       {
         address: input.whirlpoolProgram,
-        role: import_kit136.AccountRole.READONLY
+        role: import_kit135.AccountRole.READONLY
       },
       {
         address: input.whirlpool,
-        role: import_kit136.AccountRole.WRITABLE
+        role: import_kit135.AccountRole.WRITABLE
       },
       {
         address: input.orcaPosition,
-        role: import_kit136.AccountRole.WRITABLE
+        role: import_kit135.AccountRole.WRITABLE
       },
       {
         address: input.tokenProgramA,
-        role: import_kit136.AccountRole.READONLY
+        role: import_kit135.AccountRole.READONLY
       },
       {
         address: input.tokenProgramB,
-        role: import_kit136.AccountRole.READONLY
+        role: import_kit135.AccountRole.READONLY
       },
       {
         address: input.metadataUpdateAuth,
-        role: import_kit136.AccountRole.READONLY
+        role: import_kit135.AccountRole.READONLY
       },
       {
         address: input.memoProgram,
-        role: import_kit136.AccountRole.READONLY
+        role: import_kit135.AccountRole.READONLY
       },
       {
         address: input.token2022Program,
-        role: import_kit136.AccountRole.READONLY
+        role: import_kit135.AccountRole.READONLY
       },
       {
-        address: input.systemProgram ?? (0, import_kit136.address)("11111111111111111111111111111111"),
-        role: import_kit136.AccountRole.READONLY
+        address: input.systemProgram ?? (0, import_kit135.address)("11111111111111111111111111111111"),
+        role: import_kit135.AccountRole.READONLY
       },
       {
         address: input.associatedTokenProgram,
-        role: import_kit136.AccountRole.READONLY
+        role: import_kit135.AccountRole.READONLY
       }
     ],
     programAddress: TUNA_PROGRAM_ADDRESS,
@@ -14213,7 +14189,7 @@ function getOpenAndIncreaseTunaLpPositionOrcaInstructionWithEphemeralSigner(inpu
 // src/txbuilder/openAndIncreaseTunaLpPositionFusion.ts
 var import_fusionamm_client13 = require("@crypticdot/fusionamm-client");
 var import_fusionamm_core4 = require("@crypticdot/fusionamm-core");
-var import_kit137 = require("@solana/kit");
+var import_kit136 = require("@solana/kit");
 var import_sysvars2 = require("@solana/sysvars");
 var import_memo17 = require("@solana-program/memo");
 var import_token_202227 = require("@solana-program/token-2022");
@@ -14230,10 +14206,9 @@ async function openAndIncreaseTunaLpPositionFusionInstructions(rpc, authority, p
   const [mintA, mintB] = await (0, import_token_202227.fetchAllMaybeMint)(rpc, [fusionPool.data.tokenMintA, fusionPool.data.tokenMintB]);
   (0, import_assert18.default)(mintA.exists, "Token A account not found");
   (0, import_assert18.default)(mintB.exists, "Token B account not found");
-  const [vaultA, vaultB] = await fetchAllVault(rpc, [
-    (await getLendingVaultAddress(fusionPool.data.tokenMintA))[0],
-    (await getLendingVaultAddress(fusionPool.data.tokenMintB))[0]
-  ]);
+  const marketAddress = (await getMarketAddress(fusionPoolAddress))[0];
+  const market = await fetchMarket(rpc, marketAddress);
+  const [vaultA, vaultB] = await fetchAllVault(rpc, [market.data.vaultA, market.data.vaultB]);
   const createUserAtaAInstructions = await getCreateAtaInstructions(
     rpc,
     authority,
@@ -14312,7 +14287,7 @@ async function openAndIncreaseTunaLpPositionFusionInstructions(rpc, authority, p
   cleanupInstructions.push(...createUserAtaBInstructions.cleanup);
   return {
     instructions,
-    initializationCost: (0, import_kit137.lamports)(nonRefundableRent)
+    initializationCost: (0, import_kit136.lamports)(nonRefundableRent)
   };
 }
 async function openAndIncreaseTunaLpPositionFusionInstruction(authority, positionMint, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, args) {
@@ -14369,15 +14344,15 @@ async function openAndIncreaseTunaLpPositionFusionInstruction(authority, positio
   const lowerTickArrayAddress = await FusionUtils.getTickArrayAddressFromTickIndex(fusionPool, args.tickLowerIndex);
   const upperTickArrayAddress = await FusionUtils.getTickArrayAddressFromTickIndex(fusionPool, args.tickUpperIndex);
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit137.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit137.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit137.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit137.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit137.AccountRole.WRITABLE },
-    { address: lowerTickArrayAddress, role: import_kit137.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit137.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultA, role: import_kit137.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultB, role: import_kit137.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit136.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit136.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit136.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit136.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit136.AccountRole.WRITABLE },
+    { address: lowerTickArrayAddress, role: import_kit136.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit136.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultA, role: import_kit136.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultB, role: import_kit136.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -14461,123 +14436,123 @@ function getOpenAndIncreaseTunaLpPositionFusionInstructionWithEphemeralSigner(in
     accounts: [
       {
         address: input.authority.address,
-        role: import_kit137.AccountRole.WRITABLE_SIGNER
+        role: import_kit136.AccountRole.WRITABLE_SIGNER
       },
       {
         address: input.tunaConfig,
-        role: import_kit137.AccountRole.READONLY
+        role: import_kit136.AccountRole.READONLY
       },
       {
         address: input.mintA,
-        role: import_kit137.AccountRole.READONLY
+        role: import_kit136.AccountRole.READONLY
       },
       {
         address: input.mintB,
-        role: import_kit137.AccountRole.READONLY
+        role: import_kit136.AccountRole.READONLY
       },
       {
         address: input.tokenProgramA,
-        role: import_kit137.AccountRole.READONLY
+        role: import_kit136.AccountRole.READONLY
       },
       {
         address: input.tokenProgramB,
-        role: import_kit137.AccountRole.READONLY
+        role: import_kit136.AccountRole.READONLY
       },
       {
         address: input.market,
-        role: import_kit137.AccountRole.WRITABLE
+        role: import_kit136.AccountRole.WRITABLE
       },
       {
         address: input.vaultA,
-        role: import_kit137.AccountRole.WRITABLE
+        role: import_kit136.AccountRole.WRITABLE
       },
       {
         address: input.vaultB,
-        role: import_kit137.AccountRole.WRITABLE
+        role: import_kit136.AccountRole.WRITABLE
       },
       {
         address: input.vaultAAta,
-        role: import_kit137.AccountRole.WRITABLE
+        role: import_kit136.AccountRole.WRITABLE
       },
       {
         address: input.vaultBAta,
-        role: import_kit137.AccountRole.WRITABLE
+        role: import_kit136.AccountRole.WRITABLE
       },
       {
         address: input.tunaPosition,
-        role: import_kit137.AccountRole.WRITABLE
+        role: import_kit136.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionMint,
-        role: import_kit137.AccountRole.WRITABLE
+        role: import_kit136.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionAta,
-        role: import_kit137.AccountRole.WRITABLE
+        role: import_kit136.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionAtaA,
-        role: import_kit137.AccountRole.WRITABLE
+        role: import_kit136.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionAtaB,
-        role: import_kit137.AccountRole.WRITABLE
+        role: import_kit136.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionOwnerAtaA,
-        role: import_kit137.AccountRole.WRITABLE
+        role: import_kit136.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionOwnerAtaB,
-        role: import_kit137.AccountRole.WRITABLE
+        role: import_kit136.AccountRole.WRITABLE
       },
       {
         address: input.feeRecipientAtaA,
-        role: import_kit137.AccountRole.WRITABLE
+        role: import_kit136.AccountRole.WRITABLE
       },
       {
         address: input.feeRecipientAtaB,
-        role: import_kit137.AccountRole.WRITABLE
+        role: import_kit136.AccountRole.WRITABLE
       },
       {
         address: input.oraclePriceUpdateA,
-        role: import_kit137.AccountRole.READONLY
+        role: import_kit136.AccountRole.READONLY
       },
       {
         address: input.oraclePriceUpdateB,
-        role: import_kit137.AccountRole.READONLY
+        role: import_kit136.AccountRole.READONLY
       },
       {
         address: input.fusionammProgram,
-        role: import_kit137.AccountRole.READONLY
+        role: import_kit136.AccountRole.READONLY
       },
       {
         address: input.fusionPool,
-        role: import_kit137.AccountRole.WRITABLE
+        role: import_kit136.AccountRole.WRITABLE
       },
       {
         address: input.fusionPosition,
-        role: import_kit137.AccountRole.WRITABLE
+        role: import_kit136.AccountRole.WRITABLE
       },
       {
         address: input.metadataUpdateAuth,
-        role: import_kit137.AccountRole.READONLY
+        role: import_kit136.AccountRole.READONLY
       },
       {
         address: input.memoProgram,
-        role: import_kit137.AccountRole.READONLY
+        role: import_kit136.AccountRole.READONLY
       },
       {
         address: input.token2022Program,
-        role: import_kit137.AccountRole.READONLY
+        role: import_kit136.AccountRole.READONLY
       },
       {
-        address: input.systemProgram ?? (0, import_kit137.address)("11111111111111111111111111111111"),
-        role: import_kit137.AccountRole.READONLY
+        address: input.systemProgram ?? (0, import_kit136.address)("11111111111111111111111111111111"),
+        role: import_kit136.AccountRole.READONLY
       },
       {
         address: input.associatedTokenProgram,
-        role: import_kit137.AccountRole.READONLY
+        role: import_kit136.AccountRole.READONLY
       }
     ],
     programAddress: TUNA_PROGRAM_ADDRESS,
@@ -14590,17 +14565,17 @@ function getOpenAndIncreaseTunaLpPositionFusionInstructionWithEphemeralSigner(in
 // src/txbuilder/openTunaSpotPosition.ts
 var import_fusionamm_client14 = require("@crypticdot/fusionamm-client");
 var import_whirlpools_client13 = require("@orca-so/whirlpools-client");
-var import_kit138 = require("@solana/kit");
+var import_kit137 = require("@solana/kit");
 var import_token_202228 = require("@solana-program/token-2022");
 var import_assert19 = __toESM(require("assert"), 1);
 async function openTunaSpotPositionInstructions(rpc, authority, poolAddress, args) {
-  const poolAccount = await (0, import_kit138.fetchEncodedAccount)(rpc, poolAddress);
+  const poolAccount = await (0, import_kit137.fetchEncodedAccount)(rpc, poolAddress);
   (0, import_assert19.default)(poolAccount.exists, "Pool account not found");
   let pool;
   if (poolAccount.programAddress == import_fusionamm_client14.FUSIONAMM_PROGRAM_ADDRESS) {
-    pool = (0, import_kit138.decodeAccount)(poolAccount, (0, import_fusionamm_client14.getFusionPoolDecoder)());
+    pool = (0, import_kit137.decodeAccount)(poolAccount, (0, import_fusionamm_client14.getFusionPoolDecoder)());
   } else if (poolAccount.programAddress == import_whirlpools_client13.WHIRLPOOL_PROGRAM_ADDRESS) {
-    pool = (0, import_kit138.decodeAccount)(poolAccount, (0, import_whirlpools_client13.getWhirlpoolDecoder)());
+    pool = (0, import_kit137.decodeAccount)(poolAccount, (0, import_whirlpools_client13.getWhirlpoolDecoder)());
   } else {
     throw new Error("Incorrect Fusion or Orca pool account");
   }
@@ -14640,7 +14615,7 @@ async function openTunaSpotPositionInstruction(authority, mintA, mintB, poolAddr
 // src/txbuilder/decreaseTunaLpPositionOrca.ts
 var import_whirlpools_client14 = require("@orca-so/whirlpools-client");
 var import_whirlpools_core5 = require("@orca-so/whirlpools-core");
-var import_kit139 = require("@solana/kit");
+var import_kit138 = require("@solana/kit");
 var import_memo18 = require("@solana-program/memo");
 var import_token_202229 = require("@solana-program/token-2022");
 var import_assert20 = __toESM(require("assert"), 1);
@@ -14650,10 +14625,9 @@ async function decreaseTunaLpPositionOrcaInstructions(rpc, authority, positionMi
   const orcaPosition = await (0, import_whirlpools_client14.fetchPosition)(rpc, (await (0, import_whirlpools_client14.getPositionAddress)(positionMint))[0]);
   const whirlpool = await (0, import_whirlpools_client14.fetchMaybeWhirlpool)(rpc, tunaPosition.data.pool);
   if (!whirlpool.exists) throw new Error("Whirlpool account not found");
-  const [vaultA, vaultB] = await fetchAllVault(rpc, [
-    (await getLendingVaultAddress(whirlpool.data.tokenMintA))[0],
-    (await getLendingVaultAddress(whirlpool.data.tokenMintB))[0]
-  ]);
+  const marketAddress = (await getMarketAddress(tunaPosition.data.pool))[0];
+  const market = await fetchMarket(rpc, marketAddress);
+  const [vaultA, vaultB] = await fetchAllVault(rpc, [market.data.vaultA, market.data.vaultB]);
   const [mintA, mintB, ...rewardMints] = await (0, import_token_202229.fetchAllMaybeMint)(rpc, [
     whirlpool.data.tokenMintA,
     whirlpool.data.tokenMintB,
@@ -14662,7 +14636,7 @@ async function decreaseTunaLpPositionOrcaInstructions(rpc, authority, positionMi
   const allMints = [mintA, mintB, ...rewardMints];
   (0, import_assert20.default)(mintA.exists, "Token A account not found");
   (0, import_assert20.default)(mintB.exists, "Token B account not found");
-  (0, import_kit139.assertAccountsExist)(rewardMints);
+  (0, import_kit138.assertAccountsExist)(rewardMints);
   const lowerTickArrayStartIndex = (0, import_whirlpools_core5.getTickArrayStartTickIndex)(
     tunaPosition.data.tickLowerIndex,
     whirlpool.data.tickSpacing
@@ -14774,16 +14748,16 @@ async function decreaseTunaLpPositionOrcaInstruction(authority, tunaPosition, mi
     tunaPosition.data.tickUpperIndex
   );
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit139.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit139.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit139.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit139.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit139.AccountRole.WRITABLE },
-    { address: lowerTickArrayAddress, role: import_kit139.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit139.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultA, role: import_kit139.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultB, role: import_kit139.AccountRole.WRITABLE },
-    { address: orcaOracleAddress, role: import_kit139.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit138.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit138.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit138.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit138.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit138.AccountRole.WRITABLE },
+    { address: lowerTickArrayAddress, role: import_kit138.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit138.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultA, role: import_kit138.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultB, role: import_kit138.AccountRole.WRITABLE },
+    { address: orcaOracleAddress, role: import_kit138.AccountRole.WRITABLE }
   ];
   for (const rewardIndex of rewardIndicesToClaim) {
     const rewardInfo = whirlpool.data.rewardInfos[rewardIndex];
@@ -14794,10 +14768,10 @@ async function decreaseTunaLpPositionOrcaInstruction(authority, tunaPosition, mi
       mint: rewardMint.address,
       tokenProgram: rewardMint.programAddress
     });
-    remainingAccounts.push({ address: rewardMint.address, role: import_kit139.AccountRole.READONLY });
-    remainingAccounts.push({ address: rewardMint.programAddress, role: import_kit139.AccountRole.READONLY });
-    remainingAccounts.push({ address: ownerAta[0], role: import_kit139.AccountRole.WRITABLE });
-    remainingAccounts.push({ address: rewardInfo.vault, role: import_kit139.AccountRole.WRITABLE });
+    remainingAccounts.push({ address: rewardMint.address, role: import_kit138.AccountRole.READONLY });
+    remainingAccounts.push({ address: rewardMint.programAddress, role: import_kit138.AccountRole.READONLY });
+    remainingAccounts.push({ address: ownerAta[0], role: import_kit138.AccountRole.WRITABLE });
+    remainingAccounts.push({ address: rewardInfo.vault, role: import_kit138.AccountRole.WRITABLE });
   }
   const remainingAccountsInfo = {
     slices: [
@@ -14845,7 +14819,7 @@ async function decreaseTunaLpPositionOrcaInstruction(authority, tunaPosition, mi
 
 // src/txbuilder/decreaseTunaLpPositionFusion.ts
 var import_fusionamm_client15 = require("@crypticdot/fusionamm-client");
-var import_kit140 = require("@solana/kit");
+var import_kit139 = require("@solana/kit");
 var import_memo19 = require("@solana-program/memo");
 var import_token_202230 = require("@solana-program/token-2022");
 var import_assert21 = __toESM(require("assert"), 1);
@@ -14854,13 +14828,12 @@ async function decreaseTunaLpPositionFusionInstructions(rpc, authority, position
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const fusionPool = await (0, import_fusionamm_client15.fetchMaybeFusionPool)(rpc, tunaPosition.data.pool);
   if (!fusionPool.exists) throw new Error("FusionPool account not found");
-  const [vaultA, vaultB] = await fetchAllVault(rpc, [
-    (await getLendingVaultAddress(fusionPool.data.tokenMintA))[0],
-    (await getLendingVaultAddress(fusionPool.data.tokenMintB))[0]
-  ]);
   const [mintA, mintB] = await (0, import_token_202230.fetchAllMaybeMint)(rpc, [fusionPool.data.tokenMintA, fusionPool.data.tokenMintB]);
   (0, import_assert21.default)(mintA.exists, "Token A account not found");
   (0, import_assert21.default)(mintB.exists, "Token B account not found");
+  const marketAddress = (await getMarketAddress(tunaPosition.data.pool))[0];
+  const market = await fetchMarket(rpc, marketAddress);
+  const [vaultA, vaultB] = await fetchAllVault(rpc, [market.data.vaultA, market.data.vaultB]);
   const instructions = [];
   if (!createInstructions) createInstructions = instructions;
   if (!cleanupInstructions) cleanupInstructions = instructions;
@@ -14945,15 +14918,15 @@ async function decreaseTunaLpPositionFusionInstruction(authority, tunaPosition,
     tunaPosition.data.tickUpperIndex
   );
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit140.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit140.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit140.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit140.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit140.AccountRole.WRITABLE },
-    { address: lowerTickArrayAddress, role: import_kit140.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit140.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultA, role: import_kit140.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultB, role: import_kit140.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit139.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit139.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit139.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit139.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit139.AccountRole.WRITABLE },
+    { address: lowerTickArrayAddress, role: import_kit139.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit139.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultA, role: import_kit139.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultB, role: import_kit139.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -14998,12 +14971,13 @@ async function decreaseTunaLpPositionFusionInstruction(authority, tunaPosition,
 // src/txbuilder/repayBadDebt.ts
 var import_memo20 = require("@solana-program/memo");
 var import_token_202231 = require("@solana-program/token-2022");
-async function repayBadDebtInstruction(rpc, authority, mintAddress, funds, shares) {
-  const mint = await (0, import_token_202231.fetchMaybeMint)(rpc, mintAddress);
+async function repayBadDebtInstruction(rpc, authority, vaultAddress, funds, shares) {
+  const vault = await fetchMaybeVault(rpc, vaultAddress);
+  if (!vault.exists) throw new Error("Vault account not found");
+  const mint = await (0, import_token_202231.fetchMaybeMint)(rpc, vault.data.mint);
   if (!mint.exists) throw new Error("Mint account not found");
-  const vault = (await getLendingVaultAddress(mint.address))[0];
   const vaultAta = (await (0, import_token_202231.findAssociatedTokenPda)({
-    owner: vault,
+    owner: vault.address,
     mint: mint.address,
     tokenProgram: mint.programAddress
   }))[0];
@@ -15017,7 +14991,7 @@ async function repayBadDebtInstruction(rpc, authority, mintAddress, funds, share
     mint: mint.address,
     vaultAta,
     authority,
-    vault,
+    vault: vault.address,
     tokenProgram: mint.programAddress,
     memoProgram: import_memo20.MEMO_PROGRAM_ADDRESS,
     funds,
@@ -15108,14 +15082,6 @@ var import_memo21 = require("@solana-program/memo");
 var import_token_202233 = require("@solana-program/token-2022");
 async function withdrawInstructions(rpc, authority, mintAddress, vaultAddress, funds, shares) {
   const instructions = [];
-  if (!mintAddress && !vaultAddress) {
-    throw new Error("Mint or vault address must be provided.");
-  }
-  if (vaultAddress && !mintAddress) {
-    const vault = await fetchMaybeVault(rpc, vaultAddress);
-    if (!vault.exists) throw new Error("Vault account not found");
-    mintAddress = vault.data.mint;
-  }
   const mint = await (0, import_token_202233.fetchMaybeMint)(rpc, mintAddress);
   if (!mint.exists) throw new Error("Mint account not found");
   const createUserAtaInstructions = await getCreateAtaInstructions(
@@ -15165,7 +15131,7 @@ async function withdrawInstruction(authority, mint, vault, funds, shares) {
 // src/txbuilder/createMarketLookupTable.ts
 var import_fusionamm_client16 = require("@crypticdot/fusionamm-client");
 var import_whirlpools_client15 = require("@orca-so/whirlpools-client");
-var import_kit141 = require("@solana/kit");
+var import_kit140 = require("@solana/kit");
 var import_address_lookup_table2 = require("@solana-program/address-lookup-table");
 var import_memo22 = require("@solana-program/memo");
 var import_system2 = require("@solana-program/system");
@@ -15205,7 +15171,7 @@ async function getAddressesForMarketLookupTable(rpc, poolAddress, marketMaker) {
   }))[0];
   const addresses = [
     import_system2.SYSTEM_PROGRAM_ADDRESS,
-    (0, import_kit141.address)("SysvarRent111111111111111111111111111111111"),
+    (0, import_kit140.address)("SysvarRent111111111111111111111111111111111"),
     import_token_202234.ASSOCIATED_TOKEN_PROGRAM_ADDRESS,
     import_token2.TOKEN_PROGRAM_ADDRESS,
     import_token_202234.TOKEN_2022_PROGRAM_ADDRESS,
@@ -15365,7 +15331,7 @@ async function repayTunaLpPositionDebtInstruction(authority, positionMint, mintA
 
 // src/txbuilder/rebalanceTunaLpPositionOrca.ts
 var import_whirlpools_client16 = require("@orca-so/whirlpools-client");
-var import_kit142 = require("@solana/kit");
+var import_kit141 = require("@solana/kit");
 var import_sysvars3 = require("@solana/sysvars");
 var import_memo24 = require("@solana-program/memo");
 var import_token_202236 = require("@solana-program/token-2022");
@@ -15378,10 +15344,9 @@ async function rebalanceTunaLpPositionOrcaInstructions(rpc, authority, positionM
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const whirlpool = await (0, import_whirlpools_client16.fetchMaybeWhirlpool)(rpc, tunaPosition.data.pool);
   if (!whirlpool.exists) throw new Error("Whirlpool account not found");
-  const [vaultA, vaultB] = await fetchAllVault(rpc, [
-    (await getLendingVaultAddress(whirlpool.data.tokenMintA))[0],
-    (await getLendingVaultAddress(whirlpool.data.tokenMintB))[0]
-  ]);
+  const marketAddress = (await getMarketAddress(tunaPosition.data.pool))[0];
+  const market = await fetchMarket(rpc, marketAddress);
+  const [vaultA, vaultB] = await fetchAllVault(rpc, [market.data.vaultA, market.data.vaultB]);
   const [mintA, mintB] = await (0, import_token_202236.fetchAllMaybeMint)(rpc, [whirlpool.data.tokenMintA, whirlpool.data.tokenMintB]);
   (0, import_assert24.default)(mintA.exists, "Token A account not found");
   (0, import_assert24.default)(mintB.exists, "Token B account not found");
@@ -15448,7 +15413,7 @@ async function rebalanceTunaLpPositionOrcaInstructions(rpc, authority, positionM
   cleanupInstructions.push(...internalCleanupInstructions);
   return {
     instructions,
-    initializationCost: (0, import_kit142.lamports)(nonRefundableRent)
+    initializationCost: (0, import_kit141.lamports)(nonRefundableRent)
   };
 }
 async function rebalanceTunaLpPositionOrcaInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool) {
@@ -15492,18 +15457,18 @@ async function rebalanceTunaLpPositionOrcaInstruction(authority, tunaPosition, t
   );
   const secondaryTickArrays = await OrcaUtils.getTickArraysForRebalancedPosition(whirlpool, tunaPosition);
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit142.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit142.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit142.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit142.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit142.AccountRole.WRITABLE },
-    { address: lowerTickArrayAddress, role: import_kit142.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit142.AccountRole.WRITABLE },
-    { address: secondaryTickArrays.lowerTickArrayAddress, role: import_kit142.AccountRole.WRITABLE },
-    { address: secondaryTickArrays.upperTickArrayAddress, role: import_kit142.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultA, role: import_kit142.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultB, role: import_kit142.AccountRole.WRITABLE },
-    { address: orcaOracleAddress, role: import_kit142.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit141.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit141.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit141.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit141.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit141.AccountRole.WRITABLE },
+    { address: lowerTickArrayAddress, role: import_kit141.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit141.AccountRole.WRITABLE },
+    { address: secondaryTickArrays.lowerTickArrayAddress, role: import_kit141.AccountRole.WRITABLE },
+    { address: secondaryTickArrays.upperTickArrayAddress, role: import_kit141.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultA, role: import_kit141.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultB, role: import_kit141.AccountRole.WRITABLE },
+    { address: orcaOracleAddress, role: import_kit141.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -15547,7 +15512,7 @@ async function rebalanceTunaLpPositionOrcaInstruction(authority, tunaPosition, t
 
 // src/txbuilder/rebalanceTunaLpPositionFusion.ts
 var import_fusionamm_client17 = require("@crypticdot/fusionamm-client");
-var import_kit143 = require("@solana/kit");
+var import_kit142 = require("@solana/kit");
 var import_sysvars4 = require("@solana/sysvars");
 var import_memo25 = require("@solana-program/memo");
 var import_token_202237 = require("@solana-program/token-2022");
@@ -15560,10 +15525,9 @@ async function rebalanceTunaLpPositionFusionInstructions(rpc, authority, positio
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const fusionPool = await (0, import_fusionamm_client17.fetchMaybeFusionPool)(rpc, tunaPosition.data.pool);
   if (!fusionPool.exists) throw new Error("FusionPool account not found");
-  const [vaultA, vaultB] = await fetchAllVault(rpc, [
-    (await getLendingVaultAddress(fusionPool.data.tokenMintA))[0],
-    (await getLendingVaultAddress(fusionPool.data.tokenMintB))[0]
-  ]);
+  const marketAddress = (await getMarketAddress(tunaPosition.data.pool))[0];
+  const market = await fetchMarket(rpc, marketAddress);
+  const [vaultA, vaultB] = await fetchAllVault(rpc, [market.data.vaultA, market.data.vaultB]);
   const [mintA, mintB] = await (0, import_token_202237.fetchAllMaybeMint)(rpc, [fusionPool.data.tokenMintA, fusionPool.data.tokenMintB]);
   (0, import_assert25.default)(mintA.exists, "Token A account not found");
   (0, import_assert25.default)(mintB.exists, "Token B account not found");
@@ -15626,7 +15590,7 @@ async function rebalanceTunaLpPositionFusionInstructions(rpc, authority, positio
   instructions.push(ix);
   return {
     instructions,
-    initializationCost: (0, import_kit143.lamports)(nonRefundableRent)
+    initializationCost: (0, import_kit142.lamports)(nonRefundableRent)
   };
 }
 async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool) {
@@ -15669,17 +15633,17 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   );
   const secondaryTickArrays = await FusionUtils.getTickArraysForRebalancedPosition(fusionPool, tunaPosition);
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit143.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit143.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit143.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit143.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit143.AccountRole.WRITABLE },
-    { address: lowerTickArrayAddress, role: import_kit143.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit143.AccountRole.WRITABLE },
-    { address: secondaryTickArrays.lowerTickArrayAddress, role: import_kit143.AccountRole.WRITABLE },
-    { address: secondaryTickArrays.upperTickArrayAddress, role: import_kit143.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultA, role: import_kit143.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultB, role: import_kit143.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit142.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit142.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit142.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit142.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit142.AccountRole.WRITABLE },
+    { address: lowerTickArrayAddress, role: import_kit142.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit142.AccountRole.WRITABLE },
+    { address: secondaryTickArrays.lowerTickArrayAddress, role: import_kit142.AccountRole.WRITABLE },
+    { address: secondaryTickArrays.upperTickArrayAddress, role: import_kit142.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultA, role: import_kit142.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultB, role: import_kit142.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -15732,11 +15696,11 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   COLLECT_REWARD_ORCA_DISCRIMINATOR,
   COMPUTED_AMOUNT,
   CREATE_MARKET_DISCRIMINATOR,
-  CREATE_MARKET_V2_DISCRIMINATOR,
+  CREATE_MARKET_PERMISSIONLESS_DISCRIMINATOR,
   CREATE_PRICE_UPDATE_DISCRIMINATOR,
   CREATE_TUNA_CONFIG_DISCRIMINATOR,
   CREATE_VAULT_DISCRIMINATOR,
-  CREATE_VAULT_V2_DISCRIMINATOR,
+  CREATE_VAULT_PERMISSIONLESS_DISCRIMINATOR,
   DECREASE_TUNA_LP_POSITION_FUSION_DISCRIMINATOR,
   DECREASE_TUNA_LP_POSITION_ORCA_DISCRIMINATOR,
   DEFAULT_ADDRESS,
@@ -15905,10 +15869,10 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   createAddressLookupTableForMarketInstructions,
   createAddressLookupTableInstructions,
   createMarketInstruction,
-  createMarketV2Instruction,
+  createMarketPermissionlessInstruction,
   createTunaConfigInstruction,
   createVaultInstructions,
-  createVaultV2Instructions,
+  createVaultPermissionlessInstructions,
   decodeLendingPosition,
   decodeMarket,
   decodeTunaConfig,
@@ -16006,11 +15970,11 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   getCreateMarketInstructionDataCodec,
   getCreateMarketInstructionDataDecoder,
   getCreateMarketInstructionDataEncoder,
-  getCreateMarketV2DiscriminatorBytes,
-  getCreateMarketV2Instruction,
-  getCreateMarketV2InstructionDataCodec,
-  getCreateMarketV2InstructionDataDecoder,
-  getCreateMarketV2InstructionDataEncoder,
+  getCreateMarketPermissionlessDiscriminatorBytes,
+  getCreateMarketPermissionlessInstruction,
+  getCreateMarketPermissionlessInstructionDataCodec,
+  getCreateMarketPermissionlessInstructionDataDecoder,
+  getCreateMarketPermissionlessInstructionDataEncoder,
   getCreatePriceUpdateDiscriminatorBytes,
   getCreatePriceUpdateInstruction,
   getCreatePriceUpdateInstructionDataCodec,
@@ -16026,11 +15990,11 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   getCreateVaultInstructionDataCodec,
   getCreateVaultInstructionDataDecoder,
   getCreateVaultInstructionDataEncoder,
-  getCreateVaultV2DiscriminatorBytes,
-  getCreateVaultV2Instruction,
-  getCreateVaultV2InstructionDataCodec,
-  getCreateVaultV2InstructionDataDecoder,
-  getCreateVaultV2InstructionDataEncoder,
+  getCreateVaultPermissionlessDiscriminatorBytes,
+  getCreateVaultPermissionlessInstruction,
+  getCreateVaultPermissionlessInstructionDataCodec,
+  getCreateVaultPermissionlessInstructionDataDecoder,
+  getCreateVaultPermissionlessInstructionDataEncoder,
   getDecreaseTunaLpPositionFusionDiscriminatorBytes,
   getDecreaseTunaLpPositionFusionInstruction,
   getDecreaseTunaLpPositionFusionInstructionDataCodec,
@@ -16063,7 +16027,6 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   getLendingPositionEncoder,
   getLendingPositionSize,
   getLendingVaultAddress,
-  getLendingVaultV2Address,
   getLiquidateTunaLpPositionFusionDiscriminatorBytes,
   getLiquidateTunaLpPositionFusionInstruction,
   getLiquidateTunaLpPositionFusionInstructionDataCodec,
@@ -16375,11 +16338,11 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   parseCollectFeesOrcaInstruction,
   parseCollectRewardOrcaInstruction,
   parseCreateMarketInstruction,
-  parseCreateMarketV2Instruction,
+  parseCreateMarketPermissionlessInstruction,
   parseCreatePriceUpdateInstruction,
   parseCreateTunaConfigInstruction,
   parseCreateVaultInstruction,
-  parseCreateVaultV2Instruction,
+  parseCreateVaultPermissionlessInstruction,
   parseDecreaseTunaLpPositionFusionInstruction,
   parseDecreaseTunaLpPositionOrcaInstruction,
   parseDepositInstruction,