@crypticdot/defituna-client 3.1.0 → 3.1.1

package/dist/index.d.mts

@@ -554,13 +554,11 @@ type TunaSpotPosition = {
     collateralToken: PoolToken;
     /** Position options */
     flags: number;
-    /** Position state: normal, liquidated, closed by limit order */
-    state: TunaPositionState;
     /** The total amount of the position in token A (long) or B (short). */
     amount: bigint;
-    /** The amount of shares borrowed by user from vault B (long) or A (short). */
+    /** The amount of shares borrowed by the user from vault B (long) or A (short). */
     loanShares: bigint;
-    /** The amount of funds borrowed by user from vault B (long) or A (short). Doesn't include accrued interest. */
+    /** The amount of funds borrowed by the user from vault B (long) or A (short). Doesn't include accrued interest. */
     loanFunds: bigint;
     /** Position entry sqrt price. */
     entrySqrtPrice: bigint;
@@ -592,13 +590,11 @@ type TunaSpotPositionArgs = {
     collateralToken: PoolTokenArgs;
     /** Position options */
     flags: number;
-    /** Position state: normal, liquidated, closed by limit order */
-    state: TunaPositionStateArgs;
     /** The total amount of the position in token A (long) or B (short). */
     amount: number | bigint;
-    /** The amount of shares borrowed by user from vault B (long) or A (short). */
+    /** The amount of shares borrowed by the user from vault B (long) or A (short). */
     loanShares: number | bigint;
-    /** The amount of funds borrowed by user from vault B (long) or A (short). Doesn't include accrued interest. */
+    /** The amount of funds borrowed by the user from vault B (long) or A (short). Doesn't include accrued interest. */
     loanFunds: number | bigint;
     /** Position entry sqrt price. */
     entrySqrtPrice: number | bigint;
@@ -3833,7 +3829,7 @@ declare function parseLiquidateTunaLpPositionOrcaInstruction<TProgram extends st
 
 declare const LIQUIDATE_TUNA_SPOT_POSITION_FUSION_DISCRIMINATOR: Uint8Array<ArrayBuffer>;
 declare function getLiquidateTunaSpotPositionFusionDiscriminatorBytes(): ReadonlyUint8Array;
-type LiquidateTunaSpotPositionFusionInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountAuthority extends string | IAccountMeta<string> = string, TAccountTunaConfig extends string | IAccountMeta<string> = string, TAccountMintA extends string | IAccountMeta<string> = string, TAccountMintB extends string | IAccountMeta<string> = string, TAccountTokenProgramA extends string | IAccountMeta<string> = string, TAccountTokenProgramB extends string | IAccountMeta<string> = string, TAccountMarket extends string | IAccountMeta<string> = string, TAccountVaultA extends string | IAccountMeta<string> = string, TAccountVaultB extends string | IAccountMeta<string> = string, TAccountVaultAAta extends string | IAccountMeta<string> = string, TAccountVaultBAta extends string | IAccountMeta<string> = string, TAccountTunaPosition extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaA extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaB extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedA extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedB extends string | IAccountMeta<string> = string, TAccountFusionammProgram extends string | IAccountMeta<string> = string, TAccountFusionPool extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, TAccountSystemProgram extends string | IAccountMeta<string> = '11111111111111111111111111111111', TRemainingAccounts extends readonly IAccountMeta<string>[] = []> = IInstruction<TProgram> & IInstructionWithData<Uint8Array> & IInstructionWithAccounts<[
+type LiquidateTunaSpotPositionFusionInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountAuthority extends string | IAccountMeta<string> = string, TAccountTunaConfig extends string | IAccountMeta<string> = string, TAccountMintA extends string | IAccountMeta<string> = string, TAccountMintB extends string | IAccountMeta<string> = string, TAccountTokenProgramA extends string | IAccountMeta<string> = string, TAccountTokenProgramB extends string | IAccountMeta<string> = string, TAccountMarket extends string | IAccountMeta<string> = string, TAccountVaultA extends string | IAccountMeta<string> = string, TAccountVaultB extends string | IAccountMeta<string> = string, TAccountVaultAAta extends string | IAccountMeta<string> = string, TAccountVaultBAta extends string | IAccountMeta<string> = string, TAccountTunaPosition extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaA extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaB extends string | IAccountMeta<string> = string, TAccountTunaPositionOwner extends string | IAccountMeta<string> = string, TAccountTunaPositionOwnerAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionOwnerAtaB extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedA extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedB extends string | IAccountMeta<string> = string, TAccountFusionammProgram extends string | IAccountMeta<string> = string, TAccountFusionPool extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, TAccountSystemProgram extends string | IAccountMeta<string> = '11111111111111111111111111111111', TRemainingAccounts extends readonly IAccountMeta<string>[] = []> = IInstruction<TProgram> & IInstructionWithData<Uint8Array> & IInstructionWithAccounts<[
     TAccountAuthority extends string ? WritableSignerAccount<TAccountAuthority> & IAccountSignerMeta<TAccountAuthority> : TAccountAuthority,
     TAccountTunaConfig extends string ? ReadonlyAccount<TAccountTunaConfig> : TAccountTunaConfig,
     TAccountMintA extends string ? ReadonlyAccount<TAccountMintA> : TAccountMintA,
@@ -3850,6 +3846,9 @@ type LiquidateTunaSpotPositionFusionInstruction<TProgram extends string = typeof
     TAccountTunaPositionAtaB extends string ? WritableAccount<TAccountTunaPositionAtaB> : TAccountTunaPositionAtaB,
     TAccountFeeRecipientAtaA extends string ? WritableAccount<TAccountFeeRecipientAtaA> : TAccountFeeRecipientAtaA,
     TAccountFeeRecipientAtaB extends string ? WritableAccount<TAccountFeeRecipientAtaB> : TAccountFeeRecipientAtaB,
+    TAccountTunaPositionOwner extends string ? WritableAccount<TAccountTunaPositionOwner> : TAccountTunaPositionOwner,
+    TAccountTunaPositionOwnerAtaA extends string ? WritableAccount<TAccountTunaPositionOwnerAtaA> : TAccountTunaPositionOwnerAtaA,
+    TAccountTunaPositionOwnerAtaB extends string ? WritableAccount<TAccountTunaPositionOwnerAtaB> : TAccountTunaPositionOwnerAtaB,
     TAccountPythOraclePriceFeedA extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedA> : TAccountPythOraclePriceFeedA,
     TAccountPythOraclePriceFeedB extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedB> : TAccountPythOraclePriceFeedB,
     TAccountFusionammProgram extends string ? ReadonlyAccount<TAccountFusionammProgram> : TAccountFusionammProgram,
@@ -3870,7 +3869,7 @@ type LiquidateTunaSpotPositionFusionInstructionDataArgs = {
 declare function getLiquidateTunaSpotPositionFusionInstructionDataEncoder(): Encoder<LiquidateTunaSpotPositionFusionInstructionDataArgs>;
 declare function getLiquidateTunaSpotPositionFusionInstructionDataDecoder(): Decoder<LiquidateTunaSpotPositionFusionInstructionData>;
 declare function getLiquidateTunaSpotPositionFusionInstructionDataCodec(): Codec<LiquidateTunaSpotPositionFusionInstructionDataArgs, LiquidateTunaSpotPositionFusionInstructionData>;
-type LiquidateTunaSpotPositionFusionInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB extends string = string, TAccountTokenProgramA extends string = string, TAccountTokenProgramB extends string = string, TAccountMarket extends string = string, TAccountVaultA extends string = string, TAccountVaultB extends string = string, TAccountVaultAAta extends string = string, TAccountVaultBAta extends string = string, TAccountTunaPosition extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string, TAccountFeeRecipientAtaA extends string = string, TAccountFeeRecipientAtaB extends string = string, TAccountPythOraclePriceFeedA extends string = string, TAccountPythOraclePriceFeedB extends string = string, TAccountFusionammProgram extends string = string, TAccountFusionPool extends string = string, TAccountMemoProgram extends string = string, TAccountSystemProgram extends string = string> = {
+type LiquidateTunaSpotPositionFusionInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB extends string = string, TAccountTokenProgramA extends string = string, TAccountTokenProgramB extends string = string, TAccountMarket extends string = string, TAccountVaultA extends string = string, TAccountVaultB extends string = string, TAccountVaultAAta extends string = string, TAccountVaultBAta extends string = string, TAccountTunaPosition extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string, TAccountFeeRecipientAtaA extends string = string, TAccountFeeRecipientAtaB extends string = string, TAccountTunaPositionOwner extends string = string, TAccountTunaPositionOwnerAtaA extends string = string, TAccountTunaPositionOwnerAtaB extends string = string, TAccountPythOraclePriceFeedA extends string = string, TAccountPythOraclePriceFeedB extends string = string, TAccountFusionammProgram extends string = string, TAccountFusionPool extends string = string, TAccountMemoProgram extends string = string, TAccountSystemProgram extends string = string> = {
     /**
      *
      * TUNA accounts
@@ -3892,6 +3891,9 @@ type LiquidateTunaSpotPositionFusionInput<TAccountAuthority extends string = str
     tunaPositionAtaB: Address<TAccountTunaPositionAtaB>;
     feeRecipientAtaA: Address<TAccountFeeRecipientAtaA>;
     feeRecipientAtaB: Address<TAccountFeeRecipientAtaB>;
+    tunaPositionOwner: Address<TAccountTunaPositionOwner>;
+    tunaPositionOwnerAtaA?: Address<TAccountTunaPositionOwnerAtaA>;
+    tunaPositionOwnerAtaB?: Address<TAccountTunaPositionOwnerAtaB>;
     pythOraclePriceFeedA: Address<TAccountPythOraclePriceFeedA>;
     pythOraclePriceFeedB: Address<TAccountPythOraclePriceFeedB>;
     /**
@@ -3911,9 +3913,9 @@ type LiquidateTunaSpotPositionFusionInput<TAccountAuthority extends string = str
     withdrawPercent: LiquidateTunaSpotPositionFusionInstructionDataArgs['withdrawPercent'];
     remainingAccountsInfo: LiquidateTunaSpotPositionFusionInstructionDataArgs['remainingAccountsInfo'];
 };
-declare function getLiquidateTunaSpotPositionFusionInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountTokenProgramA extends string, TAccountTokenProgramB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string, TAccountFeeRecipientAtaA extends string, TAccountFeeRecipientAtaB extends string, TAccountPythOraclePriceFeedA extends string, TAccountPythOraclePriceFeedB extends string, TAccountFusionammProgram extends string, TAccountFusionPool extends string, TAccountMemoProgram extends string, TAccountSystemProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidateTunaSpotPositionFusionInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountMemoProgram, TAccountSystemProgram>, config?: {
+declare function getLiquidateTunaSpotPositionFusionInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountTokenProgramA extends string, TAccountTokenProgramB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string, TAccountFeeRecipientAtaA extends string, TAccountFeeRecipientAtaB extends string, TAccountTunaPositionOwner extends string, TAccountTunaPositionOwnerAtaA extends string, TAccountTunaPositionOwnerAtaB extends string, TAccountPythOraclePriceFeedA extends string, TAccountPythOraclePriceFeedB extends string, TAccountFusionammProgram extends string, TAccountFusionPool extends string, TAccountMemoProgram extends string, TAccountSystemProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidateTunaSpotPositionFusionInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountTunaPositionOwner, TAccountTunaPositionOwnerAtaA, TAccountTunaPositionOwnerAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountMemoProgram, TAccountSystemProgram>, config?: {
     programAddress?: TProgramAddress;
-}): LiquidateTunaSpotPositionFusionInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountMemoProgram, TAccountSystemProgram>;
+}): LiquidateTunaSpotPositionFusionInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountTunaPositionOwner, TAccountTunaPositionOwnerAtaA, TAccountTunaPositionOwnerAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountMemoProgram, TAccountSystemProgram>;
 type ParsedLiquidateTunaSpotPositionFusionInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[]> = {
     programAddress: Address<TProgram>;
     accounts: {
@@ -3938,22 +3940,25 @@ type ParsedLiquidateTunaSpotPositionFusionInstruction<TProgram extends string =
         tunaPositionAtaB: TAccountMetas[13];
         feeRecipientAtaA: TAccountMetas[14];
         feeRecipientAtaB: TAccountMetas[15];
-        pythOraclePriceFeedA: TAccountMetas[16];
-        pythOraclePriceFeedB: TAccountMetas[17];
+        tunaPositionOwner: TAccountMetas[16];
+        tunaPositionOwnerAtaA?: TAccountMetas[17] | undefined;
+        tunaPositionOwnerAtaB?: TAccountMetas[18] | undefined;
+        pythOraclePriceFeedA: TAccountMetas[19];
+        pythOraclePriceFeedB: TAccountMetas[20];
         /**
          *
          * Fusion accounts
          *
          */
-        fusionammProgram: TAccountMetas[18];
-        fusionPool: TAccountMetas[19];
-        memoProgram: TAccountMetas[20];
+        fusionammProgram: TAccountMetas[21];
+        fusionPool: TAccountMetas[22];
+        memoProgram: TAccountMetas[23];
         /**
          *
          * Other accounts
          *
          */
-        systemProgram: TAccountMetas[21];
+        systemProgram: TAccountMetas[24];
     };
     data: LiquidateTunaSpotPositionFusionInstructionData;
 };
@@ -3969,7 +3974,7 @@ declare function parseLiquidateTunaSpotPositionFusionInstruction<TProgram extend
 
 declare const LIQUIDATE_TUNA_SPOT_POSITION_ORCA_DISCRIMINATOR: Uint8Array<ArrayBuffer>;
 declare function getLiquidateTunaSpotPositionOrcaDiscriminatorBytes(): ReadonlyUint8Array;
-type LiquidateTunaSpotPositionOrcaInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountAuthority extends string | IAccountMeta<string> = string, TAccountTunaConfig extends string | IAccountMeta<string> = string, TAccountMintA extends string | IAccountMeta<string> = string, TAccountMintB extends string | IAccountMeta<string> = string, TAccountTokenProgramA extends string | IAccountMeta<string> = string, TAccountTokenProgramB extends string | IAccountMeta<string> = string, TAccountMarket extends string | IAccountMeta<string> = string, TAccountVaultA extends string | IAccountMeta<string> = string, TAccountVaultB extends string | IAccountMeta<string> = string, TAccountVaultAAta extends string | IAccountMeta<string> = string, TAccountVaultBAta extends string | IAccountMeta<string> = string, TAccountTunaPosition extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaA extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaB extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedA extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedB extends string | IAccountMeta<string> = string, TAccountWhirlpoolProgram extends string | IAccountMeta<string> = string, TAccountWhirlpool extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, TAccountSystemProgram extends string | IAccountMeta<string> = '11111111111111111111111111111111', TRemainingAccounts extends readonly IAccountMeta<string>[] = []> = IInstruction<TProgram> & IInstructionWithData<Uint8Array> & IInstructionWithAccounts<[
+type LiquidateTunaSpotPositionOrcaInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountAuthority extends string | IAccountMeta<string> = string, TAccountTunaConfig extends string | IAccountMeta<string> = string, TAccountMintA extends string | IAccountMeta<string> = string, TAccountMintB extends string | IAccountMeta<string> = string, TAccountTokenProgramA extends string | IAccountMeta<string> = string, TAccountTokenProgramB extends string | IAccountMeta<string> = string, TAccountMarket extends string | IAccountMeta<string> = string, TAccountVaultA extends string | IAccountMeta<string> = string, TAccountVaultB extends string | IAccountMeta<string> = string, TAccountVaultAAta extends string | IAccountMeta<string> = string, TAccountVaultBAta extends string | IAccountMeta<string> = string, TAccountTunaPosition extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaA extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaB extends string | IAccountMeta<string> = string, TAccountTunaPositionOwner extends string | IAccountMeta<string> = string, TAccountTunaPositionOwnerAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionOwnerAtaB extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedA extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedB extends string | IAccountMeta<string> = string, TAccountWhirlpoolProgram extends string | IAccountMeta<string> = string, TAccountWhirlpool extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, TAccountSystemProgram extends string | IAccountMeta<string> = '11111111111111111111111111111111', TRemainingAccounts extends readonly IAccountMeta<string>[] = []> = IInstruction<TProgram> & IInstructionWithData<Uint8Array> & IInstructionWithAccounts<[
     TAccountAuthority extends string ? WritableSignerAccount<TAccountAuthority> & IAccountSignerMeta<TAccountAuthority> : TAccountAuthority,
     TAccountTunaConfig extends string ? ReadonlyAccount<TAccountTunaConfig> : TAccountTunaConfig,
     TAccountMintA extends string ? ReadonlyAccount<TAccountMintA> : TAccountMintA,
@@ -3986,6 +3991,9 @@ type LiquidateTunaSpotPositionOrcaInstruction<TProgram extends string = typeof T
     TAccountTunaPositionAtaB extends string ? WritableAccount<TAccountTunaPositionAtaB> : TAccountTunaPositionAtaB,
     TAccountFeeRecipientAtaA extends string ? WritableAccount<TAccountFeeRecipientAtaA> : TAccountFeeRecipientAtaA,
     TAccountFeeRecipientAtaB extends string ? WritableAccount<TAccountFeeRecipientAtaB> : TAccountFeeRecipientAtaB,
+    TAccountTunaPositionOwner extends string ? WritableAccount<TAccountTunaPositionOwner> : TAccountTunaPositionOwner,
+    TAccountTunaPositionOwnerAtaA extends string ? WritableAccount<TAccountTunaPositionOwnerAtaA> : TAccountTunaPositionOwnerAtaA,
+    TAccountTunaPositionOwnerAtaB extends string ? WritableAccount<TAccountTunaPositionOwnerAtaB> : TAccountTunaPositionOwnerAtaB,
     TAccountPythOraclePriceFeedA extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedA> : TAccountPythOraclePriceFeedA,
     TAccountPythOraclePriceFeedB extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedB> : TAccountPythOraclePriceFeedB,
     TAccountWhirlpoolProgram extends string ? ReadonlyAccount<TAccountWhirlpoolProgram> : TAccountWhirlpoolProgram,
@@ -4006,7 +4014,7 @@ type LiquidateTunaSpotPositionOrcaInstructionDataArgs = {
 declare function getLiquidateTunaSpotPositionOrcaInstructionDataEncoder(): Encoder<LiquidateTunaSpotPositionOrcaInstructionDataArgs>;
 declare function getLiquidateTunaSpotPositionOrcaInstructionDataDecoder(): Decoder<LiquidateTunaSpotPositionOrcaInstructionData>;
 declare function getLiquidateTunaSpotPositionOrcaInstructionDataCodec(): Codec<LiquidateTunaSpotPositionOrcaInstructionDataArgs, LiquidateTunaSpotPositionOrcaInstructionData>;
-type LiquidateTunaSpotPositionOrcaInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB extends string = string, TAccountTokenProgramA extends string = string, TAccountTokenProgramB extends string = string, TAccountMarket extends string = string, TAccountVaultA extends string = string, TAccountVaultB extends string = string, TAccountVaultAAta extends string = string, TAccountVaultBAta extends string = string, TAccountTunaPosition extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string, TAccountFeeRecipientAtaA extends string = string, TAccountFeeRecipientAtaB extends string = string, TAccountPythOraclePriceFeedA extends string = string, TAccountPythOraclePriceFeedB extends string = string, TAccountWhirlpoolProgram extends string = string, TAccountWhirlpool extends string = string, TAccountMemoProgram extends string = string, TAccountSystemProgram extends string = string> = {
+type LiquidateTunaSpotPositionOrcaInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB extends string = string, TAccountTokenProgramA extends string = string, TAccountTokenProgramB extends string = string, TAccountMarket extends string = string, TAccountVaultA extends string = string, TAccountVaultB extends string = string, TAccountVaultAAta extends string = string, TAccountVaultBAta extends string = string, TAccountTunaPosition extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string, TAccountFeeRecipientAtaA extends string = string, TAccountFeeRecipientAtaB extends string = string, TAccountTunaPositionOwner extends string = string, TAccountTunaPositionOwnerAtaA extends string = string, TAccountTunaPositionOwnerAtaB extends string = string, TAccountPythOraclePriceFeedA extends string = string, TAccountPythOraclePriceFeedB extends string = string, TAccountWhirlpoolProgram extends string = string, TAccountWhirlpool extends string = string, TAccountMemoProgram extends string = string, TAccountSystemProgram extends string = string> = {
     /**
      *
      * TUNA accounts
@@ -4028,6 +4036,9 @@ type LiquidateTunaSpotPositionOrcaInput<TAccountAuthority extends string = strin
     tunaPositionAtaB: Address<TAccountTunaPositionAtaB>;
     feeRecipientAtaA: Address<TAccountFeeRecipientAtaA>;
     feeRecipientAtaB: Address<TAccountFeeRecipientAtaB>;
+    tunaPositionOwner: Address<TAccountTunaPositionOwner>;
+    tunaPositionOwnerAtaA?: Address<TAccountTunaPositionOwnerAtaA>;
+    tunaPositionOwnerAtaB?: Address<TAccountTunaPositionOwnerAtaB>;
     pythOraclePriceFeedA: Address<TAccountPythOraclePriceFeedA>;
     pythOraclePriceFeedB: Address<TAccountPythOraclePriceFeedB>;
     /**
@@ -4047,9 +4058,9 @@ type LiquidateTunaSpotPositionOrcaInput<TAccountAuthority extends string = strin
     withdrawPercent: LiquidateTunaSpotPositionOrcaInstructionDataArgs['withdrawPercent'];
     remainingAccountsInfo: LiquidateTunaSpotPositionOrcaInstructionDataArgs['remainingAccountsInfo'];
 };
-declare function getLiquidateTunaSpotPositionOrcaInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountTokenProgramA extends string, TAccountTokenProgramB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string, TAccountFeeRecipientAtaA extends string, TAccountFeeRecipientAtaB extends string, TAccountPythOraclePriceFeedA extends string, TAccountPythOraclePriceFeedB extends string, TAccountWhirlpoolProgram extends string, TAccountWhirlpool extends string, TAccountMemoProgram extends string, TAccountSystemProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidateTunaSpotPositionOrcaInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountMemoProgram, TAccountSystemProgram>, config?: {
+declare function getLiquidateTunaSpotPositionOrcaInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountTokenProgramA extends string, TAccountTokenProgramB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string, TAccountFeeRecipientAtaA extends string, TAccountFeeRecipientAtaB extends string, TAccountTunaPositionOwner extends string, TAccountTunaPositionOwnerAtaA extends string, TAccountTunaPositionOwnerAtaB extends string, TAccountPythOraclePriceFeedA extends string, TAccountPythOraclePriceFeedB extends string, TAccountWhirlpoolProgram extends string, TAccountWhirlpool extends string, TAccountMemoProgram extends string, TAccountSystemProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidateTunaSpotPositionOrcaInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountTunaPositionOwner, TAccountTunaPositionOwnerAtaA, TAccountTunaPositionOwnerAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountMemoProgram, TAccountSystemProgram>, config?: {
     programAddress?: TProgramAddress;
-}): LiquidateTunaSpotPositionOrcaInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountMemoProgram, TAccountSystemProgram>;
+}): LiquidateTunaSpotPositionOrcaInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountTunaPositionOwner, TAccountTunaPositionOwnerAtaA, TAccountTunaPositionOwnerAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountMemoProgram, TAccountSystemProgram>;
 type ParsedLiquidateTunaSpotPositionOrcaInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[]> = {
     programAddress: Address<TProgram>;
     accounts: {
@@ -4074,22 +4085,25 @@ type ParsedLiquidateTunaSpotPositionOrcaInstruction<TProgram extends string = ty
         tunaPositionAtaB: TAccountMetas[13];
         feeRecipientAtaA: TAccountMetas[14];
         feeRecipientAtaB: TAccountMetas[15];
-        pythOraclePriceFeedA: TAccountMetas[16];
-        pythOraclePriceFeedB: TAccountMetas[17];
+        tunaPositionOwner: TAccountMetas[16];
+        tunaPositionOwnerAtaA?: TAccountMetas[17] | undefined;
+        tunaPositionOwnerAtaB?: TAccountMetas[18] | undefined;
+        pythOraclePriceFeedA: TAccountMetas[19];
+        pythOraclePriceFeedB: TAccountMetas[20];
         /**
          *
          * Orca accounts
          *
          */
-        whirlpoolProgram: TAccountMetas[18];
-        whirlpool: TAccountMetas[19];
-        memoProgram: TAccountMetas[20];
+        whirlpoolProgram: TAccountMetas[21];
+        whirlpool: TAccountMetas[22];
+        memoProgram: TAccountMetas[23];
         /**
          *
          * Other accounts
          *
          */
-        systemProgram: TAccountMetas[21];
+        systemProgram: TAccountMetas[24];
     };
     data: LiquidateTunaSpotPositionOrcaInstructionData;
 };
@@ -6784,11 +6798,11 @@ declare function liquidateTunaLpPositionOrcaInstruction(authority: TransactionSi
 declare function liquidateTunaLpPositionFusionInstructions(authority: TransactionSigner, tunaPosition: Account<TunaLpPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction[]>;
 declare function liquidateTunaLpPositionFusionInstruction(authority: TransactionSigner, tunaPosition: Account<TunaLpPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, fusionPool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction>;
 
-declare function liquidateTunaSpotPositionFusionInstructions(authority: TransactionSigner, tunaPosition: Account<TunaSpotPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, fusionPool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction[]>;
-declare function liquidateTunaSpotPositionFusionInstruction(authority: TransactionSigner, tunaPositionAddress: Address, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, fusionPool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction>;
+declare function liquidateTunaSpotPositionFusionInstructions(authority: TransactionSigner, tunaPosition: Account<TunaSpotPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, fusionPool: Account<FusionPool>, createTunaPositionOwnerAta: boolean, withdrawPercent: number): Promise<IInstruction[]>;
+declare function liquidateTunaSpotPositionFusionInstruction(authority: TransactionSigner, tunaPosition: Account<TunaSpotPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, fusionPool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction>;
 
-declare function liquidateTunaSpotPositionOrcaInstructions(authority: TransactionSigner, tunaPosition: Account<TunaSpotPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction[]>;
-declare function liquidateTunaSpotPositionOrcaInstruction(authority: TransactionSigner, tunaPositionAddress: Address, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction>;
+declare function liquidateTunaSpotPositionOrcaInstructions(authority: TransactionSigner, tunaPosition: Account<TunaSpotPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, createTunaPositionOwnerAta: boolean, withdrawPercent: number): Promise<IInstruction[]>;
+declare function liquidateTunaSpotPositionOrcaInstruction(authority: TransactionSigner, tunaPosition: Account<TunaSpotPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction>;
 
 declare function openTunaLpPositionOrcaInstruction(rpc: Rpc<GetAccountInfoApi & GetMultipleAccountsApi>, authority: TransactionSigner, positionMint: TransactionSigner, whirlpoolAddress: Address, args: OpenTunaLpPositionOrcaInstructionDataArgs): Promise<IInstruction>;
 

package/dist/index.d.ts

@@ -554,13 +554,11 @@ type TunaSpotPosition = {
     collateralToken: PoolToken;
     /** Position options */
     flags: number;
-    /** Position state: normal, liquidated, closed by limit order */
-    state: TunaPositionState;
     /** The total amount of the position in token A (long) or B (short). */
     amount: bigint;
-    /** The amount of shares borrowed by user from vault B (long) or A (short). */
+    /** The amount of shares borrowed by the user from vault B (long) or A (short). */
     loanShares: bigint;
-    /** The amount of funds borrowed by user from vault B (long) or A (short). Doesn't include accrued interest. */
+    /** The amount of funds borrowed by the user from vault B (long) or A (short). Doesn't include accrued interest. */
     loanFunds: bigint;
     /** Position entry sqrt price. */
     entrySqrtPrice: bigint;
@@ -592,13 +590,11 @@ type TunaSpotPositionArgs = {
     collateralToken: PoolTokenArgs;
     /** Position options */
     flags: number;
-    /** Position state: normal, liquidated, closed by limit order */
-    state: TunaPositionStateArgs;
     /** The total amount of the position in token A (long) or B (short). */
     amount: number | bigint;
-    /** The amount of shares borrowed by user from vault B (long) or A (short). */
+    /** The amount of shares borrowed by the user from vault B (long) or A (short). */
     loanShares: number | bigint;
-    /** The amount of funds borrowed by user from vault B (long) or A (short). Doesn't include accrued interest. */
+    /** The amount of funds borrowed by the user from vault B (long) or A (short). Doesn't include accrued interest. */
     loanFunds: number | bigint;
     /** Position entry sqrt price. */
     entrySqrtPrice: number | bigint;
@@ -3833,7 +3829,7 @@ declare function parseLiquidateTunaLpPositionOrcaInstruction<TProgram extends st
 
 declare const LIQUIDATE_TUNA_SPOT_POSITION_FUSION_DISCRIMINATOR: Uint8Array<ArrayBuffer>;
 declare function getLiquidateTunaSpotPositionFusionDiscriminatorBytes(): ReadonlyUint8Array;
-type LiquidateTunaSpotPositionFusionInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountAuthority extends string | IAccountMeta<string> = string, TAccountTunaConfig extends string | IAccountMeta<string> = string, TAccountMintA extends string | IAccountMeta<string> = string, TAccountMintB extends string | IAccountMeta<string> = string, TAccountTokenProgramA extends string | IAccountMeta<string> = string, TAccountTokenProgramB extends string | IAccountMeta<string> = string, TAccountMarket extends string | IAccountMeta<string> = string, TAccountVaultA extends string | IAccountMeta<string> = string, TAccountVaultB extends string | IAccountMeta<string> = string, TAccountVaultAAta extends string | IAccountMeta<string> = string, TAccountVaultBAta extends string | IAccountMeta<string> = string, TAccountTunaPosition extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaA extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaB extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedA extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedB extends string | IAccountMeta<string> = string, TAccountFusionammProgram extends string | IAccountMeta<string> = string, TAccountFusionPool extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, TAccountSystemProgram extends string | IAccountMeta<string> = '11111111111111111111111111111111', TRemainingAccounts extends readonly IAccountMeta<string>[] = []> = IInstruction<TProgram> & IInstructionWithData<Uint8Array> & IInstructionWithAccounts<[
+type LiquidateTunaSpotPositionFusionInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountAuthority extends string | IAccountMeta<string> = string, TAccountTunaConfig extends string | IAccountMeta<string> = string, TAccountMintA extends string | IAccountMeta<string> = string, TAccountMintB extends string | IAccountMeta<string> = string, TAccountTokenProgramA extends string | IAccountMeta<string> = string, TAccountTokenProgramB extends string | IAccountMeta<string> = string, TAccountMarket extends string | IAccountMeta<string> = string, TAccountVaultA extends string | IAccountMeta<string> = string, TAccountVaultB extends string | IAccountMeta<string> = string, TAccountVaultAAta extends string | IAccountMeta<string> = string, TAccountVaultBAta extends string | IAccountMeta<string> = string, TAccountTunaPosition extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaA extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaB extends string | IAccountMeta<string> = string, TAccountTunaPositionOwner extends string | IAccountMeta<string> = string, TAccountTunaPositionOwnerAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionOwnerAtaB extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedA extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedB extends string | IAccountMeta<string> = string, TAccountFusionammProgram extends string | IAccountMeta<string> = string, TAccountFusionPool extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, TAccountSystemProgram extends string | IAccountMeta<string> = '11111111111111111111111111111111', TRemainingAccounts extends readonly IAccountMeta<string>[] = []> = IInstruction<TProgram> & IInstructionWithData<Uint8Array> & IInstructionWithAccounts<[
     TAccountAuthority extends string ? WritableSignerAccount<TAccountAuthority> & IAccountSignerMeta<TAccountAuthority> : TAccountAuthority,
     TAccountTunaConfig extends string ? ReadonlyAccount<TAccountTunaConfig> : TAccountTunaConfig,
     TAccountMintA extends string ? ReadonlyAccount<TAccountMintA> : TAccountMintA,
@@ -3850,6 +3846,9 @@ type LiquidateTunaSpotPositionFusionInstruction<TProgram extends string = typeof
     TAccountTunaPositionAtaB extends string ? WritableAccount<TAccountTunaPositionAtaB> : TAccountTunaPositionAtaB,
     TAccountFeeRecipientAtaA extends string ? WritableAccount<TAccountFeeRecipientAtaA> : TAccountFeeRecipientAtaA,
     TAccountFeeRecipientAtaB extends string ? WritableAccount<TAccountFeeRecipientAtaB> : TAccountFeeRecipientAtaB,
+    TAccountTunaPositionOwner extends string ? WritableAccount<TAccountTunaPositionOwner> : TAccountTunaPositionOwner,
+    TAccountTunaPositionOwnerAtaA extends string ? WritableAccount<TAccountTunaPositionOwnerAtaA> : TAccountTunaPositionOwnerAtaA,
+    TAccountTunaPositionOwnerAtaB extends string ? WritableAccount<TAccountTunaPositionOwnerAtaB> : TAccountTunaPositionOwnerAtaB,
     TAccountPythOraclePriceFeedA extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedA> : TAccountPythOraclePriceFeedA,
     TAccountPythOraclePriceFeedB extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedB> : TAccountPythOraclePriceFeedB,
     TAccountFusionammProgram extends string ? ReadonlyAccount<TAccountFusionammProgram> : TAccountFusionammProgram,
@@ -3870,7 +3869,7 @@ type LiquidateTunaSpotPositionFusionInstructionDataArgs = {
 declare function getLiquidateTunaSpotPositionFusionInstructionDataEncoder(): Encoder<LiquidateTunaSpotPositionFusionInstructionDataArgs>;
 declare function getLiquidateTunaSpotPositionFusionInstructionDataDecoder(): Decoder<LiquidateTunaSpotPositionFusionInstructionData>;
 declare function getLiquidateTunaSpotPositionFusionInstructionDataCodec(): Codec<LiquidateTunaSpotPositionFusionInstructionDataArgs, LiquidateTunaSpotPositionFusionInstructionData>;
-type LiquidateTunaSpotPositionFusionInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB extends string = string, TAccountTokenProgramA extends string = string, TAccountTokenProgramB extends string = string, TAccountMarket extends string = string, TAccountVaultA extends string = string, TAccountVaultB extends string = string, TAccountVaultAAta extends string = string, TAccountVaultBAta extends string = string, TAccountTunaPosition extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string, TAccountFeeRecipientAtaA extends string = string, TAccountFeeRecipientAtaB extends string = string, TAccountPythOraclePriceFeedA extends string = string, TAccountPythOraclePriceFeedB extends string = string, TAccountFusionammProgram extends string = string, TAccountFusionPool extends string = string, TAccountMemoProgram extends string = string, TAccountSystemProgram extends string = string> = {
+type LiquidateTunaSpotPositionFusionInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB extends string = string, TAccountTokenProgramA extends string = string, TAccountTokenProgramB extends string = string, TAccountMarket extends string = string, TAccountVaultA extends string = string, TAccountVaultB extends string = string, TAccountVaultAAta extends string = string, TAccountVaultBAta extends string = string, TAccountTunaPosition extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string, TAccountFeeRecipientAtaA extends string = string, TAccountFeeRecipientAtaB extends string = string, TAccountTunaPositionOwner extends string = string, TAccountTunaPositionOwnerAtaA extends string = string, TAccountTunaPositionOwnerAtaB extends string = string, TAccountPythOraclePriceFeedA extends string = string, TAccountPythOraclePriceFeedB extends string = string, TAccountFusionammProgram extends string = string, TAccountFusionPool extends string = string, TAccountMemoProgram extends string = string, TAccountSystemProgram extends string = string> = {
     /**
      *
      * TUNA accounts
@@ -3892,6 +3891,9 @@ type LiquidateTunaSpotPositionFusionInput<TAccountAuthority extends string = str
     tunaPositionAtaB: Address<TAccountTunaPositionAtaB>;
     feeRecipientAtaA: Address<TAccountFeeRecipientAtaA>;
     feeRecipientAtaB: Address<TAccountFeeRecipientAtaB>;
+    tunaPositionOwner: Address<TAccountTunaPositionOwner>;
+    tunaPositionOwnerAtaA?: Address<TAccountTunaPositionOwnerAtaA>;
+    tunaPositionOwnerAtaB?: Address<TAccountTunaPositionOwnerAtaB>;
     pythOraclePriceFeedA: Address<TAccountPythOraclePriceFeedA>;
     pythOraclePriceFeedB: Address<TAccountPythOraclePriceFeedB>;
     /**
@@ -3911,9 +3913,9 @@ type LiquidateTunaSpotPositionFusionInput<TAccountAuthority extends string = str
     withdrawPercent: LiquidateTunaSpotPositionFusionInstructionDataArgs['withdrawPercent'];
     remainingAccountsInfo: LiquidateTunaSpotPositionFusionInstructionDataArgs['remainingAccountsInfo'];
 };
-declare function getLiquidateTunaSpotPositionFusionInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountTokenProgramA extends string, TAccountTokenProgramB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string, TAccountFeeRecipientAtaA extends string, TAccountFeeRecipientAtaB extends string, TAccountPythOraclePriceFeedA extends string, TAccountPythOraclePriceFeedB extends string, TAccountFusionammProgram extends string, TAccountFusionPool extends string, TAccountMemoProgram extends string, TAccountSystemProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidateTunaSpotPositionFusionInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountMemoProgram, TAccountSystemProgram>, config?: {
+declare function getLiquidateTunaSpotPositionFusionInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountTokenProgramA extends string, TAccountTokenProgramB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string, TAccountFeeRecipientAtaA extends string, TAccountFeeRecipientAtaB extends string, TAccountTunaPositionOwner extends string, TAccountTunaPositionOwnerAtaA extends string, TAccountTunaPositionOwnerAtaB extends string, TAccountPythOraclePriceFeedA extends string, TAccountPythOraclePriceFeedB extends string, TAccountFusionammProgram extends string, TAccountFusionPool extends string, TAccountMemoProgram extends string, TAccountSystemProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidateTunaSpotPositionFusionInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountTunaPositionOwner, TAccountTunaPositionOwnerAtaA, TAccountTunaPositionOwnerAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountMemoProgram, TAccountSystemProgram>, config?: {
     programAddress?: TProgramAddress;
-}): LiquidateTunaSpotPositionFusionInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountMemoProgram, TAccountSystemProgram>;
+}): LiquidateTunaSpotPositionFusionInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountTunaPositionOwner, TAccountTunaPositionOwnerAtaA, TAccountTunaPositionOwnerAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountMemoProgram, TAccountSystemProgram>;
 type ParsedLiquidateTunaSpotPositionFusionInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[]> = {
     programAddress: Address<TProgram>;
     accounts: {
@@ -3938,22 +3940,25 @@ type ParsedLiquidateTunaSpotPositionFusionInstruction<TProgram extends string =
         tunaPositionAtaB: TAccountMetas[13];
         feeRecipientAtaA: TAccountMetas[14];
         feeRecipientAtaB: TAccountMetas[15];
-        pythOraclePriceFeedA: TAccountMetas[16];
-        pythOraclePriceFeedB: TAccountMetas[17];
+        tunaPositionOwner: TAccountMetas[16];
+        tunaPositionOwnerAtaA?: TAccountMetas[17] | undefined;
+        tunaPositionOwnerAtaB?: TAccountMetas[18] | undefined;
+        pythOraclePriceFeedA: TAccountMetas[19];
+        pythOraclePriceFeedB: TAccountMetas[20];
         /**
          *
          * Fusion accounts
          *
          */
-        fusionammProgram: TAccountMetas[18];
-        fusionPool: TAccountMetas[19];
-        memoProgram: TAccountMetas[20];
+        fusionammProgram: TAccountMetas[21];
+        fusionPool: TAccountMetas[22];
+        memoProgram: TAccountMetas[23];
         /**
          *
          * Other accounts
          *
          */
-        systemProgram: TAccountMetas[21];
+        systemProgram: TAccountMetas[24];
     };
     data: LiquidateTunaSpotPositionFusionInstructionData;
 };
@@ -3969,7 +3974,7 @@ declare function parseLiquidateTunaSpotPositionFusionInstruction<TProgram extend
 
 declare const LIQUIDATE_TUNA_SPOT_POSITION_ORCA_DISCRIMINATOR: Uint8Array<ArrayBuffer>;
 declare function getLiquidateTunaSpotPositionOrcaDiscriminatorBytes(): ReadonlyUint8Array;
-type LiquidateTunaSpotPositionOrcaInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountAuthority extends string | IAccountMeta<string> = string, TAccountTunaConfig extends string | IAccountMeta<string> = string, TAccountMintA extends string | IAccountMeta<string> = string, TAccountMintB extends string | IAccountMeta<string> = string, TAccountTokenProgramA extends string | IAccountMeta<string> = string, TAccountTokenProgramB extends string | IAccountMeta<string> = string, TAccountMarket extends string | IAccountMeta<string> = string, TAccountVaultA extends string | IAccountMeta<string> = string, TAccountVaultB extends string | IAccountMeta<string> = string, TAccountVaultAAta extends string | IAccountMeta<string> = string, TAccountVaultBAta extends string | IAccountMeta<string> = string, TAccountTunaPosition extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaA extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaB extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedA extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedB extends string | IAccountMeta<string> = string, TAccountWhirlpoolProgram extends string | IAccountMeta<string> = string, TAccountWhirlpool extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, TAccountSystemProgram extends string | IAccountMeta<string> = '11111111111111111111111111111111', TRemainingAccounts extends readonly IAccountMeta<string>[] = []> = IInstruction<TProgram> & IInstructionWithData<Uint8Array> & IInstructionWithAccounts<[
+type LiquidateTunaSpotPositionOrcaInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountAuthority extends string | IAccountMeta<string> = string, TAccountTunaConfig extends string | IAccountMeta<string> = string, TAccountMintA extends string | IAccountMeta<string> = string, TAccountMintB extends string | IAccountMeta<string> = string, TAccountTokenProgramA extends string | IAccountMeta<string> = string, TAccountTokenProgramB extends string | IAccountMeta<string> = string, TAccountMarket extends string | IAccountMeta<string> = string, TAccountVaultA extends string | IAccountMeta<string> = string, TAccountVaultB extends string | IAccountMeta<string> = string, TAccountVaultAAta extends string | IAccountMeta<string> = string, TAccountVaultBAta extends string | IAccountMeta<string> = string, TAccountTunaPosition extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaA extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaB extends string | IAccountMeta<string> = string, TAccountTunaPositionOwner extends string | IAccountMeta<string> = string, TAccountTunaPositionOwnerAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionOwnerAtaB extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedA extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedB extends string | IAccountMeta<string> = string, TAccountWhirlpoolProgram extends string | IAccountMeta<string> = string, TAccountWhirlpool extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, TAccountSystemProgram extends string | IAccountMeta<string> = '11111111111111111111111111111111', TRemainingAccounts extends readonly IAccountMeta<string>[] = []> = IInstruction<TProgram> & IInstructionWithData<Uint8Array> & IInstructionWithAccounts<[
     TAccountAuthority extends string ? WritableSignerAccount<TAccountAuthority> & IAccountSignerMeta<TAccountAuthority> : TAccountAuthority,
     TAccountTunaConfig extends string ? ReadonlyAccount<TAccountTunaConfig> : TAccountTunaConfig,
     TAccountMintA extends string ? ReadonlyAccount<TAccountMintA> : TAccountMintA,
@@ -3986,6 +3991,9 @@ type LiquidateTunaSpotPositionOrcaInstruction<TProgram extends string = typeof T
     TAccountTunaPositionAtaB extends string ? WritableAccount<TAccountTunaPositionAtaB> : TAccountTunaPositionAtaB,
     TAccountFeeRecipientAtaA extends string ? WritableAccount<TAccountFeeRecipientAtaA> : TAccountFeeRecipientAtaA,
     TAccountFeeRecipientAtaB extends string ? WritableAccount<TAccountFeeRecipientAtaB> : TAccountFeeRecipientAtaB,
+    TAccountTunaPositionOwner extends string ? WritableAccount<TAccountTunaPositionOwner> : TAccountTunaPositionOwner,
+    TAccountTunaPositionOwnerAtaA extends string ? WritableAccount<TAccountTunaPositionOwnerAtaA> : TAccountTunaPositionOwnerAtaA,
+    TAccountTunaPositionOwnerAtaB extends string ? WritableAccount<TAccountTunaPositionOwnerAtaB> : TAccountTunaPositionOwnerAtaB,
     TAccountPythOraclePriceFeedA extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedA> : TAccountPythOraclePriceFeedA,
     TAccountPythOraclePriceFeedB extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedB> : TAccountPythOraclePriceFeedB,
     TAccountWhirlpoolProgram extends string ? ReadonlyAccount<TAccountWhirlpoolProgram> : TAccountWhirlpoolProgram,
@@ -4006,7 +4014,7 @@ type LiquidateTunaSpotPositionOrcaInstructionDataArgs = {
 declare function getLiquidateTunaSpotPositionOrcaInstructionDataEncoder(): Encoder<LiquidateTunaSpotPositionOrcaInstructionDataArgs>;
 declare function getLiquidateTunaSpotPositionOrcaInstructionDataDecoder(): Decoder<LiquidateTunaSpotPositionOrcaInstructionData>;
 declare function getLiquidateTunaSpotPositionOrcaInstructionDataCodec(): Codec<LiquidateTunaSpotPositionOrcaInstructionDataArgs, LiquidateTunaSpotPositionOrcaInstructionData>;
-type LiquidateTunaSpotPositionOrcaInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB extends string = string, TAccountTokenProgramA extends string = string, TAccountTokenProgramB extends string = string, TAccountMarket extends string = string, TAccountVaultA extends string = string, TAccountVaultB extends string = string, TAccountVaultAAta extends string = string, TAccountVaultBAta extends string = string, TAccountTunaPosition extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string, TAccountFeeRecipientAtaA extends string = string, TAccountFeeRecipientAtaB extends string = string, TAccountPythOraclePriceFeedA extends string = string, TAccountPythOraclePriceFeedB extends string = string, TAccountWhirlpoolProgram extends string = string, TAccountWhirlpool extends string = string, TAccountMemoProgram extends string = string, TAccountSystemProgram extends string = string> = {
+type LiquidateTunaSpotPositionOrcaInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB extends string = string, TAccountTokenProgramA extends string = string, TAccountTokenProgramB extends string = string, TAccountMarket extends string = string, TAccountVaultA extends string = string, TAccountVaultB extends string = string, TAccountVaultAAta extends string = string, TAccountVaultBAta extends string = string, TAccountTunaPosition extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string, TAccountFeeRecipientAtaA extends string = string, TAccountFeeRecipientAtaB extends string = string, TAccountTunaPositionOwner extends string = string, TAccountTunaPositionOwnerAtaA extends string = string, TAccountTunaPositionOwnerAtaB extends string = string, TAccountPythOraclePriceFeedA extends string = string, TAccountPythOraclePriceFeedB extends string = string, TAccountWhirlpoolProgram extends string = string, TAccountWhirlpool extends string = string, TAccountMemoProgram extends string = string, TAccountSystemProgram extends string = string> = {
     /**
      *
      * TUNA accounts
@@ -4028,6 +4036,9 @@ type LiquidateTunaSpotPositionOrcaInput<TAccountAuthority extends string = strin
     tunaPositionAtaB: Address<TAccountTunaPositionAtaB>;
     feeRecipientAtaA: Address<TAccountFeeRecipientAtaA>;
     feeRecipientAtaB: Address<TAccountFeeRecipientAtaB>;
+    tunaPositionOwner: Address<TAccountTunaPositionOwner>;
+    tunaPositionOwnerAtaA?: Address<TAccountTunaPositionOwnerAtaA>;
+    tunaPositionOwnerAtaB?: Address<TAccountTunaPositionOwnerAtaB>;
     pythOraclePriceFeedA: Address<TAccountPythOraclePriceFeedA>;
     pythOraclePriceFeedB: Address<TAccountPythOraclePriceFeedB>;
     /**
@@ -4047,9 +4058,9 @@ type LiquidateTunaSpotPositionOrcaInput<TAccountAuthority extends string = strin
     withdrawPercent: LiquidateTunaSpotPositionOrcaInstructionDataArgs['withdrawPercent'];
     remainingAccountsInfo: LiquidateTunaSpotPositionOrcaInstructionDataArgs['remainingAccountsInfo'];
 };
-declare function getLiquidateTunaSpotPositionOrcaInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountTokenProgramA extends string, TAccountTokenProgramB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string, TAccountFeeRecipientAtaA extends string, TAccountFeeRecipientAtaB extends string, TAccountPythOraclePriceFeedA extends string, TAccountPythOraclePriceFeedB extends string, TAccountWhirlpoolProgram extends string, TAccountWhirlpool extends string, TAccountMemoProgram extends string, TAccountSystemProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidateTunaSpotPositionOrcaInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountMemoProgram, TAccountSystemProgram>, config?: {
+declare function getLiquidateTunaSpotPositionOrcaInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountTokenProgramA extends string, TAccountTokenProgramB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string, TAccountFeeRecipientAtaA extends string, TAccountFeeRecipientAtaB extends string, TAccountTunaPositionOwner extends string, TAccountTunaPositionOwnerAtaA extends string, TAccountTunaPositionOwnerAtaB extends string, TAccountPythOraclePriceFeedA extends string, TAccountPythOraclePriceFeedB extends string, TAccountWhirlpoolProgram extends string, TAccountWhirlpool extends string, TAccountMemoProgram extends string, TAccountSystemProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidateTunaSpotPositionOrcaInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountTunaPositionOwner, TAccountTunaPositionOwnerAtaA, TAccountTunaPositionOwnerAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountMemoProgram, TAccountSystemProgram>, config?: {
     programAddress?: TProgramAddress;
-}): LiquidateTunaSpotPositionOrcaInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountMemoProgram, TAccountSystemProgram>;
+}): LiquidateTunaSpotPositionOrcaInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountTunaPositionOwner, TAccountTunaPositionOwnerAtaA, TAccountTunaPositionOwnerAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountMemoProgram, TAccountSystemProgram>;
 type ParsedLiquidateTunaSpotPositionOrcaInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[]> = {
     programAddress: Address<TProgram>;
     accounts: {
@@ -4074,22 +4085,25 @@ type ParsedLiquidateTunaSpotPositionOrcaInstruction<TProgram extends string = ty
         tunaPositionAtaB: TAccountMetas[13];
         feeRecipientAtaA: TAccountMetas[14];
         feeRecipientAtaB: TAccountMetas[15];
-        pythOraclePriceFeedA: TAccountMetas[16];
-        pythOraclePriceFeedB: TAccountMetas[17];
+        tunaPositionOwner: TAccountMetas[16];
+        tunaPositionOwnerAtaA?: TAccountMetas[17] | undefined;
+        tunaPositionOwnerAtaB?: TAccountMetas[18] | undefined;
+        pythOraclePriceFeedA: TAccountMetas[19];
+        pythOraclePriceFeedB: TAccountMetas[20];
         /**
          *
          * Orca accounts
          *
          */
-        whirlpoolProgram: TAccountMetas[18];
-        whirlpool: TAccountMetas[19];
-        memoProgram: TAccountMetas[20];
+        whirlpoolProgram: TAccountMetas[21];
+        whirlpool: TAccountMetas[22];
+        memoProgram: TAccountMetas[23];
         /**
          *
          * Other accounts
          *
          */
-        systemProgram: TAccountMetas[21];
+        systemProgram: TAccountMetas[24];
     };
     data: LiquidateTunaSpotPositionOrcaInstructionData;
 };
@@ -6784,11 +6798,11 @@ declare function liquidateTunaLpPositionOrcaInstruction(authority: TransactionSi
 declare function liquidateTunaLpPositionFusionInstructions(authority: TransactionSigner, tunaPosition: Account<TunaLpPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction[]>;
 declare function liquidateTunaLpPositionFusionInstruction(authority: TransactionSigner, tunaPosition: Account<TunaLpPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, fusionPool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction>;
 
-declare function liquidateTunaSpotPositionFusionInstructions(authority: TransactionSigner, tunaPosition: Account<TunaSpotPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, fusionPool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction[]>;
-declare function liquidateTunaSpotPositionFusionInstruction(authority: TransactionSigner, tunaPositionAddress: Address, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, fusionPool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction>;
+declare function liquidateTunaSpotPositionFusionInstructions(authority: TransactionSigner, tunaPosition: Account<TunaSpotPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, fusionPool: Account<FusionPool>, createTunaPositionOwnerAta: boolean, withdrawPercent: number): Promise<IInstruction[]>;
+declare function liquidateTunaSpotPositionFusionInstruction(authority: TransactionSigner, tunaPosition: Account<TunaSpotPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, fusionPool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction>;
 
-declare function liquidateTunaSpotPositionOrcaInstructions(authority: TransactionSigner, tunaPosition: Account<TunaSpotPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction[]>;
-declare function liquidateTunaSpotPositionOrcaInstruction(authority: TransactionSigner, tunaPositionAddress: Address, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction>;
+declare function liquidateTunaSpotPositionOrcaInstructions(authority: TransactionSigner, tunaPosition: Account<TunaSpotPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, createTunaPositionOwnerAta: boolean, withdrawPercent: number): Promise<IInstruction[]>;
+declare function liquidateTunaSpotPositionOrcaInstruction(authority: TransactionSigner, tunaPosition: Account<TunaSpotPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction>;
 
 declare function openTunaLpPositionOrcaInstruction(rpc: Rpc<GetAccountInfoApi & GetMultipleAccountsApi>, authority: TransactionSigner, positionMint: TransactionSigner, whirlpoolAddress: Address, args: OpenTunaLpPositionOrcaInstructionDataArgs): Promise<IInstruction>;
 

package/dist/index.js

@@ -1252,7 +1252,6 @@ function getTunaSpotPositionEncoder() {
       ["positionToken", getPoolTokenEncoder()],
       ["collateralToken", getPoolTokenEncoder()],
       ["flags", (0, import_kit11.getU32Encoder)()],
-      ["state", getTunaPositionStateEncoder()],
       ["amount", (0, import_kit11.getU64Encoder)()],
       ["loanShares", (0, import_kit11.getU64Encoder)()],
       ["loanFunds", (0, import_kit11.getU64Encoder)()],
@@ -1277,7 +1276,6 @@ function getTunaSpotPositionDecoder() {
     ["positionToken", getPoolTokenDecoder()],
     ["collateralToken", getPoolTokenDecoder()],
     ["flags", (0, import_kit11.getU32Decoder)()],
-    ["state", getTunaPositionStateDecoder()],
     ["amount", (0, import_kit11.getU64Decoder)()],
     ["loanShares", (0, import_kit11.getU64Decoder)()],
     ["loanFunds", (0, import_kit11.getU64Decoder)()],
@@ -1324,7 +1322,7 @@ async function fetchAllMaybeTunaSpotPosition(rpc, addresses, config) {
   );
 }
 function getTunaSpotPositionSize() {
-  return 347;
+  return 346;
 }
 
 // src/generated/accounts/vault.ts
@@ -5955,6 +5953,18 @@ function getLiquidateTunaSpotPositionFusionInstruction(input, config) {
       value: input.feeRecipientAtaB ?? null,
       isWritable: true
     },
+    tunaPositionOwner: {
+      value: input.tunaPositionOwner ?? null,
+      isWritable: true
+    },
+    tunaPositionOwnerAtaA: {
+      value: input.tunaPositionOwnerAtaA ?? null,
+      isWritable: true
+    },
+    tunaPositionOwnerAtaB: {
+      value: input.tunaPositionOwnerAtaB ?? null,
+      isWritable: true
+    },
     pythOraclePriceFeedA: {
       value: input.pythOraclePriceFeedA ?? null,
       isWritable: false
@@ -5995,6 +6005,9 @@ function getLiquidateTunaSpotPositionFusionInstruction(input, config) {
       getAccountMeta(accounts.tunaPositionAtaB),
       getAccountMeta(accounts.feeRecipientAtaA),
       getAccountMeta(accounts.feeRecipientAtaB),
+      getAccountMeta(accounts.tunaPositionOwner),
+      getAccountMeta(accounts.tunaPositionOwnerAtaA),
+      getAccountMeta(accounts.tunaPositionOwnerAtaB),
       getAccountMeta(accounts.pythOraclePriceFeedA),
       getAccountMeta(accounts.pythOraclePriceFeedB),
       getAccountMeta(accounts.fusionammProgram),
@@ -6010,7 +6023,7 @@ function getLiquidateTunaSpotPositionFusionInstruction(input, config) {
   return instruction;
 }
 function parseLiquidateTunaSpotPositionFusionInstruction(instruction) {
-  if (instruction.accounts.length < 22) {
+  if (instruction.accounts.length < 25) {
     throw new Error("Not enough accounts");
   }
   let accountIndex = 0;
@@ -6019,6 +6032,10 @@ function parseLiquidateTunaSpotPositionFusionInstruction(instruction) {
     accountIndex += 1;
     return accountMeta;
   };
+  const getNextOptionalAccount = () => {
+    const accountMeta = getNextAccount();
+    return accountMeta.address === TUNA_PROGRAM_ADDRESS ? void 0 : accountMeta;
+  };
   return {
     programAddress: instruction.programAddress,
     accounts: {
@@ -6038,6 +6055,9 @@ function parseLiquidateTunaSpotPositionFusionInstruction(instruction) {
       tunaPositionAtaB: getNextAccount(),
       feeRecipientAtaA: getNextAccount(),
       feeRecipientAtaB: getNextAccount(),
+      tunaPositionOwner: getNextAccount(),
+      tunaPositionOwnerAtaA: getNextOptionalAccount(),
+      tunaPositionOwnerAtaB: getNextOptionalAccount(),
       pythOraclePriceFeedA: getNextAccount(),
       pythOraclePriceFeedB: getNextAccount(),
       fusionammProgram: getNextAccount(),
@@ -6125,6 +6145,18 @@ function getLiquidateTunaSpotPositionOrcaInstruction(input, config) {
       value: input.feeRecipientAtaB ?? null,
       isWritable: true
     },
+    tunaPositionOwner: {
+      value: input.tunaPositionOwner ?? null,
+      isWritable: true
+    },
+    tunaPositionOwnerAtaA: {
+      value: input.tunaPositionOwnerAtaA ?? null,
+      isWritable: true
+    },
+    tunaPositionOwnerAtaB: {
+      value: input.tunaPositionOwnerAtaB ?? null,
+      isWritable: true
+    },
     pythOraclePriceFeedA: {
       value: input.pythOraclePriceFeedA ?? null,
       isWritable: false
@@ -6165,6 +6197,9 @@ function getLiquidateTunaSpotPositionOrcaInstruction(input, config) {
       getAccountMeta(accounts.tunaPositionAtaB),
       getAccountMeta(accounts.feeRecipientAtaA),
       getAccountMeta(accounts.feeRecipientAtaB),
+      getAccountMeta(accounts.tunaPositionOwner),
+      getAccountMeta(accounts.tunaPositionOwnerAtaA),
+      getAccountMeta(accounts.tunaPositionOwnerAtaB),
       getAccountMeta(accounts.pythOraclePriceFeedA),
       getAccountMeta(accounts.pythOraclePriceFeedB),
       getAccountMeta(accounts.whirlpoolProgram),
@@ -6180,7 +6215,7 @@ function getLiquidateTunaSpotPositionOrcaInstruction(input, config) {
   return instruction;
 }
 function parseLiquidateTunaSpotPositionOrcaInstruction(instruction) {
-  if (instruction.accounts.length < 22) {
+  if (instruction.accounts.length < 25) {
     throw new Error("Not enough accounts");
   }
   let accountIndex = 0;
@@ -6189,6 +6224,10 @@ function parseLiquidateTunaSpotPositionOrcaInstruction(instruction) {
     accountIndex += 1;
     return accountMeta;
   };
+  const getNextOptionalAccount = () => {
+    const accountMeta = getNextAccount();
+    return accountMeta.address === TUNA_PROGRAM_ADDRESS ? void 0 : accountMeta;
+  };
   return {
     programAddress: instruction.programAddress,
     accounts: {
@@ -6208,6 +6247,9 @@ function parseLiquidateTunaSpotPositionOrcaInstruction(instruction) {
       tunaPositionAtaB: getNextAccount(),
       feeRecipientAtaA: getNextAccount(),
       feeRecipientAtaB: getNextAccount(),
+      tunaPositionOwner: getNextAccount(),
+      tunaPositionOwnerAtaA: getNextOptionalAccount(),
+      tunaPositionOwnerAtaB: getNextOptionalAccount(),
       pythOraclePriceFeedA: getNextAccount(),
       pythOraclePriceFeedB: getNextAccount(),
       whirlpoolProgram: getNextAccount(),
@@ -12829,20 +12871,40 @@ var import_fusionamm_client11 = require("@crypticdot/fusionamm-client");
 var import_kit94 = require("@solana/kit");
 var import_memo16 = require("@solana-program/memo");
 var import_token_202223 = require("@solana-program/token-2022");
-async function liquidateTunaSpotPositionFusionInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, withdrawPercent) {
+async function liquidateTunaSpotPositionFusionInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, createTunaPositionOwnerAta, withdrawPercent) {
   const instructions = [];
-  const positionTokenMint = tunaPosition.data.positionToken == 0 /* A */ ? mintA : mintB;
-  const createFeeRecipientAtaInstructions = await getCreateAtaInstructions(
+  if (createTunaPositionOwnerAta) {
+    const collateralTokenMint = tunaPosition.data.collateralToken == 0 /* A */ ? mintA : mintB;
+    if (collateralTokenMint.address != NATIVE_MINT) {
+      const createPositionOwnerAtaInstructions = await getCreateAtaInstructions(
+        void 0,
+        authority,
+        collateralTokenMint.address,
+        tunaPosition.data.authority,
+        collateralTokenMint.programAddress
+      );
+      instructions.push(...createPositionOwnerAtaInstructions.init);
+    }
+  }
+  const createFeeRecipientAtaAInstructions = await getCreateAtaInstructions(
+    void 0,
+    authority,
+    mintA.address,
+    tunaConfig.data.feeRecipient,
+    mintA.programAddress
+  );
+  instructions.push(...createFeeRecipientAtaAInstructions.init);
+  const createFeeRecipientAtaBInstructions = await getCreateAtaInstructions(
     void 0,
     authority,
-    positionTokenMint.address,
+    mintB.address,
     tunaConfig.data.feeRecipient,
-    positionTokenMint.programAddress
+    mintB.programAddress
   );
-  instructions.push(...createFeeRecipientAtaInstructions.init);
+  instructions.push(...createFeeRecipientAtaBInstructions.init);
   const ix = await liquidateTunaSpotPositionFusionInstruction(
     authority,
-    tunaPosition.address,
+    tunaPosition,
     tunaConfig,
     mintA,
     mintB,
@@ -12854,15 +12916,25 @@ async function liquidateTunaSpotPositionFusionInstructions(authority, tunaPositi
   instructions.push(ix);
   return instructions;
 }
-async function liquidateTunaSpotPositionFusionInstruction(authority, tunaPositionAddress, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, withdrawPercent) {
+async function liquidateTunaSpotPositionFusionInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, withdrawPercent) {
   const marketAddress = (await getMarketAddress(fusionPool.address))[0];
+  const tunaPositionOwnerAtaA = (await (0, import_token_202223.findAssociatedTokenPda)({
+    owner: tunaPosition.data.authority,
+    mint: mintA.address,
+    tokenProgram: mintA.programAddress
+  }))[0];
+  const tunaPositionOwnerAtaB = (await (0, import_token_202223.findAssociatedTokenPda)({
+    owner: tunaPosition.data.authority,
+    mint: mintB.address,
+    tokenProgram: mintB.programAddress
+  }))[0];
   const tunaPositionAtaA = (await (0, import_token_202223.findAssociatedTokenPda)({
-    owner: tunaPositionAddress,
+    owner: tunaPosition.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
   const tunaPositionAtaB = (await (0, import_token_202223.findAssociatedTokenPda)({
-    owner: tunaPositionAddress,
+    owner: tunaPosition.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
@@ -12917,9 +12989,12 @@ async function liquidateTunaSpotPositionFusionInstruction(authority, tunaPositio
     vaultAAta,
     vaultB: vaultB.address,
     vaultBAta,
-    tunaPosition: tunaPositionAddress,
+    tunaPosition: tunaPosition.address,
     tunaPositionAtaA,
     tunaPositionAtaB,
+    tunaPositionOwner: tunaPosition.data.authority,
+    tunaPositionOwnerAtaA: tunaPosition.data.collateralToken == 0 /* A */ && mintA.address != NATIVE_MINT ? tunaPositionOwnerAtaA : void 0,
+    tunaPositionOwnerAtaB: tunaPosition.data.collateralToken == 1 /* B */ && mintB.address != NATIVE_MINT ? tunaPositionOwnerAtaB : void 0,
     feeRecipientAtaA,
     feeRecipientAtaB,
     fusionPool: fusionPool.address,
@@ -12937,20 +13012,40 @@ var import_whirlpools_client11 = require("@orca-so/whirlpools-client");
 var import_kit95 = require("@solana/kit");
 var import_memo17 = require("@solana-program/memo");
 var import_token_202224 = require("@solana-program/token-2022");
-async function liquidateTunaSpotPositionOrcaInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
+async function liquidateTunaSpotPositionOrcaInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, createTunaPositionOwnerAta, withdrawPercent) {
   const instructions = [];
-  const positionTokenMint = tunaPosition.data.positionToken == 0 /* A */ ? mintA : mintB;
-  const createFeeRecipientAtaInstructions = await getCreateAtaInstructions(
+  if (createTunaPositionOwnerAta) {
+    const collateralTokenMint = tunaPosition.data.collateralToken == 0 /* A */ ? mintA : mintB;
+    if (collateralTokenMint.address != NATIVE_MINT) {
+      const createPositionOwnerAtaInstructions = await getCreateAtaInstructions(
+        void 0,
+        authority,
+        collateralTokenMint.address,
+        tunaPosition.data.authority,
+        collateralTokenMint.programAddress
+      );
+      instructions.push(...createPositionOwnerAtaInstructions.init);
+    }
+  }
+  const createFeeRecipientAtaAInstructions = await getCreateAtaInstructions(
     void 0,
     authority,
-    positionTokenMint.address,
+    mintA.address,
     tunaConfig.data.feeRecipient,
-    positionTokenMint.programAddress
+    mintA.programAddress
   );
-  instructions.push(...createFeeRecipientAtaInstructions.init);
+  instructions.push(...createFeeRecipientAtaAInstructions.init);
+  const createFeeRecipientAtaBInstructions = await getCreateAtaInstructions(
+    void 0,
+    authority,
+    mintB.address,
+    tunaConfig.data.feeRecipient,
+    mintB.programAddress
+  );
+  instructions.push(...createFeeRecipientAtaBInstructions.init);
   const ix = await liquidateTunaSpotPositionOrcaInstruction(
     authority,
-    tunaPosition.address,
+    tunaPosition,
     tunaConfig,
     mintA,
     mintB,
@@ -12962,16 +13057,26 @@ async function liquidateTunaSpotPositionOrcaInstructions(authority, tunaPosition
   instructions.push(ix);
   return instructions;
 }
-async function liquidateTunaSpotPositionOrcaInstruction(authority, tunaPositionAddress, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
+async function liquidateTunaSpotPositionOrcaInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
   const marketAddress = (await getMarketAddress(whirlpool.address))[0];
   const orcaOracleAddress = (await (0, import_whirlpools_client11.getOracleAddress)(whirlpool.address))[0];
+  const tunaPositionOwnerAtaA = (await (0, import_token_202224.findAssociatedTokenPda)({
+    owner: tunaPosition.data.authority,
+    mint: mintA.address,
+    tokenProgram: mintA.programAddress
+  }))[0];
+  const tunaPositionOwnerAtaB = (await (0, import_token_202224.findAssociatedTokenPda)({
+    owner: tunaPosition.data.authority,
+    mint: mintB.address,
+    tokenProgram: mintB.programAddress
+  }))[0];
   const tunaPositionAtaA = (await (0, import_token_202224.findAssociatedTokenPda)({
-    owner: tunaPositionAddress,
+    owner: tunaPosition.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
   const tunaPositionAtaB = (await (0, import_token_202224.findAssociatedTokenPda)({
-    owner: tunaPositionAddress,
+    owner: tunaPosition.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
@@ -13028,9 +13133,12 @@ async function liquidateTunaSpotPositionOrcaInstruction(authority, tunaPositionA
     vaultAAta,
     vaultB: vaultB.address,
     vaultBAta,
-    tunaPosition: tunaPositionAddress,
+    tunaPosition: tunaPosition.address,
     tunaPositionAtaA,
     tunaPositionAtaB,
+    tunaPositionOwner: tunaPosition.data.authority,
+    tunaPositionOwnerAtaA: tunaPosition.data.collateralToken == 0 /* A */ && mintA.address != NATIVE_MINT ? tunaPositionOwnerAtaA : void 0,
+    tunaPositionOwnerAtaB: tunaPosition.data.collateralToken == 1 /* B */ && mintB.address != NATIVE_MINT ? tunaPositionOwnerAtaB : void 0,
     feeRecipientAtaA,
     feeRecipientAtaB,
     whirlpool: whirlpool.address,

package/dist/index.mjs

@@ -692,7 +692,6 @@ function getTunaSpotPositionEncoder() {
       ["positionToken", getPoolTokenEncoder()],
       ["collateralToken", getPoolTokenEncoder()],
       ["flags", getU32Encoder4()],
-      ["state", getTunaPositionStateEncoder()],
       ["amount", getU64Encoder4()],
       ["loanShares", getU64Encoder4()],
       ["loanFunds", getU64Encoder4()],
@@ -717,7 +716,6 @@ function getTunaSpotPositionDecoder() {
     ["positionToken", getPoolTokenDecoder()],
     ["collateralToken", getPoolTokenDecoder()],
     ["flags", getU32Decoder4()],
-    ["state", getTunaPositionStateDecoder()],
     ["amount", getU64Decoder4()],
     ["loanShares", getU64Decoder4()],
     ["loanFunds", getU64Decoder4()],
@@ -764,7 +762,7 @@ async function fetchAllMaybeTunaSpotPosition(rpc, addresses, config) {
   );
 }
 function getTunaSpotPositionSize() {
-  return 347;
+  return 346;
 }
 
 // src/generated/accounts/vault.ts
@@ -5719,6 +5717,18 @@ function getLiquidateTunaSpotPositionFusionInstruction(input, config) {
       value: input.feeRecipientAtaB ?? null,
       isWritable: true
     },
+    tunaPositionOwner: {
+      value: input.tunaPositionOwner ?? null,
+      isWritable: true
+    },
+    tunaPositionOwnerAtaA: {
+      value: input.tunaPositionOwnerAtaA ?? null,
+      isWritable: true
+    },
+    tunaPositionOwnerAtaB: {
+      value: input.tunaPositionOwnerAtaB ?? null,
+      isWritable: true
+    },
     pythOraclePriceFeedA: {
       value: input.pythOraclePriceFeedA ?? null,
       isWritable: false
@@ -5759,6 +5769,9 @@ function getLiquidateTunaSpotPositionFusionInstruction(input, config) {
       getAccountMeta(accounts.tunaPositionAtaB),
       getAccountMeta(accounts.feeRecipientAtaA),
       getAccountMeta(accounts.feeRecipientAtaB),
+      getAccountMeta(accounts.tunaPositionOwner),
+      getAccountMeta(accounts.tunaPositionOwnerAtaA),
+      getAccountMeta(accounts.tunaPositionOwnerAtaB),
       getAccountMeta(accounts.pythOraclePriceFeedA),
       getAccountMeta(accounts.pythOraclePriceFeedB),
       getAccountMeta(accounts.fusionammProgram),
@@ -5774,7 +5787,7 @@ function getLiquidateTunaSpotPositionFusionInstruction(input, config) {
   return instruction;
 }
 function parseLiquidateTunaSpotPositionFusionInstruction(instruction) {
-  if (instruction.accounts.length < 22) {
+  if (instruction.accounts.length < 25) {
     throw new Error("Not enough accounts");
   }
   let accountIndex = 0;
@@ -5783,6 +5796,10 @@ function parseLiquidateTunaSpotPositionFusionInstruction(instruction) {
     accountIndex += 1;
     return accountMeta;
   };
+  const getNextOptionalAccount = () => {
+    const accountMeta = getNextAccount();
+    return accountMeta.address === TUNA_PROGRAM_ADDRESS ? void 0 : accountMeta;
+  };
   return {
     programAddress: instruction.programAddress,
     accounts: {
@@ -5802,6 +5819,9 @@ function parseLiquidateTunaSpotPositionFusionInstruction(instruction) {
       tunaPositionAtaB: getNextAccount(),
       feeRecipientAtaA: getNextAccount(),
       feeRecipientAtaB: getNextAccount(),
+      tunaPositionOwner: getNextAccount(),
+      tunaPositionOwnerAtaA: getNextOptionalAccount(),
+      tunaPositionOwnerAtaB: getNextOptionalAccount(),
       pythOraclePriceFeedA: getNextAccount(),
       pythOraclePriceFeedB: getNextAccount(),
       fusionammProgram: getNextAccount(),
@@ -5900,6 +5920,18 @@ function getLiquidateTunaSpotPositionOrcaInstruction(input, config) {
       value: input.feeRecipientAtaB ?? null,
       isWritable: true
     },
+    tunaPositionOwner: {
+      value: input.tunaPositionOwner ?? null,
+      isWritable: true
+    },
+    tunaPositionOwnerAtaA: {
+      value: input.tunaPositionOwnerAtaA ?? null,
+      isWritable: true
+    },
+    tunaPositionOwnerAtaB: {
+      value: input.tunaPositionOwnerAtaB ?? null,
+      isWritable: true
+    },
     pythOraclePriceFeedA: {
       value: input.pythOraclePriceFeedA ?? null,
       isWritable: false
@@ -5940,6 +5972,9 @@ function getLiquidateTunaSpotPositionOrcaInstruction(input, config) {
       getAccountMeta(accounts.tunaPositionAtaB),
       getAccountMeta(accounts.feeRecipientAtaA),
       getAccountMeta(accounts.feeRecipientAtaB),
+      getAccountMeta(accounts.tunaPositionOwner),
+      getAccountMeta(accounts.tunaPositionOwnerAtaA),
+      getAccountMeta(accounts.tunaPositionOwnerAtaB),
       getAccountMeta(accounts.pythOraclePriceFeedA),
       getAccountMeta(accounts.pythOraclePriceFeedB),
       getAccountMeta(accounts.whirlpoolProgram),
@@ -5955,7 +5990,7 @@ function getLiquidateTunaSpotPositionOrcaInstruction(input, config) {
   return instruction;
 }
 function parseLiquidateTunaSpotPositionOrcaInstruction(instruction) {
-  if (instruction.accounts.length < 22) {
+  if (instruction.accounts.length < 25) {
     throw new Error("Not enough accounts");
   }
   let accountIndex = 0;
@@ -5964,6 +5999,10 @@ function parseLiquidateTunaSpotPositionOrcaInstruction(instruction) {
     accountIndex += 1;
     return accountMeta;
   };
+  const getNextOptionalAccount = () => {
+    const accountMeta = getNextAccount();
+    return accountMeta.address === TUNA_PROGRAM_ADDRESS ? void 0 : accountMeta;
+  };
   return {
     programAddress: instruction.programAddress,
     accounts: {
@@ -5983,6 +6022,9 @@ function parseLiquidateTunaSpotPositionOrcaInstruction(instruction) {
       tunaPositionAtaB: getNextAccount(),
       feeRecipientAtaA: getNextAccount(),
       feeRecipientAtaB: getNextAccount(),
+      tunaPositionOwner: getNextAccount(),
+      tunaPositionOwnerAtaA: getNextOptionalAccount(),
+      tunaPositionOwnerAtaB: getNextOptionalAccount(),
       pythOraclePriceFeedA: getNextAccount(),
       pythOraclePriceFeedB: getNextAccount(),
       whirlpoolProgram: getNextAccount(),
@@ -13096,20 +13138,40 @@ import { FUSIONAMM_PROGRAM_ADDRESS as FUSIONAMM_PROGRAM_ADDRESS10 } from "@crypt
 import { AccountRole as AccountRole16 } from "@solana/kit";
 import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS16 } from "@solana-program/memo";
 import { findAssociatedTokenPda as findAssociatedTokenPda23 } from "@solana-program/token-2022";
-async function liquidateTunaSpotPositionFusionInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, withdrawPercent) {
+async function liquidateTunaSpotPositionFusionInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, createTunaPositionOwnerAta, withdrawPercent) {
   const instructions = [];
-  const positionTokenMint = tunaPosition.data.positionToken == 0 /* A */ ? mintA : mintB;
-  const createFeeRecipientAtaInstructions = await getCreateAtaInstructions(
+  if (createTunaPositionOwnerAta) {
+    const collateralTokenMint = tunaPosition.data.collateralToken == 0 /* A */ ? mintA : mintB;
+    if (collateralTokenMint.address != NATIVE_MINT) {
+      const createPositionOwnerAtaInstructions = await getCreateAtaInstructions(
+        void 0,
+        authority,
+        collateralTokenMint.address,
+        tunaPosition.data.authority,
+        collateralTokenMint.programAddress
+      );
+      instructions.push(...createPositionOwnerAtaInstructions.init);
+    }
+  }
+  const createFeeRecipientAtaAInstructions = await getCreateAtaInstructions(
+    void 0,
+    authority,
+    mintA.address,
+    tunaConfig.data.feeRecipient,
+    mintA.programAddress
+  );
+  instructions.push(...createFeeRecipientAtaAInstructions.init);
+  const createFeeRecipientAtaBInstructions = await getCreateAtaInstructions(
     void 0,
     authority,
-    positionTokenMint.address,
+    mintB.address,
     tunaConfig.data.feeRecipient,
-    positionTokenMint.programAddress
+    mintB.programAddress
   );
-  instructions.push(...createFeeRecipientAtaInstructions.init);
+  instructions.push(...createFeeRecipientAtaBInstructions.init);
   const ix = await liquidateTunaSpotPositionFusionInstruction(
     authority,
-    tunaPosition.address,
+    tunaPosition,
     tunaConfig,
     mintA,
     mintB,
@@ -13121,15 +13183,25 @@ async function liquidateTunaSpotPositionFusionInstructions(authority, tunaPositi
   instructions.push(ix);
   return instructions;
 }
-async function liquidateTunaSpotPositionFusionInstruction(authority, tunaPositionAddress, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, withdrawPercent) {
+async function liquidateTunaSpotPositionFusionInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, withdrawPercent) {
   const marketAddress = (await getMarketAddress(fusionPool.address))[0];
+  const tunaPositionOwnerAtaA = (await findAssociatedTokenPda23({
+    owner: tunaPosition.data.authority,
+    mint: mintA.address,
+    tokenProgram: mintA.programAddress
+  }))[0];
+  const tunaPositionOwnerAtaB = (await findAssociatedTokenPda23({
+    owner: tunaPosition.data.authority,
+    mint: mintB.address,
+    tokenProgram: mintB.programAddress
+  }))[0];
   const tunaPositionAtaA = (await findAssociatedTokenPda23({
-    owner: tunaPositionAddress,
+    owner: tunaPosition.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
   const tunaPositionAtaB = (await findAssociatedTokenPda23({
-    owner: tunaPositionAddress,
+    owner: tunaPosition.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
@@ -13184,9 +13256,12 @@ async function liquidateTunaSpotPositionFusionInstruction(authority, tunaPositio
     vaultAAta,
     vaultB: vaultB.address,
     vaultBAta,
-    tunaPosition: tunaPositionAddress,
+    tunaPosition: tunaPosition.address,
     tunaPositionAtaA,
     tunaPositionAtaB,
+    tunaPositionOwner: tunaPosition.data.authority,
+    tunaPositionOwnerAtaA: tunaPosition.data.collateralToken == 0 /* A */ && mintA.address != NATIVE_MINT ? tunaPositionOwnerAtaA : void 0,
+    tunaPositionOwnerAtaB: tunaPosition.data.collateralToken == 1 /* B */ && mintB.address != NATIVE_MINT ? tunaPositionOwnerAtaB : void 0,
     feeRecipientAtaA,
     feeRecipientAtaB,
     fusionPool: fusionPool.address,
@@ -13204,20 +13279,40 @@ import { getOracleAddress as getOracleAddress7, WHIRLPOOL_PROGRAM_ADDRESS as WHI
 import { AccountRole as AccountRole17 } from "@solana/kit";
 import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS17 } from "@solana-program/memo";
 import { findAssociatedTokenPda as findAssociatedTokenPda24 } from "@solana-program/token-2022";
-async function liquidateTunaSpotPositionOrcaInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
+async function liquidateTunaSpotPositionOrcaInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, createTunaPositionOwnerAta, withdrawPercent) {
   const instructions = [];
-  const positionTokenMint = tunaPosition.data.positionToken == 0 /* A */ ? mintA : mintB;
-  const createFeeRecipientAtaInstructions = await getCreateAtaInstructions(
+  if (createTunaPositionOwnerAta) {
+    const collateralTokenMint = tunaPosition.data.collateralToken == 0 /* A */ ? mintA : mintB;
+    if (collateralTokenMint.address != NATIVE_MINT) {
+      const createPositionOwnerAtaInstructions = await getCreateAtaInstructions(
+        void 0,
+        authority,
+        collateralTokenMint.address,
+        tunaPosition.data.authority,
+        collateralTokenMint.programAddress
+      );
+      instructions.push(...createPositionOwnerAtaInstructions.init);
+    }
+  }
+  const createFeeRecipientAtaAInstructions = await getCreateAtaInstructions(
     void 0,
     authority,
-    positionTokenMint.address,
+    mintA.address,
     tunaConfig.data.feeRecipient,
-    positionTokenMint.programAddress
+    mintA.programAddress
   );
-  instructions.push(...createFeeRecipientAtaInstructions.init);
+  instructions.push(...createFeeRecipientAtaAInstructions.init);
+  const createFeeRecipientAtaBInstructions = await getCreateAtaInstructions(
+    void 0,
+    authority,
+    mintB.address,
+    tunaConfig.data.feeRecipient,
+    mintB.programAddress
+  );
+  instructions.push(...createFeeRecipientAtaBInstructions.init);
   const ix = await liquidateTunaSpotPositionOrcaInstruction(
     authority,
-    tunaPosition.address,
+    tunaPosition,
     tunaConfig,
     mintA,
     mintB,
@@ -13229,16 +13324,26 @@ async function liquidateTunaSpotPositionOrcaInstructions(authority, tunaPosition
   instructions.push(ix);
   return instructions;
 }
-async function liquidateTunaSpotPositionOrcaInstruction(authority, tunaPositionAddress, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
+async function liquidateTunaSpotPositionOrcaInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
   const marketAddress = (await getMarketAddress(whirlpool.address))[0];
   const orcaOracleAddress = (await getOracleAddress7(whirlpool.address))[0];
+  const tunaPositionOwnerAtaA = (await findAssociatedTokenPda24({
+    owner: tunaPosition.data.authority,
+    mint: mintA.address,
+    tokenProgram: mintA.programAddress
+  }))[0];
+  const tunaPositionOwnerAtaB = (await findAssociatedTokenPda24({
+    owner: tunaPosition.data.authority,
+    mint: mintB.address,
+    tokenProgram: mintB.programAddress
+  }))[0];
   const tunaPositionAtaA = (await findAssociatedTokenPda24({
-    owner: tunaPositionAddress,
+    owner: tunaPosition.address,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
   const tunaPositionAtaB = (await findAssociatedTokenPda24({
-    owner: tunaPositionAddress,
+    owner: tunaPosition.address,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
@@ -13295,9 +13400,12 @@ async function liquidateTunaSpotPositionOrcaInstruction(authority, tunaPositionA
     vaultAAta,
     vaultB: vaultB.address,
     vaultBAta,
-    tunaPosition: tunaPositionAddress,
+    tunaPosition: tunaPosition.address,
     tunaPositionAtaA,
     tunaPositionAtaB,
+    tunaPositionOwner: tunaPosition.data.authority,
+    tunaPositionOwnerAtaA: tunaPosition.data.collateralToken == 0 /* A */ && mintA.address != NATIVE_MINT ? tunaPositionOwnerAtaA : void 0,
+    tunaPositionOwnerAtaB: tunaPosition.data.collateralToken == 1 /* B */ && mintB.address != NATIVE_MINT ? tunaPositionOwnerAtaB : void 0,
     feeRecipientAtaA,
     feeRecipientAtaB,
     whirlpool: whirlpool.address,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@crypticdot/defituna-client",
   "description": "Typescript client to interact with DefiTuna's on-chain program.",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "private": false,
   "license": "SEE LICENSE IN LICENSE",
   "main": "./dist/index.js",
@@ -51,7 +51,7 @@
     "rimraf": "^6.0.1",
     "vitest": "^3.1.1",
     "solana-bankrun": "^0.4.0",
-    "@crypticdot/defituna-program": "3.1.0"
+    "@crypticdot/defituna-program": "3.1.1"
   },
   "scripts": {
     "build": "node ./codama.mjs && tsup src/index.ts --format cjs,esm --dts",