@crypticdot/defituna-client 3.1.17 → 3.1.19

package/dist/index.mjs

@@ -1671,8 +1671,8 @@ import {
   getBytesEncoder as getBytesEncoder8,
   getStructDecoder as getStructDecoder9,
   getStructEncoder as getStructEncoder9,
-  getU32Decoder as getU32Decoder5,
-  getU32Encoder as getU32Encoder5,
+  getU64Decoder as getU64Decoder6,
+  getU64Encoder as getU64Encoder6,
   transformEncoder as transformEncoder7
 } from "@solana/kit";
 
@@ -1727,7 +1727,7 @@ function getCloseActiveTunaSpotPositionFusionInstructionDataEncoder() {
   return transformEncoder7(
     getStructEncoder9([
       ["discriminator", fixEncoderSize8(getBytesEncoder8(), 8)],
-      ["maxSwapSlippage", getU32Encoder5()],
+      ["maxSwapAmountIn", getU64Encoder6()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -1739,7 +1739,7 @@ function getCloseActiveTunaSpotPositionFusionInstructionDataEncoder() {
 function getCloseActiveTunaSpotPositionFusionInstructionDataDecoder() {
   return getStructDecoder9([
     ["discriminator", fixDecoderSize7(getBytesDecoder7(), 8)],
-    ["maxSwapSlippage", getU32Decoder5()],
+    ["maxSwapAmountIn", getU64Decoder6()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -1883,8 +1883,8 @@ import {
   getBytesEncoder as getBytesEncoder9,
   getStructDecoder as getStructDecoder10,
   getStructEncoder as getStructEncoder10,
-  getU32Decoder as getU32Decoder6,
-  getU32Encoder as getU32Encoder6,
+  getU64Decoder as getU64Decoder7,
+  getU64Encoder as getU64Encoder7,
   transformEncoder as transformEncoder8
 } from "@solana/kit";
 var CLOSE_ACTIVE_TUNA_SPOT_POSITION_ORCA_DISCRIMINATOR = new Uint8Array([198, 185, 205, 125, 184, 130, 90, 82]);
@@ -1897,7 +1897,7 @@ function getCloseActiveTunaSpotPositionOrcaInstructionDataEncoder() {
   return transformEncoder8(
     getStructEncoder10([
       ["discriminator", fixEncoderSize9(getBytesEncoder9(), 8)],
-      ["maxSwapSlippage", getU32Encoder6()],
+      ["maxSwapAmountIn", getU64Encoder7()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -1909,7 +1909,7 @@ function getCloseActiveTunaSpotPositionOrcaInstructionDataEncoder() {
 function getCloseActiveTunaSpotPositionOrcaInstructionDataDecoder() {
   return getStructDecoder10([
     ["discriminator", fixDecoderSize8(getBytesDecoder8(), 8)],
-    ["maxSwapSlippage", getU32Decoder6()],
+    ["maxSwapAmountIn", getU64Decoder7()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -3239,10 +3239,10 @@ import {
   getStructEncoder as getStructEncoder19,
   getU16Decoder as getU16Decoder7,
   getU16Encoder as getU16Encoder7,
-  getU32Decoder as getU32Decoder7,
-  getU32Encoder as getU32Encoder7,
-  getU64Decoder as getU64Decoder6,
-  getU64Encoder as getU64Encoder6,
+  getU32Decoder as getU32Decoder5,
+  getU32Encoder as getU32Encoder5,
+  getU64Decoder as getU64Decoder8,
+  getU64Encoder as getU64Encoder8,
   transformEncoder as transformEncoder17
 } from "@solana/kit";
 var CREATE_MARKET_DISCRIMINATOR = new Uint8Array([
@@ -3266,20 +3266,20 @@ function getCreateMarketInstructionDataEncoder() {
       ["discriminator", fixEncoderSize18(getBytesEncoder18(), 8)],
       ["marketMaker", getMarketMakerEncoder()],
       ["addressLookupTable", getAddressEncoder7()],
-      ["maxLeverage", getU32Encoder7()],
+      ["maxLeverage", getU32Encoder5()],
       ["protocolFee", getU16Encoder7()],
       ["protocolFeeOnCollateral", getU16Encoder7()],
-      ["liquidationFee", getU32Encoder7()],
-      ["liquidationThreshold", getU32Encoder7()],
-      ["limitOrderExecutionFee", getU32Encoder7()],
-      ["oraclePriceDeviationThreshold", getU32Encoder7()],
+      ["liquidationFee", getU32Encoder5()],
+      ["liquidationThreshold", getU32Encoder5()],
+      ["limitOrderExecutionFee", getU32Encoder5()],
+      ["oraclePriceDeviationThreshold", getU32Encoder5()],
       ["disabled", getBooleanEncoder5()],
-      ["borrowLimitA", getU64Encoder6()],
-      ["borrowLimitB", getU64Encoder6()],
-      ["maxSwapSlippage", getU32Encoder7()],
-      ["rebalanceProtocolFee", getU32Encoder7()],
-      ["spotPositionSizeLimitA", getU64Encoder6()],
-      ["spotPositionSizeLimitB", getU64Encoder6()]
+      ["borrowLimitA", getU64Encoder8()],
+      ["borrowLimitB", getU64Encoder8()],
+      ["maxSwapSlippage", getU32Encoder5()],
+      ["rebalanceProtocolFee", getU32Encoder5()],
+      ["spotPositionSizeLimitA", getU64Encoder8()],
+      ["spotPositionSizeLimitB", getU64Encoder8()]
     ]),
     (value) => ({ ...value, discriminator: CREATE_MARKET_DISCRIMINATOR })
   );
@@ -3289,20 +3289,20 @@ function getCreateMarketInstructionDataDecoder() {
     ["discriminator", fixDecoderSize17(getBytesDecoder17(), 8)],
     ["marketMaker", getMarketMakerDecoder()],
     ["addressLookupTable", getAddressDecoder7()],
-    ["maxLeverage", getU32Decoder7()],
+    ["maxLeverage", getU32Decoder5()],
     ["protocolFee", getU16Decoder7()],
     ["protocolFeeOnCollateral", getU16Decoder7()],
-    ["liquidationFee", getU32Decoder7()],
-    ["liquidationThreshold", getU32Decoder7()],
-    ["limitOrderExecutionFee", getU32Decoder7()],
-    ["oraclePriceDeviationThreshold", getU32Decoder7()],
+    ["liquidationFee", getU32Decoder5()],
+    ["liquidationThreshold", getU32Decoder5()],
+    ["limitOrderExecutionFee", getU32Decoder5()],
+    ["oraclePriceDeviationThreshold", getU32Decoder5()],
     ["disabled", getBooleanDecoder5()],
-    ["borrowLimitA", getU64Decoder6()],
-    ["borrowLimitB", getU64Decoder6()],
-    ["maxSwapSlippage", getU32Decoder7()],
-    ["rebalanceProtocolFee", getU32Decoder7()],
-    ["spotPositionSizeLimitA", getU64Decoder6()],
-    ["spotPositionSizeLimitB", getU64Decoder6()]
+    ["borrowLimitA", getU64Decoder8()],
+    ["borrowLimitB", getU64Decoder8()],
+    ["maxSwapSlippage", getU32Decoder5()],
+    ["rebalanceProtocolFee", getU32Decoder5()],
+    ["spotPositionSizeLimitA", getU64Decoder8()],
+    ["spotPositionSizeLimitB", getU64Decoder8()]
   ]);
 }
 function getCreateMarketInstructionDataCodec() {
@@ -3485,8 +3485,8 @@ import {
   getBytesEncoder as getBytesEncoder20,
   getStructDecoder as getStructDecoder21,
   getStructEncoder as getStructEncoder21,
-  getU64Decoder as getU64Decoder7,
-  getU64Encoder as getU64Encoder7,
+  getU64Decoder as getU64Decoder9,
+  getU64Encoder as getU64Encoder9,
   transformEncoder as transformEncoder19
 } from "@solana/kit";
 var CREATE_VAULT_DISCRIMINATOR = new Uint8Array([
@@ -3508,8 +3508,8 @@ function getCreateVaultInstructionDataEncoder() {
   return transformEncoder19(
     getStructEncoder21([
       ["discriminator", fixEncoderSize20(getBytesEncoder20(), 8)],
-      ["interestRate", getU64Encoder7()],
-      ["supplyLimit", getU64Encoder7()],
+      ["interestRate", getU64Encoder9()],
+      ["supplyLimit", getU64Encoder9()],
       ["pythOraclePriceUpdate", getAddressEncoder9()],
       ["pythOracleFeedId", getAddressEncoder9()],
       ["allowUnsafeTokenExtensions", getBooleanEncoder6()]
@@ -3520,8 +3520,8 @@ function getCreateVaultInstructionDataEncoder() {
 function getCreateVaultInstructionDataDecoder() {
   return getStructDecoder21([
     ["discriminator", fixDecoderSize19(getBytesDecoder19(), 8)],
-    ["interestRate", getU64Decoder7()],
-    ["supplyLimit", getU64Decoder7()],
+    ["interestRate", getU64Decoder9()],
+    ["supplyLimit", getU64Decoder9()],
     ["pythOraclePriceUpdate", getAddressDecoder9()],
     ["pythOracleFeedId", getAddressDecoder9()],
     ["allowUnsafeTokenExtensions", getBooleanDecoder6()]
@@ -3606,10 +3606,10 @@ import {
   getOptionEncoder,
   getStructDecoder as getStructDecoder22,
   getStructEncoder as getStructEncoder22,
-  getU32Decoder as getU32Decoder8,
-  getU32Encoder as getU32Encoder8,
-  getU64Decoder as getU64Decoder8,
-  getU64Encoder as getU64Encoder8,
+  getU32Decoder as getU32Decoder6,
+  getU32Encoder as getU32Encoder6,
+  getU64Decoder as getU64Decoder10,
+  getU64Encoder as getU64Encoder10,
   transformEncoder as transformEncoder20
 } from "@solana/kit";
 var DECREASE_TUNA_LP_POSITION_FUSION_DISCRIMINATOR = new Uint8Array([
@@ -3631,11 +3631,11 @@ function getDecreaseTunaLpPositionFusionInstructionDataEncoder() {
   return transformEncoder20(
     getStructEncoder22([
       ["discriminator", fixEncoderSize21(getBytesEncoder21(), 8)],
-      ["withdrawPercent", getU32Encoder8()],
+      ["withdrawPercent", getU32Encoder6()],
       ["swapToToken", getOptionEncoder(getPoolTokenEncoder())],
-      ["minRemovedAmountA", getU64Encoder8()],
-      ["minRemovedAmountB", getU64Encoder8()],
-      ["maxSwapSlippage", getU32Encoder8()],
+      ["minRemovedAmountA", getU64Encoder10()],
+      ["minRemovedAmountB", getU64Encoder10()],
+      ["maxSwapSlippage", getU32Encoder6()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -3647,11 +3647,11 @@ function getDecreaseTunaLpPositionFusionInstructionDataEncoder() {
 function getDecreaseTunaLpPositionFusionInstructionDataDecoder() {
   return getStructDecoder22([
     ["discriminator", fixDecoderSize20(getBytesDecoder20(), 8)],
-    ["withdrawPercent", getU32Decoder8()],
+    ["withdrawPercent", getU32Decoder6()],
     ["swapToToken", getOptionDecoder(getPoolTokenDecoder())],
-    ["minRemovedAmountA", getU64Decoder8()],
-    ["minRemovedAmountB", getU64Decoder8()],
-    ["maxSwapSlippage", getU32Decoder8()],
+    ["minRemovedAmountA", getU64Decoder10()],
+    ["minRemovedAmountB", getU64Decoder10()],
+    ["maxSwapSlippage", getU32Decoder6()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -3799,10 +3799,10 @@ import {
   getOptionEncoder as getOptionEncoder2,
   getStructDecoder as getStructDecoder23,
   getStructEncoder as getStructEncoder23,
-  getU32Decoder as getU32Decoder9,
-  getU32Encoder as getU32Encoder9,
-  getU64Decoder as getU64Decoder9,
-  getU64Encoder as getU64Encoder9,
+  getU32Decoder as getU32Decoder7,
+  getU32Encoder as getU32Encoder7,
+  getU64Decoder as getU64Decoder11,
+  getU64Encoder as getU64Encoder11,
   transformEncoder as transformEncoder21
 } from "@solana/kit";
 var DECREASE_TUNA_LP_POSITION_ORCA_DISCRIMINATOR = new Uint8Array([
@@ -3824,11 +3824,11 @@ function getDecreaseTunaLpPositionOrcaInstructionDataEncoder() {
   return transformEncoder21(
     getStructEncoder23([
       ["discriminator", fixEncoderSize22(getBytesEncoder22(), 8)],
-      ["withdrawPercent", getU32Encoder9()],
+      ["withdrawPercent", getU32Encoder7()],
       ["swapToToken", getOptionEncoder2(getPoolTokenEncoder())],
-      ["minRemovedAmountA", getU64Encoder9()],
-      ["minRemovedAmountB", getU64Encoder9()],
-      ["maxSwapSlippage", getU32Encoder9()],
+      ["minRemovedAmountA", getU64Encoder11()],
+      ["minRemovedAmountB", getU64Encoder11()],
+      ["maxSwapSlippage", getU32Encoder7()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -3840,11 +3840,11 @@ function getDecreaseTunaLpPositionOrcaInstructionDataEncoder() {
 function getDecreaseTunaLpPositionOrcaInstructionDataDecoder() {
   return getStructDecoder23([
     ["discriminator", fixDecoderSize21(getBytesDecoder21(), 8)],
-    ["withdrawPercent", getU32Decoder9()],
+    ["withdrawPercent", getU32Decoder7()],
     ["swapToToken", getOptionDecoder2(getPoolTokenDecoder())],
-    ["minRemovedAmountA", getU64Decoder9()],
-    ["minRemovedAmountB", getU64Decoder9()],
-    ["maxSwapSlippage", getU32Decoder9()],
+    ["minRemovedAmountA", getU64Decoder11()],
+    ["minRemovedAmountB", getU64Decoder11()],
+    ["maxSwapSlippage", getU32Decoder7()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -3990,8 +3990,10 @@ import {
   getBytesEncoder as getBytesEncoder23,
   getStructDecoder as getStructDecoder24,
   getStructEncoder as getStructEncoder24,
-  getU32Decoder as getU32Decoder10,
-  getU32Encoder as getU32Encoder10,
+  getU32Decoder as getU32Decoder8,
+  getU32Encoder as getU32Encoder8,
+  getU64Decoder as getU64Decoder12,
+  getU64Encoder as getU64Encoder12,
   transformEncoder as transformEncoder22
 } from "@solana/kit";
 var DECREASE_TUNA_SPOT_POSITION_FUSION_DISCRIMINATOR = new Uint8Array([
@@ -4013,8 +4015,8 @@ function getDecreaseTunaSpotPositionFusionInstructionDataEncoder() {
   return transformEncoder22(
     getStructEncoder24([
       ["discriminator", fixEncoderSize23(getBytesEncoder23(), 8)],
-      ["withdrawPercent", getU32Encoder10()],
-      ["maxSwapSlippage", getU32Encoder10()],
+      ["withdrawPercent", getU32Encoder8()],
+      ["maxSwapAmountIn", getU64Encoder12()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -4026,8 +4028,8 @@ function getDecreaseTunaSpotPositionFusionInstructionDataEncoder() {
 function getDecreaseTunaSpotPositionFusionInstructionDataDecoder() {
   return getStructDecoder24([
     ["discriminator", fixDecoderSize22(getBytesDecoder22(), 8)],
-    ["withdrawPercent", getU32Decoder10()],
-    ["maxSwapSlippage", getU32Decoder10()],
+    ["withdrawPercent", getU32Decoder8()],
+    ["maxSwapAmountIn", getU64Decoder12()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -4177,8 +4179,10 @@ import {
   getBytesEncoder as getBytesEncoder24,
   getStructDecoder as getStructDecoder25,
   getStructEncoder as getStructEncoder25,
-  getU32Decoder as getU32Decoder11,
-  getU32Encoder as getU32Encoder11,
+  getU32Decoder as getU32Decoder9,
+  getU32Encoder as getU32Encoder9,
+  getU64Decoder as getU64Decoder13,
+  getU64Encoder as getU64Encoder13,
   transformEncoder as transformEncoder23
 } from "@solana/kit";
 var DECREASE_TUNA_SPOT_POSITION_ORCA_DISCRIMINATOR = new Uint8Array([
@@ -4200,8 +4204,8 @@ function getDecreaseTunaSpotPositionOrcaInstructionDataEncoder() {
   return transformEncoder23(
     getStructEncoder25([
       ["discriminator", fixEncoderSize24(getBytesEncoder24(), 8)],
-      ["withdrawPercent", getU32Encoder11()],
-      ["maxSwapSlippage", getU32Encoder11()],
+      ["withdrawPercent", getU32Encoder9()],
+      ["maxSwapAmountIn", getU64Encoder13()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -4213,8 +4217,8 @@ function getDecreaseTunaSpotPositionOrcaInstructionDataEncoder() {
 function getDecreaseTunaSpotPositionOrcaInstructionDataDecoder() {
   return getStructDecoder25([
     ["discriminator", fixDecoderSize23(getBytesDecoder23(), 8)],
-    ["withdrawPercent", getU32Decoder11()],
-    ["maxSwapSlippage", getU32Decoder11()],
+    ["withdrawPercent", getU32Decoder9()],
+    ["maxSwapAmountIn", getU64Decoder13()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -4364,8 +4368,8 @@ import {
   getBytesEncoder as getBytesEncoder25,
   getStructDecoder as getStructDecoder26,
   getStructEncoder as getStructEncoder26,
-  getU64Decoder as getU64Decoder10,
-  getU64Encoder as getU64Encoder10,
+  getU64Decoder as getU64Decoder14,
+  getU64Encoder as getU64Encoder14,
   transformEncoder as transformEncoder24
 } from "@solana/kit";
 var DEPOSIT_DISCRIMINATOR = new Uint8Array([
@@ -4385,7 +4389,7 @@ function getDepositInstructionDataEncoder() {
   return transformEncoder24(
     getStructEncoder26([
       ["discriminator", fixEncoderSize25(getBytesEncoder25(), 8)],
-      ["amount", getU64Encoder10()]
+      ["amount", getU64Encoder14()]
     ]),
     (value) => ({ ...value, discriminator: DEPOSIT_DISCRIMINATOR })
   );
@@ -4393,7 +4397,7 @@ function getDepositInstructionDataEncoder() {
 function getDepositInstructionDataDecoder() {
   return getStructDecoder26([
     ["discriminator", fixDecoderSize24(getBytesDecoder24(), 8)],
-    ["amount", getU64Decoder10()]
+    ["amount", getU64Decoder14()]
   ]);
 }
 function getDepositInstructionDataCodec() {
@@ -4476,10 +4480,10 @@ import {
   getBytesEncoder as getBytesEncoder26,
   getStructDecoder as getStructDecoder27,
   getStructEncoder as getStructEncoder27,
-  getU32Decoder as getU32Decoder12,
-  getU32Encoder as getU32Encoder12,
-  getU64Decoder as getU64Decoder11,
-  getU64Encoder as getU64Encoder11,
+  getU32Decoder as getU32Decoder10,
+  getU32Encoder as getU32Encoder10,
+  getU64Decoder as getU64Decoder15,
+  getU64Encoder as getU64Encoder15,
   transformEncoder as transformEncoder25
 } from "@solana/kit";
 var INCREASE_TUNA_LP_POSITION_FUSION_DISCRIMINATOR = new Uint8Array([
@@ -4501,13 +4505,13 @@ function getIncreaseTunaLpPositionFusionInstructionDataEncoder() {
   return transformEncoder25(
     getStructEncoder27([
       ["discriminator", fixEncoderSize26(getBytesEncoder26(), 8)],
-      ["collateralA", getU64Encoder11()],
-      ["collateralB", getU64Encoder11()],
-      ["borrowA", getU64Encoder11()],
-      ["borrowB", getU64Encoder11()],
-      ["minAddedAmountA", getU64Encoder11()],
-      ["minAddedAmountB", getU64Encoder11()],
-      ["maxSwapSlippage", getU32Encoder12()],
+      ["collateralA", getU64Encoder15()],
+      ["collateralB", getU64Encoder15()],
+      ["borrowA", getU64Encoder15()],
+      ["borrowB", getU64Encoder15()],
+      ["minAddedAmountA", getU64Encoder15()],
+      ["minAddedAmountB", getU64Encoder15()],
+      ["maxSwapSlippage", getU32Encoder10()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -4519,13 +4523,13 @@ function getIncreaseTunaLpPositionFusionInstructionDataEncoder() {
 function getIncreaseTunaLpPositionFusionInstructionDataDecoder() {
   return getStructDecoder27([
     ["discriminator", fixDecoderSize25(getBytesDecoder25(), 8)],
-    ["collateralA", getU64Decoder11()],
-    ["collateralB", getU64Decoder11()],
-    ["borrowA", getU64Decoder11()],
-    ["borrowB", getU64Decoder11()],
-    ["minAddedAmountA", getU64Decoder11()],
-    ["minAddedAmountB", getU64Decoder11()],
-    ["maxSwapSlippage", getU32Decoder12()],
+    ["collateralA", getU64Decoder15()],
+    ["collateralB", getU64Decoder15()],
+    ["borrowA", getU64Decoder15()],
+    ["borrowB", getU64Decoder15()],
+    ["minAddedAmountA", getU64Decoder15()],
+    ["minAddedAmountB", getU64Decoder15()],
+    ["maxSwapSlippage", getU32Decoder10()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -4683,10 +4687,10 @@ import {
   getBytesEncoder as getBytesEncoder27,
   getStructDecoder as getStructDecoder28,
   getStructEncoder as getStructEncoder28,
-  getU32Decoder as getU32Decoder13,
-  getU32Encoder as getU32Encoder13,
-  getU64Decoder as getU64Decoder12,
-  getU64Encoder as getU64Encoder12,
+  getU32Decoder as getU32Decoder11,
+  getU32Encoder as getU32Encoder11,
+  getU64Decoder as getU64Decoder16,
+  getU64Encoder as getU64Encoder16,
   transformEncoder as transformEncoder26
 } from "@solana/kit";
 var INCREASE_TUNA_LP_POSITION_ORCA_DISCRIMINATOR = new Uint8Array([
@@ -4708,13 +4712,13 @@ function getIncreaseTunaLpPositionOrcaInstructionDataEncoder() {
   return transformEncoder26(
     getStructEncoder28([
       ["discriminator", fixEncoderSize27(getBytesEncoder27(), 8)],
-      ["collateralA", getU64Encoder12()],
-      ["collateralB", getU64Encoder12()],
-      ["borrowA", getU64Encoder12()],
-      ["borrowB", getU64Encoder12()],
-      ["minAddedAmountA", getU64Encoder12()],
-      ["minAddedAmountB", getU64Encoder12()],
-      ["maxSwapSlippage", getU32Encoder13()],
+      ["collateralA", getU64Encoder16()],
+      ["collateralB", getU64Encoder16()],
+      ["borrowA", getU64Encoder16()],
+      ["borrowB", getU64Encoder16()],
+      ["minAddedAmountA", getU64Encoder16()],
+      ["minAddedAmountB", getU64Encoder16()],
+      ["maxSwapSlippage", getU32Encoder11()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -4726,13 +4730,13 @@ function getIncreaseTunaLpPositionOrcaInstructionDataEncoder() {
 function getIncreaseTunaLpPositionOrcaInstructionDataDecoder() {
   return getStructDecoder28([
     ["discriminator", fixDecoderSize26(getBytesDecoder26(), 8)],
-    ["collateralA", getU64Decoder12()],
-    ["collateralB", getU64Decoder12()],
-    ["borrowA", getU64Decoder12()],
-    ["borrowB", getU64Decoder12()],
-    ["minAddedAmountA", getU64Decoder12()],
-    ["minAddedAmountB", getU64Decoder12()],
-    ["maxSwapSlippage", getU32Decoder13()],
+    ["collateralA", getU64Decoder16()],
+    ["collateralB", getU64Decoder16()],
+    ["borrowA", getU64Decoder16()],
+    ["borrowB", getU64Decoder16()],
+    ["minAddedAmountA", getU64Decoder16()],
+    ["minAddedAmountB", getU64Decoder16()],
+    ["maxSwapSlippage", getU32Decoder11()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -4890,10 +4894,8 @@ import {
   getBytesEncoder as getBytesEncoder28,
   getStructDecoder as getStructDecoder29,
   getStructEncoder as getStructEncoder29,
-  getU32Decoder as getU32Decoder14,
-  getU32Encoder as getU32Encoder14,
-  getU64Decoder as getU64Decoder13,
-  getU64Encoder as getU64Encoder13,
+  getU64Decoder as getU64Decoder17,
+  getU64Encoder as getU64Encoder17,
   transformEncoder as transformEncoder27
 } from "@solana/kit";
 var INCREASE_TUNA_SPOT_POSITION_FUSION_DISCRIMINATOR = new Uint8Array([
@@ -4915,9 +4917,9 @@ function getIncreaseTunaSpotPositionFusionInstructionDataEncoder() {
   return transformEncoder27(
     getStructEncoder29([
       ["discriminator", fixEncoderSize28(getBytesEncoder28(), 8)],
-      ["collateralAmount", getU64Encoder13()],
-      ["borrowAmount", getU64Encoder13()],
-      ["maxSwapSlippage", getU32Encoder14()],
+      ["collateralAmount", getU64Encoder17()],
+      ["borrowAmount", getU64Encoder17()],
+      ["minSwapAmountOut", getU64Encoder17()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -4929,9 +4931,9 @@ function getIncreaseTunaSpotPositionFusionInstructionDataEncoder() {
 function getIncreaseTunaSpotPositionFusionInstructionDataDecoder() {
   return getStructDecoder29([
     ["discriminator", fixDecoderSize27(getBytesDecoder27(), 8)],
-    ["collateralAmount", getU64Decoder13()],
-    ["borrowAmount", getU64Decoder13()],
-    ["maxSwapSlippage", getU32Decoder14()],
+    ["collateralAmount", getU64Decoder17()],
+    ["borrowAmount", getU64Decoder17()],
+    ["minSwapAmountOut", getU64Decoder17()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -5093,10 +5095,8 @@ import {
   getBytesEncoder as getBytesEncoder29,
   getStructDecoder as getStructDecoder30,
   getStructEncoder as getStructEncoder30,
-  getU32Decoder as getU32Decoder15,
-  getU32Encoder as getU32Encoder15,
-  getU64Decoder as getU64Decoder14,
-  getU64Encoder as getU64Encoder14,
+  getU64Decoder as getU64Decoder18,
+  getU64Encoder as getU64Encoder18,
   transformEncoder as transformEncoder28
 } from "@solana/kit";
 var INCREASE_TUNA_SPOT_POSITION_ORCA_DISCRIMINATOR = new Uint8Array([
@@ -5118,9 +5118,9 @@ function getIncreaseTunaSpotPositionOrcaInstructionDataEncoder() {
   return transformEncoder28(
     getStructEncoder30([
       ["discriminator", fixEncoderSize29(getBytesEncoder29(), 8)],
-      ["collateralAmount", getU64Encoder14()],
-      ["borrowAmount", getU64Encoder14()],
-      ["maxSwapSlippage", getU32Encoder15()],
+      ["collateralAmount", getU64Encoder18()],
+      ["borrowAmount", getU64Encoder18()],
+      ["minSwapAmountOut", getU64Encoder18()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -5132,9 +5132,9 @@ function getIncreaseTunaSpotPositionOrcaInstructionDataEncoder() {
 function getIncreaseTunaSpotPositionOrcaInstructionDataDecoder() {
   return getStructDecoder30([
     ["discriminator", fixDecoderSize28(getBytesDecoder28(), 8)],
-    ["collateralAmount", getU64Decoder14()],
-    ["borrowAmount", getU64Decoder14()],
-    ["maxSwapSlippage", getU32Decoder15()],
+    ["collateralAmount", getU64Decoder18()],
+    ["borrowAmount", getU64Decoder18()],
+    ["minSwapAmountOut", getU64Decoder18()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -5296,8 +5296,8 @@ import {
   getBytesEncoder as getBytesEncoder30,
   getStructDecoder as getStructDecoder31,
   getStructEncoder as getStructEncoder31,
-  getU32Decoder as getU32Decoder16,
-  getU32Encoder as getU32Encoder16,
+  getU32Decoder as getU32Decoder12,
+  getU32Encoder as getU32Encoder12,
   transformEncoder as transformEncoder29
 } from "@solana/kit";
 var LIQUIDATE_TUNA_LP_POSITION_FUSION_DISCRIMINATOR = new Uint8Array([
@@ -5319,7 +5319,7 @@ function getLiquidateTunaLpPositionFusionInstructionDataEncoder() {
   return transformEncoder29(
     getStructEncoder31([
       ["discriminator", fixEncoderSize30(getBytesEncoder30(), 8)],
-      ["withdrawPercent", getU32Encoder16()],
+      ["withdrawPercent", getU32Encoder12()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -5331,7 +5331,7 @@ function getLiquidateTunaLpPositionFusionInstructionDataEncoder() {
 function getLiquidateTunaLpPositionFusionInstructionDataDecoder() {
   return getStructDecoder31([
     ["discriminator", fixDecoderSize29(getBytesDecoder29(), 8)],
-    ["withdrawPercent", getU32Decoder16()],
+    ["withdrawPercent", getU32Decoder12()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -5477,8 +5477,8 @@ import {
   getBytesEncoder as getBytesEncoder31,
   getStructDecoder as getStructDecoder32,
   getStructEncoder as getStructEncoder32,
-  getU32Decoder as getU32Decoder17,
-  getU32Encoder as getU32Encoder17,
+  getU32Decoder as getU32Decoder13,
+  getU32Encoder as getU32Encoder13,
   transformEncoder as transformEncoder30
 } from "@solana/kit";
 var LIQUIDATE_TUNA_LP_POSITION_ORCA_DISCRIMINATOR = new Uint8Array([
@@ -5500,7 +5500,7 @@ function getLiquidateTunaLpPositionOrcaInstructionDataEncoder() {
   return transformEncoder30(
     getStructEncoder32([
       ["discriminator", fixEncoderSize31(getBytesEncoder31(), 8)],
-      ["withdrawPercent", getU32Encoder17()],
+      ["withdrawPercent", getU32Encoder13()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -5512,7 +5512,7 @@ function getLiquidateTunaLpPositionOrcaInstructionDataEncoder() {
 function getLiquidateTunaLpPositionOrcaInstructionDataDecoder() {
   return getStructDecoder32([
     ["discriminator", fixDecoderSize30(getBytesDecoder30(), 8)],
-    ["withdrawPercent", getU32Decoder17()],
+    ["withdrawPercent", getU32Decoder13()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -5658,8 +5658,8 @@ import {
   getBytesEncoder as getBytesEncoder32,
   getStructDecoder as getStructDecoder33,
   getStructEncoder as getStructEncoder33,
-  getU32Decoder as getU32Decoder18,
-  getU32Encoder as getU32Encoder18,
+  getU32Decoder as getU32Decoder14,
+  getU32Encoder as getU32Encoder14,
   transformEncoder as transformEncoder31
 } from "@solana/kit";
 var LIQUIDATE_TUNA_SPOT_POSITION_FUSION_DISCRIMINATOR = new Uint8Array(
@@ -5674,7 +5674,7 @@ function getLiquidateTunaSpotPositionFusionInstructionDataEncoder() {
   return transformEncoder31(
     getStructEncoder33([
       ["discriminator", fixEncoderSize32(getBytesEncoder32(), 8)],
-      ["withdrawPercent", getU32Encoder18()],
+      ["withdrawPercent", getU32Encoder14()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -5686,7 +5686,7 @@ function getLiquidateTunaSpotPositionFusionInstructionDataEncoder() {
 function getLiquidateTunaSpotPositionFusionInstructionDataDecoder() {
   return getStructDecoder33([
     ["discriminator", fixDecoderSize31(getBytesDecoder31(), 8)],
-    ["withdrawPercent", getU32Decoder18()],
+    ["withdrawPercent", getU32Decoder14()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -5854,8 +5854,8 @@ import {
   getBytesEncoder as getBytesEncoder33,
   getStructDecoder as getStructDecoder34,
   getStructEncoder as getStructEncoder34,
-  getU32Decoder as getU32Decoder19,
-  getU32Encoder as getU32Encoder19,
+  getU32Decoder as getU32Decoder15,
+  getU32Encoder as getU32Encoder15,
   transformEncoder as transformEncoder32
 } from "@solana/kit";
 var LIQUIDATE_TUNA_SPOT_POSITION_ORCA_DISCRIMINATOR = new Uint8Array([
@@ -5877,7 +5877,7 @@ function getLiquidateTunaSpotPositionOrcaInstructionDataEncoder() {
   return transformEncoder32(
     getStructEncoder34([
       ["discriminator", fixEncoderSize33(getBytesEncoder33(), 8)],
-      ["withdrawPercent", getU32Encoder19()],
+      ["withdrawPercent", getU32Encoder15()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -5889,7 +5889,7 @@ function getLiquidateTunaSpotPositionOrcaInstructionDataEncoder() {
 function getLiquidateTunaSpotPositionOrcaInstructionDataDecoder() {
   return getStructDecoder34([
     ["discriminator", fixDecoderSize32(getBytesDecoder32(), 8)],
-    ["withdrawPercent", getU32Decoder19()],
+    ["withdrawPercent", getU32Decoder15()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -6061,10 +6061,10 @@ import {
   getStructEncoder as getStructEncoder35,
   getU128Decoder as getU128Decoder3,
   getU128Encoder as getU128Encoder3,
-  getU32Decoder as getU32Decoder20,
-  getU32Encoder as getU32Encoder20,
-  getU64Decoder as getU64Decoder15,
-  getU64Encoder as getU64Encoder15,
+  getU32Decoder as getU32Decoder16,
+  getU32Encoder as getU32Encoder16,
+  getU64Decoder as getU64Decoder19,
+  getU64Encoder as getU64Encoder19,
   transformEncoder as transformEncoder33
 } from "@solana/kit";
 var OPEN_AND_INCREASE_TUNA_LP_POSITION_FUSION_DISCRIMINATOR = new Uint8Array([123, 115, 192, 91, 113, 191, 73, 56]);
@@ -6081,14 +6081,14 @@ function getOpenAndIncreaseTunaLpPositionFusionInstructionDataEncoder() {
       ["tickUpperIndex", getI32Encoder2()],
       ["lowerLimitOrderSqrtPrice", getU128Encoder3()],
       ["upperLimitOrderSqrtPrice", getU128Encoder3()],
-      ["flags", getU32Encoder20()],
-      ["collateralA", getU64Encoder15()],
-      ["collateralB", getU64Encoder15()],
-      ["borrowA", getU64Encoder15()],
-      ["borrowB", getU64Encoder15()],
-      ["minAddedAmountA", getU64Encoder15()],
-      ["minAddedAmountB", getU64Encoder15()],
-      ["maxSwapSlippage", getU32Encoder20()],
+      ["flags", getU32Encoder16()],
+      ["collateralA", getU64Encoder19()],
+      ["collateralB", getU64Encoder19()],
+      ["borrowA", getU64Encoder19()],
+      ["borrowB", getU64Encoder19()],
+      ["minAddedAmountA", getU64Encoder19()],
+      ["minAddedAmountB", getU64Encoder19()],
+      ["maxSwapSlippage", getU32Encoder16()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -6104,14 +6104,14 @@ function getOpenAndIncreaseTunaLpPositionFusionInstructionDataDecoder() {
     ["tickUpperIndex", getI32Decoder2()],
     ["lowerLimitOrderSqrtPrice", getU128Decoder3()],
     ["upperLimitOrderSqrtPrice", getU128Decoder3()],
-    ["flags", getU32Decoder20()],
-    ["collateralA", getU64Decoder15()],
-    ["collateralB", getU64Decoder15()],
-    ["borrowA", getU64Decoder15()],
-    ["borrowB", getU64Decoder15()],
-    ["minAddedAmountA", getU64Decoder15()],
-    ["minAddedAmountB", getU64Decoder15()],
-    ["maxSwapSlippage", getU32Decoder20()],
+    ["flags", getU32Decoder16()],
+    ["collateralA", getU64Decoder19()],
+    ["collateralB", getU64Decoder19()],
+    ["borrowA", getU64Decoder19()],
+    ["borrowB", getU64Decoder19()],
+    ["minAddedAmountA", getU64Decoder19()],
+    ["minAddedAmountB", getU64Decoder19()],
+    ["maxSwapSlippage", getU32Decoder16()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -6303,10 +6303,10 @@ import {
   getStructEncoder as getStructEncoder36,
   getU128Decoder as getU128Decoder4,
   getU128Encoder as getU128Encoder4,
-  getU32Decoder as getU32Decoder21,
-  getU32Encoder as getU32Encoder21,
-  getU64Decoder as getU64Decoder16,
-  getU64Encoder as getU64Encoder16,
+  getU32Decoder as getU32Decoder17,
+  getU32Encoder as getU32Encoder17,
+  getU64Decoder as getU64Decoder20,
+  getU64Encoder as getU64Encoder20,
   transformEncoder as transformEncoder34
 } from "@solana/kit";
 var OPEN_AND_INCREASE_TUNA_LP_POSITION_ORCA_DISCRIMINATOR = new Uint8Array([163, 21, 84, 199, 172, 40, 87, 122]);
@@ -6323,14 +6323,14 @@ function getOpenAndIncreaseTunaLpPositionOrcaInstructionDataEncoder() {
       ["tickUpperIndex", getI32Encoder3()],
       ["lowerLimitOrderSqrtPrice", getU128Encoder4()],
       ["upperLimitOrderSqrtPrice", getU128Encoder4()],
-      ["flags", getU32Encoder21()],
-      ["collateralA", getU64Encoder16()],
-      ["collateralB", getU64Encoder16()],
-      ["borrowA", getU64Encoder16()],
-      ["borrowB", getU64Encoder16()],
-      ["minAddedAmountA", getU64Encoder16()],
-      ["minAddedAmountB", getU64Encoder16()],
-      ["maxSwapSlippage", getU32Encoder21()],
+      ["flags", getU32Encoder17()],
+      ["collateralA", getU64Encoder20()],
+      ["collateralB", getU64Encoder20()],
+      ["borrowA", getU64Encoder20()],
+      ["borrowB", getU64Encoder20()],
+      ["minAddedAmountA", getU64Encoder20()],
+      ["minAddedAmountB", getU64Encoder20()],
+      ["maxSwapSlippage", getU32Encoder17()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -6346,14 +6346,14 @@ function getOpenAndIncreaseTunaLpPositionOrcaInstructionDataDecoder() {
     ["tickUpperIndex", getI32Decoder3()],
     ["lowerLimitOrderSqrtPrice", getU128Decoder4()],
     ["upperLimitOrderSqrtPrice", getU128Decoder4()],
-    ["flags", getU32Decoder21()],
-    ["collateralA", getU64Decoder16()],
-    ["collateralB", getU64Decoder16()],
-    ["borrowA", getU64Decoder16()],
-    ["borrowB", getU64Decoder16()],
-    ["minAddedAmountA", getU64Decoder16()],
-    ["minAddedAmountB", getU64Decoder16()],
-    ["maxSwapSlippage", getU32Decoder21()],
+    ["flags", getU32Decoder17()],
+    ["collateralA", getU64Decoder20()],
+    ["collateralB", getU64Decoder20()],
+    ["borrowA", getU64Decoder20()],
+    ["borrowB", getU64Decoder20()],
+    ["minAddedAmountA", getU64Decoder20()],
+    ["minAddedAmountB", getU64Decoder20()],
+    ["maxSwapSlippage", getU32Decoder17()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -6541,12 +6541,8 @@ import {
   getBytesEncoder as getBytesEncoder36,
   getStructDecoder as getStructDecoder37,
   getStructEncoder as getStructEncoder37,
-  getU128Decoder as getU128Decoder5,
-  getU128Encoder as getU128Encoder5,
-  getU32Decoder as getU32Decoder22,
-  getU32Encoder as getU32Encoder22,
-  getU64Decoder as getU64Decoder17,
-  getU64Encoder as getU64Encoder17,
+  getU64Decoder as getU64Decoder21,
+  getU64Encoder as getU64Encoder21,
   transformEncoder as transformEncoder35
 } from "@solana/kit";
 var OPEN_AND_INCREASE_TUNA_SPOT_POSITION_FUSION_DISCRIMINATOR = new Uint8Array([242, 25, 184, 131, 250, 142, 138, 191]);
@@ -6561,12 +6557,9 @@ function getOpenAndIncreaseTunaSpotPositionFusionInstructionDataEncoder() {
       ["discriminator", fixEncoderSize36(getBytesEncoder36(), 8)],
       ["positionToken", getPoolTokenEncoder()],
       ["collateralToken", getPoolTokenEncoder()],
-      ["collateralAmount", getU64Encoder17()],
-      ["borrowAmount", getU64Encoder17()],
-      ["lowerLimitOrderSqrtPrice", getU128Encoder5()],
-      ["upperLimitOrderSqrtPrice", getU128Encoder5()],
-      ["flags", getU32Encoder22()],
-      ["maxSwapSlippage", getU32Encoder22()],
+      ["collateralAmount", getU64Encoder21()],
+      ["borrowAmount", getU64Encoder21()],
+      ["minSwapAmountOut", getU64Encoder21()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -6580,12 +6573,9 @@ function getOpenAndIncreaseTunaSpotPositionFusionInstructionDataDecoder() {
     ["discriminator", fixDecoderSize35(getBytesDecoder35(), 8)],
     ["positionToken", getPoolTokenDecoder()],
     ["collateralToken", getPoolTokenDecoder()],
-    ["collateralAmount", getU64Decoder17()],
-    ["borrowAmount", getU64Decoder17()],
-    ["lowerLimitOrderSqrtPrice", getU128Decoder5()],
-    ["upperLimitOrderSqrtPrice", getU128Decoder5()],
-    ["flags", getU32Decoder22()],
-    ["maxSwapSlippage", getU32Decoder22()],
+    ["collateralAmount", getU64Decoder21()],
+    ["borrowAmount", getU64Decoder21()],
+    ["minSwapAmountOut", getU64Decoder21()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -6753,12 +6743,8 @@ import {
   getBytesEncoder as getBytesEncoder37,
   getStructDecoder as getStructDecoder38,
   getStructEncoder as getStructEncoder38,
-  getU128Decoder as getU128Decoder6,
-  getU128Encoder as getU128Encoder6,
-  getU32Decoder as getU32Decoder23,
-  getU32Encoder as getU32Encoder23,
-  getU64Decoder as getU64Decoder18,
-  getU64Encoder as getU64Encoder18,
+  getU64Decoder as getU64Decoder22,
+  getU64Encoder as getU64Encoder22,
   transformEncoder as transformEncoder36
 } from "@solana/kit";
 var OPEN_AND_INCREASE_TUNA_SPOT_POSITION_ORCA_DISCRIMINATOR = new Uint8Array([124, 15, 205, 162, 7, 88, 34, 177]);
@@ -6773,12 +6759,9 @@ function getOpenAndIncreaseTunaSpotPositionOrcaInstructionDataEncoder() {
       ["discriminator", fixEncoderSize37(getBytesEncoder37(), 8)],
       ["positionToken", getPoolTokenEncoder()],
       ["collateralToken", getPoolTokenEncoder()],
-      ["collateralAmount", getU64Encoder18()],
-      ["borrowAmount", getU64Encoder18()],
-      ["lowerLimitOrderSqrtPrice", getU128Encoder6()],
-      ["upperLimitOrderSqrtPrice", getU128Encoder6()],
-      ["flags", getU32Encoder23()],
-      ["maxSwapSlippage", getU32Encoder23()],
+      ["collateralAmount", getU64Encoder22()],
+      ["borrowAmount", getU64Encoder22()],
+      ["minSwapAmountOut", getU64Encoder22()],
       ["remainingAccountsInfo", getRemainingAccountsInfoEncoder()]
     ]),
     (value) => ({
@@ -6792,12 +6775,9 @@ function getOpenAndIncreaseTunaSpotPositionOrcaInstructionDataDecoder() {
     ["discriminator", fixDecoderSize36(getBytesDecoder36(), 8)],
     ["positionToken", getPoolTokenDecoder()],
     ["collateralToken", getPoolTokenDecoder()],
-    ["collateralAmount", getU64Decoder18()],
-    ["borrowAmount", getU64Decoder18()],
-    ["lowerLimitOrderSqrtPrice", getU128Decoder6()],
-    ["upperLimitOrderSqrtPrice", getU128Decoder6()],
-    ["flags", getU32Decoder23()],
-    ["maxSwapSlippage", getU32Decoder23()],
+    ["collateralAmount", getU64Decoder22()],
+    ["borrowAmount", getU64Decoder22()],
+    ["minSwapAmountOut", getU64Decoder22()],
     ["remainingAccountsInfo", getRemainingAccountsInfoDecoder()]
   ]);
 }
@@ -7068,10 +7048,10 @@ import {
   getI32Encoder as getI32Encoder4,
   getStructDecoder as getStructDecoder40,
   getStructEncoder as getStructEncoder40,
-  getU128Decoder as getU128Decoder7,
-  getU128Encoder as getU128Encoder7,
-  getU32Decoder as getU32Decoder24,
-  getU32Encoder as getU32Encoder24,
+  getU128Decoder as getU128Decoder5,
+  getU128Encoder as getU128Encoder5,
+  getU32Decoder as getU32Decoder18,
+  getU32Encoder as getU32Encoder18,
   transformEncoder as transformEncoder38
 } from "@solana/kit";
 var OPEN_TUNA_LP_POSITION_FUSION_DISCRIMINATOR = new Uint8Array([
@@ -7095,9 +7075,9 @@ function getOpenTunaLpPositionFusionInstructionDataEncoder() {
       ["discriminator", fixEncoderSize39(getBytesEncoder39(), 8)],
       ["tickLowerIndex", getI32Encoder4()],
       ["tickUpperIndex", getI32Encoder4()],
-      ["lowerLimitOrderSqrtPrice", getU128Encoder7()],
-      ["upperLimitOrderSqrtPrice", getU128Encoder7()],
-      ["flags", getU32Encoder24()]
+      ["lowerLimitOrderSqrtPrice", getU128Encoder5()],
+      ["upperLimitOrderSqrtPrice", getU128Encoder5()],
+      ["flags", getU32Encoder18()]
     ]),
     (value) => ({
       ...value,
@@ -7110,9 +7090,9 @@ function getOpenTunaLpPositionFusionInstructionDataDecoder() {
     ["discriminator", fixDecoderSize38(getBytesDecoder38(), 8)],
     ["tickLowerIndex", getI32Decoder4()],
     ["tickUpperIndex", getI32Decoder4()],
-    ["lowerLimitOrderSqrtPrice", getU128Decoder7()],
-    ["upperLimitOrderSqrtPrice", getU128Decoder7()],
-    ["flags", getU32Decoder24()]
+    ["lowerLimitOrderSqrtPrice", getU128Decoder5()],
+    ["upperLimitOrderSqrtPrice", getU128Decoder5()],
+    ["flags", getU32Decoder18()]
   ]);
 }
 function getOpenTunaLpPositionFusionInstructionDataCodec() {
@@ -7247,10 +7227,10 @@ import {
   getI32Encoder as getI32Encoder5,
   getStructDecoder as getStructDecoder41,
   getStructEncoder as getStructEncoder41,
-  getU128Decoder as getU128Decoder8,
-  getU128Encoder as getU128Encoder8,
-  getU32Decoder as getU32Decoder25,
-  getU32Encoder as getU32Encoder25,
+  getU128Decoder as getU128Decoder6,
+  getU128Encoder as getU128Encoder6,
+  getU32Decoder as getU32Decoder19,
+  getU32Encoder as getU32Encoder19,
   transformEncoder as transformEncoder39
 } from "@solana/kit";
 var OPEN_TUNA_LP_POSITION_ORCA_DISCRIMINATOR = new Uint8Array([
@@ -7274,9 +7254,9 @@ function getOpenTunaLpPositionOrcaInstructionDataEncoder() {
       ["discriminator", fixEncoderSize40(getBytesEncoder40(), 8)],
       ["tickLowerIndex", getI32Encoder5()],
       ["tickUpperIndex", getI32Encoder5()],
-      ["lowerLimitOrderSqrtPrice", getU128Encoder8()],
-      ["upperLimitOrderSqrtPrice", getU128Encoder8()],
-      ["flags", getU32Encoder25()]
+      ["lowerLimitOrderSqrtPrice", getU128Encoder6()],
+      ["upperLimitOrderSqrtPrice", getU128Encoder6()],
+      ["flags", getU32Encoder19()]
     ]),
     (value) => ({
       ...value,
@@ -7289,9 +7269,9 @@ function getOpenTunaLpPositionOrcaInstructionDataDecoder() {
     ["discriminator", fixDecoderSize39(getBytesDecoder39(), 8)],
     ["tickLowerIndex", getI32Decoder5()],
     ["tickUpperIndex", getI32Decoder5()],
-    ["lowerLimitOrderSqrtPrice", getU128Decoder8()],
-    ["upperLimitOrderSqrtPrice", getU128Decoder8()],
-    ["flags", getU32Decoder25()]
+    ["lowerLimitOrderSqrtPrice", getU128Decoder6()],
+    ["upperLimitOrderSqrtPrice", getU128Decoder6()],
+    ["flags", getU32Decoder19()]
   ]);
 }
 function getOpenTunaLpPositionOrcaInstructionDataCodec() {
@@ -7424,10 +7404,6 @@ import {
   getBytesEncoder as getBytesEncoder41,
   getStructDecoder as getStructDecoder42,
   getStructEncoder as getStructEncoder42,
-  getU128Decoder as getU128Decoder9,
-  getU128Encoder as getU128Encoder9,
-  getU32Decoder as getU32Decoder26,
-  getU32Encoder as getU32Encoder26,
   transformEncoder as transformEncoder40
 } from "@solana/kit";
 var OPEN_TUNA_SPOT_POSITION_FUSION_DISCRIMINATOR = new Uint8Array([
@@ -7450,10 +7426,7 @@ function getOpenTunaSpotPositionFusionInstructionDataEncoder() {
     getStructEncoder42([
       ["discriminator", fixEncoderSize41(getBytesEncoder41(), 8)],
       ["positionToken", getPoolTokenEncoder()],
-      ["collateralToken", getPoolTokenEncoder()],
-      ["lowerLimitOrderSqrtPrice", getU128Encoder9()],
-      ["upperLimitOrderSqrtPrice", getU128Encoder9()],
-      ["flags", getU32Encoder26()]
+      ["collateralToken", getPoolTokenEncoder()]
     ]),
     (value) => ({
       ...value,
@@ -7465,10 +7438,7 @@ function getOpenTunaSpotPositionFusionInstructionDataDecoder() {
   return getStructDecoder42([
     ["discriminator", fixDecoderSize40(getBytesDecoder40(), 8)],
     ["positionToken", getPoolTokenDecoder()],
-    ["collateralToken", getPoolTokenDecoder()],
-    ["lowerLimitOrderSqrtPrice", getU128Decoder9()],
-    ["upperLimitOrderSqrtPrice", getU128Decoder9()],
-    ["flags", getU32Decoder26()]
+    ["collateralToken", getPoolTokenDecoder()]
   ]);
 }
 function getOpenTunaSpotPositionFusionInstructionDataCodec() {
@@ -7568,10 +7538,6 @@ import {
   getBytesEncoder as getBytesEncoder42,
   getStructDecoder as getStructDecoder43,
   getStructEncoder as getStructEncoder43,
-  getU128Decoder as getU128Decoder10,
-  getU128Encoder as getU128Encoder10,
-  getU32Decoder as getU32Decoder27,
-  getU32Encoder as getU32Encoder27,
   transformEncoder as transformEncoder41
 } from "@solana/kit";
 var OPEN_TUNA_SPOT_POSITION_ORCA_DISCRIMINATOR = new Uint8Array([
@@ -7594,10 +7560,7 @@ function getOpenTunaSpotPositionOrcaInstructionDataEncoder() {
     getStructEncoder43([
       ["discriminator", fixEncoderSize42(getBytesEncoder42(), 8)],
       ["positionToken", getPoolTokenEncoder()],
-      ["collateralToken", getPoolTokenEncoder()],
-      ["lowerLimitOrderSqrtPrice", getU128Encoder10()],
-      ["upperLimitOrderSqrtPrice", getU128Encoder10()],
-      ["flags", getU32Encoder27()]
+      ["collateralToken", getPoolTokenEncoder()]
     ]),
     (value) => ({
       ...value,
@@ -7609,10 +7572,7 @@ function getOpenTunaSpotPositionOrcaInstructionDataDecoder() {
   return getStructDecoder43([
     ["discriminator", fixDecoderSize41(getBytesDecoder41(), 8)],
     ["positionToken", getPoolTokenDecoder()],
-    ["collateralToken", getPoolTokenDecoder()],
-    ["lowerLimitOrderSqrtPrice", getU128Decoder10()],
-    ["upperLimitOrderSqrtPrice", getU128Decoder10()],
-    ["flags", getU32Decoder27()]
+    ["collateralToken", getPoolTokenDecoder()]
   ]);
 }
 function getOpenTunaSpotPositionOrcaInstructionDataCodec() {
@@ -8060,8 +8020,8 @@ import {
   getBytesEncoder as getBytesEncoder45,
   getStructDecoder as getStructDecoder46,
   getStructEncoder as getStructEncoder46,
-  getU64Decoder as getU64Decoder19,
-  getU64Encoder as getU64Encoder19,
+  getU64Decoder as getU64Decoder23,
+  getU64Encoder as getU64Encoder23,
   transformEncoder as transformEncoder44
 } from "@solana/kit";
 var REPAY_BAD_DEBT_DISCRIMINATOR = new Uint8Array([
@@ -8083,8 +8043,8 @@ function getRepayBadDebtInstructionDataEncoder() {
   return transformEncoder44(
     getStructEncoder46([
       ["discriminator", fixEncoderSize45(getBytesEncoder45(), 8)],
-      ["funds", getU64Encoder19()],
-      ["shares", getU64Encoder19()]
+      ["funds", getU64Encoder23()],
+      ["shares", getU64Encoder23()]
     ]),
     (value) => ({ ...value, discriminator: REPAY_BAD_DEBT_DISCRIMINATOR })
   );
@@ -8092,8 +8052,8 @@ function getRepayBadDebtInstructionDataEncoder() {
 function getRepayBadDebtInstructionDataDecoder() {
   return getStructDecoder46([
     ["discriminator", fixDecoderSize44(getBytesDecoder44(), 8)],
-    ["funds", getU64Decoder19()],
-    ["shares", getU64Decoder19()]
+    ["funds", getU64Decoder23()],
+    ["shares", getU64Decoder23()]
   ]);
 }
 function getRepayBadDebtInstructionDataCodec() {
@@ -8173,8 +8133,8 @@ import {
   getBytesEncoder as getBytesEncoder46,
   getStructDecoder as getStructDecoder47,
   getStructEncoder as getStructEncoder47,
-  getU64Decoder as getU64Decoder20,
-  getU64Encoder as getU64Encoder20,
+  getU64Decoder as getU64Decoder24,
+  getU64Encoder as getU64Encoder24,
   transformEncoder as transformEncoder45
 } from "@solana/kit";
 var REPAY_TUNA_LP_POSITION_DEBT_DISCRIMINATOR = new Uint8Array([
@@ -8196,8 +8156,8 @@ function getRepayTunaLpPositionDebtInstructionDataEncoder() {
   return transformEncoder45(
     getStructEncoder47([
       ["discriminator", fixEncoderSize46(getBytesEncoder46(), 8)],
-      ["collateralFundsA", getU64Encoder20()],
-      ["collateralFundsB", getU64Encoder20()]
+      ["collateralFundsA", getU64Encoder24()],
+      ["collateralFundsB", getU64Encoder24()]
     ]),
     (value) => ({
       ...value,
@@ -8208,8 +8168,8 @@ function getRepayTunaLpPositionDebtInstructionDataEncoder() {
 function getRepayTunaLpPositionDebtInstructionDataDecoder() {
   return getStructDecoder47([
     ["discriminator", fixDecoderSize45(getBytesDecoder45(), 8)],
-    ["collateralFundsA", getU64Decoder20()],
-    ["collateralFundsB", getU64Decoder20()]
+    ["collateralFundsA", getU64Decoder24()],
+    ["collateralFundsB", getU64Decoder24()]
   ]);
 }
 function getRepayTunaLpPositionDebtInstructionDataCodec() {
@@ -8324,8 +8284,6 @@ import {
   getBytesEncoder as getBytesEncoder47,
   getStructDecoder as getStructDecoder48,
   getStructEncoder as getStructEncoder48,
-  getU128Decoder as getU128Decoder11,
-  getU128Encoder as getU128Encoder11,
   transformEncoder as transformEncoder46
 } from "@solana/kit";
 var RESET_TUNA_SPOT_POSITION_DISCRIMINATOR = new Uint8Array([
@@ -8348,9 +8306,7 @@ function getResetTunaSpotPositionInstructionDataEncoder() {
     getStructEncoder48([
       ["discriminator", fixEncoderSize47(getBytesEncoder47(), 8)],
       ["positionToken", getPoolTokenEncoder()],
-      ["collateralToken", getPoolTokenEncoder()],
-      ["lowerLimitOrderSqrtPrice", getU128Encoder11()],
-      ["upperLimitOrderSqrtPrice", getU128Encoder11()]
+      ["collateralToken", getPoolTokenEncoder()]
     ]),
     (value) => ({
       ...value,
@@ -8362,9 +8318,7 @@ function getResetTunaSpotPositionInstructionDataDecoder() {
   return getStructDecoder48([
     ["discriminator", fixDecoderSize46(getBytesDecoder46(), 8)],
     ["positionToken", getPoolTokenDecoder()],
-    ["collateralToken", getPoolTokenDecoder()],
-    ["lowerLimitOrderSqrtPrice", getU128Decoder11()],
-    ["upperLimitOrderSqrtPrice", getU128Decoder11()]
+    ["collateralToken", getPoolTokenDecoder()]
   ]);
 }
 function getResetTunaSpotPositionInstructionDataCodec() {
@@ -8533,8 +8487,8 @@ import {
   getBytesEncoder as getBytesEncoder49,
   getStructDecoder as getStructDecoder50,
   getStructEncoder as getStructEncoder50,
-  getU32Decoder as getU32Decoder28,
-  getU32Encoder as getU32Encoder28,
+  getU32Decoder as getU32Decoder20,
+  getU32Encoder as getU32Encoder20,
   transformEncoder as transformEncoder48
 } from "@solana/kit";
 var SET_DEFAULT_MAX_PERCENTAGE_OF_LEFTOVERS_DISCRIMINATOR = new Uint8Array([37, 179, 107, 65, 203, 141, 183, 27]);
@@ -8547,7 +8501,7 @@ function getSetDefaultMaxPercentageOfLeftoversInstructionDataEncoder() {
   return transformEncoder48(
     getStructEncoder50([
       ["discriminator", fixEncoderSize49(getBytesEncoder49(), 8)],
-      ["maxPercentageOfLeftovers", getU32Encoder28()]
+      ["maxPercentageOfLeftovers", getU32Encoder20()]
     ]),
     (value) => ({
       ...value,
@@ -8558,7 +8512,7 @@ function getSetDefaultMaxPercentageOfLeftoversInstructionDataEncoder() {
 function getSetDefaultMaxPercentageOfLeftoversInstructionDataDecoder() {
   return getStructDecoder50([
     ["discriminator", fixDecoderSize48(getBytesDecoder48(), 8)],
-    ["maxPercentageOfLeftovers", getU32Decoder28()]
+    ["maxPercentageOfLeftovers", getU32Decoder20()]
   ]);
 }
 function getSetDefaultMaxPercentageOfLeftoversInstructionDataCodec() {
@@ -8619,8 +8573,8 @@ import {
   getBytesEncoder as getBytesEncoder50,
   getStructDecoder as getStructDecoder51,
   getStructEncoder as getStructEncoder51,
-  getU32Decoder as getU32Decoder29,
-  getU32Encoder as getU32Encoder29,
+  getU32Decoder as getU32Decoder21,
+  getU32Encoder as getU32Encoder21,
   transformEncoder as transformEncoder49
 } from "@solana/kit";
 var SET_DEFAULT_MAX_SWAP_SLIPPAGE_DISCRIMINATOR = new Uint8Array([
@@ -8642,7 +8596,7 @@ function getSetDefaultMaxSwapSlippageInstructionDataEncoder() {
   return transformEncoder49(
     getStructEncoder51([
       ["discriminator", fixEncoderSize50(getBytesEncoder50(), 8)],
-      ["maxSwapSlippage", getU32Encoder29()]
+      ["maxSwapSlippage", getU32Encoder21()]
     ]),
     (value) => ({
       ...value,
@@ -8653,7 +8607,7 @@ function getSetDefaultMaxSwapSlippageInstructionDataEncoder() {
 function getSetDefaultMaxSwapSlippageInstructionDataDecoder() {
   return getStructDecoder51([
     ["discriminator", fixDecoderSize49(getBytesDecoder49(), 8)],
-    ["maxSwapSlippage", getU32Decoder29()]
+    ["maxSwapSlippage", getU32Decoder21()]
   ]);
 }
 function getSetDefaultMaxSwapSlippageInstructionDataCodec() {
@@ -8714,8 +8668,8 @@ import {
   getBytesEncoder as getBytesEncoder51,
   getStructDecoder as getStructDecoder52,
   getStructEncoder as getStructEncoder52,
-  getU32Decoder as getU32Decoder30,
-  getU32Encoder as getU32Encoder30,
+  getU32Decoder as getU32Decoder22,
+  getU32Encoder as getU32Encoder22,
   transformEncoder as transformEncoder50
 } from "@solana/kit";
 var SET_DEFAULT_ORACLE_PRICE_DEVIATION_THRESHOLD_DISCRIMINATOR = new Uint8Array([142, 158, 143, 67, 206, 91, 139, 120]);
@@ -8728,7 +8682,7 @@ function getSetDefaultOraclePriceDeviationThresholdInstructionDataEncoder() {
   return transformEncoder50(
     getStructEncoder52([
       ["discriminator", fixEncoderSize51(getBytesEncoder51(), 8)],
-      ["oraclePriceDeviationThreshold", getU32Encoder30()]
+      ["oraclePriceDeviationThreshold", getU32Encoder22()]
     ]),
     (value) => ({
       ...value,
@@ -8739,7 +8693,7 @@ function getSetDefaultOraclePriceDeviationThresholdInstructionDataEncoder() {
 function getSetDefaultOraclePriceDeviationThresholdInstructionDataDecoder() {
   return getStructDecoder52([
     ["discriminator", fixDecoderSize50(getBytesDecoder50(), 8)],
-    ["oraclePriceDeviationThreshold", getU32Decoder30()]
+    ["oraclePriceDeviationThreshold", getU32Decoder22()]
   ]);
 }
 function getSetDefaultOraclePriceDeviationThresholdInstructionDataCodec() {
@@ -9171,8 +9125,8 @@ import {
   getBytesEncoder as getBytesEncoder56,
   getStructDecoder as getStructDecoder57,
   getStructEncoder as getStructEncoder57,
-  getU32Decoder as getU32Decoder31,
-  getU32Encoder as getU32Encoder31,
+  getU32Decoder as getU32Decoder23,
+  getU32Encoder as getU32Encoder23,
   transformEncoder as transformEncoder55
 } from "@solana/kit";
 var SET_TUNA_LP_POSITION_FLAGS_DISCRIMINATOR = new Uint8Array([
@@ -9194,7 +9148,7 @@ function getSetTunaLpPositionFlagsInstructionDataEncoder() {
   return transformEncoder55(
     getStructEncoder57([
       ["discriminator", fixEncoderSize56(getBytesEncoder56(), 8)],
-      ["flags", getU32Encoder31()]
+      ["flags", getU32Encoder23()]
     ]),
     (value) => ({
       ...value,
@@ -9205,7 +9159,7 @@ function getSetTunaLpPositionFlagsInstructionDataEncoder() {
 function getSetTunaLpPositionFlagsInstructionDataDecoder() {
   return getStructDecoder57([
     ["discriminator", fixDecoderSize55(getBytesDecoder55(), 8)],
-    ["flags", getU32Decoder31()]
+    ["flags", getU32Decoder23()]
   ]);
 }
 function getSetTunaLpPositionFlagsInstructionDataCodec() {
@@ -9266,8 +9220,8 @@ import {
   getBytesEncoder as getBytesEncoder57,
   getStructDecoder as getStructDecoder58,
   getStructEncoder as getStructEncoder58,
-  getU128Decoder as getU128Decoder12,
-  getU128Encoder as getU128Encoder12,
+  getU128Decoder as getU128Decoder7,
+  getU128Encoder as getU128Encoder7,
   getU8Decoder as getU8Decoder5,
   getU8Encoder as getU8Encoder5,
   transformEncoder as transformEncoder56
@@ -9291,8 +9245,8 @@ function getSetTunaLpPositionLimitOrdersInstructionDataEncoder() {
   return transformEncoder56(
     getStructEncoder58([
       ["discriminator", fixEncoderSize57(getBytesEncoder57(), 8)],
-      ["lowerLimitOrderSqrtPrice", getU128Encoder12()],
-      ["upperLimitOrderSqrtPrice", getU128Encoder12()],
+      ["lowerLimitOrderSqrtPrice", getU128Encoder7()],
+      ["upperLimitOrderSqrtPrice", getU128Encoder7()],
       ["swapToTokenOnLimitOrder", getU8Encoder5()]
     ]),
     (value) => ({
@@ -9304,8 +9258,8 @@ function getSetTunaLpPositionLimitOrdersInstructionDataEncoder() {
 function getSetTunaLpPositionLimitOrdersInstructionDataDecoder() {
   return getStructDecoder58([
     ["discriminator", fixDecoderSize56(getBytesDecoder56(), 8)],
-    ["lowerLimitOrderSqrtPrice", getU128Decoder12()],
-    ["upperLimitOrderSqrtPrice", getU128Decoder12()],
+    ["lowerLimitOrderSqrtPrice", getU128Decoder7()],
+    ["upperLimitOrderSqrtPrice", getU128Decoder7()],
     ["swapToTokenOnLimitOrder", getU8Decoder5()]
   ]);
 }
@@ -9367,8 +9321,8 @@ import {
   getBytesEncoder as getBytesEncoder58,
   getStructDecoder as getStructDecoder59,
   getStructEncoder as getStructEncoder59,
-  getU32Decoder as getU32Decoder32,
-  getU32Encoder as getU32Encoder32,
+  getU32Decoder as getU32Decoder24,
+  getU32Encoder as getU32Encoder24,
   transformEncoder as transformEncoder57
 } from "@solana/kit";
 var SET_TUNA_LP_POSITION_REBALANCE_THRESHOLD_DISCRIMINATOR = new Uint8Array([244, 174, 185, 58, 90, 150, 162, 51]);
@@ -9381,7 +9335,7 @@ function getSetTunaLpPositionRebalanceThresholdInstructionDataEncoder() {
   return transformEncoder57(
     getStructEncoder59([
       ["discriminator", fixEncoderSize58(getBytesEncoder58(), 8)],
-      ["rebalanceThresholdTicks", getU32Encoder32()]
+      ["rebalanceThresholdTicks", getU32Encoder24()]
     ]),
     (value) => ({
       ...value,
@@ -9392,7 +9346,7 @@ function getSetTunaLpPositionRebalanceThresholdInstructionDataEncoder() {
 function getSetTunaLpPositionRebalanceThresholdInstructionDataDecoder() {
   return getStructDecoder59([
     ["discriminator", fixDecoderSize57(getBytesDecoder57(), 8)],
-    ["rebalanceThresholdTicks", getU32Decoder32()]
+    ["rebalanceThresholdTicks", getU32Decoder24()]
   ]);
 }
 function getSetTunaLpPositionRebalanceThresholdInstructionDataCodec() {
@@ -9453,8 +9407,8 @@ import {
   getBytesEncoder as getBytesEncoder59,
   getStructDecoder as getStructDecoder60,
   getStructEncoder as getStructEncoder60,
-  getU128Decoder as getU128Decoder13,
-  getU128Encoder as getU128Encoder13,
+  getU128Decoder as getU128Decoder8,
+  getU128Encoder as getU128Encoder8,
   transformEncoder as transformEncoder58
 } from "@solana/kit";
 var SET_TUNA_SPOT_POSITION_LIMIT_ORDERS_DISCRIMINATOR = new Uint8Array(
@@ -9469,8 +9423,8 @@ function getSetTunaSpotPositionLimitOrdersInstructionDataEncoder() {
   return transformEncoder58(
     getStructEncoder60([
       ["discriminator", fixEncoderSize59(getBytesEncoder59(), 8)],
-      ["lowerLimitOrderSqrtPrice", getU128Encoder13()],
-      ["upperLimitOrderSqrtPrice", getU128Encoder13()]
+      ["lowerLimitOrderSqrtPrice", getU128Encoder8()],
+      ["upperLimitOrderSqrtPrice", getU128Encoder8()]
     ]),
     (value) => ({
       ...value,
@@ -9481,8 +9435,8 @@ function getSetTunaSpotPositionLimitOrdersInstructionDataEncoder() {
 function getSetTunaSpotPositionLimitOrdersInstructionDataDecoder() {
   return getStructDecoder60([
     ["discriminator", fixDecoderSize58(getBytesDecoder58(), 8)],
-    ["lowerLimitOrderSqrtPrice", getU128Decoder13()],
-    ["upperLimitOrderSqrtPrice", getU128Decoder13()]
+    ["lowerLimitOrderSqrtPrice", getU128Decoder8()],
+    ["upperLimitOrderSqrtPrice", getU128Decoder8()]
   ]);
 }
 function getSetTunaSpotPositionLimitOrdersInstructionDataCodec() {
@@ -9549,10 +9503,10 @@ import {
   getStructEncoder as getStructEncoder61,
   getU16Decoder as getU16Decoder8,
   getU16Encoder as getU16Encoder8,
-  getU32Decoder as getU32Decoder33,
-  getU32Encoder as getU32Encoder33,
-  getU64Decoder as getU64Decoder21,
-  getU64Encoder as getU64Encoder21,
+  getU32Decoder as getU32Decoder25,
+  getU32Encoder as getU32Encoder25,
+  getU64Decoder as getU64Decoder25,
+  getU64Encoder as getU64Encoder25,
   transformEncoder as transformEncoder59
 } from "@solana/kit";
 var UPDATE_MARKET_DISCRIMINATOR = new Uint8Array([
@@ -9575,20 +9529,20 @@ function getUpdateMarketInstructionDataEncoder() {
     getStructEncoder61([
       ["discriminator", fixEncoderSize60(getBytesEncoder60(), 8)],
       ["addressLookupTable", getAddressEncoder14()],
-      ["maxLeverage", getU32Encoder33()],
+      ["maxLeverage", getU32Encoder25()],
       ["protocolFee", getU16Encoder8()],
       ["protocolFeeOnCollateral", getU16Encoder8()],
-      ["liquidationFee", getU32Encoder33()],
-      ["liquidationThreshold", getU32Encoder33()],
-      ["limitOrderExecutionFee", getU32Encoder33()],
-      ["oraclePriceDeviationThreshold", getU32Encoder33()],
+      ["liquidationFee", getU32Encoder25()],
+      ["liquidationThreshold", getU32Encoder25()],
+      ["limitOrderExecutionFee", getU32Encoder25()],
+      ["oraclePriceDeviationThreshold", getU32Encoder25()],
       ["disabled", getBooleanEncoder8()],
-      ["borrowLimitA", getU64Encoder21()],
-      ["borrowLimitB", getU64Encoder21()],
-      ["maxSwapSlippage", getU32Encoder33()],
-      ["rebalanceProtocolFee", getU32Encoder33()],
-      ["spotPositionSizeLimitA", getU64Encoder21()],
-      ["spotPositionSizeLimitB", getU64Encoder21()]
+      ["borrowLimitA", getU64Encoder25()],
+      ["borrowLimitB", getU64Encoder25()],
+      ["maxSwapSlippage", getU32Encoder25()],
+      ["rebalanceProtocolFee", getU32Encoder25()],
+      ["spotPositionSizeLimitA", getU64Encoder25()],
+      ["spotPositionSizeLimitB", getU64Encoder25()]
     ]),
     (value) => ({ ...value, discriminator: UPDATE_MARKET_DISCRIMINATOR })
   );
@@ -9597,20 +9551,20 @@ function getUpdateMarketInstructionDataDecoder() {
   return getStructDecoder61([
     ["discriminator", fixDecoderSize59(getBytesDecoder59(), 8)],
     ["addressLookupTable", getAddressDecoder14()],
-    ["maxLeverage", getU32Decoder33()],
+    ["maxLeverage", getU32Decoder25()],
     ["protocolFee", getU16Decoder8()],
     ["protocolFeeOnCollateral", getU16Decoder8()],
-    ["liquidationFee", getU32Decoder33()],
-    ["liquidationThreshold", getU32Decoder33()],
-    ["limitOrderExecutionFee", getU32Decoder33()],
-    ["oraclePriceDeviationThreshold", getU32Decoder33()],
+    ["liquidationFee", getU32Decoder25()],
+    ["liquidationThreshold", getU32Decoder25()],
+    ["limitOrderExecutionFee", getU32Decoder25()],
+    ["oraclePriceDeviationThreshold", getU32Decoder25()],
     ["disabled", getBooleanDecoder8()],
-    ["borrowLimitA", getU64Decoder21()],
-    ["borrowLimitB", getU64Decoder21()],
-    ["maxSwapSlippage", getU32Decoder33()],
-    ["rebalanceProtocolFee", getU32Decoder33()],
-    ["spotPositionSizeLimitA", getU64Decoder21()],
-    ["spotPositionSizeLimitB", getU64Decoder21()]
+    ["borrowLimitA", getU64Decoder25()],
+    ["borrowLimitB", getU64Decoder25()],
+    ["maxSwapSlippage", getU32Decoder25()],
+    ["rebalanceProtocolFee", getU32Decoder25()],
+    ["spotPositionSizeLimitA", getU64Decoder25()],
+    ["spotPositionSizeLimitB", getU64Decoder25()]
   ]);
 }
 function getUpdateMarketInstructionDataCodec() {
@@ -9674,8 +9628,8 @@ import {
   getBytesEncoder as getBytesEncoder61,
   getStructDecoder as getStructDecoder62,
   getStructEncoder as getStructEncoder62,
-  getU64Decoder as getU64Decoder22,
-  getU64Encoder as getU64Encoder22,
+  getU64Decoder as getU64Decoder26,
+  getU64Encoder as getU64Encoder26,
   transformEncoder as transformEncoder60
 } from "@solana/kit";
 var UPDATE_VAULT_DISCRIMINATOR = new Uint8Array([
@@ -9697,8 +9651,8 @@ function getUpdateVaultInstructionDataEncoder() {
   return transformEncoder60(
     getStructEncoder62([
       ["discriminator", fixEncoderSize61(getBytesEncoder61(), 8)],
-      ["interestRate", getU64Encoder22()],
-      ["supplyLimit", getU64Encoder22()],
+      ["interestRate", getU64Encoder26()],
+      ["supplyLimit", getU64Encoder26()],
       ["pythOraclePriceUpdate", getAddressEncoder15()],
       ["pythOracleFeedId", getAddressEncoder15()]
     ]),
@@ -9708,8 +9662,8 @@ function getUpdateVaultInstructionDataEncoder() {
 function getUpdateVaultInstructionDataDecoder() {
   return getStructDecoder62([
     ["discriminator", fixDecoderSize60(getBytesDecoder60(), 8)],
-    ["interestRate", getU64Decoder22()],
-    ["supplyLimit", getU64Decoder22()],
+    ["interestRate", getU64Decoder26()],
+    ["supplyLimit", getU64Decoder26()],
     ["pythOraclePriceUpdate", getAddressDecoder15()],
     ["pythOracleFeedId", getAddressDecoder15()]
   ]);
@@ -9773,8 +9727,8 @@ import {
   getBytesEncoder as getBytesEncoder62,
   getStructDecoder as getStructDecoder63,
   getStructEncoder as getStructEncoder63,
-  getU64Decoder as getU64Decoder23,
-  getU64Encoder as getU64Encoder23,
+  getU64Decoder as getU64Decoder27,
+  getU64Encoder as getU64Encoder27,
   transformEncoder as transformEncoder61
 } from "@solana/kit";
 var WITHDRAW_DISCRIMINATOR = new Uint8Array([
@@ -9794,8 +9748,8 @@ function getWithdrawInstructionDataEncoder() {
   return transformEncoder61(
     getStructEncoder63([
       ["discriminator", fixEncoderSize62(getBytesEncoder62(), 8)],
-      ["funds", getU64Encoder23()],
-      ["shares", getU64Encoder23()]
+      ["funds", getU64Encoder27()],
+      ["shares", getU64Encoder27()]
     ]),
     (value) => ({ ...value, discriminator: WITHDRAW_DISCRIMINATOR })
   );
@@ -9803,8 +9757,8 @@ function getWithdrawInstructionDataEncoder() {
 function getWithdrawInstructionDataDecoder() {
   return getStructDecoder63([
     ["discriminator", fixDecoderSize61(getBytesDecoder61(), 8)],
-    ["funds", getU64Decoder23()],
-    ["shares", getU64Decoder23()]
+    ["funds", getU64Decoder27()],
+    ["shares", getU64Decoder27()]
   ]);
 }
 function getWithdrawInstructionDataCodec() {
@@ -10173,6 +10127,15 @@ async function fetchAllMarketWithFilter(rpc, ...filters) {
   return fetchDecodedProgramAccounts(rpc, TUNA_PROGRAM_ADDRESS, [discriminatorFilter, ...filters], getMarketDecoder());
 }
 
+// src/utils/math.ts
+function mulDiv(x, y, d, roundUp = false) {
+  if (!roundUp) {
+    return x * y / d;
+  } else {
+    return (x * y + (d - 1n)) / d;
+  }
+}
+
 // src/utils/orca.ts
 import { getInitializableTickIndex } from "@crypticdot/fusionamm-core";
 import { getTickArrayAddress } from "@orca-so/whirlpools-client";
@@ -10459,9 +10422,7 @@ function calculateProtocolFee(collateralAmount, borrowAmount, protocolFeeRateOnC
 import {
   sqrtPriceToPrice,
   swapQuoteByInputToken,
-  swapQuoteByOutputToken,
-  tryApplySwapFee as tryApplySwapFee2,
-  tryReverseApplySwapFee
+  swapQuoteByOutputToken
 } from "@crypticdot/fusionamm-core";
 function getIncreaseSpotPositionQuote(args) {
   const {
@@ -10493,10 +10454,10 @@ function getIncreaseSpotPositionQuote(args) {
   let nextSqrtPrice = fusionPool.sqrtPrice;
   if (positionToken != collateralToken) {
     const price = sqrtPriceToPrice(fusionPool.sqrtPrice, 1, 1);
-    borrow = BigInt(Math.round(Number(increaseAmount) * (leverage - 1) / leverage));
-    const borrowWithFeesApplied = tryApplySwapFee2(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
-    collateral = reverseApplyTunaProtocolFee(increaseAmount - borrowWithFeesApplied, protocolFeeRateOnCollateral);
-    collateral = tryReverseApplySwapFee(collateral, fusionPool.feeRate);
+    borrow = BigInt(Math.ceil(Number(increaseAmount) * (leverage - 1) / leverage));
+    collateral = increaseAmount - applySwapFee(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
+    collateral = reverseApplySwapFee(collateral, fusionPool.feeRate, false);
+    collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral, false);
     swapInputAmount = increaseAmount;
     estimatedAmount = BigInt(
       Math.round(collateralToken == 0 /* A */ ? Number(increaseAmount) * price : Number(increaseAmount) / price)
@@ -10504,16 +10465,14 @@ function getIncreaseSpotPositionQuote(args) {
   } else {
     const price = sqrtPriceToPrice(fusionPool.sqrtPrice, 1, 1);
     const positionToBorrowedTokenPrice = collateralToken == 0 /* A */ ? price : 1 / price;
-    const borrowInPositionToken = Number(increaseAmount) * (leverage - 1) / leverage;
-    borrow = BigInt(Math.round(borrowInPositionToken * positionToBorrowedTokenPrice));
-    const borrowInPositionTokenWithFeesApplied = tryApplySwapFee2(
-      applyTunaProtocolFee(BigInt(Math.floor(borrowInPositionToken)), protocolFeeRate),
+    const borrowInPositionToken = Math.ceil(Number(increaseAmount) * (leverage - 1) / leverage);
+    borrow = BigInt(Math.ceil(borrowInPositionToken * positionToBorrowedTokenPrice));
+    const borrowInPositionTokenWithFeesApplied = applySwapFee(
+      applyTunaProtocolFee(BigInt(borrowInPositionToken), protocolFeeRate),
       fusionPool.feeRate
     );
-    collateral = reverseApplyTunaProtocolFee(
-      increaseAmount - borrowInPositionTokenWithFeesApplied,
-      protocolFeeRateOnCollateral
-    );
+    collateral = increaseAmount - borrowInPositionTokenWithFeesApplied;
+    collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral, false);
     swapInputAmount = applyTunaProtocolFee(borrow, protocolFeeRate);
     estimatedAmount = increaseAmount;
   }
@@ -10600,7 +10559,7 @@ function getDecreaseSpotPositionQuote(args) {
     if (positionToken == collateralToken) {
       estimatedAmount = BigInt(Math.round(Number(increaseAmount) * positionToOppositeTokenPrice));
       borrow = BigInt(Math.round(Number(increaseAmount) * (leverage - 1) / leverage));
-      const borrowWithFeesApplied = tryApplySwapFee2(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
+      const borrowWithFeesApplied = applySwapFee(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
       collateral = increaseAmount - borrowWithFeesApplied;
       if (positionDebt > 0) {
         const swapQuote2 = swapQuoteByOutputToken(positionDebt, positionToken != 0 /* A */, 0, fusionPool, tickArrays);
@@ -10609,14 +10568,14 @@ function getDecreaseSpotPositionQuote(args) {
       swapInputAmount += collateral + applyTunaProtocolFee(borrow, protocolFeeRate);
       const swapQuote = swapQuoteByInputToken(swapInputAmount, positionToken == 0 /* A */, 0, fusionPool, tickArrays);
       nextSqrtPrice = swapQuote.nextSqrtPrice;
-      collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
+      collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral, false);
     } else {
       estimatedAmount = BigInt(Math.round(Number(increaseAmount) * positionToOppositeTokenPrice));
       borrow = BigInt(Math.round(Number(increaseAmount) * (leverage - 1) / leverage));
-      const borrowWithFeesApplied = tryApplySwapFee2(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
+      const borrowWithFeesApplied = applySwapFee(applyTunaProtocolFee(borrow, protocolFeeRate), fusionPool.feeRate);
       collateral = increaseAmount - borrowWithFeesApplied;
       collateral = BigInt(Math.round(Number(collateral) * positionToOppositeTokenPrice));
-      collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
+      collateral = reverseApplyTunaProtocolFee(collateral, protocolFeeRateOnCollateral, false);
       swapInputAmount = positionAmount + applyTunaProtocolFee(borrow, protocolFeeRate);
       const swapQuote = swapQuoteByInputToken(swapInputAmount, positionToken == 0 /* A */, 0, fusionPool, tickArrays);
       nextSqrtPrice = swapQuote.nextSqrtPrice;
@@ -10669,16 +10628,12 @@ function getTradableAmount(args) {
   let availableToTrade = 0n;
   const addLeverage = (collateral) => {
     collateral = applyTunaProtocolFee(collateral, protocolFeeRateOnCollateral);
-    const feeMultiplier = (1 - protocolFeeRate / HUNDRED_PERCENT) * (1 - fusionPool.feeRate / 1e6);
-    let borrow = BigInt(
-      Math.round(Number(collateral) * (leverage - 1) / (leverage + feeMultiplier * (1 - leverage)))
-    );
-    borrow = applyTunaProtocolFee(borrow, protocolFeeRate);
-    borrow = tryApplySwapFee2(borrow, fusionPool.feeRate);
     if (collateralToken != newPositionToken) {
-      collateral = tryApplySwapFee2(collateral, fusionPool.feeRate);
+      collateral = applySwapFee(collateral, fusionPool.feeRate);
     }
-    return collateral + borrow;
+    const feeMultiplier = (1 - protocolFeeRate / HUNDRED_PERCENT) * (1 - fusionPool.feeRate / 1e6);
+    const total = Math.floor(Number(collateral) / (1 - feeMultiplier * (leverage - 1) / leverage));
+    return BigInt(total);
   };
   if (newPositionToken == positionToken) {
     availableToTrade = addLeverage(availableBalance);
@@ -10717,11 +10672,17 @@ function getLiquidationPrice(positionToken, amount, debt, liquidationThreshold)
     return amount * liquidationThreshold / debt;
   }
 }
-function applyTunaProtocolFee(amount, protocolFeeRate) {
-  return amount * BigInt(HUNDRED_PERCENT - protocolFeeRate) / BigInt(HUNDRED_PERCENT);
+function applyTunaProtocolFee(amount, protocolFeeRate, roundUp = false) {
+  return mulDiv(amount, BigInt(HUNDRED_PERCENT - protocolFeeRate), BigInt(HUNDRED_PERCENT), roundUp);
+}
+function reverseApplyTunaProtocolFee(amount, protocolFeeRate, roundUp = true) {
+  return mulDiv(amount, BigInt(HUNDRED_PERCENT), BigInt(HUNDRED_PERCENT - protocolFeeRate), roundUp);
+}
+function applySwapFee(amount, feeRate, roundUp = false) {
+  return mulDiv(amount, BigInt(1e6 - feeRate), 1000000n, roundUp);
 }
-function reverseApplyTunaProtocolFee(amount, protocolFeeRate) {
-  return amount * BigInt(HUNDRED_PERCENT) / BigInt(HUNDRED_PERCENT - protocolFeeRate);
+function reverseApplySwapFee(amount, feeRate, roundUp = true) {
+  return mulDiv(amount, 1000000n, BigInt(1e6 - feeRate), roundUp);
 }
 
 // src/txbuilder/increaseTunaLpPositionOrca.ts
@@ -16461,6 +16422,7 @@ export {
   liquidateTunaSpotPositionFusionInstructions,
   liquidateTunaSpotPositionOrcaInstruction,
   liquidateTunaSpotPositionOrcaInstructions,
+  mulDiv,
   openAndIncreaseTunaLpPositionFusionInstruction,
   openAndIncreaseTunaLpPositionFusionInstructions,
   openAndIncreaseTunaLpPositionOrcaInstruction,