@liquid-af/sdk 0.3.0 → 0.4.0

package/src/helpers/preview.ts

@@ -160,7 +160,7 @@ export interface SwapPrefetchedState {
 export function calculateBuyCurvePreview(
 	amountInQuote: BN,
 	state: CurvePreviewState,
-	options?: CurvePreviewOptions
+	options?: CurvePreviewOptions,
 ): BuyCurvePreview {
 	const { globalConfig, bondingCurve } = state;
 
@@ -176,7 +176,7 @@ export function calculateBuyCurvePreview(
 		bondingCurve,
 		feeConfig,
 		options?.hasCreatorRef ?? false,
-		options?.hasTraderRef ?? false
+		options?.hasTraderRef ?? false,
 	);
 
 	const priceBefore = bondingCurve.virtualQuoteReserves
@@ -222,7 +222,7 @@ export function calculateBuyCurvePreview(
 export function calculateSellCurvePreview(
 	amountInTokens: BN,
 	state: CurvePreviewState,
-	options?: CurvePreviewOptions
+	options?: CurvePreviewOptions,
 ): SellCurvePreview {
 	const { globalConfig, bondingCurve } = state;
 
@@ -238,7 +238,7 @@ export function calculateSellCurvePreview(
 		bondingCurve,
 		feeConfig,
 		options?.hasCreatorRef ?? false,
-		options?.hasTraderRef ?? false
+		options?.hasTraderRef ?? false,
 	);
 
 	const priceBefore = bondingCurve.virtualQuoteReserves
@@ -280,7 +280,7 @@ export function calculateSellCurvePreview(
  */
 export function calculateSwapBuyPreview(
 	amountOut: BN,
-	state: SwapPreviewState
+	state: SwapPreviewState,
 ): SwapPreview {
 	const { ammConfig, baseVaultBalance, quoteVaultBalance } = state;
 
@@ -292,7 +292,7 @@ export function calculateSwapBuyPreview(
 			lpFeeRate: ammConfig.lpFeeRate,
 			creatorFeeRate: ammConfig.creatorFeeRate,
 			protocolFeeRate: ammConfig.protocolFeeRate,
-		}
+		},
 	);
 
 	const priceBefore = quoteVaultBalance
@@ -331,7 +331,7 @@ export function calculateSwapBuyPreview(
  */
 export function calculateSwapSellPreview(
 	amountIn: BN,
-	state: SwapPreviewState
+	state: SwapPreviewState,
 ): SwapPreview {
 	const { ammConfig, baseVaultBalance, quoteVaultBalance } = state;
 
@@ -343,7 +343,7 @@ export function calculateSwapSellPreview(
 			lpFeeRate: ammConfig.lpFeeRate,
 			creatorFeeRate: ammConfig.creatorFeeRate,
 			protocolFeeRate: ammConfig.protocolFeeRate,
-		}
+		},
 	);
 
 	const priceBefore = quoteVaultBalance
@@ -383,7 +383,7 @@ export function calculateSwapSellPreview(
  */
 async function fetchCurveGlobalConfig(
 	connection: Connection,
-	config: LiquidConfig
+	config: LiquidConfig,
 ): Promise<
 	CurvePreviewState["globalConfig"] & { initialVirtualReserveUsd: BN }
 > {
@@ -414,7 +414,7 @@ async function resolveNativeCurve(
 	connection: Connection,
 	mint: PublicKey,
 	options: NativeCurveOptions,
-	config: LiquidConfig
+	config: LiquidConfig,
 ): Promise<CurvePreviewState> {
 	const pre = options.prefetched;
 
@@ -427,7 +427,7 @@ async function resolveNativeCurve(
 
 	const virtualSolReserves = calculateVirtualSolReserves(
 		BigInt(globalConfig.initialVirtualReserveUsd!.toString()),
-		BigInt(options.solPriceUsd.toString())
+		BigInt(options.solPriceUsd.toString()),
 	);
 
 	const bondingCurve = pre?.bondingCurve ?? {
@@ -456,7 +456,7 @@ async function resolveStableCurve(
 	connection: Connection,
 	mint: PublicKey,
 	options: StableCurveOptions,
-	config: LiquidConfig
+	config: LiquidConfig,
 ): Promise<CurvePreviewState> {
 	const pre = options.prefetched;
 
@@ -467,9 +467,8 @@ async function resolveStableCurve(
 			: fetchStableBondingCurve(
 					connection,
 					mint,
-					options.quoteMint,
-					config
-			  ),
+					config,
+				),
 	]);
 
 	const bondingCurve = pre?.bondingCurve ?? {
@@ -495,21 +494,21 @@ function resolveCurveState(
 	connection: Connection,
 	mint: PublicKey,
 	config: LiquidConfig,
-	options: CurveAsyncOptions
+	options: CurveAsyncOptions,
 ): Promise<CurvePreviewState> {
 	if (options.quoteMint) {
 		return resolveStableCurve(
 			connection,
 			mint,
 			options as StableCurveOptions,
-			config
+			config,
 		);
 	}
 	return resolveNativeCurve(
 		connection,
 		mint,
 		options as NativeCurveOptions,
-		config
+		config,
 	);
 }
 
@@ -548,7 +547,7 @@ export async function previewBuyOnCurve(
 	mint: PublicKey,
 	amountInQuote: BN,
 	config: LiquidConfig,
-	options: CurveAsyncOptions
+	options: CurveAsyncOptions,
 ): Promise<BuyCurvePreview> {
 	const state = await resolveCurveState(connection, mint, config, options);
 	return calculateBuyCurvePreview(amountInQuote, state, {
@@ -584,7 +583,7 @@ export async function previewSellOnCurve(
 	mint: PublicKey,
 	amountInTokens: BN,
 	config: LiquidConfig,
-	options: CurveAsyncOptions
+	options: CurveAsyncOptions,
 ): Promise<SellCurvePreview> {
 	const state = await resolveCurveState(connection, mint, config, options);
 	return calculateSellCurvePreview(amountInTokens, state, {
@@ -617,7 +616,7 @@ export async function previewSwapSell(
 	quoteMint: PublicKey,
 	amountIn: BN,
 	config: LiquidConfig,
-	options?: { prefetched?: SwapPrefetchedState; solPriceUsd?: BN }
+	options?: { prefetched?: SwapPrefetchedState; solPriceUsd?: BN },
 ): Promise<SwapPreview> {
 	const pre = options?.prefetched;
 
@@ -638,13 +637,13 @@ export async function previewSwapSell(
 				connection,
 				poolState.baseVault,
 				"confirmed",
-				poolState.baseTokenProgram
+				poolState.baseTokenProgram,
 			),
 			getAccount(
 				connection,
 				poolState.quoteVault,
 				"confirmed",
-				poolState.quoteTokenProgram
+				poolState.quoteTokenProgram,
 			),
 		]);
 		baseVaultBalance = new BN(baseVaultAccount.amount.toString());
@@ -668,7 +667,7 @@ export async function previewSwapSell(
 			connection,
 			poolState.baseMint,
 			"confirmed",
-			poolState.baseTokenProgram
+			poolState.baseTokenProgram,
 		);
 		const baseTotalSupply = new BN(baseMintAccount.supply.toString());
 
@@ -680,13 +679,13 @@ export async function previewSwapSell(
 				baseTotalSupply,
 				options.solPriceUsd,
 				poolState.quoteMint,
-				tiers
+				tiers,
 			);
 
 		feeRates = { lpFeeRate, protocolFeeRate, creatorFeeRate };
 	} else {
 		throw new Error(
-			"Either prefetched.feeRates or solPriceUsd must be provided for tiered fee calculations"
+			"Either prefetched.feeRates or solPriceUsd must be provided for tiered fee calculations",
 		);
 	}
 
@@ -721,7 +720,7 @@ export async function previewSwapBuy(
 	quoteMint: PublicKey,
 	amountOut: BN,
 	config: LiquidConfig,
-	options?: { prefetched?: SwapPrefetchedState; solPriceUsd?: BN }
+	options?: { prefetched?: SwapPrefetchedState; solPriceUsd?: BN },
 ): Promise<SwapPreview> {
 	const pre = options?.prefetched;
 
@@ -742,13 +741,13 @@ export async function previewSwapBuy(
 				connection,
 				poolState.baseVault,
 				"confirmed",
-				poolState.baseTokenProgram
+				poolState.baseTokenProgram,
 			),
 			getAccount(
 				connection,
 				poolState.quoteVault,
 				"confirmed",
-				poolState.quoteTokenProgram
+				poolState.quoteTokenProgram,
 			),
 		]);
 		baseVaultBalance = new BN(baseVaultAccount.amount.toString());
@@ -772,7 +771,7 @@ export async function previewSwapBuy(
 			connection,
 			poolState.baseMint,
 			"confirmed",
-			poolState.baseTokenProgram
+			poolState.baseTokenProgram,
 		);
 		const baseTotalSupply = new BN(baseMintAccount.supply.toString());
 
@@ -784,13 +783,13 @@ export async function previewSwapBuy(
 				baseTotalSupply,
 				options.solPriceUsd,
 				poolState.quoteMint,
-				tiers
+				tiers,
 			);
 
 		feeRates = { lpFeeRate, protocolFeeRate, creatorFeeRate };
 	} else {
 		throw new Error(
-			"Either prefetched.feeRates or solPriceUsd must be provided for tiered fee calculations"
+			"Either prefetched.feeRates or solPriceUsd must be provided for tiered fee calculations",
 		);
 	}
 

package/src/helpers/user.ts

@@ -11,7 +11,7 @@ import { TOKEN_PROGRAM_ID, TOKEN_2022_PROGRAM_ID } from "@solana/spl-token";
  */
 export const resolveTokenProgram = async (
 	connection: Connection,
-	mint: PublicKey
+	mint: PublicKey,
 ): Promise<PublicKey> => {
 	const account = await connection.getAccountInfo(mint);
 	if (!account) {

package/src/idl/index.ts

@@ -2,6 +2,7 @@ import { Program } from "@coral-xyz/anchor";
 import { Connection } from "@solana/web3.js";
 import type { LiquidConfig } from "../config.js";
 import { createReadonlyProvider } from "../provider.js";
+import { patchIdl } from "./patch-idl.js";
 
 import liquidIdl from "./liquid.json" with { type: "json" };
 import liquidSwapIdl from "./liquid_swap.json" with { type: "json" };
@@ -9,6 +10,7 @@ import liquidFeesIdl from "./liquid_fees.json" with { type: "json" };
 import liquidStateIdl from "./liquid_state.json" with { type: "json" };
 
 export { liquidIdl, liquidSwapIdl, liquidFeesIdl, liquidStateIdl };
+export { patchIdl } from "./patch-idl.js";
 
 // Re-export Anchor-generated IDL types
 export type { Liquid } from "./liquid.js";
@@ -31,10 +33,13 @@ import type { LiquidState } from "./liquid_state.js";
  */
 export function getLiquidProgram(
 	connection: Connection,
-	config?: LiquidConfig
+	config?: LiquidConfig,
 ): Program<Liquid> {
 	const idl = config
-		? { ...liquidIdl, address: config.liquidProgramId.toBase58() }
+		? patchIdl(
+				{ ...liquidIdl, address: config.liquidProgramId.toBase58() },
+				config,
+			)
 		: liquidIdl;
 	return new Program(idl as Liquid, createReadonlyProvider(connection));
 }
@@ -49,10 +54,16 @@ export function getLiquidProgram(
  */
 export function getLiquidSwapProgram(
 	connection: Connection,
-	config?: LiquidConfig
+	config?: LiquidConfig,
 ): Program<LiquidSwap> {
 	const idl = config
-		? { ...liquidSwapIdl, address: config.liquidSwapProgramId.toBase58() }
+		? patchIdl(
+				{
+					...liquidSwapIdl,
+					address: config.liquidSwapProgramId.toBase58(),
+				},
+				config,
+			)
 		: liquidSwapIdl;
 	return new Program(idl as LiquidSwap, createReadonlyProvider(connection));
 }
@@ -67,10 +78,16 @@ export function getLiquidSwapProgram(
  */
 export function getLiquidFeesProgram(
 	connection: Connection,
-	config?: LiquidConfig
+	config?: LiquidConfig,
 ): Program<LiquidFees> {
 	const idl = config
-		? { ...liquidFeesIdl, address: config.liquidFeesProgramId.toBase58() }
+		? patchIdl(
+				{
+					...liquidFeesIdl,
+					address: config.liquidFeesProgramId.toBase58(),
+				},
+				config,
+			)
 		: liquidFeesIdl;
 	return new Program(idl as LiquidFees, createReadonlyProvider(connection));
 }
@@ -85,10 +102,16 @@ export function getLiquidFeesProgram(
  */
 export function getLiquidStateProgram(
 	connection: Connection,
-	config?: LiquidConfig
+	config?: LiquidConfig,
 ): Program<LiquidState> {
 	const idl = config
-		? { ...liquidStateIdl, address: config.liquidStateProgramId.toBase58() }
+		? patchIdl(
+				{
+					...liquidStateIdl,
+					address: config.liquidStateProgramId.toBase58(),
+				},
+				config,
+			)
 		: liquidStateIdl;
 	return new Program(idl as LiquidState, createReadonlyProvider(connection));
 }

package/src/idl/liquid.json

@@ -1108,10 +1108,6 @@
               {
                 "kind": "account",
                 "path": "mint"
-              },
-              {
-                "kind": "account",
-                "path": "quote_mint"
               }
             ]
           }
@@ -2851,10 +2847,6 @@
               {
                 "kind": "account",
                 "path": "mint"
-              },
-              {
-                "kind": "account",
-                "path": "quote_mint"
               }
             ]
           }
@@ -3814,10 +3806,6 @@
               {
                 "kind": "account",
                 "path": "mint"
-              },
-              {
-                "kind": "account",
-                "path": "quote_mint"
               }
             ]
           }
@@ -5609,10 +5597,6 @@
               {
                 "kind": "account",
                 "path": "mint"
-              },
-              {
-                "kind": "account",
-                "path": "quote_mint"
               }
             ]
           }
@@ -7076,10 +7060,6 @@
               {
                 "kind": "account",
                 "path": "mint"
-              },
-              {
-                "kind": "account",
-                "path": "quote_mint"
               }
             ]
           }

package/src/idl/liquid.ts

@@ -1114,10 +1114,6 @@ export type Liquid = {
               {
                 "kind": "account",
                 "path": "mint"
-              },
-              {
-                "kind": "account",
-                "path": "quoteMint"
               }
             ]
           }
@@ -2857,10 +2853,6 @@ export type Liquid = {
               {
                 "kind": "account",
                 "path": "mint"
-              },
-              {
-                "kind": "account",
-                "path": "quoteMint"
               }
             ]
           }
@@ -3820,10 +3812,6 @@ export type Liquid = {
               {
                 "kind": "account",
                 "path": "mint"
-              },
-              {
-                "kind": "account",
-                "path": "quoteMint"
               }
             ]
           }
@@ -5615,10 +5603,6 @@ export type Liquid = {
               {
                 "kind": "account",
                 "path": "mint"
-              },
-              {
-                "kind": "account",
-                "path": "quoteMint"
               }
             ]
           }
@@ -7082,10 +7066,6 @@ export type Liquid = {
               {
                 "kind": "account",
                 "path": "mint"
-              },
-              {
-                "kind": "account",
-                "path": "quoteMint"
               }
             ]
           }

package/src/idl/patch-idl.ts

@@ -0,0 +1,80 @@
+import { PublicKey } from "@solana/web3.js";
+import { MAINNET_CONFIG, type LiquidConfig } from "../config.js";
+
+interface ProgramReplacement {
+	mainnetAddress: string;
+	mainnetBytes: number[];
+	targetAddress: string;
+	targetBytes: number[];
+}
+
+function buildReplacementMap(config: LiquidConfig): ProgramReplacement[] {
+	const pairs: [PublicKey, PublicKey][] = [
+		[MAINNET_CONFIG.liquidProgramId, config.liquidProgramId],
+		[MAINNET_CONFIG.liquidSwapProgramId, config.liquidSwapProgramId],
+		[MAINNET_CONFIG.liquidFeesProgramId, config.liquidFeesProgramId],
+		[MAINNET_CONFIG.liquidStateProgramId, config.liquidStateProgramId],
+	];
+	return pairs
+		.filter(([mainnet, target]) => !mainnet.equals(target))
+		.map(([mainnet, target]) => ({
+			mainnetAddress: mainnet.toBase58(),
+			mainnetBytes: Array.from(mainnet.toBytes()),
+			targetAddress: target.toBase58(),
+			targetBytes: Array.from(target.toBytes()),
+		}));
+}
+
+function deepPatch(
+	node: unknown,
+	stringMap: Map<string, string>,
+	byteMap: Map<string, number[]>,
+): unknown {
+	if (node === null || node === undefined) return node;
+	if (typeof node !== "object") return node;
+
+	if (Array.isArray(node)) {
+		if (node.length === 32 && typeof node[0] === "number") {
+			const key = JSON.stringify(node);
+			const replacement = byteMap.get(key);
+			if (replacement) return replacement;
+		}
+		return node.map((item) => deepPatch(item, stringMap, byteMap));
+	}
+
+	const result: Record<string, unknown> = {};
+	for (const [key, value] of Object.entries(
+		node as Record<string, unknown>,
+	)) {
+		if (key === "address" && typeof value === "string") {
+			result[key] = stringMap.get(value) ?? value;
+		} else {
+			result[key] = deepPatch(value, stringMap, byteMap);
+		}
+	}
+	return result;
+}
+
+/**
+ * Deep-patches an Anchor IDL JSON object, replacing all embedded mainnet
+ * program addresses (both string and byte-array forms) with the addresses
+ * from the provided config.
+ *
+ * Returns the original IDL unchanged if config matches mainnet.
+ */
+export function patchIdl<T extends Record<string, unknown>>(
+	idl: T,
+	config: LiquidConfig,
+): T {
+	const replacements = buildReplacementMap(config);
+	if (replacements.length === 0) return idl;
+
+	const stringMap = new Map<string, string>();
+	const byteMap = new Map<string, number[]>();
+	for (const r of replacements) {
+		stringMap.set(r.mainnetAddress, r.targetAddress);
+		byteMap.set(JSON.stringify(r.mainnetBytes), r.targetBytes);
+	}
+
+	return deepPatch(idl, stringMap, byteMap) as T;
+}

package/src/index.ts

@@ -100,4 +100,5 @@ export {
 	liquidSwapIdl,
 	liquidFeesIdl,
 	liquidStateIdl,
+	patchIdl,
 } from "./idl/index.js";

package/src/instructions/liquid-fees.ts

@@ -27,7 +27,7 @@ export interface BuildUpdateFeeConfigParams {
  * @returns Transaction instruction
  */
 export function buildUpdateFeeConfig(
-	params: BuildUpdateFeeConfigParams
+	params: BuildUpdateFeeConfigParams,
 ): Promise<TransactionInstruction> {
 	const {
 		authority,
@@ -50,16 +50,16 @@ export function buildUpdateFeeConfig(
 	if (recipients && quoteMint) {
 		const [feeConfig] = getFeeConfigPDA(
 			tokenMint,
-			config.liquidFeesProgramId
+			config.liquidFeesProgramId,
 		);
 		const [feeVault] = getFeeVaultPDA(
 			feeConfig,
-			config.liquidFeesProgramId
+			config.liquidFeesProgramId,
 		);
 		tokenFeeVault = getAssociatedTokenAddressSync(
 			quoteMint,
 			feeVault,
-			true
+			true,
 		);
 	}
 
@@ -92,7 +92,7 @@ export interface BuildRevokeFeeConfigParams {
  * @returns Transaction instruction
  */
 export function buildRevokeFeeConfig(
-	params: BuildRevokeFeeConfigParams
+	params: BuildRevokeFeeConfigParams,
 ): Promise<TransactionInstruction> {
 	const { authority, tokenMint, quoteMint, config } = params;
 	const program = getCachedFeesProgram(config);
@@ -103,7 +103,7 @@ export function buildRevokeFeeConfig(
 	const tokenFeeVault = getAssociatedTokenAddressSync(
 		quoteMint,
 		feeVault,
-		true
+		true,
 	);
 
 	return program.methods
@@ -133,7 +133,7 @@ export interface BuildDistributeFeesParams {
  * @returns Transaction instruction
  */
 export function buildDistributeFees(
-	params: BuildDistributeFeesParams
+	params: BuildDistributeFeesParams,
 ): Promise<TransactionInstruction> {
 	const { payer, tokenMint, recipientVaults, config } = params;
 	const program = getCachedFeesProgram(config);
@@ -149,7 +149,7 @@ export function buildDistributeFees(
 				pubkey: vault,
 				isSigner: false,
 				isWritable: true,
-			}))
+			})),
 		)
 		.instruction();
 }
@@ -177,7 +177,7 @@ export interface BuildDistributeTokenFeesParams {
  * @returns Transaction instruction
  */
 export function buildDistributeTokenFees(
-	params: BuildDistributeTokenFeesParams
+	params: BuildDistributeTokenFeesParams,
 ): Promise<TransactionInstruction> {
 	const { payer, tokenMint, quoteMint, recipientVaultPairs, config } = params;
 	const program = getCachedFeesProgram(config);
@@ -213,7 +213,7 @@ export interface BuildClaimFeesParams {
  * @returns Transaction instruction
  */
 export function buildClaimFees(
-	params: BuildClaimFeesParams
+	params: BuildClaimFeesParams,
 ): Promise<TransactionInstruction> {
 	const { recipient, tokenMint, config } = params;
 	const program = getCachedFeesProgram(config);
@@ -244,7 +244,7 @@ export interface BuildClaimTokenFeesParams {
  * @returns Transaction instruction
  */
 export function buildClaimTokenFees(
-	params: BuildClaimTokenFeesParams
+	params: BuildClaimTokenFeesParams,
 ): Promise<TransactionInstruction> {
 	const { recipient, tokenMint, quoteMint, config } = params;
 	const program = getCachedFeesProgram(config);
@@ -273,19 +273,19 @@ export function deriveRecipientVaultPairs(
 	tokenMint: PublicKey,
 	recipients: PublicKey[],
 	quoteMint: PublicKey,
-	config: LiquidConfig
+	config: LiquidConfig,
 ): RecipientVaultPair[] {
 	const [feeConfig] = getFeeConfigPDA(tokenMint, config.liquidFeesProgramId);
 	return recipients.map((recipient) => {
 		const [vaultPda] = getRecipientVaultPDA(
 			feeConfig,
 			recipient,
-			config.liquidFeesProgramId
+			config.liquidFeesProgramId,
 		);
 		const vaultAta = getAssociatedTokenAddressSync(
 			quoteMint,
 			vaultPda,
-			true
+			true,
 		);
 		return { vaultPda, vaultAta };
 	});

package/src/instructions/liquid-state.ts

@@ -16,7 +16,7 @@ export interface BuildInitializeUserParams {
  * @returns Transaction instruction
  */
 export function buildInitializeUser(
-	params: BuildInitializeUserParams
+	params: BuildInitializeUserParams,
 ): Promise<TransactionInstruction> {
 	const { user, config } = params;
 	const program = getCachedStateProgram(config);
@@ -38,7 +38,7 @@ export interface BuildSetReferrerParams {
  * @returns Transaction instruction
  */
 export function buildSetReferrer(
-	params: BuildSetReferrerParams
+	params: BuildSetReferrerParams,
 ): Promise<TransactionInstruction> {
 	const { user, referrer, config } = params;
 	const program = getCachedStateProgram(config);
@@ -62,7 +62,7 @@ export interface BuildSetCashbackModeParams {
  * @returns Transaction instruction
  */
 export function buildSetCashbackMode(
-	params: BuildSetCashbackModeParams
+	params: BuildSetCashbackModeParams,
 ): Promise<TransactionInstruction> {
 	const { user, config } = params;
 	const program = getCachedStateProgram(config);
@@ -84,7 +84,7 @@ export interface BuildRedeemDealParams {
  * @returns Transaction instruction
  */
 export function buildRedeemDeal(
-	params: BuildRedeemDealParams
+	params: BuildRedeemDealParams,
 ): Promise<TransactionInstruction> {
 	const { user, dealOwner, config } = params;
 	const program = getCachedStateProgram(config);