Skip to content

Add backwards compatibility for swap client args #2006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 31, 2025
Merged

Add backwards compatibility for swap client args #2006

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions sdk/src/driftClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5756,6 +5756,7 @@ export class DriftClient {
/**
* Swap tokens in drift account using titan or jupiter
* @param swapClient swap client to find routes and instructions (Titan or Jupiter)
* @param jupiterClient @deprecated Use swapClient instead. Legacy parameter for backward compatibility
* @param outMarketIndex the market index of the token you're buying
* @param inMarketIndex the market index of the token you're selling
* @param outAssociatedTokenAccount the token account to receive the token being sold on titan or jupiter
Expand All @@ -5771,6 +5772,7 @@ export class DriftClient {
*/
public async swap({
swapClient,
jupiterClient,
outMarketIndex,
inMarketIndex,
outAssociatedTokenAccount,
Expand All @@ -5784,7 +5786,9 @@ export class DriftClient {
quote,
onlyDirectRoutes = false,
}: {
swapClient: UnifiedSwapClient | SwapClient;
swapClient?: UnifiedSwapClient | SwapClient;
/** @deprecated Use swapClient instead. Legacy parameter for backward compatibility */
jupiterClient?: JupiterClient;
outMarketIndex: number;
inMarketIndex: number;
outAssociatedTokenAccount?: PublicKey;
Expand All @@ -5800,15 +5804,22 @@ export class DriftClient {
};
quote?: QuoteResponse;
}): Promise<TransactionSignature> {
// Handle backward compatibility: use jupiterClient if swapClient is not provided
const clientToUse = swapClient || jupiterClient;

if (!clientToUse) {
throw new Error('Either swapClient or jupiterClient must be provided');
}

let res: {
ixs: TransactionInstruction[];
lookupTables: AddressLookupTableAccount[];
};

// Use unified SwapClient if available
if (swapClient instanceof UnifiedSwapClient) {
if (clientToUse instanceof UnifiedSwapClient) {
res = await this.getSwapIxV2({
swapClient,
swapClient: clientToUse,
outMarketIndex,
inMarketIndex,
outAssociatedTokenAccount,
Expand All @@ -5821,9 +5832,9 @@ export class DriftClient {
quote,
v6,
});
} else if (swapClient instanceof TitanClient) {
} else if (clientToUse instanceof TitanClient) {
res = await this.getTitanSwapIx({
titanClient: swapClient,
titanClient: clientToUse,
outMarketIndex,
inMarketIndex,
outAssociatedTokenAccount,
Expand All @@ -5834,10 +5845,10 @@ export class DriftClient {
onlyDirectRoutes,
reduceOnly,
});
} else if (swapClient instanceof JupiterClient) {
} else if (clientToUse instanceof JupiterClient) {
const quoteToUse = quote ?? v6?.quote;
res = await this.getJupiterSwapIxV6({
jupiterClient: swapClient,
jupiterClient: clientToUse,
outMarketIndex,
inMarketIndex,
outAssociatedTokenAccount,
Expand Down
Loading