npm - @crypticdot/defituna-client - Versions diffs - 2.0.14 → 2.0.15 - Mend

@crypticdot/defituna-client 2.0.14 → 2.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.d.mts CHANGED Viewed

@@ -277,7 +277,7 @@ type TunaConfig = {
     version: number;
     /** Bump seed for the vaults config account. */
     bump: number;
-    /** Current update authority address for both the tunaConfig and the Vault PDAs themselves - can be updated. */
+    /** Current update authority address for both the TunaConfig and the Vault PDAs themselves - can be updated. */
     adminAuthority: Address;
     /** Fee recipient address. */
     feeRecipient: Address;
@@ -307,7 +307,7 @@ type TunaConfigArgs = {
     version: number;
     /** Bump seed for the vaults config account. */
     bump: number;
-    /** Current update authority address for both the tunaConfig and the Vault PDAs themselves - can be updated. */
+    /** Current update authority address for both the TunaConfig and the Vault PDAs themselves - can be updated. */
     adminAuthority: Address;
     /** Fee recipient address. */
     feeRecipient: Address;
@@ -2230,7 +2230,7 @@ declare function parseDepositInstruction<TProgram extends string, TAccountMetas
 declare const LIQUIDATE_POSITION_FUSION_DISCRIMINATOR: Uint8Array<ArrayBuffer>;
 declare function getLiquidatePositionFusionDiscriminatorBytes(): ReadonlyUint8Array;
-type LiquidatePositionFusionInstruction<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, TAccountTunaPositionAta extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string, TAccountLiquidationFeeRecipientAtaA extends string | IAccountMeta<string> = string, TAccountLiquidationFeeRecipientAtaB 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, TAccountFusionPosition extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, TRemainingAccounts extends readonly IAccountMeta<string>[] = []> = IInstruction<TProgram> & IInstructionWithData<Uint8Array> & IInstructionWithAccounts<[
+type LiquidatePositionFusionInstruction<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, TAccountTunaPositionAta 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, TAccountFusionPosition extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, 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,
@@ -2246,8 +2246,8 @@ type LiquidatePositionFusionInstruction<TProgram extends string = typeof TUNA_PR
     TAccountTunaPositionAta extends string ? WritableAccount<TAccountTunaPositionAta> : TAccountTunaPositionAta,
     TAccountTunaPositionAtaA extends string ? WritableAccount<TAccountTunaPositionAtaA> : TAccountTunaPositionAtaA,
     TAccountTunaPositionAtaB extends string ? WritableAccount<TAccountTunaPositionAtaB> : TAccountTunaPositionAtaB,
-    TAccountLiquidationFeeRecipientAtaA extends string ? WritableAccount<TAccountLiquidationFeeRecipientAtaA> : TAccountLiquidationFeeRecipientAtaA,
-    TAccountLiquidationFeeRecipientAtaB extends string ? WritableAccount<TAccountLiquidationFeeRecipientAtaB> : TAccountLiquidationFeeRecipientAtaB,
+    TAccountFeeRecipientAtaA extends string ? WritableAccount<TAccountFeeRecipientAtaA> : TAccountFeeRecipientAtaA,
+    TAccountFeeRecipientAtaB extends string ? WritableAccount<TAccountFeeRecipientAtaB> : TAccountFeeRecipientAtaB,
     TAccountPythOraclePriceFeedA extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedA> : TAccountPythOraclePriceFeedA,
     TAccountPythOraclePriceFeedB extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedB> : TAccountPythOraclePriceFeedB,
     TAccountFusionammProgram extends string ? ReadonlyAccount<TAccountFusionammProgram> : TAccountFusionammProgram,
@@ -2268,7 +2268,7 @@ type LiquidatePositionFusionInstructionDataArgs = {
 declare function getLiquidatePositionFusionInstructionDataEncoder(): Encoder<LiquidatePositionFusionInstructionDataArgs>;
 declare function getLiquidatePositionFusionInstructionDataDecoder(): Decoder<LiquidatePositionFusionInstructionData>;
 declare function getLiquidatePositionFusionInstructionDataCodec(): Codec<LiquidatePositionFusionInstructionDataArgs, LiquidatePositionFusionInstructionData>;
-type LiquidatePositionFusionInput<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, TAccountTunaPositionAta extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string, TAccountLiquidationFeeRecipientAtaA extends string = string, TAccountLiquidationFeeRecipientAtaB extends string = string, TAccountPythOraclePriceFeedA extends string = string, TAccountPythOraclePriceFeedB extends string = string, TAccountFusionammProgram extends string = string, TAccountFusionPool extends string = string, TAccountFusionPosition extends string = string, TAccountMemoProgram extends string = string> = {
+type LiquidatePositionFusionInput<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, TAccountTunaPositionAta 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, TAccountFusionPosition extends string = string, TAccountMemoProgram extends string = string> = {
     /**
      *
      * TUNA accounts
@@ -2289,8 +2289,8 @@ type LiquidatePositionFusionInput<TAccountAuthority extends string = string, TAc
     tunaPositionAta: Address<TAccountTunaPositionAta>;
     tunaPositionAtaA: Address<TAccountTunaPositionAtaA>;
     tunaPositionAtaB: Address<TAccountTunaPositionAtaB>;
-    liquidationFeeRecipientAtaA: Address<TAccountLiquidationFeeRecipientAtaA>;
-    liquidationFeeRecipientAtaB: Address<TAccountLiquidationFeeRecipientAtaB>;
+    feeRecipientAtaA: Address<TAccountFeeRecipientAtaA>;
+    feeRecipientAtaB: Address<TAccountFeeRecipientAtaB>;
     pythOraclePriceFeedA: Address<TAccountPythOraclePriceFeedA>;
     pythOraclePriceFeedB: Address<TAccountPythOraclePriceFeedB>;
     /**
@@ -2305,9 +2305,9 @@ type LiquidatePositionFusionInput<TAccountAuthority extends string = string, TAc
     withdrawPercent: LiquidatePositionFusionInstructionDataArgs['withdrawPercent'];
     remainingAccountsInfo: LiquidatePositionFusionInstructionDataArgs['remainingAccountsInfo'];
 };
-declare function getLiquidatePositionFusionInstruction<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, TAccountTunaPositionAta extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string, TAccountLiquidationFeeRecipientAtaA extends string, TAccountLiquidationFeeRecipientAtaB extends string, TAccountPythOraclePriceFeedA extends string, TAccountPythOraclePriceFeedB extends string, TAccountFusionammProgram extends string, TAccountFusionPool extends string, TAccountFusionPosition extends string, TAccountMemoProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidatePositionFusionInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountLiquidationFeeRecipientAtaA, TAccountLiquidationFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountFusionPosition, TAccountMemoProgram>, config?: {
+declare function getLiquidatePositionFusionInstruction<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, TAccountTunaPositionAta 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, TAccountFusionPosition extends string, TAccountMemoProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidatePositionFusionInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountFusionPosition, TAccountMemoProgram>, config?: {
     programAddress?: TProgramAddress;
-}): LiquidatePositionFusionInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountLiquidationFeeRecipientAtaA, TAccountLiquidationFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountFusionPosition, TAccountMemoProgram>;
+}): LiquidatePositionFusionInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountFusionPosition, TAccountMemoProgram>;
 type ParsedLiquidatePositionFusionInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[]> = {
     programAddress: Address<TProgram>;
     accounts: {
@@ -2331,8 +2331,8 @@ type ParsedLiquidatePositionFusionInstruction<TProgram extends string = typeof T
         tunaPositionAta: TAccountMetas[12];
         tunaPositionAtaA: TAccountMetas[13];
         tunaPositionAtaB: TAccountMetas[14];
-        liquidationFeeRecipientAtaA: TAccountMetas[15];
-        liquidationFeeRecipientAtaB: TAccountMetas[16];
+        feeRecipientAtaA: TAccountMetas[15];
+        feeRecipientAtaB: TAccountMetas[16];
         pythOraclePriceFeedA: TAccountMetas[17];
         pythOraclePriceFeedB: TAccountMetas[18];
         /**
@@ -2359,7 +2359,7 @@ declare function parseLiquidatePositionFusionInstruction<TProgram extends string
 declare const LIQUIDATE_POSITION_ORCA_DISCRIMINATOR: Uint8Array<ArrayBuffer>;
 declare function getLiquidatePositionOrcaDiscriminatorBytes(): ReadonlyUint8Array;
-type LiquidatePositionOrcaInstruction<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, 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, TAccountTunaPositionAta extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string, TAccountLiquidationFeeRecipientAtaA extends string | IAccountMeta<string> = string, TAccountLiquidationFeeRecipientAtaB 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, TAccountOrcaPosition extends string | IAccountMeta<string> = string, TAccountTokenProgramA extends string | IAccountMeta<string> = string, TAccountTokenProgramB extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, TRemainingAccounts extends readonly IAccountMeta<string>[] = []> = IInstruction<TProgram> & IInstructionWithData<Uint8Array> & IInstructionWithAccounts<[
+type LiquidatePositionOrcaInstruction<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, 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, TAccountTunaPositionAta 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, TAccountOrcaPosition extends string | IAccountMeta<string> = string, TAccountTokenProgramA extends string | IAccountMeta<string> = string, TAccountTokenProgramB extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, 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,
@@ -2373,8 +2373,8 @@ type LiquidatePositionOrcaInstruction<TProgram extends string = typeof TUNA_PROG
     TAccountTunaPositionAta extends string ? WritableAccount<TAccountTunaPositionAta> : TAccountTunaPositionAta,
     TAccountTunaPositionAtaA extends string ? WritableAccount<TAccountTunaPositionAtaA> : TAccountTunaPositionAtaA,
     TAccountTunaPositionAtaB extends string ? WritableAccount<TAccountTunaPositionAtaB> : TAccountTunaPositionAtaB,
-    TAccountLiquidationFeeRecipientAtaA extends string ? WritableAccount<TAccountLiquidationFeeRecipientAtaA> : TAccountLiquidationFeeRecipientAtaA,
-    TAccountLiquidationFeeRecipientAtaB extends string ? WritableAccount<TAccountLiquidationFeeRecipientAtaB> : TAccountLiquidationFeeRecipientAtaB,
+    TAccountFeeRecipientAtaA extends string ? WritableAccount<TAccountFeeRecipientAtaA> : TAccountFeeRecipientAtaA,
+    TAccountFeeRecipientAtaB extends string ? WritableAccount<TAccountFeeRecipientAtaB> : TAccountFeeRecipientAtaB,
     TAccountPythOraclePriceFeedA extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedA> : TAccountPythOraclePriceFeedA,
     TAccountPythOraclePriceFeedB extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedB> : TAccountPythOraclePriceFeedB,
     TAccountWhirlpoolProgram extends string ? ReadonlyAccount<TAccountWhirlpoolProgram> : TAccountWhirlpoolProgram,
@@ -2397,7 +2397,7 @@ type LiquidatePositionOrcaInstructionDataArgs = {
 declare function getLiquidatePositionOrcaInstructionDataEncoder(): Encoder<LiquidatePositionOrcaInstructionDataArgs>;
 declare function getLiquidatePositionOrcaInstructionDataDecoder(): Decoder<LiquidatePositionOrcaInstructionData>;
 declare function getLiquidatePositionOrcaInstructionDataCodec(): Codec<LiquidatePositionOrcaInstructionDataArgs, LiquidatePositionOrcaInstructionData>;
-type LiquidatePositionOrcaInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB 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, TAccountTunaPositionAta extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string, TAccountLiquidationFeeRecipientAtaA extends string = string, TAccountLiquidationFeeRecipientAtaB extends string = string, TAccountPythOraclePriceFeedA extends string = string, TAccountPythOraclePriceFeedB extends string = string, TAccountWhirlpoolProgram extends string = string, TAccountWhirlpool extends string = string, TAccountOrcaPosition extends string = string, TAccountTokenProgramA extends string = string, TAccountTokenProgramB extends string = string, TAccountMemoProgram extends string = string> = {
+type LiquidatePositionOrcaInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB 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, TAccountTunaPositionAta 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, TAccountOrcaPosition extends string = string, TAccountTokenProgramA extends string = string, TAccountTokenProgramB extends string = string, TAccountMemoProgram extends string = string> = {
     /**
      *
      * TUNA accounts
@@ -2416,8 +2416,8 @@ type LiquidatePositionOrcaInput<TAccountAuthority extends string = string, TAcco
     tunaPositionAta: Address<TAccountTunaPositionAta>;
     tunaPositionAtaA: Address<TAccountTunaPositionAtaA>;
     tunaPositionAtaB: Address<TAccountTunaPositionAtaB>;
-    liquidationFeeRecipientAtaA: Address<TAccountLiquidationFeeRecipientAtaA>;
-    liquidationFeeRecipientAtaB: Address<TAccountLiquidationFeeRecipientAtaB>;
+    feeRecipientAtaA: Address<TAccountFeeRecipientAtaA>;
+    feeRecipientAtaB: Address<TAccountFeeRecipientAtaB>;
     pythOraclePriceFeedA: Address<TAccountPythOraclePriceFeedA>;
     pythOraclePriceFeedB: Address<TAccountPythOraclePriceFeedB>;
     /**
@@ -2434,9 +2434,9 @@ type LiquidatePositionOrcaInput<TAccountAuthority extends string = string, TAcco
     withdrawPercent: LiquidatePositionOrcaInstructionDataArgs['withdrawPercent'];
     remainingAccountsInfo: LiquidatePositionOrcaInstructionDataArgs['remainingAccountsInfo'];
 };
-declare function getLiquidatePositionOrcaInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAta extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string, TAccountLiquidationFeeRecipientAtaA extends string, TAccountLiquidationFeeRecipientAtaB extends string, TAccountPythOraclePriceFeedA extends string, TAccountPythOraclePriceFeedB extends string, TAccountWhirlpoolProgram extends string, TAccountWhirlpool extends string, TAccountOrcaPosition extends string, TAccountTokenProgramA extends string, TAccountTokenProgramB extends string, TAccountMemoProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidatePositionOrcaInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountLiquidationFeeRecipientAtaA, TAccountLiquidationFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountOrcaPosition, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMemoProgram>, config?: {
+declare function getLiquidatePositionOrcaInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAta 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, TAccountOrcaPosition extends string, TAccountTokenProgramA extends string, TAccountTokenProgramB extends string, TAccountMemoProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidatePositionOrcaInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountOrcaPosition, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMemoProgram>, config?: {
     programAddress?: TProgramAddress;
-}): LiquidatePositionOrcaInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountLiquidationFeeRecipientAtaA, TAccountLiquidationFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountOrcaPosition, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMemoProgram>;
+}): LiquidatePositionOrcaInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountOrcaPosition, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMemoProgram>;
 type ParsedLiquidatePositionOrcaInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[]> = {
     programAddress: Address<TProgram>;
     accounts: {
@@ -2458,8 +2458,8 @@ type ParsedLiquidatePositionOrcaInstruction<TProgram extends string = typeof TUN
         tunaPositionAta: TAccountMetas[10];
         tunaPositionAtaA: TAccountMetas[11];
         tunaPositionAtaB: TAccountMetas[12];
-        liquidationFeeRecipientAtaA: TAccountMetas[13];
-        liquidationFeeRecipientAtaB: TAccountMetas[14];
+        feeRecipientAtaA: TAccountMetas[13];
+        feeRecipientAtaB: TAccountMetas[14];
         pythOraclePriceFeedA: TAccountMetas[15];
         pythOraclePriceFeedB: TAccountMetas[16];
         /**
@@ -4741,11 +4741,11 @@ declare function createVaultInstructions(authority: TransactionSigner, mint: Acc
 declare function depositInstructions(rpc: Rpc<GetAccountInfoApi & GetMultipleAccountsApi>, authority: TransactionSigner, mintAddress: Address, amount: bigint): Promise<IInstruction[]>;
 declare function depositInstruction(authority: TransactionSigner, mint: Account<Mint>, amount: bigint): Promise<IInstruction>;
-declare function liquidatePositionOrcaInstructions(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction[]>;
-declare function liquidatePositionOrcaInstruction(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction>;
+declare function liquidatePositionOrcaInstructions(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction[]>;
+declare function liquidatePositionOrcaInstruction(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction>;
-declare function liquidatePositionFusionInstructions(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction[]>;
-declare function liquidatePositionFusionInstruction(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, fusionPool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction>;
+declare function liquidatePositionFusionInstructions(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction[]>;
+declare function liquidatePositionFusionInstruction(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, fusionPool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction>;
 declare function openPositionOrcaInstruction(rpc: Rpc<GetAccountInfoApi & GetMultipleAccountsApi>, authority: TransactionSigner, positionMint: TransactionSigner, whirlpoolAddress: Address, args: OpenPositionOrcaInstructionDataArgs): Promise<IInstruction>;

package/dist/index.d.ts CHANGED Viewed

@@ -277,7 +277,7 @@ type TunaConfig = {
     version: number;
     /** Bump seed for the vaults config account. */
     bump: number;
-    /** Current update authority address for both the tunaConfig and the Vault PDAs themselves - can be updated. */
+    /** Current update authority address for both the TunaConfig and the Vault PDAs themselves - can be updated. */
     adminAuthority: Address;
     /** Fee recipient address. */
     feeRecipient: Address;
@@ -307,7 +307,7 @@ type TunaConfigArgs = {
     version: number;
     /** Bump seed for the vaults config account. */
     bump: number;
-    /** Current update authority address for both the tunaConfig and the Vault PDAs themselves - can be updated. */
+    /** Current update authority address for both the TunaConfig and the Vault PDAs themselves - can be updated. */
     adminAuthority: Address;
     /** Fee recipient address. */
     feeRecipient: Address;
@@ -2230,7 +2230,7 @@ declare function parseDepositInstruction<TProgram extends string, TAccountMetas
 declare const LIQUIDATE_POSITION_FUSION_DISCRIMINATOR: Uint8Array<ArrayBuffer>;
 declare function getLiquidatePositionFusionDiscriminatorBytes(): ReadonlyUint8Array;
-type LiquidatePositionFusionInstruction<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, TAccountTunaPositionAta extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string, TAccountLiquidationFeeRecipientAtaA extends string | IAccountMeta<string> = string, TAccountLiquidationFeeRecipientAtaB 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, TAccountFusionPosition extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, TRemainingAccounts extends readonly IAccountMeta<string>[] = []> = IInstruction<TProgram> & IInstructionWithData<Uint8Array> & IInstructionWithAccounts<[
+type LiquidatePositionFusionInstruction<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, TAccountTunaPositionAta 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, TAccountFusionPosition extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, 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,
@@ -2246,8 +2246,8 @@ type LiquidatePositionFusionInstruction<TProgram extends string = typeof TUNA_PR
     TAccountTunaPositionAta extends string ? WritableAccount<TAccountTunaPositionAta> : TAccountTunaPositionAta,
     TAccountTunaPositionAtaA extends string ? WritableAccount<TAccountTunaPositionAtaA> : TAccountTunaPositionAtaA,
     TAccountTunaPositionAtaB extends string ? WritableAccount<TAccountTunaPositionAtaB> : TAccountTunaPositionAtaB,
-    TAccountLiquidationFeeRecipientAtaA extends string ? WritableAccount<TAccountLiquidationFeeRecipientAtaA> : TAccountLiquidationFeeRecipientAtaA,
-    TAccountLiquidationFeeRecipientAtaB extends string ? WritableAccount<TAccountLiquidationFeeRecipientAtaB> : TAccountLiquidationFeeRecipientAtaB,
+    TAccountFeeRecipientAtaA extends string ? WritableAccount<TAccountFeeRecipientAtaA> : TAccountFeeRecipientAtaA,
+    TAccountFeeRecipientAtaB extends string ? WritableAccount<TAccountFeeRecipientAtaB> : TAccountFeeRecipientAtaB,
     TAccountPythOraclePriceFeedA extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedA> : TAccountPythOraclePriceFeedA,
     TAccountPythOraclePriceFeedB extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedB> : TAccountPythOraclePriceFeedB,
     TAccountFusionammProgram extends string ? ReadonlyAccount<TAccountFusionammProgram> : TAccountFusionammProgram,
@@ -2268,7 +2268,7 @@ type LiquidatePositionFusionInstructionDataArgs = {
 declare function getLiquidatePositionFusionInstructionDataEncoder(): Encoder<LiquidatePositionFusionInstructionDataArgs>;
 declare function getLiquidatePositionFusionInstructionDataDecoder(): Decoder<LiquidatePositionFusionInstructionData>;
 declare function getLiquidatePositionFusionInstructionDataCodec(): Codec<LiquidatePositionFusionInstructionDataArgs, LiquidatePositionFusionInstructionData>;
-type LiquidatePositionFusionInput<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, TAccountTunaPositionAta extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string, TAccountLiquidationFeeRecipientAtaA extends string = string, TAccountLiquidationFeeRecipientAtaB extends string = string, TAccountPythOraclePriceFeedA extends string = string, TAccountPythOraclePriceFeedB extends string = string, TAccountFusionammProgram extends string = string, TAccountFusionPool extends string = string, TAccountFusionPosition extends string = string, TAccountMemoProgram extends string = string> = {
+type LiquidatePositionFusionInput<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, TAccountTunaPositionAta 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, TAccountFusionPosition extends string = string, TAccountMemoProgram extends string = string> = {
     /**
      *
      * TUNA accounts
@@ -2289,8 +2289,8 @@ type LiquidatePositionFusionInput<TAccountAuthority extends string = string, TAc
     tunaPositionAta: Address<TAccountTunaPositionAta>;
     tunaPositionAtaA: Address<TAccountTunaPositionAtaA>;
     tunaPositionAtaB: Address<TAccountTunaPositionAtaB>;
-    liquidationFeeRecipientAtaA: Address<TAccountLiquidationFeeRecipientAtaA>;
-    liquidationFeeRecipientAtaB: Address<TAccountLiquidationFeeRecipientAtaB>;
+    feeRecipientAtaA: Address<TAccountFeeRecipientAtaA>;
+    feeRecipientAtaB: Address<TAccountFeeRecipientAtaB>;
     pythOraclePriceFeedA: Address<TAccountPythOraclePriceFeedA>;
     pythOraclePriceFeedB: Address<TAccountPythOraclePriceFeedB>;
     /**
@@ -2305,9 +2305,9 @@ type LiquidatePositionFusionInput<TAccountAuthority extends string = string, TAc
     withdrawPercent: LiquidatePositionFusionInstructionDataArgs['withdrawPercent'];
     remainingAccountsInfo: LiquidatePositionFusionInstructionDataArgs['remainingAccountsInfo'];
 };
-declare function getLiquidatePositionFusionInstruction<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, TAccountTunaPositionAta extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string, TAccountLiquidationFeeRecipientAtaA extends string, TAccountLiquidationFeeRecipientAtaB extends string, TAccountPythOraclePriceFeedA extends string, TAccountPythOraclePriceFeedB extends string, TAccountFusionammProgram extends string, TAccountFusionPool extends string, TAccountFusionPosition extends string, TAccountMemoProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidatePositionFusionInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountLiquidationFeeRecipientAtaA, TAccountLiquidationFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountFusionPosition, TAccountMemoProgram>, config?: {
+declare function getLiquidatePositionFusionInstruction<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, TAccountTunaPositionAta 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, TAccountFusionPosition extends string, TAccountMemoProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidatePositionFusionInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountFusionPosition, TAccountMemoProgram>, config?: {
     programAddress?: TProgramAddress;
-}): LiquidatePositionFusionInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountLiquidationFeeRecipientAtaA, TAccountLiquidationFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountFusionPosition, TAccountMemoProgram>;
+}): LiquidatePositionFusionInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountFusionPosition, TAccountMemoProgram>;
 type ParsedLiquidatePositionFusionInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[]> = {
     programAddress: Address<TProgram>;
     accounts: {
@@ -2331,8 +2331,8 @@ type ParsedLiquidatePositionFusionInstruction<TProgram extends string = typeof T
         tunaPositionAta: TAccountMetas[12];
         tunaPositionAtaA: TAccountMetas[13];
         tunaPositionAtaB: TAccountMetas[14];
-        liquidationFeeRecipientAtaA: TAccountMetas[15];
-        liquidationFeeRecipientAtaB: TAccountMetas[16];
+        feeRecipientAtaA: TAccountMetas[15];
+        feeRecipientAtaB: TAccountMetas[16];
         pythOraclePriceFeedA: TAccountMetas[17];
         pythOraclePriceFeedB: TAccountMetas[18];
         /**
@@ -2359,7 +2359,7 @@ declare function parseLiquidatePositionFusionInstruction<TProgram extends string
 declare const LIQUIDATE_POSITION_ORCA_DISCRIMINATOR: Uint8Array<ArrayBuffer>;
 declare function getLiquidatePositionOrcaDiscriminatorBytes(): ReadonlyUint8Array;
-type LiquidatePositionOrcaInstruction<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, 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, TAccountTunaPositionAta extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string, TAccountLiquidationFeeRecipientAtaA extends string | IAccountMeta<string> = string, TAccountLiquidationFeeRecipientAtaB 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, TAccountOrcaPosition extends string | IAccountMeta<string> = string, TAccountTokenProgramA extends string | IAccountMeta<string> = string, TAccountTokenProgramB extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, TRemainingAccounts extends readonly IAccountMeta<string>[] = []> = IInstruction<TProgram> & IInstructionWithData<Uint8Array> & IInstructionWithAccounts<[
+type LiquidatePositionOrcaInstruction<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, 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, TAccountTunaPositionAta 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, TAccountOrcaPosition extends string | IAccountMeta<string> = string, TAccountTokenProgramA extends string | IAccountMeta<string> = string, TAccountTokenProgramB extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, 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,
@@ -2373,8 +2373,8 @@ type LiquidatePositionOrcaInstruction<TProgram extends string = typeof TUNA_PROG
     TAccountTunaPositionAta extends string ? WritableAccount<TAccountTunaPositionAta> : TAccountTunaPositionAta,
     TAccountTunaPositionAtaA extends string ? WritableAccount<TAccountTunaPositionAtaA> : TAccountTunaPositionAtaA,
     TAccountTunaPositionAtaB extends string ? WritableAccount<TAccountTunaPositionAtaB> : TAccountTunaPositionAtaB,
-    TAccountLiquidationFeeRecipientAtaA extends string ? WritableAccount<TAccountLiquidationFeeRecipientAtaA> : TAccountLiquidationFeeRecipientAtaA,
-    TAccountLiquidationFeeRecipientAtaB extends string ? WritableAccount<TAccountLiquidationFeeRecipientAtaB> : TAccountLiquidationFeeRecipientAtaB,
+    TAccountFeeRecipientAtaA extends string ? WritableAccount<TAccountFeeRecipientAtaA> : TAccountFeeRecipientAtaA,
+    TAccountFeeRecipientAtaB extends string ? WritableAccount<TAccountFeeRecipientAtaB> : TAccountFeeRecipientAtaB,
     TAccountPythOraclePriceFeedA extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedA> : TAccountPythOraclePriceFeedA,
     TAccountPythOraclePriceFeedB extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedB> : TAccountPythOraclePriceFeedB,
     TAccountWhirlpoolProgram extends string ? ReadonlyAccount<TAccountWhirlpoolProgram> : TAccountWhirlpoolProgram,
@@ -2397,7 +2397,7 @@ type LiquidatePositionOrcaInstructionDataArgs = {
 declare function getLiquidatePositionOrcaInstructionDataEncoder(): Encoder<LiquidatePositionOrcaInstructionDataArgs>;
 declare function getLiquidatePositionOrcaInstructionDataDecoder(): Decoder<LiquidatePositionOrcaInstructionData>;
 declare function getLiquidatePositionOrcaInstructionDataCodec(): Codec<LiquidatePositionOrcaInstructionDataArgs, LiquidatePositionOrcaInstructionData>;
-type LiquidatePositionOrcaInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB 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, TAccountTunaPositionAta extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string, TAccountLiquidationFeeRecipientAtaA extends string = string, TAccountLiquidationFeeRecipientAtaB extends string = string, TAccountPythOraclePriceFeedA extends string = string, TAccountPythOraclePriceFeedB extends string = string, TAccountWhirlpoolProgram extends string = string, TAccountWhirlpool extends string = string, TAccountOrcaPosition extends string = string, TAccountTokenProgramA extends string = string, TAccountTokenProgramB extends string = string, TAccountMemoProgram extends string = string> = {
+type LiquidatePositionOrcaInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB 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, TAccountTunaPositionAta 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, TAccountOrcaPosition extends string = string, TAccountTokenProgramA extends string = string, TAccountTokenProgramB extends string = string, TAccountMemoProgram extends string = string> = {
     /**
      *
      * TUNA accounts
@@ -2416,8 +2416,8 @@ type LiquidatePositionOrcaInput<TAccountAuthority extends string = string, TAcco
     tunaPositionAta: Address<TAccountTunaPositionAta>;
     tunaPositionAtaA: Address<TAccountTunaPositionAtaA>;
     tunaPositionAtaB: Address<TAccountTunaPositionAtaB>;
-    liquidationFeeRecipientAtaA: Address<TAccountLiquidationFeeRecipientAtaA>;
-    liquidationFeeRecipientAtaB: Address<TAccountLiquidationFeeRecipientAtaB>;
+    feeRecipientAtaA: Address<TAccountFeeRecipientAtaA>;
+    feeRecipientAtaB: Address<TAccountFeeRecipientAtaB>;
     pythOraclePriceFeedA: Address<TAccountPythOraclePriceFeedA>;
     pythOraclePriceFeedB: Address<TAccountPythOraclePriceFeedB>;
     /**
@@ -2434,9 +2434,9 @@ type LiquidatePositionOrcaInput<TAccountAuthority extends string = string, TAcco
     withdrawPercent: LiquidatePositionOrcaInstructionDataArgs['withdrawPercent'];
     remainingAccountsInfo: LiquidatePositionOrcaInstructionDataArgs['remainingAccountsInfo'];
 };
-declare function getLiquidatePositionOrcaInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAta extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string, TAccountLiquidationFeeRecipientAtaA extends string, TAccountLiquidationFeeRecipientAtaB extends string, TAccountPythOraclePriceFeedA extends string, TAccountPythOraclePriceFeedB extends string, TAccountWhirlpoolProgram extends string, TAccountWhirlpool extends string, TAccountOrcaPosition extends string, TAccountTokenProgramA extends string, TAccountTokenProgramB extends string, TAccountMemoProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidatePositionOrcaInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountLiquidationFeeRecipientAtaA, TAccountLiquidationFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountOrcaPosition, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMemoProgram>, config?: {
+declare function getLiquidatePositionOrcaInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAta 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, TAccountOrcaPosition extends string, TAccountTokenProgramA extends string, TAccountTokenProgramB extends string, TAccountMemoProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidatePositionOrcaInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountOrcaPosition, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMemoProgram>, config?: {
     programAddress?: TProgramAddress;
-}): LiquidatePositionOrcaInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountLiquidationFeeRecipientAtaA, TAccountLiquidationFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountOrcaPosition, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMemoProgram>;
+}): LiquidatePositionOrcaInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountOrcaPosition, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMemoProgram>;
 type ParsedLiquidatePositionOrcaInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[]> = {
     programAddress: Address<TProgram>;
     accounts: {
@@ -2458,8 +2458,8 @@ type ParsedLiquidatePositionOrcaInstruction<TProgram extends string = typeof TUN
         tunaPositionAta: TAccountMetas[10];
         tunaPositionAtaA: TAccountMetas[11];
         tunaPositionAtaB: TAccountMetas[12];
-        liquidationFeeRecipientAtaA: TAccountMetas[13];
-        liquidationFeeRecipientAtaB: TAccountMetas[14];
+        feeRecipientAtaA: TAccountMetas[13];
+        feeRecipientAtaB: TAccountMetas[14];
         pythOraclePriceFeedA: TAccountMetas[15];
         pythOraclePriceFeedB: TAccountMetas[16];
         /**
@@ -4741,11 +4741,11 @@ declare function createVaultInstructions(authority: TransactionSigner, mint: Acc
 declare function depositInstructions(rpc: Rpc<GetAccountInfoApi & GetMultipleAccountsApi>, authority: TransactionSigner, mintAddress: Address, amount: bigint): Promise<IInstruction[]>;
 declare function depositInstruction(authority: TransactionSigner, mint: Account<Mint>, amount: bigint): Promise<IInstruction>;
-declare function liquidatePositionOrcaInstructions(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction[]>;
-declare function liquidatePositionOrcaInstruction(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction>;
+declare function liquidatePositionOrcaInstructions(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction[]>;
+declare function liquidatePositionOrcaInstruction(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction>;
-declare function liquidatePositionFusionInstructions(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction[]>;
-declare function liquidatePositionFusionInstruction(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, fusionPool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction>;
+declare function liquidatePositionFusionInstructions(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction[]>;
+declare function liquidatePositionFusionInstruction(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, fusionPool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction>;
 declare function openPositionOrcaInstruction(rpc: Rpc<GetAccountInfoApi & GetMultipleAccountsApi>, authority: TransactionSigner, positionMint: TransactionSigner, whirlpoolAddress: Address, args: OpenPositionOrcaInstructionDataArgs): Promise<IInstruction>;

package/dist/index.js CHANGED Viewed

@@ -3627,12 +3627,12 @@ function getLiquidatePositionFusionInstruction(input, config) {
       value: input.tunaPositionAtaB ?? null,
       isWritable: true
     },
-    liquidationFeeRecipientAtaA: {
-      value: input.liquidationFeeRecipientAtaA ?? null,
+    feeRecipientAtaA: {
+      value: input.feeRecipientAtaA ?? null,
       isWritable: true
     },
-    liquidationFeeRecipientAtaB: {
-      value: input.liquidationFeeRecipientAtaB ?? null,
+    feeRecipientAtaB: {
+      value: input.feeRecipientAtaB ?? null,
       isWritable: true
     },
     pythOraclePriceFeedA: {
@@ -3671,8 +3671,8 @@ function getLiquidatePositionFusionInstruction(input, config) {
       getAccountMeta(accounts.tunaPositionAta),
       getAccountMeta(accounts.tunaPositionAtaA),
       getAccountMeta(accounts.tunaPositionAtaB),
-      getAccountMeta(accounts.liquidationFeeRecipientAtaA),
-      getAccountMeta(accounts.liquidationFeeRecipientAtaB),
+      getAccountMeta(accounts.feeRecipientAtaA),
+      getAccountMeta(accounts.feeRecipientAtaB),
       getAccountMeta(accounts.pythOraclePriceFeedA),
       getAccountMeta(accounts.pythOraclePriceFeedB),
       getAccountMeta(accounts.fusionammProgram),
@@ -3715,8 +3715,8 @@ function parseLiquidatePositionFusionInstruction(instruction) {
       tunaPositionAta: getNextAccount(),
       tunaPositionAtaA: getNextAccount(),
       tunaPositionAtaB: getNextAccount(),
-      liquidationFeeRecipientAtaA: getNextAccount(),
-      liquidationFeeRecipientAtaB: getNextAccount(),
+      feeRecipientAtaA: getNextAccount(),
+      feeRecipientAtaB: getNextAccount(),
       pythOraclePriceFeedA: getNextAccount(),
       pythOraclePriceFeedB: getNextAccount(),
       fusionammProgram: getNextAccount(),
@@ -3795,12 +3795,12 @@ function getLiquidatePositionOrcaInstruction(input, config) {
       value: input.tunaPositionAtaB ?? null,
       isWritable: true
     },
-    liquidationFeeRecipientAtaA: {
-      value: input.liquidationFeeRecipientAtaA ?? null,
+    feeRecipientAtaA: {
+      value: input.feeRecipientAtaA ?? null,
       isWritable: true
     },
-    liquidationFeeRecipientAtaB: {
-      value: input.liquidationFeeRecipientAtaB ?? null,
+    feeRecipientAtaB: {
+      value: input.feeRecipientAtaB ?? null,
       isWritable: true
     },
     pythOraclePriceFeedA: {
@@ -3839,8 +3839,8 @@ function getLiquidatePositionOrcaInstruction(input, config) {
       getAccountMeta(accounts.tunaPositionAta),
       getAccountMeta(accounts.tunaPositionAtaA),
       getAccountMeta(accounts.tunaPositionAtaB),
-      getAccountMeta(accounts.liquidationFeeRecipientAtaA),
-      getAccountMeta(accounts.liquidationFeeRecipientAtaB),
+      getAccountMeta(accounts.feeRecipientAtaA),
+      getAccountMeta(accounts.feeRecipientAtaB),
       getAccountMeta(accounts.pythOraclePriceFeedA),
       getAccountMeta(accounts.pythOraclePriceFeedB),
       getAccountMeta(accounts.whirlpoolProgram),
@@ -3883,8 +3883,8 @@ function parseLiquidatePositionOrcaInstruction(instruction) {
       tunaPositionAta: getNextAccount(),
       tunaPositionAtaA: getNextAccount(),
       tunaPositionAtaB: getNextAccount(),
-      liquidationFeeRecipientAtaA: getNextAccount(),
-      liquidationFeeRecipientAtaB: getNextAccount(),
+      feeRecipientAtaA: getNextAccount(),
+      feeRecipientAtaB: getNextAccount(),
       pythOraclePriceFeedA: getNextAccount(),
       pythOraclePriceFeedB: getNextAccount(),
       whirlpoolProgram: getNextAccount(),
@@ -8735,7 +8735,7 @@ var import_whirlpools_client7 = require("@orca-so/whirlpools-client");
 var import_kit67 = require("@solana/kit");
 var import_memo8 = require("@solana-program/memo");
 var import_token_202214 = require("@solana-program/token-2022");
-async function liquidatePositionOrcaInstructions(authority, tunaPosition, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
+async function liquidatePositionOrcaInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
   const instructions = [];
   const createLiquidatorAtaAInstructions = await getCreateAtaInstructions(
     void 0,
@@ -8756,6 +8756,7 @@ async function liquidatePositionOrcaInstructions(authority, tunaPosition, mintA,
   const ix = await liquidatePositionOrcaInstruction(
     authority,
     tunaPosition,
+    tunaConfig,
     mintA,
     mintB,
     vaultA,
@@ -8768,8 +8769,7 @@ async function liquidatePositionOrcaInstructions(authority, tunaPosition, mintA,
   instructions.push(...createLiquidatorAtaBInstructions.cleanup);
   return instructions;
 }
-async function liquidatePositionOrcaInstruction(authority, tunaPosition, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
-  const tunaConfigAddress = (await getTunaConfigAddress())[0];
+async function liquidatePositionOrcaInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
   const positionMint = tunaPosition.data.positionMint;
   const marketAddress = (await getMarketAddress(whirlpool.address))[0];
   const orcaPositionAddress = (await (0, import_whirlpools_client7.getPositionAddress)(positionMint))[0];
@@ -8799,13 +8799,13 @@ async function liquidatePositionOrcaInstruction(authority, tunaPosition, mintA,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const liquidationFeeRecipientAtaA = (await (0, import_token_202214.findAssociatedTokenPda)({
-    owner: authority.address,
+  const feeRecipientAtaA = (await (0, import_token_202214.findAssociatedTokenPda)({
+    owner: tunaConfig.data.feeRecipient,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const liquidationFeeRecipientAtaB = (await (0, import_token_202214.findAssociatedTokenPda)({
-    owner: authority.address,
+  const feeRecipientAtaB = (await (0, import_token_202214.findAssociatedTokenPda)({
+    owner: tunaConfig.data.feeRecipient,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
@@ -8851,14 +8851,14 @@ async function liquidatePositionOrcaInstruction(authority, tunaPosition, mintA,
     vaultB: vaultB.address,
     vaultBAta,
     authority,
-    tunaConfig: tunaConfigAddress,
+    tunaConfig: tunaConfig.address,
     tunaPositionAta,
     tunaPositionAtaA,
     tunaPositionAtaB,
     orcaPosition: orcaPositionAddress,
     tunaPosition: tunaPosition.address,
-    liquidationFeeRecipientAtaA,
-    liquidationFeeRecipientAtaB,
+    feeRecipientAtaA,
+    feeRecipientAtaB,
     whirlpool: whirlpool.address,
     whirlpoolProgram: import_whirlpools_client7.WHIRLPOOL_PROGRAM_ADDRESS,
     tokenProgramA: mintA.programAddress,
@@ -8876,7 +8876,7 @@ var import_fusionamm_client7 = require("@crypticdot/fusionamm-client");
 var import_kit68 = require("@solana/kit");
 var import_memo9 = require("@solana-program/memo");
 var import_token_202215 = require("@solana-program/token-2022");
-async function liquidatePositionFusionInstructions(authority, tunaPosition, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
+async function liquidatePositionFusionInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
   const instructions = [];
   const createLiquidatorAtaAInstructions = await getCreateAtaInstructions(
     void 0,
@@ -8897,6 +8897,7 @@ async function liquidatePositionFusionInstructions(authority, tunaPosition, mint
   const ix = await liquidatePositionFusionInstruction(
     authority,
     tunaPosition,
+    tunaConfig,
     mintA,
     mintB,
     vaultA,
@@ -8909,8 +8910,7 @@ async function liquidatePositionFusionInstructions(authority, tunaPosition, mint
   instructions.push(...createLiquidatorAtaBInstructions.cleanup);
   return instructions;
 }
-async function liquidatePositionFusionInstruction(authority, tunaPosition, mintA, mintB, vaultA, vaultB, fusionPool, withdrawPercent) {
-  const tunaConfigAddress = (await getTunaConfigAddress())[0];
+async function liquidatePositionFusionInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, withdrawPercent) {
   const positionMint = tunaPosition.data.positionMint;
   const marketAddress = (await getMarketAddress(fusionPool.address))[0];
   const fusionPositionAddress = (await (0, import_fusionamm_client7.getPositionAddress)(positionMint))[0];
@@ -8939,13 +8939,13 @@ async function liquidatePositionFusionInstruction(authority, tunaPosition, mintA
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const liquidationFeeRecipientAtaA = (await (0, import_token_202215.findAssociatedTokenPda)({
-    owner: authority.address,
+  const feeRecipientAtaA = (await (0, import_token_202215.findAssociatedTokenPda)({
+    owner: tunaConfig.data.feeRecipient,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const liquidationFeeRecipientAtaB = (await (0, import_token_202215.findAssociatedTokenPda)({
-    owner: authority.address,
+  const feeRecipientAtaB = (await (0, import_token_202215.findAssociatedTokenPda)({
+    owner: tunaConfig.data.feeRecipient,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
@@ -8989,14 +8989,14 @@ async function liquidatePositionFusionInstruction(authority, tunaPosition, mintA
     vaultB: vaultB.address,
     vaultBAta,
     authority,
-    tunaConfig: tunaConfigAddress,
+    tunaConfig: tunaConfig.address,
     tunaPositionAta,
     tunaPositionAtaA,
     tunaPositionAtaB,
     fusionPosition: fusionPositionAddress,
     tunaPosition: tunaPosition.address,
-    liquidationFeeRecipientAtaA,
-    liquidationFeeRecipientAtaB,
+    feeRecipientAtaA,
+    feeRecipientAtaB,
     fusionPool: fusionPool.address,
     fusionammProgram: import_fusionamm_client7.FUSIONAMM_PROGRAM_ADDRESS,
     tokenProgramA: mintA.programAddress,

package/dist/index.mjs CHANGED Viewed

@@ -3393,12 +3393,12 @@ function getLiquidatePositionFusionInstruction(input, config) {
       value: input.tunaPositionAtaB ?? null,
       isWritable: true
     },
-    liquidationFeeRecipientAtaA: {
-      value: input.liquidationFeeRecipientAtaA ?? null,
+    feeRecipientAtaA: {
+      value: input.feeRecipientAtaA ?? null,
       isWritable: true
     },
-    liquidationFeeRecipientAtaB: {
-      value: input.liquidationFeeRecipientAtaB ?? null,
+    feeRecipientAtaB: {
+      value: input.feeRecipientAtaB ?? null,
       isWritable: true
     },
     pythOraclePriceFeedA: {
@@ -3437,8 +3437,8 @@ function getLiquidatePositionFusionInstruction(input, config) {
       getAccountMeta(accounts.tunaPositionAta),
       getAccountMeta(accounts.tunaPositionAtaA),
       getAccountMeta(accounts.tunaPositionAtaB),
-      getAccountMeta(accounts.liquidationFeeRecipientAtaA),
-      getAccountMeta(accounts.liquidationFeeRecipientAtaB),
+      getAccountMeta(accounts.feeRecipientAtaA),
+      getAccountMeta(accounts.feeRecipientAtaB),
       getAccountMeta(accounts.pythOraclePriceFeedA),
       getAccountMeta(accounts.pythOraclePriceFeedB),
       getAccountMeta(accounts.fusionammProgram),
@@ -3481,8 +3481,8 @@ function parseLiquidatePositionFusionInstruction(instruction) {
       tunaPositionAta: getNextAccount(),
       tunaPositionAtaA: getNextAccount(),
       tunaPositionAtaB: getNextAccount(),
-      liquidationFeeRecipientAtaA: getNextAccount(),
-      liquidationFeeRecipientAtaB: getNextAccount(),
+      feeRecipientAtaA: getNextAccount(),
+      feeRecipientAtaB: getNextAccount(),
       pythOraclePriceFeedA: getNextAccount(),
       pythOraclePriceFeedB: getNextAccount(),
       fusionammProgram: getNextAccount(),
@@ -3572,12 +3572,12 @@ function getLiquidatePositionOrcaInstruction(input, config) {
       value: input.tunaPositionAtaB ?? null,
       isWritable: true
     },
-    liquidationFeeRecipientAtaA: {
-      value: input.liquidationFeeRecipientAtaA ?? null,
+    feeRecipientAtaA: {
+      value: input.feeRecipientAtaA ?? null,
       isWritable: true
     },
-    liquidationFeeRecipientAtaB: {
-      value: input.liquidationFeeRecipientAtaB ?? null,
+    feeRecipientAtaB: {
+      value: input.feeRecipientAtaB ?? null,
       isWritable: true
     },
     pythOraclePriceFeedA: {
@@ -3616,8 +3616,8 @@ function getLiquidatePositionOrcaInstruction(input, config) {
       getAccountMeta(accounts.tunaPositionAta),
       getAccountMeta(accounts.tunaPositionAtaA),
       getAccountMeta(accounts.tunaPositionAtaB),
-      getAccountMeta(accounts.liquidationFeeRecipientAtaA),
-      getAccountMeta(accounts.liquidationFeeRecipientAtaB),
+      getAccountMeta(accounts.feeRecipientAtaA),
+      getAccountMeta(accounts.feeRecipientAtaB),
       getAccountMeta(accounts.pythOraclePriceFeedA),
       getAccountMeta(accounts.pythOraclePriceFeedB),
       getAccountMeta(accounts.whirlpoolProgram),
@@ -3660,8 +3660,8 @@ function parseLiquidatePositionOrcaInstruction(instruction) {
       tunaPositionAta: getNextAccount(),
       tunaPositionAtaA: getNextAccount(),
       tunaPositionAtaB: getNextAccount(),
-      liquidationFeeRecipientAtaA: getNextAccount(),
-      liquidationFeeRecipientAtaB: getNextAccount(),
+      feeRecipientAtaA: getNextAccount(),
+      feeRecipientAtaB: getNextAccount(),
       pythOraclePriceFeedA: getNextAccount(),
       pythOraclePriceFeedB: getNextAccount(),
       whirlpoolProgram: getNextAccount(),
@@ -8918,7 +8918,7 @@ import { getOracleAddress as getOracleAddress3, getPositionAddress as getPositio
 import { AccountRole as AccountRole8 } from "@solana/kit";
 import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS8 } from "@solana-program/memo";
 import { findAssociatedTokenPda as findAssociatedTokenPda14, TOKEN_2022_PROGRAM_ADDRESS as TOKEN_2022_PROGRAM_ADDRESS11 } from "@solana-program/token-2022";
-async function liquidatePositionOrcaInstructions(authority, tunaPosition, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
+async function liquidatePositionOrcaInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
   const instructions = [];
   const createLiquidatorAtaAInstructions = await getCreateAtaInstructions(
     void 0,
@@ -8939,6 +8939,7 @@ async function liquidatePositionOrcaInstructions(authority, tunaPosition, mintA,
   const ix = await liquidatePositionOrcaInstruction(
     authority,
     tunaPosition,
+    tunaConfig,
     mintA,
     mintB,
     vaultA,
@@ -8951,8 +8952,7 @@ async function liquidatePositionOrcaInstructions(authority, tunaPosition, mintA,
   instructions.push(...createLiquidatorAtaBInstructions.cleanup);
   return instructions;
 }
-async function liquidatePositionOrcaInstruction(authority, tunaPosition, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
-  const tunaConfigAddress = (await getTunaConfigAddress())[0];
+async function liquidatePositionOrcaInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
   const positionMint = tunaPosition.data.positionMint;
   const marketAddress = (await getMarketAddress(whirlpool.address))[0];
   const orcaPositionAddress = (await getPositionAddress11(positionMint))[0];
@@ -8982,13 +8982,13 @@ async function liquidatePositionOrcaInstruction(authority, tunaPosition, mintA,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const liquidationFeeRecipientAtaA = (await findAssociatedTokenPda14({
-    owner: authority.address,
+  const feeRecipientAtaA = (await findAssociatedTokenPda14({
+    owner: tunaConfig.data.feeRecipient,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const liquidationFeeRecipientAtaB = (await findAssociatedTokenPda14({
-    owner: authority.address,
+  const feeRecipientAtaB = (await findAssociatedTokenPda14({
+    owner: tunaConfig.data.feeRecipient,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
@@ -9034,14 +9034,14 @@ async function liquidatePositionOrcaInstruction(authority, tunaPosition, mintA,
     vaultB: vaultB.address,
     vaultBAta,
     authority,
-    tunaConfig: tunaConfigAddress,
+    tunaConfig: tunaConfig.address,
     tunaPositionAta,
     tunaPositionAtaA,
     tunaPositionAtaB,
     orcaPosition: orcaPositionAddress,
     tunaPosition: tunaPosition.address,
-    liquidationFeeRecipientAtaA,
-    liquidationFeeRecipientAtaB,
+    feeRecipientAtaA,
+    feeRecipientAtaB,
     whirlpool: whirlpool.address,
     whirlpoolProgram: WHIRLPOOL_PROGRAM_ADDRESS6,
     tokenProgramA: mintA.programAddress,
@@ -9059,7 +9059,7 @@ import { FUSIONAMM_PROGRAM_ADDRESS as FUSIONAMM_PROGRAM_ADDRESS6, getPositionAdd
 import { AccountRole as AccountRole9 } from "@solana/kit";
 import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS9 } from "@solana-program/memo";
 import { findAssociatedTokenPda as findAssociatedTokenPda15, TOKEN_2022_PROGRAM_ADDRESS as TOKEN_2022_PROGRAM_ADDRESS12 } from "@solana-program/token-2022";
-async function liquidatePositionFusionInstructions(authority, tunaPosition, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
+async function liquidatePositionFusionInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
   const instructions = [];
   const createLiquidatorAtaAInstructions = await getCreateAtaInstructions(
     void 0,
@@ -9080,6 +9080,7 @@ async function liquidatePositionFusionInstructions(authority, tunaPosition, mint
   const ix = await liquidatePositionFusionInstruction(
     authority,
     tunaPosition,
+    tunaConfig,
     mintA,
     mintB,
     vaultA,
@@ -9092,8 +9093,7 @@ async function liquidatePositionFusionInstructions(authority, tunaPosition, mint
   instructions.push(...createLiquidatorAtaBInstructions.cleanup);
   return instructions;
 }
-async function liquidatePositionFusionInstruction(authority, tunaPosition, mintA, mintB, vaultA, vaultB, fusionPool, withdrawPercent) {
-  const tunaConfigAddress = (await getTunaConfigAddress())[0];
+async function liquidatePositionFusionInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, withdrawPercent) {
   const positionMint = tunaPosition.data.positionMint;
   const marketAddress = (await getMarketAddress(fusionPool.address))[0];
   const fusionPositionAddress = (await getPositionAddress12(positionMint))[0];
@@ -9122,13 +9122,13 @@ async function liquidatePositionFusionInstruction(authority, tunaPosition, mintA
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
-  const liquidationFeeRecipientAtaA = (await findAssociatedTokenPda15({
-    owner: authority.address,
+  const feeRecipientAtaA = (await findAssociatedTokenPda15({
+    owner: tunaConfig.data.feeRecipient,
     mint: mintA.address,
     tokenProgram: mintA.programAddress
   }))[0];
-  const liquidationFeeRecipientAtaB = (await findAssociatedTokenPda15({
-    owner: authority.address,
+  const feeRecipientAtaB = (await findAssociatedTokenPda15({
+    owner: tunaConfig.data.feeRecipient,
     mint: mintB.address,
     tokenProgram: mintB.programAddress
   }))[0];
@@ -9172,14 +9172,14 @@ async function liquidatePositionFusionInstruction(authority, tunaPosition, mintA
     vaultB: vaultB.address,
     vaultBAta,
     authority,
-    tunaConfig: tunaConfigAddress,
+    tunaConfig: tunaConfig.address,
     tunaPositionAta,
     tunaPositionAtaA,
     tunaPositionAtaB,
     fusionPosition: fusionPositionAddress,
     tunaPosition: tunaPosition.address,
-    liquidationFeeRecipientAtaA,
-    liquidationFeeRecipientAtaB,
+    feeRecipientAtaA,
+    feeRecipientAtaB,
     fusionPool: fusionPool.address,
     fusionammProgram: FUSIONAMM_PROGRAM_ADDRESS6,
     tokenProgramA: mintA.programAddress,

package/package.json CHANGED Viewed

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