@liquid-af/sdk 0.8.1 → 0.9.0

package/src/idl/liquid_fees.json

@@ -309,93 +309,7 @@
           "docs": [
             "The recipient's own token account to receive claimed fees."
           ],
-          "writable": true,
-          "pda": {
-            "seeds": [
-              {
-                "kind": "account",
-                "path": "recipient"
-              },
-              {
-                "kind": "const",
-                "value": [
-                  6,
-                  221,
-                  246,
-                  225,
-                  215,
-                  101,
-                  161,
-                  147,
-                  217,
-                  203,
-                  225,
-                  70,
-                  206,
-                  235,
-                  121,
-                  172,
-                  28,
-                  180,
-                  133,
-                  237,
-                  95,
-                  91,
-                  55,
-                  145,
-                  58,
-                  140,
-                  245,
-                  133,
-                  126,
-                  255,
-                  0,
-                  169
-                ]
-              },
-              {
-                "kind": "account",
-                "path": "quote_mint"
-              }
-            ],
-            "program": {
-              "kind": "const",
-              "value": [
-                140,
-                151,
-                37,
-                143,
-                78,
-                36,
-                137,
-                241,
-                187,
-                61,
-                16,
-                41,
-                20,
-                142,
-                13,
-                131,
-                11,
-                90,
-                19,
-                153,
-                218,
-                255,
-                16,
-                132,
-                4,
-                142,
-                123,
-                216,
-                219,
-                233,
-                248,
-                89
-              ]
-            }
-          }
+          "writable": true
         },
         {
           "name": "fee_config",

package/src/idl/liquid_fees.ts

@@ -315,93 +315,7 @@ export type LiquidFees = {
           "docs": [
             "The recipient's own token account to receive claimed fees."
           ],
-          "writable": true,
-          "pda": {
-            "seeds": [
-              {
-                "kind": "account",
-                "path": "recipient"
-              },
-              {
-                "kind": "const",
-                "value": [
-                  6,
-                  221,
-                  246,
-                  225,
-                  215,
-                  101,
-                  161,
-                  147,
-                  217,
-                  203,
-                  225,
-                  70,
-                  206,
-                  235,
-                  121,
-                  172,
-                  28,
-                  180,
-                  133,
-                  237,
-                  95,
-                  91,
-                  55,
-                  145,
-                  58,
-                  140,
-                  245,
-                  133,
-                  126,
-                  255,
-                  0,
-                  169
-                ]
-              },
-              {
-                "kind": "account",
-                "path": "quoteMint"
-              }
-            ],
-            "program": {
-              "kind": "const",
-              "value": [
-                140,
-                151,
-                37,
-                143,
-                78,
-                36,
-                137,
-                241,
-                187,
-                61,
-                16,
-                41,
-                20,
-                142,
-                13,
-                131,
-                11,
-                90,
-                19,
-                153,
-                218,
-                255,
-                16,
-                132,
-                4,
-                142,
-                123,
-                216,
-                219,
-                233,
-                248,
-                89
-              ]
-            }
-          }
+          "writable": true
         },
         {
           "name": "feeConfig",

package/src/instructions/liquid-fees.ts

@@ -245,6 +245,7 @@ export interface BuildClaimTokenFeesParams {
 	recipient: PublicKey;
 	tokenMint: PublicKey;
 	quoteMint: PublicKey;
+	recipientTokenAccount?: PublicKey;
 	config: LiquidConfig;
 }
 
@@ -259,7 +260,8 @@ export interface BuildClaimTokenFeesParams {
 export function buildClaimTokenFees(
 	params: BuildClaimTokenFeesParams,
 ): Promise<TransactionInstruction> {
-	const { recipient, tokenMint, quoteMint, config } = params;
+	const { recipient, tokenMint, quoteMint, recipientTokenAccount, config } =
+		params;
 	const program = getCachedFeesProgram(config);
 	const [feeConfig] = getFeeConfigPDA(
 		tokenMint,
@@ -267,12 +269,17 @@ export function buildClaimTokenFees(
 		config.liquidFeesProgramId,
 	);
 
+	const resolvedRecipientTokenAccount =
+		recipientTokenAccount ??
+		getAssociatedTokenAddressSync(quoteMint, recipient, false);
+
 	return program.methods
 		.claimTokenFees()
 		.accounts({
 			recipient,
 			feeConfig,
 			quoteMint,
+			recipientTokenAccount: resolvedRecipientTokenAccount,
 		})
 		.instruction();
 }

package/src/instructions/liquid.ts

@@ -6,6 +6,7 @@ import type {
 import {
 	getAssociatedTokenAddressSync,
 	TOKEN_PROGRAM_ID,
+	TOKEN_2022_PROGRAM_ID,
 } from "@solana/spl-token";
 import type BN from "bn.js";
 import { WSOL_MINT, type LiquidConfig } from "../config.js";
@@ -118,6 +119,7 @@ export interface BuildBuyExactInNativeParams {
 	feeRecipient: PublicKey;
 	creatorReferralVault?: PublicKey | null;
 	traderReferralVault?: PublicKey | null;
+	userTokenAccount?: PublicKey;
 	config: LiquidConfig;
 }
 
@@ -141,6 +143,7 @@ export function buildBuyExactInNative(
 		feeRecipient,
 		creatorReferralVault,
 		traderReferralVault,
+		userTokenAccount,
 		config,
 	} = params;
 
@@ -152,6 +155,10 @@ export function buildBuyExactInNative(
 		config.liquidStateProgramId,
 	);
 
+	const resolvedUserTokenAccount =
+		userTokenAccount ??
+		getAssociatedTokenAddressSync(mint, user, false, TOKEN_2022_PROGRAM_ID);
+
 	return program.methods
 		.buyExactInNative(amountIn, minAmountOut)
 		.accountsPartial({
@@ -160,6 +167,7 @@ export function buildBuyExactInNative(
 			mint,
 			pythPriceFeed,
 			creatorUserProperties,
+			userTokenAccount: resolvedUserTokenAccount,
 			creatorReferralVault: creatorReferralVault ?? null,
 			traderReferralVault: traderReferralVault ?? null,
 			liquidState: {
@@ -204,6 +212,7 @@ export interface BuildSellExactInNativeParams {
 	feeRecipient: PublicKey;
 	creatorReferralVault?: PublicKey | null;
 	traderReferralVault?: PublicKey | null;
+	userTokenAccount?: PublicKey;
 	config: LiquidConfig;
 }
 
@@ -227,6 +236,7 @@ export function buildSellExactInNative(
 		feeRecipient,
 		creatorReferralVault,
 		traderReferralVault,
+		userTokenAccount,
 		config,
 	} = params;
 
@@ -238,6 +248,10 @@ export function buildSellExactInNative(
 		config.liquidStateProgramId,
 	);
 
+	const resolvedUserTokenAccount =
+		userTokenAccount ??
+		getAssociatedTokenAddressSync(mint, user, false, TOKEN_2022_PROGRAM_ID);
+
 	return program.methods
 		.sellExactInNative(amountIn, minAmountOut)
 		.accountsPartial({
@@ -246,6 +260,7 @@ export function buildSellExactInNative(
 			mint,
 			pythPriceFeed,
 			creatorUserProperties,
+			userTokenAccount: resolvedUserTokenAccount,
 			creatorReferralVault: creatorReferralVault ?? null,
 			traderReferralVault: traderReferralVault ?? null,
 			liquidState: {
@@ -290,6 +305,7 @@ export interface BuildBuyExactOutNativeParams {
 	feeRecipient: PublicKey;
 	creatorReferralVault?: PublicKey | null;
 	traderReferralVault?: PublicKey | null;
+	userTokenAccount?: PublicKey;
 	config: LiquidConfig;
 }
 
@@ -313,6 +329,7 @@ export function buildBuyExactOutNative(
 		feeRecipient,
 		creatorReferralVault,
 		traderReferralVault,
+		userTokenAccount,
 		config,
 	} = params;
 
@@ -323,6 +340,10 @@ export function buildBuyExactOutNative(
 		config.liquidStateProgramId,
 	);
 
+	const resolvedUserTokenAccount =
+		userTokenAccount ??
+		getAssociatedTokenAddressSync(mint, user, false, TOKEN_2022_PROGRAM_ID);
+
 	return program.methods
 		.buyExactOutNative(exactAmountOut, maxAmountIn)
 		.accountsPartial({
@@ -331,6 +352,7 @@ export function buildBuyExactOutNative(
 			mint,
 			pythPriceFeed,
 			creatorUserProperties,
+			userTokenAccount: resolvedUserTokenAccount,
 			creatorReferralVault: creatorReferralVault ?? null,
 			traderReferralVault: traderReferralVault ?? null,
 			liquidState: {
@@ -375,6 +397,7 @@ export interface BuildSellExactOutNativeParams {
 	feeRecipient: PublicKey;
 	creatorReferralVault?: PublicKey | null;
 	traderReferralVault?: PublicKey | null;
+	userTokenAccount?: PublicKey;
 	config: LiquidConfig;
 }
 
@@ -398,6 +421,7 @@ export function buildSellExactOutNative(
 		feeRecipient,
 		creatorReferralVault,
 		traderReferralVault,
+		userTokenAccount,
 		config,
 	} = params;
 
@@ -408,6 +432,10 @@ export function buildSellExactOutNative(
 		config.liquidStateProgramId,
 	);
 
+	const resolvedUserTokenAccount =
+		userTokenAccount ??
+		getAssociatedTokenAddressSync(mint, user, false, TOKEN_2022_PROGRAM_ID);
+
 	return program.methods
 		.sellExactOutNative(exactAmountOut, maxAmountIn)
 		.accountsPartial({
@@ -416,6 +444,7 @@ export function buildSellExactOutNative(
 			mint,
 			pythPriceFeed,
 			creatorUserProperties,
+			userTokenAccount: resolvedUserTokenAccount,
 			creatorReferralVault: creatorReferralVault ?? null,
 			traderReferralVault: traderReferralVault ?? null,
 			liquidState: {
@@ -732,6 +761,8 @@ export interface BuildBuyExactInStableParams {
 	feeRecipient: PublicKey;
 	creatorReferralVault?: PublicKey | null;
 	traderReferralVault?: PublicKey | null;
+	userTokenAccount?: PublicKey;
+	userQuoteAccount?: PublicKey;
 	config: LiquidConfig;
 }
 
@@ -755,6 +786,8 @@ export function buildBuyExactInStable(
 		feeRecipient,
 		creatorReferralVault,
 		traderReferralVault,
+		userTokenAccount,
+		userQuoteAccount,
 		config,
 	} = params;
 
@@ -783,6 +816,13 @@ export function buildBuyExactInStable(
 		config.liquidProgramId,
 	);
 
+	const resolvedUserTokenAccount =
+		userTokenAccount ??
+		getAssociatedTokenAddressSync(mint, user, false, TOKEN_2022_PROGRAM_ID);
+	const resolvedUserQuoteAccount =
+		userQuoteAccount ??
+		getAssociatedTokenAddressSync(quoteMint, user, false, TOKEN_PROGRAM_ID);
+
 	return program.methods
 		.buyExactInStable(amountIn, minAmountOut)
 		.accountsPartial({
@@ -791,6 +831,8 @@ export function buildBuyExactInStable(
 			quoteMint,
 			feeRecipient: feeRecipientQuoteAccount,
 			creatorUserProperties,
+			userTokenAccount: resolvedUserTokenAccount,
+			userQuoteAccount: resolvedUserQuoteAccount,
 			creatorReferralVault: creatorReferralVault ?? null,
 			traderReferralVault: traderReferralVault ?? null,
 			buybackVault,
@@ -832,6 +874,8 @@ export interface BuildSellExactInStableParams {
 	feeRecipient: PublicKey;
 	creatorReferralVault?: PublicKey | null;
 	traderReferralVault?: PublicKey | null;
+	userTokenAccount?: PublicKey;
+	userQuoteAccount?: PublicKey;
 	config: LiquidConfig;
 }
 
@@ -855,6 +899,8 @@ export function buildSellExactInStable(
 		feeRecipient,
 		creatorReferralVault,
 		traderReferralVault,
+		userTokenAccount,
+		userQuoteAccount,
 		config,
 	} = params;
 
@@ -883,6 +929,13 @@ export function buildSellExactInStable(
 		config.liquidProgramId,
 	);
 
+	const resolvedUserTokenAccount =
+		userTokenAccount ??
+		getAssociatedTokenAddressSync(mint, user, false, TOKEN_2022_PROGRAM_ID);
+	const resolvedUserQuoteAccount =
+		userQuoteAccount ??
+		getAssociatedTokenAddressSync(quoteMint, user, false, TOKEN_PROGRAM_ID);
+
 	return program.methods
 		.sellExactInStable(amountIn, minAmountOut)
 		.accountsPartial({
@@ -891,6 +944,8 @@ export function buildSellExactInStable(
 			quoteMint,
 			feeRecipient: feeRecipientQuoteAccount,
 			creatorUserProperties,
+			userTokenAccount: resolvedUserTokenAccount,
+			userQuoteAccount: resolvedUserQuoteAccount,
 			creatorReferralVault: creatorReferralVault ?? null,
 			traderReferralVault: traderReferralVault ?? null,
 			buybackVault,
@@ -932,6 +987,8 @@ export interface BuildBuyExactOutStableParams {
 	feeRecipient: PublicKey;
 	creatorReferralVault?: PublicKey | null;
 	traderReferralVault?: PublicKey | null;
+	userTokenAccount?: PublicKey;
+	userQuoteAccount?: PublicKey;
 	config: LiquidConfig;
 }
 
@@ -955,6 +1012,8 @@ export function buildBuyExactOutStable(
 		feeRecipient,
 		creatorReferralVault,
 		traderReferralVault,
+		userTokenAccount,
+		userQuoteAccount,
 		config,
 	} = params;
 
@@ -981,6 +1040,13 @@ export function buildBuyExactOutStable(
 		config.liquidProgramId,
 	);
 
+	const resolvedUserTokenAccount =
+		userTokenAccount ??
+		getAssociatedTokenAddressSync(mint, user, false, TOKEN_2022_PROGRAM_ID);
+	const resolvedUserQuoteAccount =
+		userQuoteAccount ??
+		getAssociatedTokenAddressSync(quoteMint, user, false, TOKEN_PROGRAM_ID);
+
 	return program.methods
 		.buyExactOutStable(exactAmountOut, maxAmountIn)
 		.accountsPartial({
@@ -989,6 +1055,8 @@ export function buildBuyExactOutStable(
 			quoteMint,
 			feeRecipient: feeRecipientQuoteAccount,
 			creatorUserProperties,
+			userTokenAccount: resolvedUserTokenAccount,
+			userQuoteAccount: resolvedUserQuoteAccount,
 			creatorReferralVault: creatorReferralVault ?? null,
 			traderReferralVault: traderReferralVault ?? null,
 			buybackVault,
@@ -1030,6 +1098,8 @@ export interface BuildSellExactOutStableParams {
 	feeRecipient: PublicKey;
 	creatorReferralVault?: PublicKey | null;
 	traderReferralVault?: PublicKey | null;
+	userTokenAccount?: PublicKey;
+	userQuoteAccount?: PublicKey;
 	config: LiquidConfig;
 }
 
@@ -1053,6 +1123,8 @@ export function buildSellExactOutStable(
 		feeRecipient,
 		creatorReferralVault,
 		traderReferralVault,
+		userTokenAccount,
+		userQuoteAccount,
 		config,
 	} = params;
 
@@ -1079,6 +1151,13 @@ export function buildSellExactOutStable(
 		config.liquidProgramId,
 	);
 
+	const resolvedUserTokenAccount =
+		userTokenAccount ??
+		getAssociatedTokenAddressSync(mint, user, false, TOKEN_2022_PROGRAM_ID);
+	const resolvedUserQuoteAccount =
+		userQuoteAccount ??
+		getAssociatedTokenAddressSync(quoteMint, user, false, TOKEN_PROGRAM_ID);
+
 	return program.methods
 		.sellExactOutStable(exactAmountOut, maxAmountIn)
 		.accountsPartial({
@@ -1087,6 +1166,8 @@ export function buildSellExactOutStable(
 			quoteMint,
 			feeRecipient: feeRecipientQuoteAccount,
 			creatorUserProperties,
+			userTokenAccount: resolvedUserTokenAccount,
+			userQuoteAccount: resolvedUserQuoteAccount,
 			creatorReferralVault: creatorReferralVault ?? null,
 			traderReferralVault: traderReferralVault ?? null,
 			buybackVault,

package/src/lut.ts

@@ -38,89 +38,48 @@ function getCpiAuthorityPDA(programId: PublicKey): PublicKey {
 }
 
 /**
- * Returns the 15 account addresses for the liquid-swap global LUT.
+ * Returns the 21 account addresses for the global LUT.
  *
- * Programs (7): System, SPL Token, Token-2022, ATA, ComputeBudget, State, Events
+ * Programs (9): System, SPL Token, Token-2022, ATA, ComputeBudget, State, Events, Fees, Swap
+ * Liquid PDAs (2): global_config, cpi_authority
  * Swap PDAs (3): authority, global_config, cpi_authority
- * State PDAs (3): global_amm_volume, cashback_config, state_events_cpi_authority
+ * State PDAs (4): global_amm_volume, global_curve_volume, cashback_config, cpi_authority
  * Constants (2): WSOL mint, oracle price feed
  *
  * @param config - Liquid protocol configuration
  * @param connection - Solana RPC connection (for fetching oracle price feed)
- * @returns Array of 15 public keys to populate the LUT
+ * @returns Array of 21 public keys to populate the LUT
  */
-export async function getSwapLutAccounts(
+export async function getLutAccounts(
 	config: LiquidConfig,
 	connection: Connection,
 ): Promise<PublicKey[]> {
 	const ammConfig = await fetchAmmConfig(connection, config);
 	const oraclePriceFeed = ammConfig.oraclePriceFeed as PublicKey;
 
+	// Liquid PDAs
+	const [liquidGlobalConfig] = getLiquidGlobalConfigPDA(
+		config.liquidProgramId,
+	);
+	const liquidCpiAuthority = getCpiAuthorityPDA(config.liquidProgramId);
+
+	// Swap PDAs
 	const [swapAuthority] = getSwapAuthorityPDA(config.liquidSwapProgramId);
 	const [swapGlobalConfig] = getSwapGlobalConfigPDA(
 		config.liquidSwapProgramId,
 	);
 	const swapCpiAuthority = getCpiAuthorityPDA(config.liquidSwapProgramId);
 
+	// State PDAs
 	const [globalAmmVolume] = getGlobalAmmVolumePDA(
 		config.liquidStateProgramId,
 	);
-	const [cashbackConfig] = getCashbackConfigPDA(config.liquidStateProgramId);
-	const stateCpiAuthority = getCpiAuthorityPDA(config.liquidStateProgramId);
-
-	return [
-		// Programs
-		SystemProgram.programId,
-		TOKEN_PROGRAM_ID,
-		TOKEN_2022_PROGRAM_ID,
-		ASSOCIATED_TOKEN_PROGRAM_ID,
-		ComputeBudgetProgram.programId,
-		config.liquidStateProgramId,
-		config.liquidEventsProgramId,
-		// Swap global PDAs
-		swapAuthority,
-		swapGlobalConfig,
-		swapCpiAuthority,
-		// State global PDAs
-		globalAmmVolume,
-		cashbackConfig,
-		stateCpiAuthority,
-		// Constants
-		WSOL_MINT,
-		oraclePriceFeed,
-	];
-}
-
-/**
- * Returns the 18 account addresses for the liquid (bonding curve) global LUT.
- *
- * Programs (9): System, SPL Token, Token-2022, ATA, ComputeBudget, State, Events, Fees, Swap
- * Liquid PDAs (2): global_config, cpi_authority
- * State PDAs (3): global_curve_volume, cashback_config, state_events_cpi_authority
- * Swap PDAs for migration (3): amm_global_config, amm_authority, swap_cpi_authority
- * Constants (1): WSOL mint
- *
- * @param config - Liquid protocol configuration
- * @returns Array of 18 public keys to populate the LUT
- */
-export function getLiquidLutAccounts(config: LiquidConfig): PublicKey[] {
-	const [liquidGlobalConfig] = getLiquidGlobalConfigPDA(
-		config.liquidProgramId,
-	);
-	const liquidCpiAuthority = getCpiAuthorityPDA(config.liquidProgramId);
-
 	const [globalCurveVolume] = getGlobalCurveVolumePDA(
 		config.liquidStateProgramId,
 	);
 	const [cashbackConfig] = getCashbackConfigPDA(config.liquidStateProgramId);
 	const stateCpiAuthority = getCpiAuthorityPDA(config.liquidStateProgramId);
 
-	const [swapGlobalConfig] = getSwapGlobalConfigPDA(
-		config.liquidSwapProgramId,
-	);
-	const [swapAuthority] = getSwapAuthorityPDA(config.liquidSwapProgramId);
-	const swapCpiAuthority = getCpiAuthorityPDA(config.liquidSwapProgramId);
-
 	return [
 		// Programs
 		SystemProgram.programId,
@@ -135,16 +94,18 @@ export function getLiquidLutAccounts(config: LiquidConfig): PublicKey[] {
 		// Liquid global PDAs
 		liquidGlobalConfig,
 		liquidCpiAuthority,
+		// Swap global PDAs
+		swapAuthority,
+		swapGlobalConfig,
+		swapCpiAuthority,
 		// State global PDAs
+		globalAmmVolume,
 		globalCurveVolume,
 		cashbackConfig,
 		stateCpiAuthority,
-		// Swap PDAs (for migration CPI)
-		swapGlobalConfig,
-		swapAuthority,
-		swapCpiAuthority,
 		// Constants
 		WSOL_MINT,
+		oraclePriceFeed,
 	];
 }