@crypticdot/defituna-client 3.5.4 → 3.5.6

package/dist/index.js

@@ -73,13 +73,13 @@ function decodeLendingPosition(encodedAccount) {
     getLendingPositionDecoder()
   );
 }
-async function fetchLendingPosition(rpc, address4, config) {
-  const maybeAccount = await fetchMaybeLendingPosition(rpc, address4, config);
+async function fetchLendingPosition(rpc, address8, config) {
+  const maybeAccount = await fetchMaybeLendingPosition(rpc, address8, config);
   assertAccountExists(maybeAccount);
   return maybeAccount;
 }
-async function fetchMaybeLendingPosition(rpc, address4, config) {
-  const maybeAccount = await fetchEncodedAccount(rpc, address4, config);
+async function fetchMaybeLendingPosition(rpc, address8, config) {
+  const maybeAccount = await fetchEncodedAccount(rpc, address8, config);
   return decodeLendingPosition(maybeAccount);
 }
 async function fetchAllLendingPosition(rpc, addresses, config) {
@@ -359,13 +359,13 @@ function decodeMarket(encodedAccount) {
     getMarketDecoder()
   );
 }
-async function fetchMarket(rpc, address4, config) {
-  const maybeAccount = await fetchMaybeMarket(rpc, address4, config);
+async function fetchMarket(rpc, address8, config) {
+  const maybeAccount = await fetchMaybeMarket(rpc, address8, config);
   assertAccountExists2(maybeAccount);
   return maybeAccount;
 }
-async function fetchMaybeMarket(rpc, address4, config) {
-  const maybeAccount = await fetchEncodedAccount2(rpc, address4, config);
+async function fetchMaybeMarket(rpc, address8, config) {
+  const maybeAccount = await fetchEncodedAccount2(rpc, address8, config);
   return decodeMarket(maybeAccount);
 }
 async function fetchAllMarket(rpc, addresses, config) {
@@ -476,13 +476,13 @@ function decodeTunaConfig(encodedAccount) {
     getTunaConfigDecoder()
   );
 }
-async function fetchTunaConfig(rpc, address4, config) {
-  const maybeAccount = await fetchMaybeTunaConfig(rpc, address4, config);
+async function fetchTunaConfig(rpc, address8, config) {
+  const maybeAccount = await fetchMaybeTunaConfig(rpc, address8, config);
   assertAccountExists3(maybeAccount);
   return maybeAccount;
 }
-async function fetchMaybeTunaConfig(rpc, address4, config) {
-  const maybeAccount = await fetchEncodedAccount3(rpc, address4, config);
+async function fetchMaybeTunaConfig(rpc, address8, config) {
+  const maybeAccount = await fetchEncodedAccount3(rpc, address8, config);
   return decodeTunaConfig(maybeAccount);
 }
 async function fetchAllTunaConfig(rpc, addresses, config) {
@@ -625,13 +625,13 @@ function decodeTunaLpPosition(encodedAccount) {
     getTunaLpPositionDecoder()
   );
 }
-async function fetchTunaLpPosition(rpc, address4, config) {
-  const maybeAccount = await fetchMaybeTunaLpPosition(rpc, address4, config);
+async function fetchTunaLpPosition(rpc, address8, config) {
+  const maybeAccount = await fetchMaybeTunaLpPosition(rpc, address8, config);
   assertAccountExists4(maybeAccount);
   return maybeAccount;
 }
-async function fetchMaybeTunaLpPosition(rpc, address4, config) {
-  const maybeAccount = await fetchEncodedAccount4(rpc, address4, config);
+async function fetchMaybeTunaLpPosition(rpc, address8, config) {
+  const maybeAccount = await fetchEncodedAccount4(rpc, address8, config);
   return decodeTunaLpPosition(maybeAccount);
 }
 async function fetchAllTunaLpPosition(rpc, addresses, config) {
@@ -753,13 +753,13 @@ function decodeTunaSpotPosition(encodedAccount) {
     getTunaSpotPositionDecoder()
   );
 }
-async function fetchTunaSpotPosition(rpc, address4, config) {
-  const maybeAccount = await fetchMaybeTunaSpotPosition(rpc, address4, config);
+async function fetchTunaSpotPosition(rpc, address8, config) {
+  const maybeAccount = await fetchMaybeTunaSpotPosition(rpc, address8, config);
   assertAccountExists5(maybeAccount);
   return maybeAccount;
 }
-async function fetchMaybeTunaSpotPosition(rpc, address4, config) {
-  const maybeAccount = await fetchEncodedAccount5(rpc, address4, config);
+async function fetchMaybeTunaSpotPosition(rpc, address8, config) {
+  const maybeAccount = await fetchEncodedAccount5(rpc, address8, config);
   return decodeTunaSpotPosition(maybeAccount);
 }
 async function fetchAllTunaSpotPosition(rpc, addresses, config) {
@@ -870,13 +870,13 @@ function decodeVault(encodedAccount) {
     getVaultDecoder()
   );
 }
-async function fetchVault(rpc, address4, config) {
-  const maybeAccount = await fetchMaybeVault(rpc, address4, config);
+async function fetchVault(rpc, address8, config) {
+  const maybeAccount = await fetchMaybeVault(rpc, address8, config);
   assertAccountExists6(maybeAccount);
   return maybeAccount;
 }
-async function fetchMaybeVault(rpc, address4, config) {
-  const maybeAccount = await fetchEncodedAccount6(rpc, address4, config);
+async function fetchMaybeVault(rpc, address8, config) {
+  const maybeAccount = await fetchEncodedAccount6(rpc, address8, config);
   return decodeVault(maybeAccount);
 }
 async function fetchAllVault(rpc, addresses, config) {
@@ -9805,47 +9805,47 @@ async function fetchDecodedProgramAccounts(rpc, programAddress, filters, decoder
 }
 
 // src/gpa/tunaLpPosition.ts
-function tunaLpPositionAuthorityFilter(address4) {
+function tunaLpPositionAuthorityFilter(address8) {
   return {
     memcmp: {
       offset: 11n,
-      bytes: getBase58Decoder().decode(getAddressEncoder19().encode(address4)),
+      bytes: getBase58Decoder().decode(getAddressEncoder19().encode(address8)),
       encoding: "base58"
     }
   };
 }
-function tunaLpPositionPoolFilter(address4) {
+function tunaLpPositionPoolFilter(address8) {
   return {
     memcmp: {
       offset: 43n,
-      bytes: getBase58Decoder().decode(getAddressEncoder19().encode(address4)),
+      bytes: getBase58Decoder().decode(getAddressEncoder19().encode(address8)),
       encoding: "base58"
     }
   };
 }
-function tunaLpPositionMintAFilter(address4) {
+function tunaLpPositionMintAFilter(address8) {
   return {
     memcmp: {
       offset: 75n,
-      bytes: getBase58Decoder().decode(getAddressEncoder19().encode(address4)),
+      bytes: getBase58Decoder().decode(getAddressEncoder19().encode(address8)),
       encoding: "base58"
     }
   };
 }
-function tunaLpPositionMintBFilter(address4) {
+function tunaLpPositionMintBFilter(address8) {
   return {
     memcmp: {
       offset: 107n,
-      bytes: getBase58Decoder().decode(getAddressEncoder19().encode(address4)),
+      bytes: getBase58Decoder().decode(getAddressEncoder19().encode(address8)),
       encoding: "base58"
     }
   };
 }
-function tunaLpPositionMintFilter(address4) {
+function tunaLpPositionMintFilter(address8) {
   return {
     memcmp: {
       offset: 139n,
-      bytes: getBase58Decoder().decode(getAddressEncoder19().encode(address4)),
+      bytes: getBase58Decoder().decode(getAddressEncoder19().encode(address8)),
       encoding: "base58"
     }
   };
@@ -9881,38 +9881,38 @@ import {
   getAddressEncoder as getAddressEncoder20,
   getBase58Decoder as getBase58Decoder2
 } from "@solana/kit";
-function tunaSpotPositionAuthorityFilter(address4) {
+function tunaSpotPositionAuthorityFilter(address8) {
   return {
     memcmp: {
       offset: 11n,
-      bytes: getBase58Decoder2().decode(getAddressEncoder20().encode(address4)),
+      bytes: getBase58Decoder2().decode(getAddressEncoder20().encode(address8)),
       encoding: "base58"
     }
   };
 }
-function tunaSpotPositionPoolFilter(address4) {
+function tunaSpotPositionPoolFilter(address8) {
   return {
     memcmp: {
       offset: 43n,
-      bytes: getBase58Decoder2().decode(getAddressEncoder20().encode(address4)),
+      bytes: getBase58Decoder2().decode(getAddressEncoder20().encode(address8)),
       encoding: "base58"
     }
   };
 }
-function tunaSpotPositionMintAFilter(address4) {
+function tunaSpotPositionMintAFilter(address8) {
   return {
     memcmp: {
       offset: 75n,
-      bytes: getBase58Decoder2().decode(getAddressEncoder20().encode(address4)),
+      bytes: getBase58Decoder2().decode(getAddressEncoder20().encode(address8)),
       encoding: "base58"
     }
   };
 }
-function tunaSpotPositionMintBFilter(address4) {
+function tunaSpotPositionMintBFilter(address8) {
   return {
     memcmp: {
       offset: 107n,
-      bytes: getBase58Decoder2().decode(getAddressEncoder20().encode(address4)),
+      bytes: getBase58Decoder2().decode(getAddressEncoder20().encode(address8)),
       encoding: "base58"
     }
   };
@@ -9939,29 +9939,29 @@ import {
   getAddressEncoder as getAddressEncoder21,
   getBase58Decoder as getBase58Decoder3
 } from "@solana/kit";
-function lendingPositionAuthorityFilter(address4) {
+function lendingPositionAuthorityFilter(address8) {
   return {
     memcmp: {
       offset: 11n,
-      bytes: getBase58Decoder3().decode(getAddressEncoder21().encode(address4)),
+      bytes: getBase58Decoder3().decode(getAddressEncoder21().encode(address8)),
       encoding: "base58"
     }
   };
 }
-function lendingPositionMintFilter(address4) {
+function lendingPositionMintFilter(address8) {
   return {
     memcmp: {
       offset: 43n,
-      bytes: getBase58Decoder3().decode(getAddressEncoder21().encode(address4)),
+      bytes: getBase58Decoder3().decode(getAddressEncoder21().encode(address8)),
       encoding: "base58"
     }
   };
 }
-function lendingPositionVaultFilter(address4) {
+function lendingPositionVaultFilter(address8) {
   return {
     memcmp: {
       offset: 91n,
-      bytes: getBase58Decoder3().decode(getAddressEncoder21().encode(address4)),
+      bytes: getBase58Decoder3().decode(getAddressEncoder21().encode(address8)),
       encoding: "base58"
     }
   };
@@ -13587,6 +13587,10 @@ async function liquidateTunaSpotPositionOrcaInstruction(authority, tunaPosition,
 
 // src/txbuilder/openTunaLpPositionOrca.ts
 import { fetchMaybeWhirlpool as fetchMaybeWhirlpool6, getPositionAddress as getPositionAddress13, WHIRLPOOL_PROGRAM_ADDRESS as WHIRLPOOL_PROGRAM_ADDRESS9 } from "@orca-so/whirlpools-client";
+import {
+  AccountRole as AccountRole15,
+  address as address3
+} from "@solana/kit";
 import {
   ASSOCIATED_TOKEN_PROGRAM_ADDRESS,
   fetchAllMaybeMint as fetchAllMaybeMint15,
@@ -13659,85 +13663,94 @@ 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: AccountRole15.WRITABLE_SIGNER
+      },
+      {
+        address: input.mintA,
+        role: AccountRole15.READONLY
+      },
+      {
+        address: input.mintB,
+        role: AccountRole15.READONLY
+      },
+      {
+        address: input.tokenProgramA,
+        role: AccountRole15.READONLY
+      },
+      {
+        address: input.tokenProgramB,
+        role: AccountRole15.READONLY
+      },
+      {
+        address: input.market,
+        role: AccountRole15.READONLY
+      },
+      {
+        address: input.tunaPosition,
+        role: AccountRole15.WRITABLE
+      },
+      {
+        address: input.tunaPositionMint,
+        role: AccountRole15.WRITABLE_SIGNER
+      },
+      {
+        address: input.tunaPositionAta,
+        role: AccountRole15.WRITABLE
+      },
+      {
+        address: input.tunaPositionAtaA,
+        role: AccountRole15.WRITABLE
+      },
+      {
+        address: input.tunaPositionAtaB,
+        role: AccountRole15.WRITABLE
+      },
+      {
+        address: input.whirlpoolProgram,
+        role: AccountRole15.READONLY
+      },
+      {
+        address: input.whirlpool,
+        role: AccountRole15.READONLY
+      },
+      {
+        address: input.orcaPosition,
+        role: AccountRole15.WRITABLE
+      },
+      {
+        address: input.metadataUpdateAuth,
+        role: AccountRole15.READONLY
+      },
+      {
+        address: input.token2022Program,
+        role: AccountRole15.READONLY
+      },
+      {
+        address: input.systemProgram ?? address3("11111111111111111111111111111111"),
+        role: AccountRole15.READONLY
+      },
+      {
+        address: input.associatedTokenProgram,
+        role: AccountRole15.READONLY
+      }
     ],
-    programAddress,
-    data: getOpenTunaLpPositionOrcaInstructionDataEncoder().encode(args)
+    programAddress: TUNA_PROGRAM_ADDRESS,
+    data: getOpenTunaLpPositionOrcaInstructionDataEncoder().encode(input)
   };
-  return instruction;
 }
 
 // src/txbuilder/openTunaLpPositionFusion.ts
 import { fetchMaybeFusionPool as fetchMaybeFusionPool6, FUSIONAMM_PROGRAM_ADDRESS as FUSIONAMM_PROGRAM_ADDRESS9, getPositionAddress as getPositionAddress14 } from "@crypticdot/fusionamm-client";
 import { FP_NFT_UPDATE_AUTH } from "@crypticdot/fusionamm-client";
+import {
+  AccountRole as AccountRole16,
+  address as address4
+} from "@solana/kit";
 import {
   ASSOCIATED_TOKEN_PROGRAM_ADDRESS as ASSOCIATED_TOKEN_PROGRAM_ADDRESS2,
   fetchAllMaybeMint as fetchAllMaybeMint16,
@@ -13810,82 +13823,87 @@ async function openTunaLpPositionFusionInstruction(rpc, authority, positionMint,
     ...args
   });
 }
-function getOpenTunaLpPositionFusionInstructionWithEphemeralSigner(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 },
-    tokenProgramA: { value: input.tokenProgramA ?? null, isWritable: false },
-    tokenProgramB: { value: input.tokenProgramB ?? 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
-    },
-    fusionammProgram: {
-      value: input.fusionammProgram ?? null,
-      isWritable: false
-    },
-    fusionPool: { value: input.fusionPool ?? null, isWritable: false },
-    fusionPosition: { value: input.fusionPosition ?? null, isWritable: true },
-    metadataUpdateAuth: {
-      value: input.metadataUpdateAuth ?? 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 getOpenTunaLpPositionFusionInstructionWithEphemeralSigner(input) {
+  return {
     accounts: [
-      getAccountMeta(accounts.authority),
-      getAccountMeta(accounts.mintA),
-      getAccountMeta(accounts.mintB),
-      getAccountMeta(accounts.tokenProgramA),
-      getAccountMeta(accounts.tokenProgramB),
-      getAccountMeta(accounts.market),
-      getAccountMeta(accounts.tunaPosition),
-      getAccountMeta(accounts.tunaPositionMint),
-      getAccountMeta(accounts.tunaPositionAta),
-      getAccountMeta(accounts.tunaPositionAtaA),
-      getAccountMeta(accounts.tunaPositionAtaB),
-      getAccountMeta(accounts.fusionammProgram),
-      getAccountMeta(accounts.fusionPool),
-      getAccountMeta(accounts.fusionPosition),
-      getAccountMeta(accounts.metadataUpdateAuth),
-      getAccountMeta(accounts.token2022Program),
-      getAccountMeta(accounts.systemProgram),
-      getAccountMeta(accounts.associatedTokenProgram)
+      {
+        address: input.authority.address,
+        role: AccountRole16.WRITABLE_SIGNER
+      },
+      {
+        address: input.mintA,
+        role: AccountRole16.READONLY
+      },
+      {
+        address: input.mintB,
+        role: AccountRole16.READONLY
+      },
+      {
+        address: input.tokenProgramA,
+        role: AccountRole16.READONLY
+      },
+      {
+        address: input.tokenProgramB,
+        role: AccountRole16.READONLY
+      },
+      {
+        address: input.market,
+        role: AccountRole16.READONLY
+      },
+      {
+        address: input.tunaPosition,
+        role: AccountRole16.WRITABLE
+      },
+      {
+        address: input.tunaPositionMint,
+        role: AccountRole16.WRITABLE_SIGNER
+      },
+      {
+        address: input.tunaPositionAta,
+        role: AccountRole16.WRITABLE
+      },
+      {
+        address: input.tunaPositionAtaA,
+        role: AccountRole16.WRITABLE
+      },
+      {
+        address: input.tunaPositionAtaB,
+        role: AccountRole16.WRITABLE
+      },
+      {
+        address: input.fusionammProgram,
+        role: AccountRole16.READONLY
+      },
+      {
+        address: input.fusionPool,
+        role: AccountRole16.READONLY
+      },
+      {
+        address: input.fusionPosition,
+        role: AccountRole16.WRITABLE
+      },
+      {
+        address: input.metadataUpdateAuth,
+        role: AccountRole16.READONLY
+      },
+      {
+        address: input.token2022Program,
+        role: AccountRole16.READONLY
+      },
+      {
+        address: input.systemProgram ?? address4("11111111111111111111111111111111"),
+        role: AccountRole16.READONLY
+      },
+      {
+        address: input.associatedTokenProgram,
+        role: AccountRole16.READONLY
+      }
     ],
-    programAddress,
+    programAddress: TUNA_PROGRAM_ADDRESS,
     data: getOpenTunaLpPositionFusionInstructionDataEncoder().encode(
-      args
+      input
     )
   };
-  return instruction;
 }
 
 // src/txbuilder/openAndIncreaseTunaLpPositionOrca.ts
@@ -13901,7 +13919,8 @@ import {
 } from "@orca-so/whirlpools-client";
 import { getTickArrayStartTickIndex as getTickArrayStartTickIndex6 } from "@orca-so/whirlpools-core";
 import {
-  AccountRole as AccountRole15,
+  AccountRole as AccountRole17,
+  address as address5,
   lamports
 } from "@solana/kit";
 import { fetchSysvarRent } from "@solana/sysvars";
@@ -14078,16 +14097,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: AccountRole15.WRITABLE },
-    { address: swapTickArrays[1], role: AccountRole15.WRITABLE },
-    { address: swapTickArrays[2], role: AccountRole15.WRITABLE },
-    { address: swapTickArrays[3], role: AccountRole15.WRITABLE },
-    { address: swapTickArrays[4], role: AccountRole15.WRITABLE },
-    { address: lowerTickArrayAddress, role: AccountRole15.WRITABLE },
-    { address: upperTickArrayAddress, role: AccountRole15.WRITABLE },
-    { address: whirlpool.data.tokenVaultA, role: AccountRole15.WRITABLE },
-    { address: whirlpool.data.tokenVaultB, role: AccountRole15.WRITABLE },
-    { address: orcaOracleAddress, role: AccountRole15.WRITABLE }
+    { address: swapTickArrays[0], role: AccountRole17.WRITABLE },
+    { address: swapTickArrays[1], role: AccountRole17.WRITABLE },
+    { address: swapTickArrays[2], role: AccountRole17.WRITABLE },
+    { address: swapTickArrays[3], role: AccountRole17.WRITABLE },
+    { address: swapTickArrays[4], role: AccountRole17.WRITABLE },
+    { address: lowerTickArrayAddress, role: AccountRole17.WRITABLE },
+    { address: upperTickArrayAddress, role: AccountRole17.WRITABLE },
+    { address: whirlpool.data.tokenVaultA, role: AccountRole17.WRITABLE },
+    { address: whirlpool.data.tokenVaultB, role: AccountRole17.WRITABLE },
+    { address: orcaOracleAddress, role: AccountRole17.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -14164,127 +14183,138 @@ async function openAndIncreaseTunaLpPositionOrcaInstruction(authority, positionM
     ...args,
     remainingAccountsInfo
   });
-  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 = {
-    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)
+  ix.accounts.push(...remainingAccounts);
+  return ix;
+}
+function getOpenAndIncreaseTunaLpPositionOrcaInstructionWithEphemeralSigner(input) {
+  return {
+    accounts: [
+      {
+        address: input.authority.address,
+        role: AccountRole17.WRITABLE_SIGNER
+      },
+      {
+        address: input.tunaConfig,
+        role: AccountRole17.READONLY
+      },
+      {
+        address: input.mintA,
+        role: AccountRole17.READONLY
+      },
+      {
+        address: input.mintB,
+        role: AccountRole17.READONLY
+      },
+      {
+        address: input.market,
+        role: AccountRole17.WRITABLE
+      },
+      {
+        address: input.vaultA,
+        role: AccountRole17.WRITABLE
+      },
+      {
+        address: input.vaultB,
+        role: AccountRole17.WRITABLE
+      },
+      {
+        address: input.vaultAAta,
+        role: AccountRole17.WRITABLE
+      },
+      {
+        address: input.vaultBAta,
+        role: AccountRole17.WRITABLE
+      },
+      {
+        address: input.tunaPosition,
+        role: AccountRole17.WRITABLE
+      },
+      {
+        address: input.tunaPositionMint,
+        role: AccountRole17.WRITABLE
+      },
+      {
+        address: input.tunaPositionAta,
+        role: AccountRole17.WRITABLE
+      },
+      {
+        address: input.tunaPositionAtaA,
+        role: AccountRole17.WRITABLE
+      },
+      {
+        address: input.tunaPositionAtaB,
+        role: AccountRole17.WRITABLE
+      },
+      {
+        address: input.tunaPositionOwnerAtaA,
+        role: AccountRole17.WRITABLE
+      },
+      {
+        address: input.tunaPositionOwnerAtaB,
+        role: AccountRole17.WRITABLE
+      },
+      {
+        address: input.feeRecipientAtaA,
+        role: AccountRole17.WRITABLE
+      },
+      {
+        address: input.feeRecipientAtaB,
+        role: AccountRole17.WRITABLE
+      },
+      {
+        address: input.pythOraclePriceFeedA,
+        role: AccountRole17.READONLY
+      },
+      {
+        address: input.pythOraclePriceFeedB,
+        role: AccountRole17.READONLY
+      },
+      {
+        address: input.whirlpoolProgram,
+        role: AccountRole17.READONLY
+      },
+      {
+        address: input.whirlpool,
+        role: AccountRole17.WRITABLE
+      },
+      {
+        address: input.orcaPosition,
+        role: AccountRole17.WRITABLE
+      },
+      {
+        address: input.tokenProgramA,
+        role: AccountRole17.READONLY
+      },
+      {
+        address: input.tokenProgramB,
+        role: AccountRole17.READONLY
+      },
+      {
+        address: input.metadataUpdateAuth,
+        role: AccountRole17.READONLY
+      },
+      {
+        address: input.memoProgram,
+        role: AccountRole17.READONLY
+      },
+      {
+        address: input.token2022Program,
+        role: AccountRole17.READONLY
+      },
+      {
+        address: input.systemProgram ?? address5("11111111111111111111111111111111"),
+        role: AccountRole17.READONLY
+      },
+      {
+        address: input.associatedTokenProgram,
+        role: AccountRole17.READONLY
+      }
     ],
-    programAddress,
+    programAddress: TUNA_PROGRAM_ADDRESS,
     data: getOpenAndIncreaseTunaLpPositionOrcaInstructionDataEncoder().encode(
-      args
+      input
     )
   };
-  return instruction;
 }
 
 // src/txbuilder/openAndIncreaseTunaLpPositionFusion.ts
@@ -14300,7 +14330,8 @@ import {
 } from "@crypticdot/fusionamm-client";
 import { getTickArrayStartTickIndex as getTickArrayStartTickIndex7 } from "@crypticdot/fusionamm-core";
 import {
-  AccountRole as AccountRole16,
+  AccountRole as AccountRole18,
+  address as address6,
   lamports as lamports2
 } from "@solana/kit";
 import { fetchSysvarRent as fetchSysvarRent2 } from "@solana/sysvars";
@@ -14463,15 +14494,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: AccountRole16.WRITABLE },
-    { address: swapTickArrays[1], role: AccountRole16.WRITABLE },
-    { address: swapTickArrays[2], role: AccountRole16.WRITABLE },
-    { address: swapTickArrays[3], role: AccountRole16.WRITABLE },
-    { address: swapTickArrays[4], role: AccountRole16.WRITABLE },
-    { address: lowerTickArrayAddress, role: AccountRole16.WRITABLE },
-    { address: upperTickArrayAddress, role: AccountRole16.WRITABLE },
-    { address: fusionPool.data.tokenVaultA, role: AccountRole16.WRITABLE },
-    { address: fusionPool.data.tokenVaultB, role: AccountRole16.WRITABLE }
+    { address: swapTickArrays[0], role: AccountRole18.WRITABLE },
+    { address: swapTickArrays[1], role: AccountRole18.WRITABLE },
+    { address: swapTickArrays[2], role: AccountRole18.WRITABLE },
+    { address: swapTickArrays[3], role: AccountRole18.WRITABLE },
+    { address: swapTickArrays[4], role: AccountRole18.WRITABLE },
+    { address: lowerTickArrayAddress, role: AccountRole18.WRITABLE },
+    { address: upperTickArrayAddress, role: AccountRole18.WRITABLE },
+    { address: fusionPool.data.tokenVaultA, role: AccountRole18.WRITABLE },
+    { address: fusionPool.data.tokenVaultB, role: AccountRole18.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -14550,124 +14581,135 @@ 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: AccountRole18.WRITABLE_SIGNER
+      },
+      {
+        address: input.tunaConfig,
+        role: AccountRole18.READONLY
+      },
+      {
+        address: input.mintA,
+        role: AccountRole18.READONLY
+      },
+      {
+        address: input.mintB,
+        role: AccountRole18.READONLY
+      },
+      {
+        address: input.tokenProgramA,
+        role: AccountRole18.READONLY
+      },
+      {
+        address: input.tokenProgramB,
+        role: AccountRole18.READONLY
+      },
+      {
+        address: input.market,
+        role: AccountRole18.WRITABLE
+      },
+      {
+        address: input.vaultA,
+        role: AccountRole18.WRITABLE
+      },
+      {
+        address: input.vaultB,
+        role: AccountRole18.WRITABLE
+      },
+      {
+        address: input.vaultAAta,
+        role: AccountRole18.WRITABLE
+      },
+      {
+        address: input.vaultBAta,
+        role: AccountRole18.WRITABLE
+      },
+      {
+        address: input.tunaPosition,
+        role: AccountRole18.WRITABLE
+      },
+      {
+        address: input.tunaPositionMint,
+        role: AccountRole18.WRITABLE
+      },
+      {
+        address: input.tunaPositionAta,
+        role: AccountRole18.WRITABLE
+      },
+      {
+        address: input.tunaPositionAtaA,
+        role: AccountRole18.WRITABLE
+      },
+      {
+        address: input.tunaPositionAtaB,
+        role: AccountRole18.WRITABLE
+      },
+      {
+        address: input.tunaPositionOwnerAtaA,
+        role: AccountRole18.WRITABLE
+      },
+      {
+        address: input.tunaPositionOwnerAtaB,
+        role: AccountRole18.WRITABLE
+      },
+      {
+        address: input.feeRecipientAtaA,
+        role: AccountRole18.WRITABLE
+      },
+      {
+        address: input.feeRecipientAtaB,
+        role: AccountRole18.WRITABLE
+      },
+      {
+        address: input.pythOraclePriceFeedA,
+        role: AccountRole18.READONLY
+      },
+      {
+        address: input.pythOraclePriceFeedB,
+        role: AccountRole18.READONLY
+      },
+      {
+        address: input.fusionammProgram,
+        role: AccountRole18.READONLY
+      },
+      {
+        address: input.fusionPool,
+        role: AccountRole18.WRITABLE
+      },
+      {
+        address: input.fusionPosition,
+        role: AccountRole18.WRITABLE
+      },
+      {
+        address: input.metadataUpdateAuth,
+        role: AccountRole18.READONLY
+      },
+      {
+        address: input.memoProgram,
+        role: AccountRole18.READONLY
+      },
+      {
+        address: input.token2022Program,
+        role: AccountRole18.READONLY
+      },
+      {
+        address: input.systemProgram ?? address6("11111111111111111111111111111111"),
+        role: AccountRole18.READONLY
+      },
+      {
+        address: input.associatedTokenProgram,
+        role: AccountRole18.READONLY
+      }
     ],
-    programAddress,
+    programAddress: TUNA_PROGRAM_ADDRESS,
     data: getOpenAndIncreaseTunaLpPositionFusionInstructionDataEncoder().encode(
-      args
+      input
     )
   };
-  return instruction;
 }
 
 // src/txbuilder/openTunaSpotPosition.ts
@@ -14739,7 +14781,7 @@ import {
 } from "@orca-so/whirlpools-client";
 import { collectRewardsQuote as collectRewardsQuote2, getTickArrayStartTickIndex as getTickArrayStartTickIndex8, getTickIndexInArray as getTickIndexInArray2 } from "@orca-so/whirlpools-core";
 import {
-  AccountRole as AccountRole17,
+  AccountRole as AccountRole19,
   assertAccountsExist as assertAccountsExist9
 } from "@solana/kit";
 import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS18 } from "@solana-program/memo";
@@ -14879,16 +14921,16 @@ async function decreaseTunaLpPositionOrcaInstruction(authority, tunaPosition, mi
     tunaPosition.data.tickUpperIndex
   );
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: AccountRole17.WRITABLE },
-    { address: swapTickArrays[1], role: AccountRole17.WRITABLE },
-    { address: swapTickArrays[2], role: AccountRole17.WRITABLE },
-    { address: swapTickArrays[3], role: AccountRole17.WRITABLE },
-    { address: swapTickArrays[4], role: AccountRole17.WRITABLE },
-    { address: lowerTickArrayAddress, role: AccountRole17.WRITABLE },
-    { address: upperTickArrayAddress, role: AccountRole17.WRITABLE },
-    { address: whirlpool.data.tokenVaultA, role: AccountRole17.WRITABLE },
-    { address: whirlpool.data.tokenVaultB, role: AccountRole17.WRITABLE },
-    { address: orcaOracleAddress, role: AccountRole17.WRITABLE }
+    { address: swapTickArrays[0], role: AccountRole19.WRITABLE },
+    { address: swapTickArrays[1], role: AccountRole19.WRITABLE },
+    { address: swapTickArrays[2], role: AccountRole19.WRITABLE },
+    { address: swapTickArrays[3], role: AccountRole19.WRITABLE },
+    { address: swapTickArrays[4], role: AccountRole19.WRITABLE },
+    { address: lowerTickArrayAddress, role: AccountRole19.WRITABLE },
+    { address: upperTickArrayAddress, role: AccountRole19.WRITABLE },
+    { address: whirlpool.data.tokenVaultA, role: AccountRole19.WRITABLE },
+    { address: whirlpool.data.tokenVaultB, role: AccountRole19.WRITABLE },
+    { address: orcaOracleAddress, role: AccountRole19.WRITABLE }
   ];
   for (const rewardIndex of rewardIndicesToClaim) {
     const rewardInfo = whirlpool.data.rewardInfos[rewardIndex];
@@ -14899,10 +14941,10 @@ async function decreaseTunaLpPositionOrcaInstruction(authority, tunaPosition, mi
       mint: rewardMint.address,
       tokenProgram: rewardMint.programAddress
     });
-    remainingAccounts.push({ address: rewardMint.address, role: AccountRole17.READONLY });
-    remainingAccounts.push({ address: rewardMint.programAddress, role: AccountRole17.READONLY });
-    remainingAccounts.push({ address: ownerAta[0], role: AccountRole17.WRITABLE });
-    remainingAccounts.push({ address: rewardInfo.vault, role: AccountRole17.WRITABLE });
+    remainingAccounts.push({ address: rewardMint.address, role: AccountRole19.READONLY });
+    remainingAccounts.push({ address: rewardMint.programAddress, role: AccountRole19.READONLY });
+    remainingAccounts.push({ address: ownerAta[0], role: AccountRole19.WRITABLE });
+    remainingAccounts.push({ address: rewardInfo.vault, role: AccountRole19.WRITABLE });
   }
   const remainingAccountsInfo = {
     slices: [
@@ -14955,7 +14997,7 @@ import {
   getPositionAddress as getPositionAddress18
 } from "@crypticdot/fusionamm-client";
 import {
-  AccountRole as AccountRole18
+  AccountRole as AccountRole20
 } from "@solana/kit";
 import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS19 } from "@solana-program/memo";
 import {
@@ -15060,15 +15102,15 @@ async function decreaseTunaLpPositionFusionInstruction(authority, tunaPosition,
     tunaPosition.data.tickUpperIndex
   );
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: AccountRole18.WRITABLE },
-    { address: swapTickArrays[1], role: AccountRole18.WRITABLE },
-    { address: swapTickArrays[2], role: AccountRole18.WRITABLE },
-    { address: swapTickArrays[3], role: AccountRole18.WRITABLE },
-    { address: swapTickArrays[4], role: AccountRole18.WRITABLE },
-    { address: lowerTickArrayAddress, role: AccountRole18.WRITABLE },
-    { address: upperTickArrayAddress, role: AccountRole18.WRITABLE },
-    { address: fusionPool.data.tokenVaultA, role: AccountRole18.WRITABLE },
-    { address: fusionPool.data.tokenVaultB, role: AccountRole18.WRITABLE }
+    { address: swapTickArrays[0], role: AccountRole20.WRITABLE },
+    { address: swapTickArrays[1], role: AccountRole20.WRITABLE },
+    { address: swapTickArrays[2], role: AccountRole20.WRITABLE },
+    { address: swapTickArrays[3], role: AccountRole20.WRITABLE },
+    { address: swapTickArrays[4], role: AccountRole20.WRITABLE },
+    { address: lowerTickArrayAddress, role: AccountRole20.WRITABLE },
+    { address: upperTickArrayAddress, role: AccountRole20.WRITABLE },
+    { address: fusionPool.data.tokenVaultA, role: AccountRole20.WRITABLE },
+    { address: fusionPool.data.tokenVaultB, role: AccountRole20.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -15281,7 +15323,7 @@ async function withdrawInstruction(authority, mint, vault, funds, shares) {
 import { fetchFusionPool as fetchFusionPool3, FP_NFT_UPDATE_AUTH as FP_NFT_UPDATE_AUTH3, FUSIONAMM_PROGRAM_ADDRESS as FUSIONAMM_PROGRAM_ADDRESS13 } from "@crypticdot/fusionamm-client";
 import { fetchWhirlpool as fetchWhirlpool3, getOracleAddress as getOracleAddress8, WHIRLPOOL_PROGRAM_ADDRESS as WHIRLPOOL_PROGRAM_ADDRESS13 } from "@orca-so/whirlpools-client";
 import {
-  address as address3
+  address as address7
 } from "@solana/kit";
 import { fetchAddressLookupTable, getExtendLookupTableInstruction as getExtendLookupTableInstruction2 } from "@solana-program/address-lookup-table";
 import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS22 } from "@solana-program/memo";
@@ -15327,7 +15369,7 @@ async function getAddressesForMarketLookupTable(rpc, poolAddress, marketMaker) {
   }))[0];
   const addresses = [
     SYSTEM_PROGRAM_ADDRESS,
-    address3("SysvarRent111111111111111111111111111111111"),
+    address7("SysvarRent111111111111111111111111111111111"),
     ASSOCIATED_TOKEN_PROGRAM_ADDRESS6,
     TOKEN_PROGRAM_ADDRESS2,
     TOKEN_2022_PROGRAM_ADDRESS19,
@@ -15496,7 +15538,7 @@ import {
   WHIRLPOOL_PROGRAM_ADDRESS as WHIRLPOOL_PROGRAM_ADDRESS14
 } from "@orca-so/whirlpools-client";
 import {
-  AccountRole as AccountRole19,
+  AccountRole as AccountRole21,
   lamports as lamports3
 } from "@solana/kit";
 import { fetchSysvarRent as fetchSysvarRent3 } from "@solana/sysvars";
@@ -15629,18 +15671,18 @@ async function rebalanceTunaLpPositionOrcaInstruction(authority, tunaPosition, t
   );
   const secondaryTickArrays = await OrcaUtils.getTickArraysForRebalancedPosition(whirlpool, tunaPosition);
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: AccountRole19.WRITABLE },
-    { address: swapTickArrays[1], role: AccountRole19.WRITABLE },
-    { address: swapTickArrays[2], role: AccountRole19.WRITABLE },
-    { address: swapTickArrays[3], role: AccountRole19.WRITABLE },
-    { address: swapTickArrays[4], role: AccountRole19.WRITABLE },
-    { address: lowerTickArrayAddress, role: AccountRole19.WRITABLE },
-    { address: upperTickArrayAddress, role: AccountRole19.WRITABLE },
-    { address: secondaryTickArrays.lowerTickArrayAddress, role: AccountRole19.WRITABLE },
-    { address: secondaryTickArrays.upperTickArrayAddress, role: AccountRole19.WRITABLE },
-    { address: whirlpool.data.tokenVaultA, role: AccountRole19.WRITABLE },
-    { address: whirlpool.data.tokenVaultB, role: AccountRole19.WRITABLE },
-    { address: orcaOracleAddress, role: AccountRole19.WRITABLE }
+    { address: swapTickArrays[0], role: AccountRole21.WRITABLE },
+    { address: swapTickArrays[1], role: AccountRole21.WRITABLE },
+    { address: swapTickArrays[2], role: AccountRole21.WRITABLE },
+    { address: swapTickArrays[3], role: AccountRole21.WRITABLE },
+    { address: swapTickArrays[4], role: AccountRole21.WRITABLE },
+    { address: lowerTickArrayAddress, role: AccountRole21.WRITABLE },
+    { address: upperTickArrayAddress, role: AccountRole21.WRITABLE },
+    { address: secondaryTickArrays.lowerTickArrayAddress, role: AccountRole21.WRITABLE },
+    { address: secondaryTickArrays.upperTickArrayAddress, role: AccountRole21.WRITABLE },
+    { address: whirlpool.data.tokenVaultA, role: AccountRole21.WRITABLE },
+    { address: whirlpool.data.tokenVaultB, role: AccountRole21.WRITABLE },
+    { address: orcaOracleAddress, role: AccountRole21.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [
@@ -15692,7 +15734,7 @@ import {
   getTickArraySize as getTickArraySize2
 } from "@crypticdot/fusionamm-client";
 import {
-  AccountRole as AccountRole20,
+  AccountRole as AccountRole22,
   lamports as lamports4
 } from "@solana/kit";
 import { fetchSysvarRent as fetchSysvarRent4 } from "@solana/sysvars";
@@ -15820,17 +15862,17 @@ async function rebalanceTunaLpPositionFusionInstruction(authority, tunaPosition,
   );
   const secondaryTickArrays = await FusionUtils.getTickArraysForRebalancedPosition(fusionPool, tunaPosition);
   const remainingAccounts = [
-    { address: swapTickArrays[0], role: AccountRole20.WRITABLE },
-    { address: swapTickArrays[1], role: AccountRole20.WRITABLE },
-    { address: swapTickArrays[2], role: AccountRole20.WRITABLE },
-    { address: swapTickArrays[3], role: AccountRole20.WRITABLE },
-    { address: swapTickArrays[4], role: AccountRole20.WRITABLE },
-    { address: lowerTickArrayAddress, role: AccountRole20.WRITABLE },
-    { address: upperTickArrayAddress, role: AccountRole20.WRITABLE },
-    { address: secondaryTickArrays.lowerTickArrayAddress, role: AccountRole20.WRITABLE },
-    { address: secondaryTickArrays.upperTickArrayAddress, role: AccountRole20.WRITABLE },
-    { address: fusionPool.data.tokenVaultA, role: AccountRole20.WRITABLE },
-    { address: fusionPool.data.tokenVaultB, role: AccountRole20.WRITABLE }
+    { address: swapTickArrays[0], role: AccountRole22.WRITABLE },
+    { address: swapTickArrays[1], role: AccountRole22.WRITABLE },
+    { address: swapTickArrays[2], role: AccountRole22.WRITABLE },
+    { address: swapTickArrays[3], role: AccountRole22.WRITABLE },
+    { address: swapTickArrays[4], role: AccountRole22.WRITABLE },
+    { address: lowerTickArrayAddress, role: AccountRole22.WRITABLE },
+    { address: upperTickArrayAddress, role: AccountRole22.WRITABLE },
+    { address: secondaryTickArrays.lowerTickArrayAddress, role: AccountRole22.WRITABLE },
+    { address: secondaryTickArrays.upperTickArrayAddress, role: AccountRole22.WRITABLE },
+    { address: fusionPool.data.tokenVaultA, role: AccountRole22.WRITABLE },
+    { address: fusionPool.data.tokenVaultB, role: AccountRole22.WRITABLE }
   ];
   const remainingAccountsInfo = {
     slices: [