@crypticdot/defituna-client 3.5.12 → 3.6.0

package/dist/index.js

@@ -347,7 +347,8 @@ function getMarketEncoder() {
       ["vaultB", getAddressEncoder2()],
       ["badDebtA", getU64Encoder2()],
       ["badDebtB", getU64Encoder2()],
-      ["reserved", fixEncoderSize2(getBytesEncoder2(), 111)]
+      ["authority", getAddressEncoder2()],
+      ["reserved", fixEncoderSize2(getBytesEncoder2(), 79)]
     ]),
     (value) => ({ ...value, discriminator: MARKET_DISCRIMINATOR })
   );
@@ -380,7 +381,8 @@ function getMarketDecoder() {
     ["vaultB", getAddressDecoder2()],
     ["badDebtA", getU64Decoder2()],
     ["badDebtB", getU64Decoder2()],
-    ["reserved", fixDecoderSize2(getBytesDecoder2(), 111)]
+    ["authority", getAddressDecoder2()],
+    ["reserved", fixDecoderSize2(getBytesDecoder2(), 79)]
   ]);
 }
 function getMarketCodec() {
@@ -927,8 +929,6 @@ import {
   getStructEncoder as getStructEncoder10,
   getU16Decoder as getU16Decoder6,
   getU16Encoder as getU16Encoder6,
-  getU32Decoder as getU32Decoder5,
-  getU32Encoder as getU32Encoder5,
   getU64Decoder as getU64Decoder5,
   getU64Encoder as getU64Encoder5,
   transformEncoder as transformEncoder7
@@ -963,8 +963,9 @@ function getVaultEncoder() {
       ["supplyLimit", getU64Encoder5()],
       ["oraclePriceUpdate", getAddressEncoder6()],
       ["pythOracleFeedId", getAddressEncoder6()],
-      ["id", getU32Encoder5()],
-      ["reserved", fixEncoderSize7(getBytesEncoder7(), 180)]
+      ["authority", getAddressEncoder6()],
+      ["market", getAddressEncoder6()],
+      ["reserved", fixEncoderSize7(getBytesEncoder7(), 120)]
     ]),
     (value) => ({ ...value, discriminator: VAULT_DISCRIMINATOR })
   );
@@ -985,8 +986,9 @@ function getVaultDecoder() {
     ["supplyLimit", getU64Decoder5()],
     ["oraclePriceUpdate", getAddressDecoder6()],
     ["pythOracleFeedId", getAddressDecoder6()],
-    ["id", getU32Decoder5()],
-    ["reserved", fixDecoderSize7(getBytesDecoder7(), 180)]
+    ["authority", getAddressDecoder6()],
+    ["market", getAddressDecoder6()],
+    ["reserved", fixDecoderSize7(getBytesDecoder7(), 120)]
   ]);
 }
 function getVaultCodec() {
@@ -1121,11 +1123,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";
@@ -1260,11 +1262,11 @@ function identifyTunaInstruction(instruction) {
   if (containsBytes(
     data,
     fixEncoderSize8(getBytesEncoder8(), 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 (containsBytes(
     data,
@@ -1296,11 +1298,11 @@ function identifyTunaInstruction(instruction) {
   if (containsBytes(
     data,
     fixEncoderSize8(getBytesEncoder8(), 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 (containsBytes(
     data,
@@ -3119,8 +3121,8 @@ import {
   getStructEncoder as getStructEncoder19,
   getU16Decoder as getU16Decoder7,
   getU16Encoder as getU16Encoder7,
-  getU32Decoder as getU32Decoder6,
-  getU32Encoder as getU32Encoder6,
+  getU32Decoder as getU32Decoder5,
+  getU32Encoder as getU32Encoder5,
   getU64Decoder as getU64Decoder6,
   getU64Encoder as getU64Encoder6,
   transformEncoder as transformEncoder16
@@ -3145,17 +3147,17 @@ function getCreateMarketInstructionDataEncoder() {
     getStructEncoder19([
       ["discriminator", fixEncoderSize17(getBytesEncoder17(), 8)],
       ["addressLookupTable", getAddressEncoder7()],
-      ["maxLeverage", getU32Encoder6()],
+      ["maxLeverage", getU32Encoder5()],
       ["protocolFee", getU16Encoder7()],
       ["protocolFeeOnCollateral", getU16Encoder7()],
-      ["liquidationFee", getU32Encoder6()],
-      ["liquidationThreshold", getU32Encoder6()],
-      ["oraclePriceDeviationThreshold", getU32Encoder6()],
+      ["liquidationFee", getU32Encoder5()],
+      ["liquidationThreshold", getU32Encoder5()],
+      ["oraclePriceDeviationThreshold", getU32Encoder5()],
       ["disabled", getBooleanEncoder5()],
       ["borrowLimitA", getU64Encoder6()],
       ["borrowLimitB", getU64Encoder6()],
-      ["maxSwapSlippage", getU32Encoder6()],
-      ["rebalanceProtocolFee", getU32Encoder6()],
+      ["maxSwapSlippage", getU32Encoder5()],
+      ["rebalanceProtocolFee", getU32Encoder5()],
       ["spotPositionSizeLimitA", getU64Encoder6()],
       ["spotPositionSizeLimitB", getU64Encoder6()]
     ]),
@@ -3166,17 +3168,17 @@ function getCreateMarketInstructionDataDecoder() {
   return getStructDecoder19([
     ["discriminator", fixDecoderSize16(getBytesDecoder16(), 8)],
     ["addressLookupTable", getAddressDecoder7()],
-    ["maxLeverage", getU32Decoder6()],
+    ["maxLeverage", getU32Decoder5()],
     ["protocolFee", getU16Decoder7()],
     ["protocolFeeOnCollateral", getU16Decoder7()],
-    ["liquidationFee", getU32Decoder6()],
-    ["liquidationThreshold", getU32Decoder6()],
-    ["oraclePriceDeviationThreshold", getU32Decoder6()],
+    ["liquidationFee", getU32Decoder5()],
+    ["liquidationThreshold", getU32Decoder5()],
+    ["oraclePriceDeviationThreshold", getU32Decoder5()],
     ["disabled", getBooleanDecoder5()],
     ["borrowLimitA", getU64Decoder6()],
     ["borrowLimitB", getU64Decoder6()],
-    ["maxSwapSlippage", getU32Decoder6()],
-    ["rebalanceProtocolFee", getU32Decoder6()],
+    ["maxSwapSlippage", getU32Decoder5()],
+    ["rebalanceProtocolFee", getU32Decoder5()],
     ["spotPositionSizeLimitA", getU64Decoder6()],
     ["spotPositionSizeLimitB", getU64Decoder6()]
   ]);
@@ -3246,7 +3248,7 @@ function parseCreateMarketInstruction(instruction) {
   };
 }
 
-// src/generated/instructions/createMarketV2.ts
+// src/generated/instructions/createMarketPermissionless.ts
 import {
   combineCodec as combineCodec24,
   fixDecoderSize as fixDecoderSize17,
@@ -3257,49 +3259,48 @@ import {
   getBytesEncoder as getBytesEncoder18,
   getStructDecoder as getStructDecoder20,
   getStructEncoder as getStructEncoder20,
-  getU32Decoder as getU32Decoder7,
-  getU32Encoder as getU32Encoder7,
   transformEncoder as transformEncoder17
 } from "@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 fixEncoderSize18(getBytesEncoder18(), 8).encode(
-    CREATE_MARKET_V2_DISCRIMINATOR
+    CREATE_MARKET_PERMISSIONLESS_DISCRIMINATOR
   );
 }
-function getCreateMarketV2InstructionDataEncoder() {
+function getCreateMarketPermissionlessInstructionDataEncoder() {
   return transformEncoder17(
     getStructEncoder20([
       ["discriminator", fixEncoderSize18(getBytesEncoder18(), 8)],
-      ["addressLookupTable", getAddressEncoder8()],
-      ["maxLeverage", getU32Encoder7()]
+      ["addressLookupTable", getAddressEncoder8()]
     ]),
-    (value) => ({ ...value, discriminator: CREATE_MARKET_V2_DISCRIMINATOR })
+    (value) => ({
+      ...value,
+      discriminator: CREATE_MARKET_PERMISSIONLESS_DISCRIMINATOR
+    })
   );
 }
-function getCreateMarketV2InstructionDataDecoder() {
+function getCreateMarketPermissionlessInstructionDataDecoder() {
   return getStructDecoder20([
     ["discriminator", fixDecoderSize17(getBytesDecoder17(), 8)],
-    ["addressLookupTable", getAddressDecoder8()],
-    ["maxLeverage", getU32Decoder7()]
+    ["addressLookupTable", getAddressDecoder8()]
   ]);
 }
-function getCreateMarketV2InstructionDataCodec() {
+function getCreateMarketPermissionlessInstructionDataCodec() {
   return combineCodec24(
-    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 },
@@ -3327,13 +3328,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");
   }
@@ -3354,7 +3355,9 @@ function parseCreateMarketV2Instruction(instruction) {
       pool: getNextAccount(),
       systemProgram: getNextAccount()
     },
-    data: getCreateMarketV2InstructionDataDecoder().decode(instruction.data)
+    data: getCreateMarketPermissionlessInstructionDataDecoder().decode(
+      instruction.data
+    )
   };
 }
 
@@ -3684,72 +3687,63 @@ function parseCreateVaultInstruction(instruction) {
   };
 }
 
-// src/generated/instructions/createVaultV2.ts
+// src/generated/instructions/createVaultPermissionless.ts
 import {
   combineCodec as combineCodec28,
   fixDecoderSize as fixDecoderSize21,
   fixEncoderSize as fixEncoderSize22,
   getAddressDecoder as getAddressDecoder11,
   getAddressEncoder as getAddressEncoder11,
-  getBooleanDecoder as getBooleanDecoder7,
-  getBooleanEncoder as getBooleanEncoder7,
   getBytesDecoder as getBytesDecoder21,
   getBytesEncoder as getBytesEncoder22,
   getStructDecoder as getStructDecoder24,
   getStructEncoder as getStructEncoder24,
-  getU32Decoder as getU32Decoder8,
-  getU32Encoder as getU32Encoder8,
   getU64Decoder as getU64Decoder8,
   getU64Encoder as getU64Encoder8,
   transformEncoder as transformEncoder21
 } from "@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 fixEncoderSize22(getBytesEncoder22(), 8).encode(
-    CREATE_VAULT_V2_DISCRIMINATOR
+    CREATE_VAULT_PERMISSIONLESS_DISCRIMINATOR
   );
 }
-function getCreateVaultV2InstructionDataEncoder() {
+function getCreateVaultPermissionlessInstructionDataEncoder() {
   return transformEncoder21(
     getStructEncoder24([
       ["discriminator", fixEncoderSize22(getBytesEncoder22(), 8)],
-      ["id", getU32Encoder8()],
-      ["interestRate", getU64Encoder8()],
-      ["supplyLimit", getU64Encoder8()],
-      ["oraclePriceUpdate", getAddressEncoder11()],
-      ["pythOracleFeedId", getAddressEncoder11()],
-      ["allowUnsafeTokenExtensions", getBooleanEncoder7()]
+      ["market", getAddressEncoder11()],
+      ["interestRate", getU64Encoder8()]
     ]),
-    (value) => ({ ...value, discriminator: CREATE_VAULT_V2_DISCRIMINATOR })
+    (value) => ({
+      ...value,
+      discriminator: CREATE_VAULT_PERMISSIONLESS_DISCRIMINATOR
+    })
   );
 }
-function getCreateVaultV2InstructionDataDecoder() {
+function getCreateVaultPermissionlessInstructionDataDecoder() {
   return getStructDecoder24([
     ["discriminator", fixDecoderSize21(getBytesDecoder21(), 8)],
-    ["id", getU32Decoder8()],
-    ["interestRate", getU64Decoder8()],
-    ["supplyLimit", getU64Decoder8()],
-    ["oraclePriceUpdate", getAddressDecoder11()],
-    ["pythOracleFeedId", getAddressDecoder11()],
-    ["allowUnsafeTokenExtensions", getBooleanDecoder7()]
+    ["market", getAddressDecoder11()],
+    ["interestRate", getU64Decoder8()]
   ]);
 }
-function getCreateVaultV2InstructionDataCodec() {
+function getCreateVaultPermissionlessInstructionDataCodec() {
   return combineCodec28(
-    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 },
@@ -3780,13 +3774,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");
   }
@@ -3807,7 +3801,9 @@ function parseCreateVaultV2Instruction(instruction) {
       tokenProgram: getNextAccount(),
       systemProgram: getNextAccount()
     },
-    data: getCreateVaultV2InstructionDataDecoder().decode(instruction.data)
+    data: getCreateVaultPermissionlessInstructionDataDecoder().decode(
+      instruction.data
+    )
   };
 }
 
@@ -3822,8 +3818,8 @@ import {
   getOptionEncoder,
   getStructDecoder as getStructDecoder25,
   getStructEncoder as getStructEncoder25,
-  getU32Decoder as getU32Decoder9,
-  getU32Encoder as getU32Encoder9,
+  getU32Decoder as getU32Decoder6,
+  getU32Encoder as getU32Encoder6,
   getU64Decoder as getU64Decoder9,
   getU64Encoder as getU64Encoder9,
   transformEncoder as transformEncoder22
@@ -3847,11 +3843,11 @@ function getDecreaseTunaLpPositionFusionInstructionDataEncoder() {
   return transformEncoder22(
     getStructEncoder25([
       ["discriminator", fixEncoderSize23(getBytesEncoder23(), 8)],
-      ["decreasePercent", getU32Encoder9()],
+      ["decreasePercent", getU32Encoder6()],
       ["swapToToken", getOptionEncoder(getPoolTokenEncoder())],
       ["minRemovedAmountA", getU64Encoder9()],
       ["minRemovedAmountB", getU64Encoder9()],
-      ["maxSwapSlippage", getU32Encoder9()],
+      ["maxSwapSlippage", getU32Encoder6()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -3863,11 +3859,11 @@ function getDecreaseTunaLpPositionFusionInstructionDataEncoder() {
 function getDecreaseTunaLpPositionFusionInstructionDataDecoder() {
   return getStructDecoder25([
     ["discriminator", fixDecoderSize22(getBytesDecoder22(), 8)],
-    ["decreasePercent", getU32Decoder9()],
+    ["decreasePercent", getU32Decoder6()],
     ["swapToToken", getOptionDecoder(getPoolTokenDecoder())],
     ["minRemovedAmountA", getU64Decoder9()],
     ["minRemovedAmountB", getU64Decoder9()],
-    ["maxSwapSlippage", getU32Decoder9()],
+    ["maxSwapSlippage", getU32Decoder6()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -4015,8 +4011,8 @@ import {
   getOptionEncoder as getOptionEncoder2,
   getStructDecoder as getStructDecoder26,
   getStructEncoder as getStructEncoder26,
-  getU32Decoder as getU32Decoder10,
-  getU32Encoder as getU32Encoder10,
+  getU32Decoder as getU32Decoder7,
+  getU32Encoder as getU32Encoder7,
   getU64Decoder as getU64Decoder10,
   getU64Encoder as getU64Encoder10,
   transformEncoder as transformEncoder23
@@ -4040,11 +4036,11 @@ function getDecreaseTunaLpPositionOrcaInstructionDataEncoder() {
   return transformEncoder23(
     getStructEncoder26([
       ["discriminator", fixEncoderSize24(getBytesEncoder24(), 8)],
-      ["decreasePercent", getU32Encoder10()],
+      ["decreasePercent", getU32Encoder7()],
       ["swapToToken", getOptionEncoder2(getPoolTokenEncoder())],
       ["minRemovedAmountA", getU64Encoder10()],
       ["minRemovedAmountB", getU64Encoder10()],
-      ["maxSwapSlippage", getU32Encoder10()],
+      ["maxSwapSlippage", getU32Encoder7()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -4056,11 +4052,11 @@ function getDecreaseTunaLpPositionOrcaInstructionDataEncoder() {
 function getDecreaseTunaLpPositionOrcaInstructionDataDecoder() {
   return getStructDecoder26([
     ["discriminator", fixDecoderSize23(getBytesDecoder23(), 8)],
-    ["decreasePercent", getU32Decoder10()],
+    ["decreasePercent", getU32Decoder7()],
     ["swapToToken", getOptionDecoder2(getPoolTokenDecoder())],
     ["minRemovedAmountA", getU64Decoder10()],
     ["minRemovedAmountB", getU64Decoder10()],
-    ["maxSwapSlippage", getU32Decoder10()],
+    ["maxSwapSlippage", getU32Decoder7()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -4318,8 +4314,8 @@ import {
   getBytesEncoder as getBytesEncoder26,
   getStructDecoder as getStructDecoder28,
   getStructEncoder as getStructEncoder28,
-  getU32Decoder as getU32Decoder11,
-  getU32Encoder as getU32Encoder11,
+  getU32Decoder as getU32Decoder8,
+  getU32Encoder as getU32Encoder8,
   getU64Decoder as getU64Decoder12,
   getU64Encoder as getU64Encoder12,
   transformEncoder as transformEncoder25
@@ -4349,7 +4345,7 @@ function getIncreaseTunaLpPositionFusionInstructionDataEncoder() {
       ["borrowB", getU64Encoder12()],
       ["minAddedAmountA", getU64Encoder12()],
       ["minAddedAmountB", getU64Encoder12()],
-      ["maxSwapSlippage", getU32Encoder11()],
+      ["maxSwapSlippage", getU32Encoder8()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -4367,7 +4363,7 @@ function getIncreaseTunaLpPositionFusionInstructionDataDecoder() {
     ["borrowB", getU64Decoder12()],
     ["minAddedAmountA", getU64Decoder12()],
     ["minAddedAmountB", getU64Decoder12()],
-    ["maxSwapSlippage", getU32Decoder11()],
+    ["maxSwapSlippage", getU32Decoder8()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -4531,8 +4527,8 @@ import {
   getBytesEncoder as getBytesEncoder27,
   getStructDecoder as getStructDecoder29,
   getStructEncoder as getStructEncoder29,
-  getU32Decoder as getU32Decoder12,
-  getU32Encoder as getU32Encoder12,
+  getU32Decoder as getU32Decoder9,
+  getU32Encoder as getU32Encoder9,
   getU64Decoder as getU64Decoder13,
   getU64Encoder as getU64Encoder13,
   transformEncoder as transformEncoder26
@@ -4562,7 +4558,7 @@ function getIncreaseTunaLpPositionOrcaInstructionDataEncoder() {
       ["borrowB", getU64Encoder13()],
       ["minAddedAmountA", getU64Encoder13()],
       ["minAddedAmountB", getU64Encoder13()],
-      ["maxSwapSlippage", getU32Encoder12()],
+      ["maxSwapSlippage", getU32Encoder9()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -4580,7 +4576,7 @@ function getIncreaseTunaLpPositionOrcaInstructionDataDecoder() {
     ["borrowB", getU64Decoder13()],
     ["minAddedAmountA", getU64Decoder13()],
     ["minAddedAmountB", getU64Decoder13()],
-    ["maxSwapSlippage", getU32Decoder12()],
+    ["maxSwapSlippage", getU32Decoder9()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -4744,8 +4740,8 @@ import {
   getBytesEncoder as getBytesEncoder28,
   getStructDecoder as getStructDecoder30,
   getStructEncoder as getStructEncoder30,
-  getU32Decoder as getU32Decoder13,
-  getU32Encoder as getU32Encoder13,
+  getU32Decoder as getU32Decoder10,
+  getU32Encoder as getU32Encoder10,
   transformEncoder as transformEncoder27
 } from "@solana/kit";
 var LIQUIDATE_TUNA_LP_POSITION_FUSION_DISCRIMINATOR = new Uint8Array([
@@ -4767,7 +4763,7 @@ function getLiquidateTunaLpPositionFusionInstructionDataEncoder() {
   return transformEncoder27(
     getStructEncoder30([
       ["discriminator", fixEncoderSize28(getBytesEncoder28(), 8)],
-      ["decreasePercent", getU32Encoder13()],
+      ["decreasePercent", getU32Encoder10()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -4779,7 +4775,7 @@ function getLiquidateTunaLpPositionFusionInstructionDataEncoder() {
 function getLiquidateTunaLpPositionFusionInstructionDataDecoder() {
   return getStructDecoder30([
     ["discriminator", fixDecoderSize27(getBytesDecoder27(), 8)],
-    ["decreasePercent", getU32Decoder13()],
+    ["decreasePercent", getU32Decoder10()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -4925,8 +4921,8 @@ import {
   getBytesEncoder as getBytesEncoder29,
   getStructDecoder as getStructDecoder31,
   getStructEncoder as getStructEncoder31,
-  getU32Decoder as getU32Decoder14,
-  getU32Encoder as getU32Encoder14,
+  getU32Decoder as getU32Decoder11,
+  getU32Encoder as getU32Encoder11,
   transformEncoder as transformEncoder28
 } from "@solana/kit";
 var LIQUIDATE_TUNA_LP_POSITION_ORCA_DISCRIMINATOR = new Uint8Array([
@@ -4948,7 +4944,7 @@ function getLiquidateTunaLpPositionOrcaInstructionDataEncoder() {
   return transformEncoder28(
     getStructEncoder31([
       ["discriminator", fixEncoderSize29(getBytesEncoder29(), 8)],
-      ["decreasePercent", getU32Encoder14()],
+      ["decreasePercent", getU32Encoder11()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -4960,7 +4956,7 @@ function getLiquidateTunaLpPositionOrcaInstructionDataEncoder() {
 function getLiquidateTunaLpPositionOrcaInstructionDataDecoder() {
   return getStructDecoder31([
     ["discriminator", fixDecoderSize28(getBytesDecoder28(), 8)],
-    ["decreasePercent", getU32Decoder14()],
+    ["decreasePercent", getU32Decoder11()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -5106,8 +5102,8 @@ import {
   getBytesEncoder as getBytesEncoder30,
   getStructDecoder as getStructDecoder32,
   getStructEncoder as getStructEncoder32,
-  getU32Decoder as getU32Decoder15,
-  getU32Encoder as getU32Encoder15,
+  getU32Decoder as getU32Decoder12,
+  getU32Encoder as getU32Encoder12,
   transformEncoder as transformEncoder29
 } from "@solana/kit";
 var LIQUIDATE_TUNA_SPOT_POSITION_FUSION_DISCRIMINATOR = new Uint8Array(
@@ -5122,7 +5118,7 @@ function getLiquidateTunaSpotPositionFusionInstructionDataEncoder() {
   return transformEncoder29(
     getStructEncoder32([
       ["discriminator", fixEncoderSize30(getBytesEncoder30(), 8)],
-      ["decreasePercent", getU32Encoder15()],
+      ["decreasePercent", getU32Encoder12()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -5134,7 +5130,7 @@ function getLiquidateTunaSpotPositionFusionInstructionDataEncoder() {
 function getLiquidateTunaSpotPositionFusionInstructionDataDecoder() {
   return getStructDecoder32([
     ["discriminator", fixDecoderSize29(getBytesDecoder29(), 8)],
-    ["decreasePercent", getU32Decoder15()],
+    ["decreasePercent", getU32Decoder12()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -5304,8 +5300,8 @@ import {
   getBytesEncoder as getBytesEncoder31,
   getStructDecoder as getStructDecoder33,
   getStructEncoder as getStructEncoder33,
-  getU32Decoder as getU32Decoder16,
-  getU32Encoder as getU32Encoder16,
+  getU32Decoder as getU32Decoder13,
+  getU32Encoder as getU32Encoder13,
   transformEncoder as transformEncoder30
 } from "@solana/kit";
 var LIQUIDATE_TUNA_SPOT_POSITION_JUPITER_DISCRIMINATOR = new Uint8Array([202, 175, 176, 66, 139, 120, 175, 193]);
@@ -5318,8 +5314,8 @@ function getLiquidateTunaSpotPositionJupiterInstructionDataEncoder() {
   return transformEncoder30(
     getStructEncoder33([
       ["discriminator", fixEncoderSize31(getBytesEncoder31(), 8)],
-      ["decreasePercent", getU32Encoder16()],
-      ["routeData", addEncoderSizePrefix(getBytesEncoder31(), getU32Encoder16())]
+      ["decreasePercent", getU32Encoder13()],
+      ["routeData", addEncoderSizePrefix(getBytesEncoder31(), getU32Encoder13())]
     ]),
     (value) => ({
       ...value,
@@ -5330,8 +5326,8 @@ function getLiquidateTunaSpotPositionJupiterInstructionDataEncoder() {
 function getLiquidateTunaSpotPositionJupiterInstructionDataDecoder() {
   return getStructDecoder33([
     ["discriminator", fixDecoderSize30(getBytesDecoder30(), 8)],
-    ["decreasePercent", getU32Decoder16()],
-    ["routeData", addDecoderSizePrefix(getBytesDecoder30(), getU32Decoder16())]
+    ["decreasePercent", getU32Decoder13()],
+    ["routeData", addDecoderSizePrefix(getBytesDecoder30(), getU32Decoder13())]
   ]);
 }
 function getLiquidateTunaSpotPositionJupiterInstructionDataCodec() {
@@ -5509,8 +5505,8 @@ import {
   getBytesEncoder as getBytesEncoder32,
   getStructDecoder as getStructDecoder34,
   getStructEncoder as getStructEncoder34,
-  getU32Decoder as getU32Decoder17,
-  getU32Encoder as getU32Encoder17,
+  getU32Decoder as getU32Decoder14,
+  getU32Encoder as getU32Encoder14,
   transformEncoder as transformEncoder31
 } from "@solana/kit";
 var LIQUIDATE_TUNA_SPOT_POSITION_ORCA_DISCRIMINATOR = new Uint8Array([
@@ -5532,7 +5528,7 @@ function getLiquidateTunaSpotPositionOrcaInstructionDataEncoder() {
   return transformEncoder31(
     getStructEncoder34([
       ["discriminator", fixEncoderSize32(getBytesEncoder32(), 8)],
-      ["decreasePercent", getU32Encoder17()],
+      ["decreasePercent", getU32Encoder14()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -5544,7 +5540,7 @@ function getLiquidateTunaSpotPositionOrcaInstructionDataEncoder() {
 function getLiquidateTunaSpotPositionOrcaInstructionDataDecoder() {
   return getStructDecoder34([
     ["discriminator", fixDecoderSize31(getBytesDecoder31(), 8)],
-    ["decreasePercent", getU32Decoder17()],
+    ["decreasePercent", getU32Decoder14()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -5712,8 +5708,8 @@ import {
   getBytesEncoder as getBytesEncoder33,
   getStructDecoder as getStructDecoder35,
   getStructEncoder as getStructEncoder35,
-  getU32Decoder as getU32Decoder18,
-  getU32Encoder as getU32Encoder18,
+  getU32Decoder as getU32Decoder15,
+  getU32Encoder as getU32Encoder15,
   getU64Decoder as getU64Decoder14,
   getU64Encoder as getU64Encoder14,
   transformEncoder as transformEncoder32
@@ -5737,7 +5733,7 @@ function getModifyTunaSpotPositionFusionInstructionDataEncoder() {
   return transformEncoder32(
     getStructEncoder35([
       ["discriminator", fixEncoderSize33(getBytesEncoder33(), 8)],
-      ["decreasePercent", getU32Encoder18()],
+      ["decreasePercent", getU32Encoder15()],
       ["collateralAmount", getU64Encoder14()],
       ["borrowAmount", getU64Encoder14()],
       ["requiredSwapAmount", getU64Encoder14()],
@@ -5752,7 +5748,7 @@ function getModifyTunaSpotPositionFusionInstructionDataEncoder() {
 function getModifyTunaSpotPositionFusionInstructionDataDecoder() {
   return getStructDecoder35([
     ["discriminator", fixDecoderSize32(getBytesDecoder32(), 8)],
-    ["decreasePercent", getU32Decoder18()],
+    ["decreasePercent", getU32Decoder15()],
     ["collateralAmount", getU64Decoder14()],
     ["borrowAmount", getU64Decoder14()],
     ["requiredSwapAmount", getU64Decoder14()],
@@ -5919,8 +5915,8 @@ import {
   getBytesEncoder as getBytesEncoder34,
   getStructDecoder as getStructDecoder36,
   getStructEncoder as getStructEncoder36,
-  getU32Decoder as getU32Decoder19,
-  getU32Encoder as getU32Encoder19,
+  getU32Decoder as getU32Decoder16,
+  getU32Encoder as getU32Encoder16,
   getU64Decoder as getU64Decoder15,
   getU64Encoder as getU64Encoder15,
   transformEncoder as transformEncoder33
@@ -5944,10 +5940,10 @@ function getModifyTunaSpotPositionJupiterInstructionDataEncoder() {
   return transformEncoder33(
     getStructEncoder36([
       ["discriminator", fixEncoderSize34(getBytesEncoder34(), 8)],
-      ["decreasePercent", getU32Encoder19()],
+      ["decreasePercent", getU32Encoder16()],
       ["collateralAmount", getU64Encoder15()],
       ["borrowAmount", getU64Encoder15()],
-      ["routeData", addEncoderSizePrefix2(getBytesEncoder34(), getU32Encoder19())]
+      ["routeData", addEncoderSizePrefix2(getBytesEncoder34(), getU32Encoder16())]
     ]),
     (value) => ({
       ...value,
@@ -5958,10 +5954,10 @@ function getModifyTunaSpotPositionJupiterInstructionDataEncoder() {
 function getModifyTunaSpotPositionJupiterInstructionDataDecoder() {
   return getStructDecoder36([
     ["discriminator", fixDecoderSize33(getBytesDecoder33(), 8)],
-    ["decreasePercent", getU32Decoder19()],
+    ["decreasePercent", getU32Decoder16()],
     ["collateralAmount", getU64Decoder15()],
     ["borrowAmount", getU64Decoder15()],
-    ["routeData", addDecoderSizePrefix2(getBytesDecoder33(), getU32Decoder19())]
+    ["routeData", addDecoderSizePrefix2(getBytesDecoder33(), getU32Decoder16())]
   ]);
 }
 function getModifyTunaSpotPositionJupiterInstructionDataCodec() {
@@ -6133,8 +6129,8 @@ import {
   getBytesEncoder as getBytesEncoder35,
   getStructDecoder as getStructDecoder37,
   getStructEncoder as getStructEncoder37,
-  getU32Decoder as getU32Decoder20,
-  getU32Encoder as getU32Encoder20,
+  getU32Decoder as getU32Decoder17,
+  getU32Encoder as getU32Encoder17,
   getU64Decoder as getU64Decoder16,
   getU64Encoder as getU64Encoder16,
   transformEncoder as transformEncoder34
@@ -6158,7 +6154,7 @@ function getModifyTunaSpotPositionOrcaInstructionDataEncoder() {
   return transformEncoder34(
     getStructEncoder37([
       ["discriminator", fixEncoderSize35(getBytesEncoder35(), 8)],
-      ["decreasePercent", getU32Encoder20()],
+      ["decreasePercent", getU32Encoder17()],
       ["collateralAmount", getU64Encoder16()],
       ["borrowAmount", getU64Encoder16()],
       ["requiredSwapAmount", getU64Encoder16()],
@@ -6173,7 +6169,7 @@ function getModifyTunaSpotPositionOrcaInstructionDataEncoder() {
 function getModifyTunaSpotPositionOrcaInstructionDataDecoder() {
   return getStructDecoder37([
     ["discriminator", fixDecoderSize34(getBytesDecoder34(), 8)],
-    ["decreasePercent", getU32Decoder20()],
+    ["decreasePercent", getU32Decoder17()],
     ["collateralAmount", getU64Decoder16()],
     ["borrowAmount", getU64Decoder16()],
     ["requiredSwapAmount", getU64Decoder16()],
@@ -6342,8 +6338,8 @@ import {
   getStructEncoder as getStructEncoder38,
   getU128Decoder as getU128Decoder3,
   getU128Encoder as getU128Encoder3,
-  getU32Decoder as getU32Decoder21,
-  getU32Encoder as getU32Encoder21,
+  getU32Decoder as getU32Decoder18,
+  getU32Encoder as getU32Encoder18,
   getU64Decoder as getU64Decoder17,
   getU64Encoder as getU64Encoder17,
   transformEncoder as transformEncoder35
@@ -6362,14 +6358,14 @@ function getOpenAndIncreaseTunaLpPositionFusionInstructionDataEncoder() {
       ["tickUpperIndex", getI32Encoder4()],
       ["lowerLimitOrderSqrtPrice", getU128Encoder3()],
       ["upperLimitOrderSqrtPrice", getU128Encoder3()],
-      ["flags", getU32Encoder21()],
+      ["flags", getU32Encoder18()],
       ["collateralA", getU64Encoder17()],
       ["collateralB", getU64Encoder17()],
       ["borrowA", getU64Encoder17()],
       ["borrowB", getU64Encoder17()],
       ["minAddedAmountA", getU64Encoder17()],
       ["minAddedAmountB", getU64Encoder17()],
-      ["maxSwapSlippage", getU32Encoder21()],
+      ["maxSwapSlippage", getU32Encoder18()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -6385,14 +6381,14 @@ function getOpenAndIncreaseTunaLpPositionFusionInstructionDataDecoder() {
     ["tickUpperIndex", getI32Decoder4()],
     ["lowerLimitOrderSqrtPrice", getU128Decoder3()],
     ["upperLimitOrderSqrtPrice", getU128Decoder3()],
-    ["flags", getU32Decoder21()],
+    ["flags", getU32Decoder18()],
     ["collateralA", getU64Decoder17()],
     ["collateralB", getU64Decoder17()],
     ["borrowA", getU64Decoder17()],
     ["borrowB", getU64Decoder17()],
     ["minAddedAmountA", getU64Decoder17()],
     ["minAddedAmountB", getU64Decoder17()],
-    ["maxSwapSlippage", getU32Decoder21()],
+    ["maxSwapSlippage", getU32Decoder18()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -6584,8 +6580,8 @@ import {
   getStructEncoder as getStructEncoder39,
   getU128Decoder as getU128Decoder4,
   getU128Encoder as getU128Encoder4,
-  getU32Decoder as getU32Decoder22,
-  getU32Encoder as getU32Encoder22,
+  getU32Decoder as getU32Decoder19,
+  getU32Encoder as getU32Encoder19,
   getU64Decoder as getU64Decoder18,
   getU64Encoder as getU64Encoder18,
   transformEncoder as transformEncoder36
@@ -6604,14 +6600,14 @@ function getOpenAndIncreaseTunaLpPositionOrcaInstructionDataEncoder() {
       ["tickUpperIndex", getI32Encoder5()],
       ["lowerLimitOrderSqrtPrice", getU128Encoder4()],
       ["upperLimitOrderSqrtPrice", getU128Encoder4()],
-      ["flags", getU32Encoder22()],
+      ["flags", getU32Encoder19()],
       ["collateralA", getU64Encoder18()],
       ["collateralB", getU64Encoder18()],
       ["borrowA", getU64Encoder18()],
       ["borrowB", getU64Encoder18()],
       ["minAddedAmountA", getU64Encoder18()],
       ["minAddedAmountB", getU64Encoder18()],
-      ["maxSwapSlippage", getU32Encoder22()],
+      ["maxSwapSlippage", getU32Encoder19()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -6627,14 +6623,14 @@ function getOpenAndIncreaseTunaLpPositionOrcaInstructionDataDecoder() {
     ["tickUpperIndex", getI32Decoder5()],
     ["lowerLimitOrderSqrtPrice", getU128Decoder4()],
     ["upperLimitOrderSqrtPrice", getU128Decoder4()],
-    ["flags", getU32Decoder22()],
+    ["flags", getU32Decoder19()],
     ["collateralA", getU64Decoder18()],
     ["collateralB", getU64Decoder18()],
     ["borrowA", getU64Decoder18()],
     ["borrowB", getU64Decoder18()],
     ["minAddedAmountA", getU64Decoder18()],
     ["minAddedAmountB", getU64Decoder18()],
-    ["maxSwapSlippage", getU32Decoder22()],
+    ["maxSwapSlippage", getU32Decoder19()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -7025,8 +7021,8 @@ import {
   getStructEncoder as getStructEncoder42,
   getU128Decoder as getU128Decoder5,
   getU128Encoder as getU128Encoder5,
-  getU32Decoder as getU32Decoder23,
-  getU32Encoder as getU32Encoder23,
+  getU32Decoder as getU32Decoder20,
+  getU32Encoder as getU32Encoder20,
   transformEncoder as transformEncoder39
 } from "@solana/kit";
 var OPEN_TUNA_LP_POSITION_FUSION_DISCRIMINATOR = new Uint8Array([
@@ -7052,7 +7048,7 @@ function getOpenTunaLpPositionFusionInstructionDataEncoder() {
       ["tickUpperIndex", getI32Encoder6()],
       ["lowerLimitOrderSqrtPrice", getU128Encoder5()],
       ["upperLimitOrderSqrtPrice", getU128Encoder5()],
-      ["flags", getU32Encoder23()]
+      ["flags", getU32Encoder20()]
     ]),
     (value) => ({
       ...value,
@@ -7067,7 +7063,7 @@ function getOpenTunaLpPositionFusionInstructionDataDecoder() {
     ["tickUpperIndex", getI32Decoder6()],
     ["lowerLimitOrderSqrtPrice", getU128Decoder5()],
     ["upperLimitOrderSqrtPrice", getU128Decoder5()],
-    ["flags", getU32Decoder23()]
+    ["flags", getU32Decoder20()]
   ]);
 }
 function getOpenTunaLpPositionFusionInstructionDataCodec() {
@@ -7204,8 +7200,8 @@ import {
   getStructEncoder as getStructEncoder43,
   getU128Decoder as getU128Decoder6,
   getU128Encoder as getU128Encoder6,
-  getU32Decoder as getU32Decoder24,
-  getU32Encoder as getU32Encoder24,
+  getU32Decoder as getU32Decoder21,
+  getU32Encoder as getU32Encoder21,
   transformEncoder as transformEncoder40
 } from "@solana/kit";
 var OPEN_TUNA_LP_POSITION_ORCA_DISCRIMINATOR = new Uint8Array([
@@ -7231,7 +7227,7 @@ function getOpenTunaLpPositionOrcaInstructionDataEncoder() {
       ["tickUpperIndex", getI32Encoder7()],
       ["lowerLimitOrderSqrtPrice", getU128Encoder6()],
       ["upperLimitOrderSqrtPrice", getU128Encoder6()],
-      ["flags", getU32Encoder24()]
+      ["flags", getU32Encoder21()]
     ]),
     (value) => ({
       ...value,
@@ -7246,7 +7242,7 @@ function getOpenTunaLpPositionOrcaInstructionDataDecoder() {
     ["tickUpperIndex", getI32Decoder7()],
     ["lowerLimitOrderSqrtPrice", getU128Decoder6()],
     ["upperLimitOrderSqrtPrice", getU128Decoder6()],
-    ["flags", getU32Decoder24()]
+    ["flags", getU32Decoder21()]
   ]);
 }
 function getOpenTunaLpPositionOrcaInstructionDataCodec() {
@@ -8426,8 +8422,8 @@ import {
   getBytesEncoder as getBytesEncoder50,
   getStructDecoder as getStructDecoder52,
   getStructEncoder as getStructEncoder52,
-  getU32Decoder as getU32Decoder25,
-  getU32Encoder as getU32Encoder25,
+  getU32Decoder as getU32Decoder22,
+  getU32Encoder as getU32Encoder22,
   transformEncoder as transformEncoder49
 } from "@solana/kit";
 var SET_DEFAULT_LIQUIDATION_FEE_RATE_DISCRIMINATOR = new Uint8Array([
@@ -8449,7 +8445,7 @@ function getSetDefaultLiquidationFeeRateInstructionDataEncoder() {
   return transformEncoder49(
     getStructEncoder52([
       ["discriminator", fixEncoderSize50(getBytesEncoder50(), 8)],
-      ["defaultLiquidationFeeRate", getU32Encoder25()]
+      ["defaultLiquidationFeeRate", getU32Encoder22()]
     ]),
     (value) => ({
       ...value,
@@ -8460,7 +8456,7 @@ function getSetDefaultLiquidationFeeRateInstructionDataEncoder() {
 function getSetDefaultLiquidationFeeRateInstructionDataDecoder() {
   return getStructDecoder52([
     ["discriminator", fixDecoderSize49(getBytesDecoder49(), 8)],
-    ["defaultLiquidationFeeRate", getU32Decoder25()]
+    ["defaultLiquidationFeeRate", getU32Decoder22()]
   ]);
 }
 function getSetDefaultLiquidationFeeRateInstructionDataCodec() {
@@ -8521,8 +8517,8 @@ import {
   getBytesEncoder as getBytesEncoder51,
   getStructDecoder as getStructDecoder53,
   getStructEncoder as getStructEncoder53,
-  getU32Decoder as getU32Decoder26,
-  getU32Encoder as getU32Encoder26,
+  getU32Decoder as getU32Decoder23,
+  getU32Encoder as getU32Encoder23,
   transformEncoder as transformEncoder50
 } from "@solana/kit";
 var SET_DEFAULT_MAX_PERCENTAGE_OF_LEFTOVERS_DISCRIMINATOR = new Uint8Array([37, 179, 107, 65, 203, 141, 183, 27]);
@@ -8535,7 +8531,7 @@ function getSetDefaultMaxPercentageOfLeftoversInstructionDataEncoder() {
   return transformEncoder50(
     getStructEncoder53([
       ["discriminator", fixEncoderSize51(getBytesEncoder51(), 8)],
-      ["maxPercentageOfLeftovers", getU32Encoder26()]
+      ["maxPercentageOfLeftovers", getU32Encoder23()]
     ]),
     (value) => ({
       ...value,
@@ -8546,7 +8542,7 @@ function getSetDefaultMaxPercentageOfLeftoversInstructionDataEncoder() {
 function getSetDefaultMaxPercentageOfLeftoversInstructionDataDecoder() {
   return getStructDecoder53([
     ["discriminator", fixDecoderSize50(getBytesDecoder50(), 8)],
-    ["maxPercentageOfLeftovers", getU32Decoder26()]
+    ["maxPercentageOfLeftovers", getU32Decoder23()]
   ]);
 }
 function getSetDefaultMaxPercentageOfLeftoversInstructionDataCodec() {
@@ -8607,8 +8603,8 @@ import {
   getBytesEncoder as getBytesEncoder52,
   getStructDecoder as getStructDecoder54,
   getStructEncoder as getStructEncoder54,
-  getU32Decoder as getU32Decoder27,
-  getU32Encoder as getU32Encoder27,
+  getU32Decoder as getU32Decoder24,
+  getU32Encoder as getU32Encoder24,
   transformEncoder as transformEncoder51
 } from "@solana/kit";
 var SET_DEFAULT_MAX_SWAP_SLIPPAGE_DISCRIMINATOR = new Uint8Array([
@@ -8630,7 +8626,7 @@ function getSetDefaultMaxSwapSlippageInstructionDataEncoder() {
   return transformEncoder51(
     getStructEncoder54([
       ["discriminator", fixEncoderSize52(getBytesEncoder52(), 8)],
-      ["maxSwapSlippage", getU32Encoder27()]
+      ["maxSwapSlippage", getU32Encoder24()]
     ]),
     (value) => ({
       ...value,
@@ -8641,7 +8637,7 @@ function getSetDefaultMaxSwapSlippageInstructionDataEncoder() {
 function getSetDefaultMaxSwapSlippageInstructionDataDecoder() {
   return getStructDecoder54([
     ["discriminator", fixDecoderSize51(getBytesDecoder51(), 8)],
-    ["maxSwapSlippage", getU32Decoder27()]
+    ["maxSwapSlippage", getU32Decoder24()]
   ]);
 }
 function getSetDefaultMaxSwapSlippageInstructionDataCodec() {
@@ -8702,8 +8698,8 @@ import {
   getBytesEncoder as getBytesEncoder53,
   getStructDecoder as getStructDecoder55,
   getStructEncoder as getStructEncoder55,
-  getU32Decoder as getU32Decoder28,
-  getU32Encoder as getU32Encoder28,
+  getU32Decoder as getU32Decoder25,
+  getU32Encoder as getU32Encoder25,
   transformEncoder as transformEncoder52
 } from "@solana/kit";
 var SET_DEFAULT_ORACLE_PRICE_DEVIATION_THRESHOLD_DISCRIMINATOR = new Uint8Array([142, 158, 143, 67, 206, 91, 139, 120]);
@@ -8716,7 +8712,7 @@ function getSetDefaultOraclePriceDeviationThresholdInstructionDataEncoder() {
   return transformEncoder52(
     getStructEncoder55([
       ["discriminator", fixEncoderSize53(getBytesEncoder53(), 8)],
-      ["oraclePriceDeviationThreshold", getU32Encoder28()]
+      ["oraclePriceDeviationThreshold", getU32Encoder25()]
     ]),
     (value) => ({
       ...value,
@@ -8727,7 +8723,7 @@ function getSetDefaultOraclePriceDeviationThresholdInstructionDataEncoder() {
 function getSetDefaultOraclePriceDeviationThresholdInstructionDataDecoder() {
   return getStructDecoder55([
     ["discriminator", fixDecoderSize52(getBytesDecoder52(), 8)],
-    ["oraclePriceDeviationThreshold", getU32Decoder28()]
+    ["oraclePriceDeviationThreshold", getU32Decoder25()]
   ]);
 }
 function getSetDefaultOraclePriceDeviationThresholdInstructionDataCodec() {
@@ -8883,8 +8879,8 @@ import {
   getBytesEncoder as getBytesEncoder55,
   getStructDecoder as getStructDecoder57,
   getStructEncoder as getStructEncoder57,
-  getU32Decoder as getU32Decoder29,
-  getU32Encoder as getU32Encoder29,
+  getU32Decoder as getU32Decoder26,
+  getU32Encoder as getU32Encoder26,
   transformEncoder as transformEncoder54
 } from "@solana/kit";
 var SET_DEFAULT_REBALANCE_FEE_RATE_DISCRIMINATOR = new Uint8Array([
@@ -8906,7 +8902,7 @@ function getSetDefaultRebalanceFeeRateInstructionDataEncoder() {
   return transformEncoder54(
     getStructEncoder57([
       ["discriminator", fixEncoderSize55(getBytesEncoder55(), 8)],
-      ["defaultRebalanceFeeRate", getU32Encoder29()]
+      ["defaultRebalanceFeeRate", getU32Encoder26()]
     ]),
     (value) => ({
       ...value,
@@ -8917,7 +8913,7 @@ function getSetDefaultRebalanceFeeRateInstructionDataEncoder() {
 function getSetDefaultRebalanceFeeRateInstructionDataDecoder() {
   return getStructDecoder57([
     ["discriminator", fixDecoderSize54(getBytesDecoder54(), 8)],
-    ["defaultRebalanceFeeRate", getU32Decoder29()]
+    ["defaultRebalanceFeeRate", getU32Decoder26()]
   ]);
 }
 function getSetDefaultRebalanceFeeRateInstructionDataCodec() {
@@ -9344,8 +9340,8 @@ import {
   combineCodec as combineCodec66,
   fixDecoderSize as fixDecoderSize59,
   fixEncoderSize as fixEncoderSize60,
-  getBooleanDecoder as getBooleanDecoder8,
-  getBooleanEncoder as getBooleanEncoder8,
+  getBooleanDecoder as getBooleanDecoder7,
+  getBooleanEncoder as getBooleanEncoder7,
   getBytesDecoder as getBytesDecoder59,
   getBytesEncoder as getBytesEncoder60,
   getStructDecoder as getStructDecoder62,
@@ -9371,10 +9367,10 @@ function getSetSuspendedStateInstructionDataEncoder() {
   return transformEncoder59(
     getStructEncoder62([
       ["discriminator", fixEncoderSize60(getBytesEncoder60(), 8)],
-      ["suspendLendingDeposits", getBooleanEncoder8()],
-      ["suspendLendingWithdrawals", getBooleanEncoder8()],
-      ["suspendAddLiquidity", getBooleanEncoder8()],
-      ["suspendRemoveLiquidity", getBooleanEncoder8()]
+      ["suspendLendingDeposits", getBooleanEncoder7()],
+      ["suspendLendingWithdrawals", getBooleanEncoder7()],
+      ["suspendAddLiquidity", getBooleanEncoder7()],
+      ["suspendRemoveLiquidity", getBooleanEncoder7()]
     ]),
     (value) => ({ ...value, discriminator: SET_SUSPENDED_STATE_DISCRIMINATOR })
   );
@@ -9382,10 +9378,10 @@ function getSetSuspendedStateInstructionDataEncoder() {
 function getSetSuspendedStateInstructionDataDecoder() {
   return getStructDecoder62([
     ["discriminator", fixDecoderSize59(getBytesDecoder59(), 8)],
-    ["suspendLendingDeposits", getBooleanDecoder8()],
-    ["suspendLendingWithdrawals", getBooleanDecoder8()],
-    ["suspendAddLiquidity", getBooleanDecoder8()],
-    ["suspendRemoveLiquidity", getBooleanDecoder8()]
+    ["suspendLendingDeposits", getBooleanDecoder7()],
+    ["suspendLendingWithdrawals", getBooleanDecoder7()],
+    ["suspendAddLiquidity", getBooleanDecoder7()],
+    ["suspendRemoveLiquidity", getBooleanDecoder7()]
   ]);
 }
 function getSetSuspendedStateInstructionDataCodec() {
@@ -9444,8 +9440,8 @@ import {
   getBytesEncoder as getBytesEncoder61,
   getStructDecoder as getStructDecoder63,
   getStructEncoder as getStructEncoder63,
-  getU32Decoder as getU32Decoder30,
-  getU32Encoder as getU32Encoder30,
+  getU32Decoder as getU32Decoder27,
+  getU32Encoder as getU32Encoder27,
   transformEncoder as transformEncoder60
 } from "@solana/kit";
 var SET_TUNA_LP_POSITION_FLAGS_DISCRIMINATOR = new Uint8Array([
@@ -9467,7 +9463,7 @@ function getSetTunaLpPositionFlagsInstructionDataEncoder() {
   return transformEncoder60(
     getStructEncoder63([
       ["discriminator", fixEncoderSize61(getBytesEncoder61(), 8)],
-      ["flags", getU32Encoder30()]
+      ["flags", getU32Encoder27()]
     ]),
     (value) => ({
       ...value,
@@ -9478,7 +9474,7 @@ function getSetTunaLpPositionFlagsInstructionDataEncoder() {
 function getSetTunaLpPositionFlagsInstructionDataDecoder() {
   return getStructDecoder63([
     ["discriminator", fixDecoderSize60(getBytesDecoder60(), 8)],
-    ["flags", getU32Decoder30()]
+    ["flags", getU32Decoder27()]
   ]);
 }
 function getSetTunaLpPositionFlagsInstructionDataCodec() {
@@ -9640,8 +9636,8 @@ import {
   getBytesEncoder as getBytesEncoder63,
   getStructDecoder as getStructDecoder65,
   getStructEncoder as getStructEncoder65,
-  getU32Decoder as getU32Decoder31,
-  getU32Encoder as getU32Encoder31,
+  getU32Decoder as getU32Decoder28,
+  getU32Encoder as getU32Encoder28,
   transformEncoder as transformEncoder62
 } from "@solana/kit";
 var SET_TUNA_LP_POSITION_REBALANCE_THRESHOLD_DISCRIMINATOR = new Uint8Array([244, 174, 185, 58, 90, 150, 162, 51]);
@@ -9654,7 +9650,7 @@ function getSetTunaLpPositionRebalanceThresholdInstructionDataEncoder() {
   return transformEncoder62(
     getStructEncoder65([
       ["discriminator", fixEncoderSize63(getBytesEncoder63(), 8)],
-      ["rebalanceThresholdTicks", getU32Encoder31()]
+      ["rebalanceThresholdTicks", getU32Encoder28()]
     ]),
     (value) => ({
       ...value,
@@ -9665,7 +9661,7 @@ function getSetTunaLpPositionRebalanceThresholdInstructionDataEncoder() {
 function getSetTunaLpPositionRebalanceThresholdInstructionDataDecoder() {
   return getStructDecoder65([
     ["discriminator", fixDecoderSize62(getBytesDecoder62(), 8)],
-    ["rebalanceThresholdTicks", getU32Decoder31()]
+    ["rebalanceThresholdTicks", getU32Decoder28()]
   ]);
 }
 function getSetTunaLpPositionRebalanceThresholdInstructionDataCodec() {
@@ -9814,16 +9810,16 @@ import {
   fixEncoderSize as fixEncoderSize65,
   getAddressDecoder as getAddressDecoder17,
   getAddressEncoder as getAddressEncoder17,
-  getBooleanDecoder as getBooleanDecoder9,
-  getBooleanEncoder as getBooleanEncoder9,
+  getBooleanDecoder as getBooleanDecoder8,
+  getBooleanEncoder as getBooleanEncoder8,
   getBytesDecoder as getBytesDecoder64,
   getBytesEncoder as getBytesEncoder65,
   getStructDecoder as getStructDecoder67,
   getStructEncoder as getStructEncoder67,
   getU16Decoder as getU16Decoder9,
   getU16Encoder as getU16Encoder9,
-  getU32Decoder as getU32Decoder32,
-  getU32Encoder as getU32Encoder32,
+  getU32Decoder as getU32Decoder29,
+  getU32Encoder as getU32Encoder29,
   getU64Decoder as getU64Decoder21,
   getU64Encoder as getU64Encoder21,
   transformEncoder as transformEncoder64
@@ -9848,17 +9844,17 @@ function getUpdateMarketInstructionDataEncoder() {
     getStructEncoder67([
       ["discriminator", fixEncoderSize65(getBytesEncoder65(), 8)],
       ["addressLookupTable", getAddressEncoder17()],
-      ["maxLeverage", getU32Encoder32()],
+      ["maxLeverage", getU32Encoder29()],
       ["protocolFee", getU16Encoder9()],
       ["protocolFeeOnCollateral", getU16Encoder9()],
-      ["liquidationFee", getU32Encoder32()],
-      ["liquidationThreshold", getU32Encoder32()],
-      ["oraclePriceDeviationThreshold", getU32Encoder32()],
-      ["disabled", getBooleanEncoder9()],
+      ["liquidationFee", getU32Encoder29()],
+      ["liquidationThreshold", getU32Encoder29()],
+      ["oraclePriceDeviationThreshold", getU32Encoder29()],
+      ["disabled", getBooleanEncoder8()],
       ["borrowLimitA", getU64Encoder21()],
       ["borrowLimitB", getU64Encoder21()],
-      ["maxSwapSlippage", getU32Encoder32()],
-      ["rebalanceProtocolFee", getU32Encoder32()],
+      ["maxSwapSlippage", getU32Encoder29()],
+      ["rebalanceProtocolFee", getU32Encoder29()],
       ["spotPositionSizeLimitA", getU64Encoder21()],
       ["spotPositionSizeLimitB", getU64Encoder21()]
     ]),
@@ -9869,17 +9865,17 @@ function getUpdateMarketInstructionDataDecoder() {
   return getStructDecoder67([
     ["discriminator", fixDecoderSize64(getBytesDecoder64(), 8)],
     ["addressLookupTable", getAddressDecoder17()],
-    ["maxLeverage", getU32Decoder32()],
+    ["maxLeverage", getU32Decoder29()],
     ["protocolFee", getU16Decoder9()],
     ["protocolFeeOnCollateral", getU16Decoder9()],
-    ["liquidationFee", getU32Decoder32()],
-    ["liquidationThreshold", getU32Decoder32()],
-    ["oraclePriceDeviationThreshold", getU32Decoder32()],
-    ["disabled", getBooleanDecoder9()],
+    ["liquidationFee", getU32Decoder29()],
+    ["liquidationThreshold", getU32Decoder29()],
+    ["oraclePriceDeviationThreshold", getU32Decoder29()],
+    ["disabled", getBooleanDecoder8()],
     ["borrowLimitA", getU64Decoder21()],
     ["borrowLimitB", getU64Decoder21()],
-    ["maxSwapSlippage", getU32Decoder32()],
-    ["rebalanceProtocolFee", getU32Decoder32()],
+    ["maxSwapSlippage", getU32Decoder29()],
+    ["rebalanceProtocolFee", getU32Decoder29()],
     ["spotPositionSizeLimitA", getU64Decoder21()],
     ["spotPositionSizeLimitB", getU64Decoder21()]
   ]);
@@ -10240,7 +10236,6 @@ function parseWithdrawInstruction(instruction) {
 }
 
 // src/pda.ts
-import { getU32Encoder as getU32Encoder33 } from "@solana/kit";
 import { getAddressEncoder as getAddressEncoder19, getProgramDerivedAddress } from "@solana/kit";
 
 // src/consts.ts
@@ -10285,16 +10280,10 @@ async function getMarketAddress(pool) {
     seeds: ["market", getAddressEncoder19().encode(pool)]
   });
 }
-async function getLendingVaultAddress(mint) {
-  return await getProgramDerivedAddress({
-    programAddress: TUNA_PROGRAM_ADDRESS,
-    seeds: ["vault", getAddressEncoder19().encode(mint)]
-  });
-}
-async function getLendingVaultV2Address(mint, id) {
+async function getLendingVaultAddress(mint, market) {
   return await getProgramDerivedAddress({
     programAddress: TUNA_PROGRAM_ADDRESS,
-    seeds: ["vault", getAddressEncoder19().encode(mint), getU32Encoder33().encode(id)]
+    seeds: market ? ["vault", getAddressEncoder19().encode(mint), getAddressEncoder19().encode(market)] : ["vault", getAddressEncoder19().encode(mint)]
   });
 }
 async function getLendingPositionAddress(authority, mintOrVault) {
@@ -10781,13 +10770,12 @@ async function increaseTunaLpPositionOrcaInstructions(rpc, authority, positionMi
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const whirlpool = await 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 fetchAllMaybeMint(rpc, [whirlpool.data.tokenMintA, whirlpool.data.tokenMintB]);
   assert(mintA.exists, "Token A not found");
   assert(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,
@@ -11008,13 +10996,12 @@ async function increaseTunaLpPositionFusionInstructions(rpc, authority, position
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const fusionPool = await 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 fetchAllMaybeMint2(rpc, [fusionPool.data.tokenMintA, fusionPool.data.tokenMintB]);
   assert2(mintA.exists, "Token A not found");
   assert2(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,
@@ -11325,10 +11312,9 @@ async function collectAndCompoundFeesOrcaInstructions(rpc, authority, positionMi
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const whirlpool = await fetchMaybeWhirlpool3(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 fetchAllMaybeMint5(rpc, [whirlpool.data.tokenMintA, whirlpool.data.tokenMintB]);
   assert5(mintA.exists, "Token A account not found");
   assert5(mintB.exists, "Token B account not found");
@@ -11487,10 +11473,9 @@ async function collectAndCompoundFeesFusionInstructions(rpc, authority, position
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const fusionPool = await fetchMaybeFusionPool3(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 fetchAllMaybeMint6(rpc, [fusionPool.data.tokenMintA, fusionPool.data.tokenMintB]);
   assert6(mintA.exists, "Token A account not found");
   assert6(mintB.exists, "Token B account not found");
@@ -11901,14 +11886,6 @@ import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS7 } from "@solana-program/m
 import { fetchMaybeMint, findAssociatedTokenPda as findAssociatedTokenPda10 } from "@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 fetchMaybeMint(rpc, mintAddress);
   if (!mint.exists) throw new Error("Mint account not found");
   const createUserAtaInstructions = await getCreateAtaInstructions(
@@ -11992,10 +11969,9 @@ async function closeActiveTunaLpPositionOrcaInstructions(rpc, authority, positio
   const orcaPosition = await fetchPosition(rpc, (await getPositionAddress9(positionMint))[0]);
   const whirlpool = await fetchMaybeWhirlpool5(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 fetchAllMaybeMint9(rpc, [
     whirlpool.data.tokenMintA,
     whirlpool.data.tokenMintB,
@@ -12115,10 +12091,9 @@ async function closeActiveTunaLpPositionFusionInstructions(rpc, authority, posit
   const fusionPosition = await fetchPosition2(rpc, (await getPositionAddress10(positionMint))[0]);
   const fusionPool = await fetchMaybeFusionPool5(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 fetchAllMaybeMint10(rpc, [fusionPool.data.tokenMintA, fusionPool.data.tokenMintB]);
   const allMints = [mintA, mintB];
   assert10(mintA.exists, "Token A account not found");
@@ -12207,10 +12182,9 @@ async function modifyTunaSpotPositionOrcaInstructions(rpc, authority, poolAddres
   const [mintA, mintB] = await fetchAllMaybeMint11(rpc, [pool.data.tokenMintA, pool.data.tokenMintB]);
   assert11(mintA.exists, "Token A account not found");
   assert11(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) {
@@ -12386,10 +12360,9 @@ async function modifyTunaSpotPositionFusionInstructions(rpc, authority, poolAddr
   const [mintA, mintB] = await fetchAllMaybeMint12(rpc, [pool.data.tokenMintA, pool.data.tokenMintB]);
   assert12(mintA.exists, "Token A account not found");
   assert12(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) {
@@ -12605,8 +12578,8 @@ import {
   combineCodec as combineCodec410,
   fixDecoderSize as fixDecoderSize410,
   fixEncoderSize as fixEncoderSize510,
-  getBooleanDecoder as getBooleanDecoder10,
-  getBooleanEncoder as getBooleanEncoder10,
+  getBooleanDecoder as getBooleanDecoder9,
+  getBooleanEncoder as getBooleanEncoder9,
   getBytesDecoder as getBytesDecoder410,
   getBytesEncoder as getBytesEncoder510,
   getStructDecoder as getStructDecoder410,
@@ -12759,8 +12732,8 @@ import {
   getOptionEncoder as getOptionEncoder3,
   getStructDecoder as getStructDecoder162,
   getStructEncoder as getStructEncoder162,
-  getU32Decoder as getU32Decoder33,
-  getU32Encoder as getU32Encoder34,
+  getU32Decoder as getU32Decoder30,
+  getU32Encoder as getU32Encoder30,
   getU64Decoder as getU64Decoder32,
   getU64Encoder as getU64Encoder32,
   getU8Decoder as getU8Decoder10,
@@ -13187,10 +13160,7 @@ async function modifyTunaSpotPositionJupiterInstructions(rpc, authority, poolAdd
   const [mintA, mintB] = await fetchAllMaybeMint13(rpc, [pool.data.tokenMintA, pool.data.tokenMintB]);
   assert13(mintA.exists, "Token A account not found");
   assert13(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,
@@ -13366,11 +13336,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,
@@ -13419,9 +13389,9 @@ async function createVaultInstructions(authority, mint, args) {
   ];
 }
 
-// src/txbuilder/createVaultV2.ts
+// src/txbuilder/createVaultPermissionless.ts
 import { findAssociatedTokenPda as findAssociatedTokenPda18 } from "@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 findAssociatedTokenPda18({
     owner: vault,
@@ -13430,7 +13400,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,
@@ -14517,10 +14487,9 @@ async function openAndIncreaseTunaLpPositionOrcaInstructions(rpc, authority, pos
   const [mintA, mintB] = await fetchAllMaybeMint17(rpc, [whirlpool.data.tokenMintA, whirlpool.data.tokenMintB]);
   assert17(mintA.exists, "Token A account not found");
   assert17(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,
@@ -14917,10 +14886,9 @@ async function openAndIncreaseTunaLpPositionFusionInstructions(rpc, authority, p
   const [mintA, mintB] = await fetchAllMaybeMint18(rpc, [fusionPool.data.tokenMintA, fusionPool.data.tokenMintB]);
   assert18(mintA.exists, "Token A account not found");
   assert18(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,
@@ -15359,10 +15327,9 @@ async function decreaseTunaLpPositionOrcaInstructions(rpc, authority, positionMi
   const orcaPosition = await fetchPosition3(rpc, (await getPositionAddress17(positionMint))[0]);
   const whirlpool = await fetchMaybeWhirlpool8(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 fetchAllMaybeMint20(rpc, [
     whirlpool.data.tokenMintA,
     whirlpool.data.tokenMintB,
@@ -15573,13 +15540,12 @@ async function decreaseTunaLpPositionFusionInstructions(rpc, authority, position
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const fusionPool = await fetchMaybeFusionPool8(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 fetchAllMaybeMint21(rpc, [fusionPool.data.tokenMintA, fusionPool.data.tokenMintB]);
   assert21(mintA.exists, "Token A account not found");
   assert21(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;
@@ -15717,12 +15683,13 @@ async function decreaseTunaLpPositionFusionInstruction(authority, tunaPosition,
 // src/txbuilder/repayBadDebt.ts
 import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS20 } from "@solana-program/memo";
 import { fetchMaybeMint as fetchMaybeMint2, findAssociatedTokenPda as findAssociatedTokenPda31 } from "@solana-program/token-2022";
-async function repayBadDebtInstruction(rpc, authority, mintAddress, funds, shares) {
-  const mint = await fetchMaybeMint2(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 fetchMaybeMint2(rpc, vault.data.mint);
   if (!mint.exists) throw new Error("Mint account not found");
-  const vault = (await getLendingVaultAddress(mint.address))[0];
   const vaultAta = (await findAssociatedTokenPda31({
-    owner: vault,
+    owner: vault.address,
     mint: mint.address,
     tokenProgram: mint.programAddress
   }))[0];
@@ -15736,7 +15703,7 @@ async function repayBadDebtInstruction(rpc, authority, mintAddress, funds, share
     mint: mint.address,
     vaultAta,
     authority,
-    vault,
+    vault: vault.address,
     tokenProgram: mint.programAddress,
     memoProgram: MEMO_PROGRAM_ADDRESS20,
     funds,
@@ -15827,14 +15794,6 @@ import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS21 } from "@solana-program/
 import { fetchMaybeMint as fetchMaybeMint3, findAssociatedTokenPda as findAssociatedTokenPda33 } from "@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 fetchMaybeMint3(rpc, mintAddress);
   if (!mint.exists) throw new Error("Mint account not found");
   const createUserAtaInstructions = await getCreateAtaInstructions(
@@ -16119,10 +16078,9 @@ async function rebalanceTunaLpPositionOrcaInstructions(rpc, authority, positionM
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const whirlpool = await fetchMaybeWhirlpool9(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 fetchAllMaybeMint24(rpc, [whirlpool.data.tokenMintA, whirlpool.data.tokenMintB]);
   assert24(mintA.exists, "Token A account not found");
   assert24(mintB.exists, "Token B account not found");
@@ -16315,10 +16273,9 @@ async function rebalanceTunaLpPositionFusionInstructions(rpc, authority, positio
   if (!tunaPosition.exists) throw new Error("Tuna position account not found");
   const fusionPool = await fetchMaybeFusionPool9(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 fetchAllMaybeMint25(rpc, [fusionPool.data.tokenMintA, fusionPool.data.tokenMintB]);
   assert25(mintA.exists, "Token A account not found");
   assert25(mintB.exists, "Token B account not found");
@@ -16486,11 +16443,11 @@ export {
   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,
@@ -16659,10 +16616,10 @@ export {
   createAddressLookupTableForMarketInstructions,
   createAddressLookupTableInstructions,
   createMarketInstruction,
-  createMarketV2Instruction,
+  createMarketPermissionlessInstruction,
   createTunaConfigInstruction,
   createVaultInstructions,
-  createVaultV2Instructions,
+  createVaultPermissionlessInstructions,
   decodeLendingPosition,
   decodeMarket,
   decodeTunaConfig,
@@ -16760,11 +16717,11 @@ export {
   getCreateMarketInstructionDataCodec,
   getCreateMarketInstructionDataDecoder,
   getCreateMarketInstructionDataEncoder,
-  getCreateMarketV2DiscriminatorBytes,
-  getCreateMarketV2Instruction,
-  getCreateMarketV2InstructionDataCodec,
-  getCreateMarketV2InstructionDataDecoder,
-  getCreateMarketV2InstructionDataEncoder,
+  getCreateMarketPermissionlessDiscriminatorBytes,
+  getCreateMarketPermissionlessInstruction,
+  getCreateMarketPermissionlessInstructionDataCodec,
+  getCreateMarketPermissionlessInstructionDataDecoder,
+  getCreateMarketPermissionlessInstructionDataEncoder,
   getCreatePriceUpdateDiscriminatorBytes,
   getCreatePriceUpdateInstruction,
   getCreatePriceUpdateInstructionDataCodec,
@@ -16780,11 +16737,11 @@ export {
   getCreateVaultInstructionDataCodec,
   getCreateVaultInstructionDataDecoder,
   getCreateVaultInstructionDataEncoder,
-  getCreateVaultV2DiscriminatorBytes,
-  getCreateVaultV2Instruction,
-  getCreateVaultV2InstructionDataCodec,
-  getCreateVaultV2InstructionDataDecoder,
-  getCreateVaultV2InstructionDataEncoder,
+  getCreateVaultPermissionlessDiscriminatorBytes,
+  getCreateVaultPermissionlessInstruction,
+  getCreateVaultPermissionlessInstructionDataCodec,
+  getCreateVaultPermissionlessInstructionDataDecoder,
+  getCreateVaultPermissionlessInstructionDataEncoder,
   getDecreaseTunaLpPositionFusionDiscriminatorBytes,
   getDecreaseTunaLpPositionFusionInstruction,
   getDecreaseTunaLpPositionFusionInstructionDataCodec,
@@ -16817,7 +16774,6 @@ export {
   getLendingPositionEncoder,
   getLendingPositionSize,
   getLendingVaultAddress,
-  getLendingVaultV2Address,
   getLiquidateTunaLpPositionFusionDiscriminatorBytes,
   getLiquidateTunaLpPositionFusionInstruction,
   getLiquidateTunaLpPositionFusionInstructionDataCodec,
@@ -17129,11 +17085,11 @@ export {
   parseCollectFeesOrcaInstruction,
   parseCollectRewardOrcaInstruction,
   parseCreateMarketInstruction,
-  parseCreateMarketV2Instruction,
+  parseCreateMarketPermissionlessInstruction,
   parseCreatePriceUpdateInstruction,
   parseCreateTunaConfigInstruction,
   parseCreateVaultInstruction,
-  parseCreateVaultV2Instruction,
+  parseCreateVaultPermissionlessInstruction,
   parseDecreaseTunaLpPositionFusionInstruction,
   parseDecreaseTunaLpPositionOrcaInstruction,
   parseDepositInstruction,