@liquid-af/sdk 0.10.4 → 0.11.0

package/src/instructions/liquid-fees.ts

@@ -209,14 +209,13 @@ export function buildDistributeTokenFees(
 
 export interface BuildClaimFeesParams {
 	recipient: PublicKey;
-	tokenMint: PublicKey;
-	quoteMint: PublicKey;
 	config: LiquidConfig;
 }
 
 /**
  * Builds a claimFees instruction.
  * Allows a recipient to claim accumulated SOL fees from their vault PDA.
+ * Vaults are shared across all fee configs — one claim drains all SOL fees.
  *
  * @param params - {@link BuildClaimFeesParams}
  * @returns Transaction instruction
@@ -224,26 +223,19 @@ export interface BuildClaimFeesParams {
 export function buildClaimFees(
 	params: BuildClaimFeesParams,
 ): Promise<TransactionInstruction> {
-	const { recipient, tokenMint, quoteMint, config } = params;
+	const { recipient, config } = params;
 	const program = getCachedFeesProgram(config);
-	const [feeConfig] = getFeeConfigPDA(
-		tokenMint,
-		quoteMint,
-		config.liquidFeesProgramId,
-	);
 
 	return program.methods
 		.claimFees()
 		.accounts({
 			recipient,
-			feeConfig,
 		})
 		.instruction();
 }
 
 export interface BuildClaimTokenFeesParams {
 	recipient: PublicKey;
-	tokenMint: PublicKey;
 	quoteMint: PublicKey;
 	recipientTokenAccount?: PublicKey;
 	config: LiquidConfig;
@@ -252,7 +244,7 @@ export interface BuildClaimTokenFeesParams {
 /**
  * Builds a claimTokenFees instruction.
  * Allows a recipient to claim accumulated token fees from their vault ATA.
- * Closes the vault ATA after claiming to reclaim rent.
+ * Vaults are shared across all fee configs — one claim drains all token fees for the quote mint.
  *
  * @param params - {@link BuildClaimTokenFeesParams}
  * @returns Transaction instruction
@@ -260,14 +252,8 @@ export interface BuildClaimTokenFeesParams {
 export function buildClaimTokenFees(
 	params: BuildClaimTokenFeesParams,
 ): Promise<TransactionInstruction> {
-	const { recipient, tokenMint, quoteMint, recipientTokenAccount, config } =
-		params;
+	const { recipient, quoteMint, recipientTokenAccount, config } = params;
 	const program = getCachedFeesProgram(config);
-	const [feeConfig] = getFeeConfigPDA(
-		tokenMint,
-		quoteMint,
-		config.liquidFeesProgramId,
-	);
 
 	const resolvedRecipientTokenAccount =
 		recipientTokenAccount ??
@@ -277,7 +263,6 @@ export function buildClaimTokenFees(
 		.claimTokenFees()
 		.accounts({
 			recipient,
-			feeConfig,
 			quoteMint,
 			recipientTokenAccount: resolvedRecipientTokenAccount,
 		})
@@ -313,26 +298,18 @@ export function buildInitializeGlobalConfig(
 /**
  * Helper: derives recipient vault PDA pairs for use with buildDistributeTokenFees.
  *
- * @param tokenMint - Token mint address
  * @param recipients - Array of recipient public keys in fee_config order
  * @param quoteMint - Quote mint for ATA derivation
  * @param config - Liquid protocol config
  * @returns Array of RecipientVaultPair for remaining accounts
  */
 export function deriveRecipientVaultPairs(
-	tokenMint: PublicKey,
 	recipients: PublicKey[],
 	quoteMint: PublicKey,
 	config: LiquidConfig,
 ): RecipientVaultPair[] {
-	const [feeConfig] = getFeeConfigPDA(
-		tokenMint,
-		quoteMint,
-		config.liquidFeesProgramId,
-	);
 	return recipients.map((recipient) => {
 		const [vaultPda] = getRecipientVaultPDA(
-			feeConfig,
 			recipient,
 			config.liquidFeesProgramId,
 		);

package/src/math/bonding-curve.ts

@@ -41,8 +41,9 @@ export const calculateBuyExpectation = (
 	// New quote reserves after adding net amount
 	const newVirtualQuote = curveState.virtualQuoteReserves.add(amountInNet);
 
-	// Solve for new token reserves: newToken = k / newQuote + 1 (ceiling division)
-	const newVirtualToken = k.div(newVirtualQuote).add(new BN(1));
+	// Solve for new token reserves: newToken = ⌈k / newQuote⌉
+	const { div: q1, mod: r1 } = k.divmod(newVirtualQuote);
+	const newVirtualToken = r1.isZero() ? q1 : q1.add(new BN(1));
 
 	// Tokens out = difference in token reserves
 	const tokensOut = curveState.virtualTokenReserves.sub(newVirtualToken);
@@ -90,8 +91,9 @@ export const calculateSellExpectation = (
 	// New token reserves after adding sold tokens
 	const newVirtualToken = curveState.virtualTokenReserves.add(amountInTokens);
 
-	// Solve for new quote reserves: newQuote = k / newToken + 1 (ceiling division)
-	const newVirtualQuote = k.div(newVirtualToken).add(new BN(1));
+	// Solve for new quote reserves: newQuote = ⌈k / newToken⌉
+	const { div: q2, mod: r2 } = k.divmod(newVirtualToken);
+	const newVirtualQuote = r2.isZero() ? q2 : q2.add(new BN(1));
 
 	// Gross quote out (before fees)
 	const quoteOutGross = curveState.virtualQuoteReserves.sub(newVirtualQuote);

package/src/math/fees.ts

@@ -9,14 +9,18 @@ import type {
 
 /**
  * Calculates basis points of an amount.
- * result = (amount * bps) / 10000
+ * result = ceil(amount * bps / 10000)
  *
  * @param amount - The amount to calculate basis points of
  * @param bps - Basis points (1 bps = 0.01%)
  * @returns The calculated portion
  */
-export const calcBps = (amount: BN, bps: number): BN =>
-	amount.mul(new BN(bps)).div(new BN(BPS_DENOMINATOR));
+export const calcBps = (amount: BN, bps: number): BN => {
+	if (bps === 0) return new BN(0);
+	const numerator = amount.mul(new BN(bps));
+	const denom = new BN(BPS_DENOMINATOR);
+	return numerator.add(denom).sub(new BN(1)).div(denom);
+};
 
 /**
  * Fee configuration for bonding curve trades.
@@ -30,7 +34,10 @@ export interface FeeConfig {
 
 /**
  * Calculates fee distribution for a given trade amount.
- * Referral fees are carved from the protocol fee, not the trade amount.
+ * Matches the on-chain algorithm in `trade_utils::fees::calculate_fees`:
+ * - Single ceiling division for total fees
+ * - Proportional floor distribution for creator; protocol gets remainder (dust)
+ * - Referral fees use ceiling (carved from protocol fee, not trade amount)
  *
  * @param amount - Gross trade amount (before fees)
  * @param config - Fee configuration in basis points
@@ -44,23 +51,34 @@ export const calculateFees = (
 	hasCreatorRef: boolean,
 	hasTraderRef: boolean,
 ): FeeDistribution => {
-	const baseProtocolFee = calcBps(amount, config.protocolFeeBps);
-	const creatorFee = calcBps(amount, config.creatorFeeBps);
+	const totalBps = config.protocolFeeBps + config.creatorFeeBps;
+	if (totalBps === 0) {
+		return {
+			protocolFee: new BN(0),
+			creatorFee: new BN(0),
+			creatorReferralFee: new BN(0),
+			traderReferralFee: new BN(0),
+			totalFees: new BN(0),
+		};
+	}
+
+	// Single ceiling division for total fees (matches on-chain)
+	const totalFees = calcBps(amount, totalBps);
 
-	// Referral amounts are BPS of the protocol fee (not trade amount)
+	// Proportional floor distribution: creator gets floor, protocol gets remainder
+	const creatorFee = totalFees
+		.mul(new BN(config.creatorFeeBps))
+		.div(new BN(totalBps));
+	const protocolFee = totalFees.sub(creatorFee);
+
+	// Referral amounts are ceiling BPS of the protocol fee (not trade amount)
 	const creatorReferralFee = hasCreatorRef
-		? calcBps(baseProtocolFee, config.creatorReferralBps)
+		? calcBps(protocolFee, config.creatorReferralBps)
 		: new BN(0);
 	const traderReferralFee = hasTraderRef
-		? calcBps(baseProtocolFee, config.traderReferralBps)
+		? calcBps(protocolFee, config.traderReferralBps)
 		: new BN(0);
 
-	// Protocol fee starts at base amount. On-chain, it is only reduced
-	// when referral transfers actually succeed.
-	const protocolFee = baseProtocolFee;
-	// Referrals are carved from protocol fee (not additive), so total = protocol + creator.
-	const totalFees = protocolFee.add(creatorFee);
-
 	return {
 		protocolFee,
 		creatorFee,

package/src/pda/liquid-fees.ts

@@ -54,20 +54,19 @@ export const getFeeVaultPDA = (
 };
 
 /**
- * Derives the recipient vault PDA for a specific recipient within a fee config.
+ * Derives the recipient vault PDA for a specific recipient.
+ * Vaults are shared across all fee configs — one vault per recipient.
  *
- * @param feeConfig - Fee config PDA address
  * @param recipient - Recipient wallet address
  * @param programId - Liquid Fees program ID
  * @returns Tuple of [PDA address, bump seed]
  */
 export const getRecipientVaultPDA = (
-	feeConfig: PublicKey,
 	recipient: PublicKey,
 	programId: PublicKey,
 ): [PublicKey, number] => {
 	return PublicKey.findProgramAddressSync(
-		[SEED_RECIPIENT_VAULT, feeConfig.toBuffer(), recipient.toBuffer()],
+		[SEED_RECIPIENT_VAULT, recipient.toBuffer()],
 		programId,
 	);
 };