@crypticdot/defituna-client 3.5.5 → 3.5.7

package/dist/index.cjs

@@ -773,13 +773,13 @@ function decodeLendingPosition(encodedAccount) {
     getLendingPositionDecoder()
   );
 }
-async function fetchLendingPosition(rpc, address5, config) {
-  const maybeAccount = await fetchMaybeLendingPosition(rpc, address5, config);
+async function fetchLendingPosition(rpc, address8, config) {
+  const maybeAccount = await fetchMaybeLendingPosition(rpc, address8, config);
   (0, import_kit.assertAccountExists)(maybeAccount);
   return maybeAccount;
 }
-async function fetchMaybeLendingPosition(rpc, address5, config) {
-  const maybeAccount = await (0, import_kit.fetchEncodedAccount)(rpc, address5, config);
+async function fetchMaybeLendingPosition(rpc, address8, config) {
+  const maybeAccount = await (0, import_kit.fetchEncodedAccount)(rpc, address8, config);
   return decodeLendingPosition(maybeAccount);
 }
 async function fetchAllLendingPosition(rpc, addresses, config) {
@@ -1007,13 +1007,13 @@ function decodeMarket(encodedAccount) {
     getMarketDecoder()
   );
 }
-async function fetchMarket(rpc, address5, config) {
-  const maybeAccount = await fetchMaybeMarket(rpc, address5, config);
+async function fetchMarket(rpc, address8, config) {
+  const maybeAccount = await fetchMaybeMarket(rpc, address8, config);
   (0, import_kit8.assertAccountExists)(maybeAccount);
   return maybeAccount;
 }
-async function fetchMaybeMarket(rpc, address5, config) {
-  const maybeAccount = await (0, import_kit8.fetchEncodedAccount)(rpc, address5, config);
+async function fetchMaybeMarket(rpc, address8, config) {
+  const maybeAccount = await (0, import_kit8.fetchEncodedAccount)(rpc, address8, config);
   return decodeMarket(maybeAccount);
 }
 async function fetchAllMarket(rpc, addresses, config) {
@@ -1100,13 +1100,13 @@ function decodeTunaConfig(encodedAccount) {
     getTunaConfigDecoder()
   );
 }
-async function fetchTunaConfig(rpc, address5, config) {
-  const maybeAccount = await fetchMaybeTunaConfig(rpc, address5, config);
+async function fetchTunaConfig(rpc, address8, config) {
+  const maybeAccount = await fetchMaybeTunaConfig(rpc, address8, config);
   (0, import_kit9.assertAccountExists)(maybeAccount);
   return maybeAccount;
 }
-async function fetchMaybeTunaConfig(rpc, address5, config) {
-  const maybeAccount = await (0, import_kit9.fetchEncodedAccount)(rpc, address5, config);
+async function fetchMaybeTunaConfig(rpc, address8, config) {
+  const maybeAccount = await (0, import_kit9.fetchEncodedAccount)(rpc, address8, config);
   return decodeTunaConfig(maybeAccount);
 }
 async function fetchAllTunaConfig(rpc, addresses, config) {
@@ -1221,13 +1221,13 @@ function decodeTunaLpPosition(encodedAccount) {
     getTunaLpPositionDecoder()
   );
 }
-async function fetchTunaLpPosition(rpc, address5, config) {
-  const maybeAccount = await fetchMaybeTunaLpPosition(rpc, address5, config);
+async function fetchTunaLpPosition(rpc, address8, config) {
+  const maybeAccount = await fetchMaybeTunaLpPosition(rpc, address8, config);
   (0, import_kit10.assertAccountExists)(maybeAccount);
   return maybeAccount;
 }
-async function fetchMaybeTunaLpPosition(rpc, address5, config) {
-  const maybeAccount = await (0, import_kit10.fetchEncodedAccount)(rpc, address5, config);
+async function fetchMaybeTunaLpPosition(rpc, address8, config) {
+  const maybeAccount = await (0, import_kit10.fetchEncodedAccount)(rpc, address8, config);
   return decodeTunaLpPosition(maybeAccount);
 }
 async function fetchAllTunaLpPosition(rpc, addresses, config) {
@@ -1325,13 +1325,13 @@ function decodeTunaSpotPosition(encodedAccount) {
     getTunaSpotPositionDecoder()
   );
 }
-async function fetchTunaSpotPosition(rpc, address5, config) {
-  const maybeAccount = await fetchMaybeTunaSpotPosition(rpc, address5, config);
+async function fetchTunaSpotPosition(rpc, address8, config) {
+  const maybeAccount = await fetchMaybeTunaSpotPosition(rpc, address8, config);
   (0, import_kit11.assertAccountExists)(maybeAccount);
   return maybeAccount;
 }
-async function fetchMaybeTunaSpotPosition(rpc, address5, config) {
-  const maybeAccount = await (0, import_kit11.fetchEncodedAccount)(rpc, address5, config);
+async function fetchMaybeTunaSpotPosition(rpc, address8, config) {
+  const maybeAccount = await (0, import_kit11.fetchEncodedAccount)(rpc, address8, config);
   return decodeTunaSpotPosition(maybeAccount);
 }
 async function fetchAllTunaSpotPosition(rpc, addresses, config) {
@@ -1420,13 +1420,13 @@ function decodeVault(encodedAccount) {
     getVaultDecoder()
   );
 }
-async function fetchVault(rpc, address5, config) {
-  const maybeAccount = await fetchMaybeVault(rpc, address5, config);
+async function fetchVault(rpc, address8, config) {
+  const maybeAccount = await fetchMaybeVault(rpc, address8, config);
   (0, import_kit12.assertAccountExists)(maybeAccount);
   return maybeAccount;
 }
-async function fetchMaybeVault(rpc, address5, config) {
-  const maybeAccount = await (0, import_kit12.fetchEncodedAccount)(rpc, address5, config);
+async function fetchMaybeVault(rpc, address8, config) {
+  const maybeAccount = await (0, import_kit12.fetchEncodedAccount)(rpc, address8, config);
   return decodeVault(maybeAccount);
 }
 async function fetchAllVault(rpc, addresses, config) {
@@ -9672,47 +9672,47 @@ async function fetchDecodedProgramAccounts(rpc, programAddress, filters, decoder
 }
 
 // src/gpa/tunaLpPosition.ts
-function tunaLpPositionAuthorityFilter(address5) {
+function tunaLpPositionAuthorityFilter(address8) {
   return {
     memcmp: {
       offset: 11n,
-      bytes: (0, import_kit76.getBase58Decoder)().decode((0, import_kit76.getAddressEncoder)().encode(address5)),
+      bytes: (0, import_kit76.getBase58Decoder)().decode((0, import_kit76.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
 }
-function tunaLpPositionPoolFilter(address5) {
+function tunaLpPositionPoolFilter(address8) {
   return {
     memcmp: {
       offset: 43n,
-      bytes: (0, import_kit76.getBase58Decoder)().decode((0, import_kit76.getAddressEncoder)().encode(address5)),
+      bytes: (0, import_kit76.getBase58Decoder)().decode((0, import_kit76.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
 }
-function tunaLpPositionMintAFilter(address5) {
+function tunaLpPositionMintAFilter(address8) {
   return {
     memcmp: {
       offset: 75n,
-      bytes: (0, import_kit76.getBase58Decoder)().decode((0, import_kit76.getAddressEncoder)().encode(address5)),
+      bytes: (0, import_kit76.getBase58Decoder)().decode((0, import_kit76.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
 }
-function tunaLpPositionMintBFilter(address5) {
+function tunaLpPositionMintBFilter(address8) {
   return {
     memcmp: {
       offset: 107n,
-      bytes: (0, import_kit76.getBase58Decoder)().decode((0, import_kit76.getAddressEncoder)().encode(address5)),
+      bytes: (0, import_kit76.getBase58Decoder)().decode((0, import_kit76.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
 }
-function tunaLpPositionMintFilter(address5) {
+function tunaLpPositionMintFilter(address8) {
   return {
     memcmp: {
       offset: 139n,
-      bytes: (0, import_kit76.getBase58Decoder)().decode((0, import_kit76.getAddressEncoder)().encode(address5)),
+      bytes: (0, import_kit76.getBase58Decoder)().decode((0, import_kit76.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
@@ -9745,38 +9745,38 @@ async function fetchAllTunaLpPositionWithFilter(rpc, ...filters) {
 
 // src/gpa/tunaSpotPosition.ts
 var import_kit77 = require("@solana/kit");
-function tunaSpotPositionAuthorityFilter(address5) {
+function tunaSpotPositionAuthorityFilter(address8) {
   return {
     memcmp: {
       offset: 11n,
-      bytes: (0, import_kit77.getBase58Decoder)().decode((0, import_kit77.getAddressEncoder)().encode(address5)),
+      bytes: (0, import_kit77.getBase58Decoder)().decode((0, import_kit77.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
 }
-function tunaSpotPositionPoolFilter(address5) {
+function tunaSpotPositionPoolFilter(address8) {
   return {
     memcmp: {
       offset: 43n,
-      bytes: (0, import_kit77.getBase58Decoder)().decode((0, import_kit77.getAddressEncoder)().encode(address5)),
+      bytes: (0, import_kit77.getBase58Decoder)().decode((0, import_kit77.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
 }
-function tunaSpotPositionMintAFilter(address5) {
+function tunaSpotPositionMintAFilter(address8) {
   return {
     memcmp: {
       offset: 75n,
-      bytes: (0, import_kit77.getBase58Decoder)().decode((0, import_kit77.getAddressEncoder)().encode(address5)),
+      bytes: (0, import_kit77.getBase58Decoder)().decode((0, import_kit77.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
 }
-function tunaSpotPositionMintBFilter(address5) {
+function tunaSpotPositionMintBFilter(address8) {
   return {
     memcmp: {
       offset: 107n,
-      bytes: (0, import_kit77.getBase58Decoder)().decode((0, import_kit77.getAddressEncoder)().encode(address5)),
+      bytes: (0, import_kit77.getBase58Decoder)().decode((0, import_kit77.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
@@ -9800,29 +9800,29 @@ async function fetchAllTunaSpotPositionWithFilter(rpc, ...filters) {
 
 // src/gpa/lendingPosition.ts
 var import_kit78 = require("@solana/kit");
-function lendingPositionAuthorityFilter(address5) {
+function lendingPositionAuthorityFilter(address8) {
   return {
     memcmp: {
       offset: 11n,
-      bytes: (0, import_kit78.getBase58Decoder)().decode((0, import_kit78.getAddressEncoder)().encode(address5)),
+      bytes: (0, import_kit78.getBase58Decoder)().decode((0, import_kit78.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
 }
-function lendingPositionMintFilter(address5) {
+function lendingPositionMintFilter(address8) {
   return {
     memcmp: {
       offset: 43n,
-      bytes: (0, import_kit78.getBase58Decoder)().decode((0, import_kit78.getAddressEncoder)().encode(address5)),
+      bytes: (0, import_kit78.getBase58Decoder)().decode((0, import_kit78.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
 }
-function lendingPositionVaultFilter(address5) {
+function lendingPositionVaultFilter(address8) {
   return {
     memcmp: {
       offset: 91n,
-      bytes: (0, import_kit78.getBase58Decoder)().decode((0, import_kit78.getAddressEncoder)().encode(address5)),
+      bytes: (0, import_kit78.getBase58Decoder)().decode((0, import_kit78.getAddressEncoder)().encode(address8)),
       encoding: "base58"
     }
   };
@@ -12974,6 +12974,7 @@ async function liquidateTunaSpotPositionOrcaInstruction(authority, tunaPosition,
 
 // src/txbuilder/openTunaLpPositionOrca.ts
 var import_whirlpools_client11 = require("@orca-so/whirlpools-client");
+var import_kit128 = require("@solana/kit");
 var import_token_202224 = require("@solana-program/token-2022");
 var import_assert15 = __toESM(require("assert"), 1);
 async function openTunaLpPositionOrcaInstruction(rpc, authority, positionMint, whirlpoolAddress, args) {
@@ -13041,86 +13042,91 @@ async function openTunaLpPositionOrcaInstruction(rpc, authority, positionMint, w
     ...args
   });
 }
-function getOpenTunaLpPositionOrcaInstructionWithEphemeralSigner(input, config) {
-  const programAddress = config?.programAddress ?? TUNA_PROGRAM_ADDRESS;
-  const originalAccounts = {
-    authority: { value: input.authority ?? null, isWritable: true },
-    mintA: { value: input.mintA ?? null, isWritable: false },
-    mintB: { value: input.mintB ?? null, isWritable: false },
-    market: { value: input.market ?? null, isWritable: false },
-    tunaPosition: { value: input.tunaPosition ?? null, isWritable: true },
-    tunaPositionMint: {
-      value: input.tunaPositionMint ?? null,
-      isWritable: true
-    },
-    tunaPositionAta: { value: input.tunaPositionAta ?? null, isWritable: true },
-    tunaPositionAtaA: {
-      value: input.tunaPositionAtaA ?? null,
-      isWritable: true
-    },
-    tunaPositionAtaB: {
-      value: input.tunaPositionAtaB ?? null,
-      isWritable: true
-    },
-    whirlpoolProgram: {
-      value: input.whirlpoolProgram ?? null,
-      isWritable: false
-    },
-    whirlpool: { value: input.whirlpool ?? null, isWritable: false },
-    orcaPosition: { value: input.orcaPosition ?? null, isWritable: true },
-    metadataUpdateAuth: {
-      value: input.metadataUpdateAuth ?? null,
-      isWritable: false
-    },
-    tokenProgramA: { value: input.tokenProgramA ?? null, isWritable: false },
-    tokenProgramB: { value: input.tokenProgramB ?? null, isWritable: false },
-    token2022Program: {
-      value: input.token2022Program ?? null,
-      isWritable: false
-    },
-    systemProgram: { value: input.systemProgram ?? null, isWritable: false },
-    associatedTokenProgram: {
-      value: input.associatedTokenProgram ?? null,
-      isWritable: false
-    }
-  };
-  const accounts = originalAccounts;
-  const args = { ...input };
-  if (!accounts.systemProgram.value) {
-    accounts.systemProgram.value = "11111111111111111111111111111111";
-  }
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
-  const instruction = {
+function getOpenTunaLpPositionOrcaInstructionWithEphemeralSigner(input) {
+  return {
     accounts: [
-      getAccountMeta(accounts.authority),
-      getAccountMeta(accounts.mintA),
-      getAccountMeta(accounts.mintB),
-      getAccountMeta(accounts.market),
-      getAccountMeta(accounts.tunaPosition),
-      getAccountMeta(accounts.tunaPositionMint),
-      getAccountMeta(accounts.tunaPositionAta),
-      getAccountMeta(accounts.tunaPositionAtaA),
-      getAccountMeta(accounts.tunaPositionAtaB),
-      getAccountMeta(accounts.whirlpoolProgram),
-      getAccountMeta(accounts.whirlpool),
-      getAccountMeta(accounts.orcaPosition),
-      getAccountMeta(accounts.metadataUpdateAuth),
-      getAccountMeta(accounts.tokenProgramA),
-      getAccountMeta(accounts.tokenProgramB),
-      getAccountMeta(accounts.token2022Program),
-      getAccountMeta(accounts.systemProgram),
-      getAccountMeta(accounts.associatedTokenProgram)
+      {
+        address: input.authority.address,
+        role: import_kit128.AccountRole.WRITABLE_SIGNER
+      },
+      {
+        address: input.mintA,
+        role: import_kit128.AccountRole.READONLY
+      },
+      {
+        address: input.mintB,
+        role: import_kit128.AccountRole.READONLY
+      },
+      {
+        address: input.tokenProgramA,
+        role: import_kit128.AccountRole.READONLY
+      },
+      {
+        address: input.tokenProgramB,
+        role: import_kit128.AccountRole.READONLY
+      },
+      {
+        address: input.market,
+        role: import_kit128.AccountRole.READONLY
+      },
+      {
+        address: input.tunaPosition,
+        role: import_kit128.AccountRole.WRITABLE
+      },
+      {
+        address: input.tunaPositionMint,
+        role: import_kit128.AccountRole.WRITABLE_SIGNER
+      },
+      {
+        address: input.tunaPositionAta,
+        role: import_kit128.AccountRole.WRITABLE
+      },
+      {
+        address: input.tunaPositionAtaA,
+        role: import_kit128.AccountRole.WRITABLE
+      },
+      {
+        address: input.tunaPositionAtaB,
+        role: import_kit128.AccountRole.WRITABLE
+      },
+      {
+        address: input.whirlpoolProgram,
+        role: import_kit128.AccountRole.READONLY
+      },
+      {
+        address: input.whirlpool,
+        role: import_kit128.AccountRole.READONLY
+      },
+      {
+        address: input.orcaPosition,
+        role: import_kit128.AccountRole.WRITABLE
+      },
+      {
+        address: input.metadataUpdateAuth,
+        role: import_kit128.AccountRole.READONLY
+      },
+      {
+        address: input.token2022Program,
+        role: import_kit128.AccountRole.READONLY
+      },
+      {
+        address: input.systemProgram ?? (0, import_kit128.address)("11111111111111111111111111111111"),
+        role: import_kit128.AccountRole.READONLY
+      },
+      {
+        address: input.associatedTokenProgram,
+        role: import_kit128.AccountRole.READONLY
+      }
     ],
-    programAddress,
-    data: getOpenTunaLpPositionOrcaInstructionDataEncoder().encode(args)
+    programAddress: TUNA_PROGRAM_ADDRESS,
+    data: getOpenTunaLpPositionOrcaInstructionDataEncoder().encode(input)
   };
-  return instruction;
 }
 
 // src/txbuilder/openTunaLpPositionFusion.ts
 var import_fusionamm_client11 = require("@crypticdot/fusionamm-client");
 var import_fusionamm_client12 = require("@crypticdot/fusionamm-client");
-var import_kit128 = require("@solana/kit");
+var import_kit129 = require("@solana/kit");
 var import_token_202225 = require("@solana-program/token-2022");
 var import_assert16 = __toESM(require("assert"), 1);
 async function openTunaLpPositionFusionInstruction(rpc, authority, positionMint, fusionPoolAddress, args) {
@@ -13189,79 +13195,79 @@ async function openTunaLpPositionFusionInstruction(rpc, authority, positionMint,
   });
 }
 function getOpenTunaLpPositionFusionInstructionWithEphemeralSigner(input) {
-  const instruction = {
+  return {
     accounts: [
       {
         address: input.authority.address,
-        role: import_kit128.AccountRole.WRITABLE_SIGNER
+        role: import_kit129.AccountRole.WRITABLE_SIGNER
       },
       {
         address: input.mintA,
-        role: import_kit128.AccountRole.READONLY
+        role: import_kit129.AccountRole.READONLY
       },
       {
         address: input.mintB,
-        role: import_kit128.AccountRole.READONLY
+        role: import_kit129.AccountRole.READONLY
       },
       {
         address: input.tokenProgramA,
-        role: import_kit128.AccountRole.READONLY
+        role: import_kit129.AccountRole.READONLY
       },
       {
         address: input.tokenProgramB,
-        role: import_kit128.AccountRole.READONLY
+        role: import_kit129.AccountRole.READONLY
       },
       {
         address: input.market,
-        role: import_kit128.AccountRole.READONLY
+        role: import_kit129.AccountRole.READONLY
       },
       {
         address: input.tunaPosition,
-        role: import_kit128.AccountRole.WRITABLE
+        role: import_kit129.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionMint,
-        role: import_kit128.AccountRole.WRITABLE_SIGNER
+        role: import_kit129.AccountRole.WRITABLE_SIGNER
       },
       {
         address: input.tunaPositionAta,
-        role: import_kit128.AccountRole.WRITABLE
+        role: import_kit129.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionAtaA,
-        role: import_kit128.AccountRole.WRITABLE
+        role: import_kit129.AccountRole.WRITABLE
       },
       {
         address: input.tunaPositionAtaB,
-        role: import_kit128.AccountRole.WRITABLE
+        role: import_kit129.AccountRole.WRITABLE
       },
       {
         address: input.fusionammProgram,
-        role: import_kit128.AccountRole.READONLY
+        role: import_kit129.AccountRole.READONLY
       },
       {
         address: input.fusionPool,
-        role: import_kit128.AccountRole.READONLY
+        role: import_kit129.AccountRole.READONLY
       },
       {
         address: input.fusionPosition,
-        role: import_kit128.AccountRole.WRITABLE
+        role: import_kit129.AccountRole.WRITABLE
       },
       {
         address: input.metadataUpdateAuth,
-        role: import_kit128.AccountRole.READONLY
+        role: import_kit129.AccountRole.READONLY
       },
       {
         address: input.token2022Program,
-        role: import_kit128.AccountRole.READONLY
+        role: import_kit129.AccountRole.READONLY
       },
       {
-        address: input.systemProgram ?? (0, import_kit128.address)("11111111111111111111111111111111"),
-        role: import_kit128.AccountRole.READONLY
+        address: input.systemProgram ?? (0, import_kit129.address)("11111111111111111111111111111111"),
+        role: import_kit129.AccountRole.READONLY
       },
       {
         address: input.associatedTokenProgram,
-        role: import_kit128.AccountRole.READONLY
+        role: import_kit129.AccountRole.READONLY
       }
     ],
     programAddress: TUNA_PROGRAM_ADDRESS,
@@ -13269,13 +13275,12 @@ function getOpenTunaLpPositionFusionInstructionWithEphemeralSigner(input) {
       input
     )
   };
-  return instruction;
 }
 
 // src/txbuilder/openAndIncreaseTunaLpPositionOrca.ts
 var import_whirlpools_client12 = require("@orca-so/whirlpools-client");
 var import_whirlpools_core4 = require("@orca-so/whirlpools-core");
-var import_kit129 = require("@solana/kit");
+var import_kit130 = require("@solana/kit");
 var import_sysvars = require("@solana/sysvars");
 var import_memo16 = require("@solana-program/memo");
 var import_token_202226 = require("@solana-program/token-2022");
@@ -13387,7 +13392,7 @@ async function openAndIncreaseTunaLpPositionOrcaInstructions(rpc, authority, pos
   cleanupInstructions.push(...createUserAtaBInstructions.cleanup);
   return {
     instructions,
-    initializationCost: (0, import_kit129.lamports)(nonRefundableRent)
+    initializationCost: (0, import_kit130.lamports)(nonRefundableRent)
   };
 }
 async function openAndIncreaseTunaLpPositionOrcaInstruction(authority, positionMint, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, args) {
@@ -13445,16 +13450,16 @@ async function openAndIncreaseTunaLpPositionOrcaInstruction(authority, positionM
   const lowerTickArrayAddress = await OrcaUtils.getTickArrayAddressFromTickIndex(whirlpool, args.tickLowerIndex);
   const upperTickArrayAddress = await OrcaUtils.getTickArrayAddressFromTickIndex(whirlpool, args.tickUpperIndex);
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit129.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit129.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit129.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit129.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit129.AccountRole.WRITABLE },
-    { address: lowerTickArrayAddress, role: import_kit129.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit129.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultA, role: import_kit129.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultB, role: import_kit129.AccountRole.WRITABLE },
-    { address: orcaOracleAddress, role: import_kit129.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit130.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit130.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit130.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit130.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit130.AccountRole.WRITABLE },
+    { address: lowerTickArrayAddress, role: import_kit130.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit130.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultA, role: import_kit130.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultB, role: import_kit130.AccountRole.WRITABLE },
+    { address: orcaOracleAddress, role: import_kit130.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -13534,130 +13539,141 @@ async function openAndIncreaseTunaLpPositionOrcaInstruction(authority, positionM
   ix.accounts.push(...remainingAccounts);
   return ix;
 }
-function getOpenAndIncreaseTunaLpPositionOrcaInstructionWithEphemeralSigner(input, config) {
-  const programAddress = config?.programAddress ?? TUNA_PROGRAM_ADDRESS;
-  const originalAccounts = {
-    authority: { value: input.authority ?? null, isWritable: true },
-    tunaConfig: { value: input.tunaConfig ?? null, isWritable: false },
-    mintA: { value: input.mintA ?? null, isWritable: false },
-    mintB: { value: input.mintB ?? null, isWritable: false },
-    market: { value: input.market ?? null, isWritable: true },
-    vaultA: { value: input.vaultA ?? null, isWritable: true },
-    vaultB: { value: input.vaultB ?? null, isWritable: true },
-    vaultAAta: { value: input.vaultAAta ?? null, isWritable: true },
-    vaultBAta: { value: input.vaultBAta ?? null, isWritable: true },
-    tunaPosition: { value: input.tunaPosition ?? null, isWritable: true },
-    tunaPositionMint: {
-      value: input.tunaPositionMint ?? null,
-      isWritable: true
-    },
-    tunaPositionAta: { value: input.tunaPositionAta ?? null, isWritable: true },
-    tunaPositionAtaA: {
-      value: input.tunaPositionAtaA ?? null,
-      isWritable: true
-    },
-    tunaPositionAtaB: {
-      value: input.tunaPositionAtaB ?? null,
-      isWritable: true
-    },
-    tunaPositionOwnerAtaA: {
-      value: input.tunaPositionOwnerAtaA ?? null,
-      isWritable: true
-    },
-    tunaPositionOwnerAtaB: {
-      value: input.tunaPositionOwnerAtaB ?? null,
-      isWritable: true
-    },
-    feeRecipientAtaA: {
-      value: input.feeRecipientAtaA ?? null,
-      isWritable: true
-    },
-    feeRecipientAtaB: {
-      value: input.feeRecipientAtaB ?? null,
-      isWritable: true
-    },
-    pythOraclePriceFeedA: {
-      value: input.pythOraclePriceFeedA ?? null,
-      isWritable: false
-    },
-    pythOraclePriceFeedB: {
-      value: input.pythOraclePriceFeedB ?? null,
-      isWritable: false
-    },
-    whirlpoolProgram: {
-      value: input.whirlpoolProgram ?? null,
-      isWritable: false
-    },
-    whirlpool: { value: input.whirlpool ?? null, isWritable: true },
-    orcaPosition: { value: input.orcaPosition ?? null, isWritable: true },
-    tokenProgramA: { value: input.tokenProgramA ?? null, isWritable: false },
-    tokenProgramB: { value: input.tokenProgramB ?? null, isWritable: false },
-    metadataUpdateAuth: {
-      value: input.metadataUpdateAuth ?? null,
-      isWritable: false
-    },
-    memoProgram: { value: input.memoProgram ?? null, isWritable: false },
-    token2022Program: {
-      value: input.token2022Program ?? null,
-      isWritable: false
-    },
-    systemProgram: { value: input.systemProgram ?? null, isWritable: false },
-    associatedTokenProgram: {
-      value: input.associatedTokenProgram ?? null,
-      isWritable: false
-    }
-  };
-  const accounts = originalAccounts;
-  const args = { ...input };
-  if (!accounts.systemProgram.value) {
-    accounts.systemProgram.value = "11111111111111111111111111111111";
-  }
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
-  const instruction = {
+function getOpenAndIncreaseTunaLpPositionOrcaInstructionWithEphemeralSigner(input) {
+  return {
     accounts: [
-      getAccountMeta(accounts.authority),
-      getAccountMeta(accounts.tunaConfig),
-      getAccountMeta(accounts.mintA),
-      getAccountMeta(accounts.mintB),
-      getAccountMeta(accounts.market),
-      getAccountMeta(accounts.vaultA),
-      getAccountMeta(accounts.vaultB),
-      getAccountMeta(accounts.vaultAAta),
-      getAccountMeta(accounts.vaultBAta),
-      getAccountMeta(accounts.tunaPosition),
-      getAccountMeta(accounts.tunaPositionMint),
-      getAccountMeta(accounts.tunaPositionAta),
-      getAccountMeta(accounts.tunaPositionAtaA),
-      getAccountMeta(accounts.tunaPositionAtaB),
-      getAccountMeta(accounts.tunaPositionOwnerAtaA),
-      getAccountMeta(accounts.tunaPositionOwnerAtaB),
-      getAccountMeta(accounts.feeRecipientAtaA),
-      getAccountMeta(accounts.feeRecipientAtaB),
-      getAccountMeta(accounts.pythOraclePriceFeedA),
-      getAccountMeta(accounts.pythOraclePriceFeedB),
-      getAccountMeta(accounts.whirlpoolProgram),
-      getAccountMeta(accounts.whirlpool),
-      getAccountMeta(accounts.orcaPosition),
-      getAccountMeta(accounts.tokenProgramA),
-      getAccountMeta(accounts.tokenProgramB),
-      getAccountMeta(accounts.metadataUpdateAuth),
-      getAccountMeta(accounts.memoProgram),
-      getAccountMeta(accounts.token2022Program),
-      getAccountMeta(accounts.systemProgram),
-      getAccountMeta(accounts.associatedTokenProgram)
+      {
+        address: input.authority.address,
+        role: import_kit130.AccountRole.WRITABLE_SIGNER
+      },
+      {
+        address: input.tunaConfig,
+        role: import_kit130.AccountRole.READONLY
+      },
+      {
+        address: input.mintA,
+        role: import_kit130.AccountRole.READONLY
+      },
+      {
+        address: input.mintB,
+        role: import_kit130.AccountRole.READONLY
+      },
+      {
+        address: input.market,
+        role: import_kit130.AccountRole.WRITABLE
+      },
+      {
+        address: input.vaultA,
+        role: import_kit130.AccountRole.WRITABLE
+      },
+      {
+        address: input.vaultB,
+        role: import_kit130.AccountRole.WRITABLE
+      },
+      {
+        address: input.vaultAAta,
+        role: import_kit130.AccountRole.WRITABLE
+      },
+      {
+        address: input.vaultBAta,
+        role: import_kit130.AccountRole.WRITABLE
+      },
+      {
+        address: input.tunaPosition,
+        role: import_kit130.AccountRole.WRITABLE
+      },
+      {
+        address: input.tunaPositionMint,
+        role: import_kit130.AccountRole.WRITABLE
+      },
+      {
+        address: input.tunaPositionAta,
+        role: import_kit130.AccountRole.WRITABLE
+      },
+      {
+        address: input.tunaPositionAtaA,
+        role: import_kit130.AccountRole.WRITABLE
+      },
+      {
+        address: input.tunaPositionAtaB,
+        role: import_kit130.AccountRole.WRITABLE
+      },
+      {
+        address: input.tunaPositionOwnerAtaA,
+        role: import_kit130.AccountRole.WRITABLE
+      },
+      {
+        address: input.tunaPositionOwnerAtaB,
+        role: import_kit130.AccountRole.WRITABLE
+      },
+      {
+        address: input.feeRecipientAtaA,
+        role: import_kit130.AccountRole.WRITABLE
+      },
+      {
+        address: input.feeRecipientAtaB,
+        role: import_kit130.AccountRole.WRITABLE
+      },
+      {
+        address: input.pythOraclePriceFeedA,
+        role: import_kit130.AccountRole.READONLY
+      },
+      {
+        address: input.pythOraclePriceFeedB,
+        role: import_kit130.AccountRole.READONLY
+      },
+      {
+        address: input.whirlpoolProgram,
+        role: import_kit130.AccountRole.READONLY
+      },
+      {
+        address: input.whirlpool,
+        role: import_kit130.AccountRole.WRITABLE
+      },
+      {
+        address: input.orcaPosition,
+        role: import_kit130.AccountRole.WRITABLE
+      },
+      {
+        address: input.tokenProgramA,
+        role: import_kit130.AccountRole.READONLY
+      },
+      {
+        address: input.tokenProgramB,
+        role: import_kit130.AccountRole.READONLY
+      },
+      {
+        address: input.metadataUpdateAuth,
+        role: import_kit130.AccountRole.READONLY
+      },
+      {
+        address: input.memoProgram,
+        role: import_kit130.AccountRole.READONLY
+      },
+      {
+        address: input.token2022Program,
+        role: import_kit130.AccountRole.READONLY
+      },
+      {
+        address: input.systemProgram ?? (0, import_kit130.address)("11111111111111111111111111111111"),
+        role: import_kit130.AccountRole.READONLY
+      },
+      {
+        address: input.associatedTokenProgram,
+        role: import_kit130.AccountRole.READONLY
+      }
     ],
-    programAddress,
+    programAddress: TUNA_PROGRAM_ADDRESS,
     data: getOpenAndIncreaseTunaLpPositionOrcaInstructionDataEncoder().encode(
-      args
+      input
     )
   };
-  return instruction;
 }
 
 // src/txbuilder/openAndIncreaseTunaLpPositionFusion.ts
 var import_fusionamm_client13 = require("@crypticdot/fusionamm-client");
 var import_fusionamm_core4 = require("@crypticdot/fusionamm-core");
-var import_kit130 = require("@solana/kit");
+var import_kit131 = require("@solana/kit");
 var import_sysvars2 = require("@solana/sysvars");
 var import_memo17 = require("@solana-program/memo");
 var import_token_202227 = require("@solana-program/token-2022");
@@ -13756,7 +13772,7 @@ async function openAndIncreaseTunaLpPositionFusionInstructions(rpc, authority, p
   cleanupInstructions.push(...createUserAtaBInstructions.cleanup);
   return {
     instructions,
-    initializationCost: (0, import_kit130.lamports)(nonRefundableRent)
+    initializationCost: (0, import_kit131.lamports)(nonRefundableRent)
   };
 }
 async function openAndIncreaseTunaLpPositionFusionInstruction(authority, positionMint, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, args) {
@@ -13813,15 +13829,15 @@ async function openAndIncreaseTunaLpPositionFusionInstruction(authority, positio
   const lowerTickArrayAddress = await FusionUtils.getTickArrayAddressFromTickIndex(fusionPool, args.tickLowerIndex);
   const upperTickArrayAddress = await FusionUtils.getTickArrayAddressFromTickIndex(fusionPool, args.tickUpperIndex);
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit130.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit130.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit130.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit130.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit130.AccountRole.WRITABLE },
-    { address: lowerTickArrayAddress, role: import_kit130.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit130.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultA, role: import_kit130.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultB, role: import_kit130.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit131.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit131.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit131.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit131.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit131.AccountRole.WRITABLE },
+    { address: lowerTickArrayAddress, role: import_kit131.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit131.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultA, role: import_kit131.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultB, role: import_kit131.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -13900,140 +13916,151 @@ async function openAndIncreaseTunaLpPositionFusionInstruction(authority, positio
   ix.accounts.push(...remainingAccounts);
   return ix;
 }
-function getOpenAndIncreaseTunaLpPositionFusionInstructionWithEphemeralSigner(input, config) {
-  const programAddress = config?.programAddress ?? TUNA_PROGRAM_ADDRESS;
-  const originalAccounts = {
-    authority: { value: input.authority ?? null, isWritable: true },
-    tunaConfig: { value: input.tunaConfig ?? null, isWritable: false },
-    mintA: { value: input.mintA ?? null, isWritable: false },
-    mintB: { value: input.mintB ?? null, isWritable: false },
-    tokenProgramA: { value: input.tokenProgramA ?? null, isWritable: false },
-    tokenProgramB: { value: input.tokenProgramB ?? null, isWritable: false },
-    market: { value: input.market ?? null, isWritable: true },
-    vaultA: { value: input.vaultA ?? null, isWritable: true },
-    vaultB: { value: input.vaultB ?? null, isWritable: true },
-    vaultAAta: { value: input.vaultAAta ?? null, isWritable: true },
-    vaultBAta: { value: input.vaultBAta ?? null, isWritable: true },
-    tunaPosition: { value: input.tunaPosition ?? null, isWritable: true },
-    tunaPositionMint: {
-      value: input.tunaPositionMint ?? null,
-      isWritable: true
-    },
-    tunaPositionAta: { value: input.tunaPositionAta ?? null, isWritable: true },
-    tunaPositionAtaA: {
-      value: input.tunaPositionAtaA ?? null,
-      isWritable: true
-    },
-    tunaPositionAtaB: {
-      value: input.tunaPositionAtaB ?? null,
-      isWritable: true
-    },
-    tunaPositionOwnerAtaA: {
-      value: input.tunaPositionOwnerAtaA ?? null,
-      isWritable: true
-    },
-    tunaPositionOwnerAtaB: {
-      value: input.tunaPositionOwnerAtaB ?? null,
-      isWritable: true
-    },
-    feeRecipientAtaA: {
-      value: input.feeRecipientAtaA ?? null,
-      isWritable: true
-    },
-    feeRecipientAtaB: {
-      value: input.feeRecipientAtaB ?? null,
-      isWritable: true
-    },
-    pythOraclePriceFeedA: {
-      value: input.pythOraclePriceFeedA ?? null,
-      isWritable: false
-    },
-    pythOraclePriceFeedB: {
-      value: input.pythOraclePriceFeedB ?? null,
-      isWritable: false
-    },
-    fusionammProgram: {
-      value: input.fusionammProgram ?? null,
-      isWritable: false
-    },
-    fusionPool: { value: input.fusionPool ?? null, isWritable: true },
-    fusionPosition: { value: input.fusionPosition ?? null, isWritable: true },
-    metadataUpdateAuth: {
-      value: input.metadataUpdateAuth ?? null,
-      isWritable: false
-    },
-    memoProgram: { value: input.memoProgram ?? null, isWritable: false },
-    token2022Program: {
-      value: input.token2022Program ?? null,
-      isWritable: false
-    },
-    systemProgram: { value: input.systemProgram ?? null, isWritable: false },
-    associatedTokenProgram: {
-      value: input.associatedTokenProgram ?? null,
-      isWritable: false
-    }
-  };
-  const accounts = originalAccounts;
-  const args = { ...input };
-  if (!accounts.systemProgram.value) {
-    accounts.systemProgram.value = "11111111111111111111111111111111";
-  }
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
-  const instruction = {
+function getOpenAndIncreaseTunaLpPositionFusionInstructionWithEphemeralSigner(input) {
+  return {
     accounts: [
-      getAccountMeta(accounts.authority),
-      getAccountMeta(accounts.tunaConfig),
-      getAccountMeta(accounts.mintA),
-      getAccountMeta(accounts.mintB),
-      getAccountMeta(accounts.tokenProgramA),
-      getAccountMeta(accounts.tokenProgramB),
-      getAccountMeta(accounts.market),
-      getAccountMeta(accounts.vaultA),
-      getAccountMeta(accounts.vaultB),
-      getAccountMeta(accounts.vaultAAta),
-      getAccountMeta(accounts.vaultBAta),
-      getAccountMeta(accounts.tunaPosition),
-      getAccountMeta(accounts.tunaPositionMint),
-      getAccountMeta(accounts.tunaPositionAta),
-      getAccountMeta(accounts.tunaPositionAtaA),
-      getAccountMeta(accounts.tunaPositionAtaB),
-      getAccountMeta(accounts.tunaPositionOwnerAtaA),
-      getAccountMeta(accounts.tunaPositionOwnerAtaB),
-      getAccountMeta(accounts.feeRecipientAtaA),
-      getAccountMeta(accounts.feeRecipientAtaB),
-      getAccountMeta(accounts.pythOraclePriceFeedA),
-      getAccountMeta(accounts.pythOraclePriceFeedB),
-      getAccountMeta(accounts.fusionammProgram),
-      getAccountMeta(accounts.fusionPool),
-      getAccountMeta(accounts.fusionPosition),
-      getAccountMeta(accounts.metadataUpdateAuth),
-      getAccountMeta(accounts.memoProgram),
-      getAccountMeta(accounts.token2022Program),
-      getAccountMeta(accounts.systemProgram),
-      getAccountMeta(accounts.associatedTokenProgram)
+      {
+        address: input.authority.address,
+        role: import_kit131.AccountRole.WRITABLE_SIGNER
+      },
+      {
+        address: input.tunaConfig,
+        role: import_kit131.AccountRole.READONLY
+      },
+      {
+        address: input.mintA,
+        role: import_kit131.AccountRole.READONLY
+      },
+      {
+        address: input.mintB,
+        role: import_kit131.AccountRole.READONLY
+      },
+      {
+        address: input.tokenProgramA,
+        role: import_kit131.AccountRole.READONLY
+      },
+      {
+        address: input.tokenProgramB,
+        role: import_kit131.AccountRole.READONLY
+      },
+      {
+        address: input.market,
+        role: import_kit131.AccountRole.WRITABLE
+      },
+      {
+        address: input.vaultA,
+        role: import_kit131.AccountRole.WRITABLE
+      },
+      {
+        address: input.vaultB,
+        role: import_kit131.AccountRole.WRITABLE
+      },
+      {
+        address: input.vaultAAta,
+        role: import_kit131.AccountRole.WRITABLE
+      },
+      {
+        address: input.vaultBAta,
+        role: import_kit131.AccountRole.WRITABLE
+      },
+      {
+        address: input.tunaPosition,
+        role: import_kit131.AccountRole.WRITABLE
+      },
+      {
+        address: input.tunaPositionMint,
+        role: import_kit131.AccountRole.WRITABLE
+      },
+      {
+        address: input.tunaPositionAta,
+        role: import_kit131.AccountRole.WRITABLE
+      },
+      {
+        address: input.tunaPositionAtaA,
+        role: import_kit131.AccountRole.WRITABLE
+      },
+      {
+        address: input.tunaPositionAtaB,
+        role: import_kit131.AccountRole.WRITABLE
+      },
+      {
+        address: input.tunaPositionOwnerAtaA,
+        role: import_kit131.AccountRole.WRITABLE
+      },
+      {
+        address: input.tunaPositionOwnerAtaB,
+        role: import_kit131.AccountRole.WRITABLE
+      },
+      {
+        address: input.feeRecipientAtaA,
+        role: import_kit131.AccountRole.WRITABLE
+      },
+      {
+        address: input.feeRecipientAtaB,
+        role: import_kit131.AccountRole.WRITABLE
+      },
+      {
+        address: input.pythOraclePriceFeedA,
+        role: import_kit131.AccountRole.READONLY
+      },
+      {
+        address: input.pythOraclePriceFeedB,
+        role: import_kit131.AccountRole.READONLY
+      },
+      {
+        address: input.fusionammProgram,
+        role: import_kit131.AccountRole.READONLY
+      },
+      {
+        address: input.fusionPool,
+        role: import_kit131.AccountRole.WRITABLE
+      },
+      {
+        address: input.fusionPosition,
+        role: import_kit131.AccountRole.WRITABLE
+      },
+      {
+        address: input.metadataUpdateAuth,
+        role: import_kit131.AccountRole.READONLY
+      },
+      {
+        address: input.memoProgram,
+        role: import_kit131.AccountRole.READONLY
+      },
+      {
+        address: input.token2022Program,
+        role: import_kit131.AccountRole.READONLY
+      },
+      {
+        address: input.systemProgram ?? (0, import_kit131.address)("11111111111111111111111111111111"),
+        role: import_kit131.AccountRole.READONLY
+      },
+      {
+        address: input.associatedTokenProgram,
+        role: import_kit131.AccountRole.READONLY
+      }
     ],
-    programAddress,
+    programAddress: TUNA_PROGRAM_ADDRESS,
     data: getOpenAndIncreaseTunaLpPositionFusionInstructionDataEncoder().encode(
-      args
+      input
     )
   };
-  return instruction;
 }
 
 // src/txbuilder/openTunaSpotPosition.ts
 var import_fusionamm_client14 = require("@crypticdot/fusionamm-client");
 var import_whirlpools_client13 = require("@orca-so/whirlpools-client");
-var import_kit131 = require("@solana/kit");
+var import_kit132 = require("@solana/kit");
 var import_token_202228 = require("@solana-program/token-2022");
 var import_assert19 = __toESM(require("assert"), 1);
 async function openTunaSpotPositionInstructions(rpc, authority, poolAddress, args) {
-  const poolAccount = await (0, import_kit131.fetchEncodedAccount)(rpc, poolAddress);
+  const poolAccount = await (0, import_kit132.fetchEncodedAccount)(rpc, poolAddress);
   (0, import_assert19.default)(poolAccount.exists, "Pool account not found");
   let pool;
   if (poolAccount.programAddress == import_fusionamm_client14.FUSIONAMM_PROGRAM_ADDRESS) {
-    pool = (0, import_kit131.decodeAccount)(poolAccount, (0, import_fusionamm_client14.getFusionPoolDecoder)());
+    pool = (0, import_kit132.decodeAccount)(poolAccount, (0, import_fusionamm_client14.getFusionPoolDecoder)());
   } else if (poolAccount.programAddress == import_whirlpools_client13.WHIRLPOOL_PROGRAM_ADDRESS) {
-    pool = (0, import_kit131.decodeAccount)(poolAccount, (0, import_whirlpools_client13.getWhirlpoolDecoder)());
+    pool = (0, import_kit132.decodeAccount)(poolAccount, (0, import_whirlpools_client13.getWhirlpoolDecoder)());
   } else {
     throw new Error("Incorrect Fusion or Orca pool account");
   }
@@ -14073,7 +14100,7 @@ async function openTunaSpotPositionInstruction(authority, mintA, mintB, poolAddr
 // src/txbuilder/decreaseTunaLpPositionOrca.ts
 var import_whirlpools_client14 = require("@orca-so/whirlpools-client");
 var import_whirlpools_core5 = require("@orca-so/whirlpools-core");
-var import_kit132 = require("@solana/kit");
+var import_kit133 = require("@solana/kit");
 var import_memo18 = require("@solana-program/memo");
 var import_token_202229 = require("@solana-program/token-2022");
 var import_assert20 = __toESM(require("assert"), 1);
@@ -14095,7 +14122,7 @@ async function decreaseTunaLpPositionOrcaInstructions(rpc, authority, positionMi
   const allMints = [mintA, mintB, ...rewardMints];
   (0, import_assert20.default)(mintA.exists, "Token A account not found");
   (0, import_assert20.default)(mintB.exists, "Token B account not found");
-  (0, import_kit132.assertAccountsExist)(rewardMints);
+  (0, import_kit133.assertAccountsExist)(rewardMints);
   const lowerTickArrayStartIndex = (0, import_whirlpools_core5.getTickArrayStartTickIndex)(
     tunaPosition.data.tickLowerIndex,
     whirlpool.data.tickSpacing
@@ -14207,16 +14234,16 @@ async function decreaseTunaLpPositionOrcaInstruction(authority, tunaPosition, mi
     tunaPosition.data.tickUpperIndex
   );
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit132.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit132.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit132.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit132.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit132.AccountRole.WRITABLE },
-    { address: lowerTickArrayAddress, role: import_kit132.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit132.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultA, role: import_kit132.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultB, role: import_kit132.AccountRole.WRITABLE },
-    { address: orcaOracleAddress, role: import_kit132.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit133.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit133.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit133.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit133.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit133.AccountRole.WRITABLE },
+    { address: lowerTickArrayAddress, role: import_kit133.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit133.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultA, role: import_kit133.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultB, role: import_kit133.AccountRole.WRITABLE },
+    { address: orcaOracleAddress, role: import_kit133.AccountRole.WRITABLE }
   ];
   for (const rewardIndex of rewardIndicesToClaim) {
     const rewardInfo = whirlpool.data.rewardInfos[rewardIndex];
@@ -14227,10 +14254,10 @@ async function decreaseTunaLpPositionOrcaInstruction(authority, tunaPosition, mi
       mint: rewardMint.address,
       tokenProgram: rewardMint.programAddress
     });
-    remainingAccounts.push({ address: rewardMint.address, role: import_kit132.AccountRole.READONLY });
-    remainingAccounts.push({ address: rewardMint.programAddress, role: import_kit132.AccountRole.READONLY });
-    remainingAccounts.push({ address: ownerAta[0], role: import_kit132.AccountRole.WRITABLE });
-    remainingAccounts.push({ address: rewardInfo.vault, role: import_kit132.AccountRole.WRITABLE });
+    remainingAccounts.push({ address: rewardMint.address, role: import_kit133.AccountRole.READONLY });
+    remainingAccounts.push({ address: rewardMint.programAddress, role: import_kit133.AccountRole.READONLY });
+    remainingAccounts.push({ address: ownerAta[0], role: import_kit133.AccountRole.WRITABLE });
+    remainingAccounts.push({ address: rewardInfo.vault, role: import_kit133.AccountRole.WRITABLE });
   }
   const remainingAccountsInfo = {
     slices: [
@@ -14278,7 +14305,7 @@ async function decreaseTunaLpPositionOrcaInstruction(authority, tunaPosition, mi
 
 // src/txbuilder/decreaseTunaLpPositionFusion.ts
 var import_fusionamm_client15 = require("@crypticdot/fusionamm-client");
-var import_kit133 = require("@solana/kit");
+var import_kit134 = require("@solana/kit");
 var import_memo19 = require("@solana-program/memo");
 var import_token_202230 = require("@solana-program/token-2022");
 var import_assert21 = __toESM(require("assert"), 1);
@@ -14378,15 +14405,15 @@ async function decreaseTunaLpPositionFusionInstruction(authority, tunaPosition,
     tunaPosition.data.tickUpperIndex
   );
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit133.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit133.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit133.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit133.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit133.AccountRole.WRITABLE },
-    { address: lowerTickArrayAddress, role: import_kit133.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit133.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultA, role: import_kit133.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultB, role: import_kit133.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit134.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit134.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit134.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit134.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit134.AccountRole.WRITABLE },
+    { address: lowerTickArrayAddress, role: import_kit134.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit134.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultA, role: import_kit134.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultB, role: import_kit134.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -14598,7 +14625,7 @@ async function withdrawInstruction(authority, mint, vault, funds, shares) {
 // src/txbuilder/createMarketLookupTable.ts
 var import_fusionamm_client16 = require("@crypticdot/fusionamm-client");
 var import_whirlpools_client15 = require("@orca-so/whirlpools-client");
-var import_kit134 = require("@solana/kit");
+var import_kit135 = require("@solana/kit");
 var import_address_lookup_table2 = require("@solana-program/address-lookup-table");
 var import_memo22 = require("@solana-program/memo");
 var import_system2 = require("@solana-program/system");
@@ -14638,7 +14665,7 @@ async function getAddressesForMarketLookupTable(rpc, poolAddress, marketMaker) {
   }))[0];
   const addresses = [
     import_system2.SYSTEM_PROGRAM_ADDRESS,
-    (0, import_kit134.address)("SysvarRent111111111111111111111111111111111"),
+    (0, import_kit135.address)("SysvarRent111111111111111111111111111111111"),
     import_token_202234.ASSOCIATED_TOKEN_PROGRAM_ADDRESS,
     import_token2.TOKEN_PROGRAM_ADDRESS,
     import_token_202234.TOKEN_2022_PROGRAM_ADDRESS,
@@ -14798,7 +14825,7 @@ async function repayTunaLpPositionDebtInstruction(authority, positionMint, mintA
 
 // src/txbuilder/rebalanceTunaLpPositionOrca.ts
 var import_whirlpools_client16 = require("@orca-so/whirlpools-client");
-var import_kit135 = require("@solana/kit");
+var import_kit136 = require("@solana/kit");
 var import_sysvars3 = require("@solana/sysvars");
 var import_memo24 = require("@solana-program/memo");
 var import_token_202236 = require("@solana-program/token-2022");
@@ -14881,7 +14908,7 @@ async function rebalanceTunaLpPositionOrcaInstructions(rpc, authority, positionM
   cleanupInstructions.push(...internalCleanupInstructions);
   return {
     instructions,
-    initializationCost: (0, import_kit135.lamports)(nonRefundableRent)
+    initializationCost: (0, import_kit136.lamports)(nonRefundableRent)
   };
 }
 async function rebalanceTunaLpPositionOrcaInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool) {
@@ -14925,18 +14952,18 @@ async function rebalanceTunaLpPositionOrcaInstruction(authority, tunaPosition, t
   );
   const secondaryTickArrays = await OrcaUtils.getTickArraysForRebalancedPosition(whirlpool, tunaPosition);
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit135.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit135.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit135.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit135.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit135.AccountRole.WRITABLE },
-    { address: lowerTickArrayAddress, role: import_kit135.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit135.AccountRole.WRITABLE },
-    { address: secondaryTickArrays.lowerTickArrayAddress, role: import_kit135.AccountRole.WRITABLE },
-    { address: secondaryTickArrays.upperTickArrayAddress, role: import_kit135.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultA, role: import_kit135.AccountRole.WRITABLE },
-    { address: whirlpool.data.tokenVaultB, role: import_kit135.AccountRole.WRITABLE },
-    { address: orcaOracleAddress, role: import_kit135.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit136.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit136.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit136.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit136.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit136.AccountRole.WRITABLE },
+    { address: lowerTickArrayAddress, role: import_kit136.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit136.AccountRole.WRITABLE },
+    { address: secondaryTickArrays.lowerTickArrayAddress, role: import_kit136.AccountRole.WRITABLE },
+    { address: secondaryTickArrays.upperTickArrayAddress, role: import_kit136.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultA, role: import_kit136.AccountRole.WRITABLE },
+    { address: whirlpool.data.tokenVaultB, role: import_kit136.AccountRole.WRITABLE },
+    { address: orcaOracleAddress, role: import_kit136.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -14980,7 +15007,7 @@ async function rebalanceTunaLpPositionOrcaInstruction(authority, tunaPosition, t
 
 // src/txbuilder/rebalanceTunaLpPositionFusion.ts
 var import_fusionamm_client17 = require("@crypticdot/fusionamm-client");
-var import_kit136 = require("@solana/kit");
+var import_kit137 = require("@solana/kit");
 var import_sysvars4 = require("@solana/sysvars");
 var import_memo25 = require("@solana-program/memo");
 var import_token_202237 = require("@solana-program/token-2022");
@@ -15059,7 +15086,7 @@ async function rebalanceTunaLpPositionFusionInstructions(rpc, authority, positio
   instructions.push(ix);
   return {
     instructions,
-    initializationCost: (0, import_kit136.lamports)(nonRefundableRent)
+    initializationCost: (0, import_kit137.lamports)(nonRefundableRent)
   };
 }
 async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool) {
@@ -15102,17 +15129,17 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   );
   const secondaryTickArrays = await FusionUtils.getTickArraysForRebalancedPosition(fusionPool, tunaPosition);
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: import_kit136.AccountRole.WRITABLE },
-    { address: swapTickArrays[1], role: import_kit136.AccountRole.WRITABLE },
-    { address: swapTickArrays[2], role: import_kit136.AccountRole.WRITABLE },
-    { address: swapTickArrays[3], role: import_kit136.AccountRole.WRITABLE },
-    { address: swapTickArrays[4], role: import_kit136.AccountRole.WRITABLE },
-    { address: lowerTickArrayAddress, role: import_kit136.AccountRole.WRITABLE },
-    { address: upperTickArrayAddress, role: import_kit136.AccountRole.WRITABLE },
-    { address: secondaryTickArrays.lowerTickArrayAddress, role: import_kit136.AccountRole.WRITABLE },
-    { address: secondaryTickArrays.upperTickArrayAddress, role: import_kit136.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultA, role: import_kit136.AccountRole.WRITABLE },
-    { address: fusionPool.data.tokenVaultB, role: import_kit136.AccountRole.WRITABLE }
+    { address: swapTickArrays[0], role: import_kit137.AccountRole.WRITABLE },
+    { address: swapTickArrays[1], role: import_kit137.AccountRole.WRITABLE },
+    { address: swapTickArrays[2], role: import_kit137.AccountRole.WRITABLE },
+    { address: swapTickArrays[3], role: import_kit137.AccountRole.WRITABLE },
+    { address: swapTickArrays[4], role: import_kit137.AccountRole.WRITABLE },
+    { address: lowerTickArrayAddress, role: import_kit137.AccountRole.WRITABLE },
+    { address: upperTickArrayAddress, role: import_kit137.AccountRole.WRITABLE },
+    { address: secondaryTickArrays.lowerTickArrayAddress, role: import_kit137.AccountRole.WRITABLE },
+    { address: secondaryTickArrays.upperTickArrayAddress, role: import_kit137.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultA, role: import_kit137.AccountRole.WRITABLE },
+    { address: fusionPool.data.tokenVaultB, role: import_kit137.AccountRole.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [