@liquid-af/sdk 0.6.1 → 0.7.1

package/src/instructions/liquid-fees.ts

@@ -12,10 +12,9 @@ import {
 export interface BuildUpdateFeeConfigParams {
 	authority: PublicKey;
 	tokenMint: PublicKey;
+	quoteMint: PublicKey;
 	recipients?: FeeRecipient[] | null;
 	newUpdateAuthority?: PublicKey | null;
-	/** Required when changing recipients to verify token fee vault is drained. */
-	quoteMint?: PublicKey;
 	config: LiquidConfig;
 }
 
@@ -47,9 +46,10 @@ export function buildUpdateFeeConfig(
 
 	// When changing recipients, the token fee vault must be passed to verify it's drained
 	let tokenFeeVault: PublicKey | null = null;
-	if (recipients && quoteMint) {
+	if (recipients) {
 		const [feeConfig] = getFeeConfigPDA(
 			tokenMint,
+			quoteMint,
 			config.liquidFeesProgramId,
 		);
 		const [feeVault] = getFeeVaultPDA(
@@ -68,9 +68,10 @@ export function buildUpdateFeeConfig(
 			recipients: formattedRecipients,
 			newUpdateAuthority: newUpdateAuthority ?? null,
 		})
-		.accounts({
+		.accountsPartial({
 			authority,
 			tokenMint,
+			quoteMint,
 			tokenFeeVault,
 		})
 		.instruction();
@@ -98,7 +99,11 @@ export function buildRevokeFeeConfig(
 	const program = getCachedFeesProgram(config);
 
 	// Derive token fee vault ATA (fee_vault's ATA for quote_mint)
-	const [feeConfig] = getFeeConfigPDA(tokenMint, config.liquidFeesProgramId);
+	const [feeConfig] = getFeeConfigPDA(
+		tokenMint,
+		quoteMint,
+		config.liquidFeesProgramId,
+	);
 	const [feeVault] = getFeeVaultPDA(feeConfig, config.liquidFeesProgramId);
 	const tokenFeeVault = getAssociatedTokenAddressSync(
 		quoteMint,
@@ -111,6 +116,7 @@ export function buildRevokeFeeConfig(
 		.accounts({
 			authority,
 			tokenMint,
+			quoteMint,
 			tokenFeeVault,
 		})
 		.instruction();
@@ -119,6 +125,7 @@ export function buildRevokeFeeConfig(
 export interface BuildDistributeFeesParams {
 	payer: PublicKey;
 	tokenMint: PublicKey;
+	quoteMint: PublicKey;
 	recipientVaults: PublicKey[];
 	config: LiquidConfig;
 }
@@ -135,7 +142,7 @@ export interface BuildDistributeFeesParams {
 export function buildDistributeFees(
 	params: BuildDistributeFeesParams,
 ): Promise<TransactionInstruction> {
-	const { payer, tokenMint, recipientVaults, config } = params;
+	const { payer, tokenMint, quoteMint, recipientVaults, config } = params;
 	const program = getCachedFeesProgram(config);
 
 	return program.methods
@@ -143,6 +150,7 @@ export function buildDistributeFees(
 		.accounts({
 			payer,
 			tokenMint,
+			quoteMint,
 		})
 		.remainingAccounts(
 			recipientVaults.map((vault) => ({
@@ -202,6 +210,7 @@ export function buildDistributeTokenFees(
 export interface BuildClaimFeesParams {
 	recipient: PublicKey;
 	tokenMint: PublicKey;
+	quoteMint: PublicKey;
 	config: LiquidConfig;
 }
 
@@ -215,9 +224,13 @@ export interface BuildClaimFeesParams {
 export function buildClaimFees(
 	params: BuildClaimFeesParams,
 ): Promise<TransactionInstruction> {
-	const { recipient, tokenMint, config } = params;
+	const { recipient, tokenMint, quoteMint, config } = params;
 	const program = getCachedFeesProgram(config);
-	const [feeConfig] = getFeeConfigPDA(tokenMint, config.liquidFeesProgramId);
+	const [feeConfig] = getFeeConfigPDA(
+		tokenMint,
+		quoteMint,
+		config.liquidFeesProgramId,
+	);
 
 	return program.methods
 		.claimFees()
@@ -248,7 +261,11 @@ export function buildClaimTokenFees(
 ): Promise<TransactionInstruction> {
 	const { recipient, tokenMint, quoteMint, config } = params;
 	const program = getCachedFeesProgram(config);
-	const [feeConfig] = getFeeConfigPDA(tokenMint, config.liquidFeesProgramId);
+	const [feeConfig] = getFeeConfigPDA(
+		tokenMint,
+		quoteMint,
+		config.liquidFeesProgramId,
+	);
 
 	return program.methods
 		.claimTokenFees()
@@ -301,7 +318,11 @@ export function deriveRecipientVaultPairs(
 	quoteMint: PublicKey,
 	config: LiquidConfig,
 ): RecipientVaultPair[] {
-	const [feeConfig] = getFeeConfigPDA(tokenMint, config.liquidFeesProgramId);
+	const [feeConfig] = getFeeConfigPDA(
+		tokenMint,
+		quoteMint,
+		config.liquidFeesProgramId,
+	);
 	return recipients.map((recipient) => {
 		const [vaultPda] = getRecipientVaultPDA(
 			feeConfig,

package/src/pda/index.ts

@@ -97,7 +97,11 @@ export const getAllBondingCurvePDAs = (
 		bondingCurve,
 		config.liquidProgramId,
 	);
-	const [feeConfig] = getFeeConfigPDA(mint, config.liquidFeesProgramId);
+	const [feeConfig] = getFeeConfigPDA(
+		mint,
+		WSOL_MINT,
+		config.liquidFeesProgramId,
+	);
 	const [feeVault] = getFeeVaultPDA(feeConfig, config.liquidFeesProgramId);
 	const [userProperties] = getUserPropertiesPDA(
 		creator,
@@ -165,7 +169,11 @@ export const getAllPoolPDAs = (
 	);
 	const [ammConfig] = getSwapGlobalConfigPDA(config.liquidSwapProgramId);
 	const [ammAuthority] = getSwapAuthorityPDA(config.liquidSwapProgramId);
-	const [feeConfig] = getFeeConfigPDA(baseMint, config.liquidFeesProgramId);
+	const [feeConfig] = getFeeConfigPDA(
+		baseMint,
+		quoteMint,
+		config.liquidFeesProgramId,
+	);
 	const [tokenVolume] = getTokenVolumePDA(
 		baseMint,
 		config.liquidStateProgramId,

package/src/pda/liquid-fees.ts

@@ -6,18 +6,20 @@ const SEED_GLOBAL_CONFIG = Buffer.from("global_config");
 const SEED_RECIPIENT_VAULT = Buffer.from("recipient_vault");
 
 /**
- * Derives the fee config PDA for a token mint.
+ * Derives the fee config PDA for a token mint and quote mint pair.
  *
  * @param tokenMint - Token mint address
+ * @param quoteMint - Quote token mint address (e.g., WSOL for native, USDC for stable)
  * @param programId - Liquid Fees program ID
  * @returns Tuple of [PDA address, bump seed]
  */
 export const getFeeConfigPDA = (
 	tokenMint: PublicKey,
+	quoteMint: PublicKey,
 	programId: PublicKey,
 ): [PublicKey, number] => {
 	return PublicKey.findProgramAddressSync(
-		[SEED_FEE_CONFIG, tokenMint.toBuffer()],
+		[SEED_FEE_CONFIG, tokenMint.toBuffer(), quoteMint.toBuffer()],
 		programId,
 	);
 };