@drift-labs/sdk 2.144.0-beta.2 → 2.144.0-beta.3

package/VERSION

@@ -1 +1 @@
-2.144.0-beta.2
+2.144.0-beta.3

package/lib/browser/accounts/grpcDriftClientAccountSubscriberV2.js

@@ -413,18 +413,6 @@ class grpcDriftClientAccountSubscriberV2 {
         // Remove accounts in batches - perp markets
         if (perpMarketPubkeysToRemove.length > 0) {
             await this.perpMarketsSubscriber.removeAccounts(perpMarketPubkeysToRemove);
-            // Clean up the mapping for removed perp markets
-            for (const pubkey of perpMarketPubkeysToRemove) {
-                const pubkeyString = pubkey.toBase58();
-                for (const [marketIndex, accountPubkey,] of this.perpMarketIndexToAccountPubkeyMap.entries()) {
-                    if (accountPubkey === pubkeyString) {
-                        this.perpMarketIndexToAccountPubkeyMap.delete(marketIndex);
-                        this.perpOracleMap.delete(marketIndex);
-                        this.perpOracleStringMap.delete(marketIndex);
-                        break;
-                    }
-                }
-            }
         }
         // Remove accounts in batches - oracles
         if (oraclePubkeysToRemove.length > 0) {

package/lib/browser/driftClient.d.ts

@@ -26,6 +26,11 @@ import { PythSolanaReceiver } from '@pythnetwork/pyth-solana-receiver/lib/idl/py
 import { Slothash } from './slot/SlothashSubscriber';
 import { SignedMsgOrderParams } from './types';
 import { RevenueShareEscrowMap } from './userMap/revenueShareEscrowMap';
+import { TitanClient } from './titan/titanClient';
+/**
+ * Union type for swap clients (Titan and Jupiter)
+ */
+export type SwapClient = TitanClient | JupiterClient;
 type RemainingAccountParams = {
     userAccounts: UserAccount[];
     writablePerpMarketIndexes?: number[];
@@ -531,23 +536,23 @@ export declare class DriftClient {
     addPhoenixRemainingAccounts(marketIndex: number, remainingAccounts: AccountMeta[], fulfillmentConfig: PhoenixV1FulfillmentConfigAccount): void;
     addOpenbookRemainingAccounts(marketIndex: number, remainingAccounts: AccountMeta[], fulfillmentConfig: OpenbookV2FulfillmentConfigAccount): void;
     /**
-     * Swap tokens in drift account using jupiter
-     * @param jupiterClient jupiter client to find routes and jupiter instructions
+     * Swap tokens in drift account using titan or jupiter
+     * @param swapClient swap client to find routes and instructions (Titan or Jupiter)
      * @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 jupiter
+     * @param outAssociatedTokenAccount the token account to receive the token being sold on titan or jupiter
      * @param inAssociatedTokenAccount the token account to
      * @param amount the amount of TokenIn, regardless of swapMode
-     * @param slippageBps the max slippage passed to jupiter api
-     * @param swapMode jupiter swapMode (ExactIn or ExactOut), default is ExactIn
-     * @param route the jupiter route to use for the swap
+     * @param slippageBps the max slippage passed to titan or jupiter api
+     * @param swapMode titan or jupiter swapMode (ExactIn or ExactOut), default is ExactIn
+     * @param route the titan or jupiter route to use for the swap
      * @param reduceOnly specify if In or Out token on the drift account must reduceOnly, checked at end of swap
      * @param v6 pass in the quote response from Jupiter quote's API (deprecated, use quote instead)
      * @param quote pass in the quote response from Jupiter quote's API
      * @param txParams
      */
-    swap({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, reduceOnly, txParams, v6, quote, onlyDirectRoutes, }: {
-        jupiterClient: JupiterClient;
+    swap({ swapClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, reduceOnly, txParams, v6, quote, onlyDirectRoutes, }: {
+        swapClient: SwapClient;
         outMarketIndex: number;
         inMarketIndex: number;
         outAssociatedTokenAccount?: PublicKey;
@@ -563,6 +568,22 @@ export declare class DriftClient {
         };
         quote?: QuoteResponse;
     }): Promise<TransactionSignature>;
+    getTitanSwapIx({ titanClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, onlyDirectRoutes, reduceOnly, userAccountPublicKey, }: {
+        titanClient: TitanClient;
+        outMarketIndex: number;
+        inMarketIndex: number;
+        outAssociatedTokenAccount?: PublicKey;
+        inAssociatedTokenAccount?: PublicKey;
+        amount: BN;
+        slippageBps?: number;
+        swapMode?: string;
+        onlyDirectRoutes?: boolean;
+        reduceOnly?: SwapReduceOnly;
+        userAccountPublicKey?: PublicKey;
+    }): Promise<{
+        ixs: TransactionInstruction[];
+        lookupTables: AddressLookupTableAccount[];
+    }>;
     getJupiterSwapIxV6({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, onlyDirectRoutes, quote, reduceOnly, userAccountPublicKey, }: {
         jupiterClient: JupiterClient;
         outMarketIndex: number;

package/lib/browser/driftClient.js

@@ -51,6 +51,7 @@ const spotPosition_1 = require("./math/spotPosition");
 const market_1 = require("./math/market");
 const fetch_1 = require("./accounts/fetch");
 const spotMarket_1 = require("./math/spotMarket");
+const jupiterClient_1 = require("./jupiter/jupiterClient");
 const memcmp_1 = require("./memcmp");
 const marinade_1 = require("./marinade");
 const orderParams_1 = require("./orderParams");
@@ -74,6 +75,7 @@ const utils_3 = require("./oracles/utils");
 const webSocketDriftClientAccountSubscriber_1 = require("./accounts/webSocketDriftClientAccountSubscriber");
 const orders_1 = require("./math/orders");
 const builder_1 = require("./math/builder");
+const titanClient_1 = require("./titan/titanClient");
 /**
  * # DriftClient
  * This class is the main way to interact with Drift Protocol. It allows you to subscribe to the various accounts where the Market's state is stored, as well as: opening positions, liquidating, settling funding, depositing & withdrawing, and more.
@@ -3100,36 +3102,56 @@ class DriftClient {
         }
     }
     /**
-     * Swap tokens in drift account using jupiter
-     * @param jupiterClient jupiter client to find routes and jupiter instructions
+     * Swap tokens in drift account using titan or jupiter
+     * @param swapClient swap client to find routes and instructions (Titan or Jupiter)
      * @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 jupiter
+     * @param outAssociatedTokenAccount the token account to receive the token being sold on titan or jupiter
      * @param inAssociatedTokenAccount the token account to
      * @param amount the amount of TokenIn, regardless of swapMode
-     * @param slippageBps the max slippage passed to jupiter api
-     * @param swapMode jupiter swapMode (ExactIn or ExactOut), default is ExactIn
-     * @param route the jupiter route to use for the swap
+     * @param slippageBps the max slippage passed to titan or jupiter api
+     * @param swapMode titan or jupiter swapMode (ExactIn or ExactOut), default is ExactIn
+     * @param route the titan or jupiter route to use for the swap
      * @param reduceOnly specify if In or Out token on the drift account must reduceOnly, checked at end of swap
      * @param v6 pass in the quote response from Jupiter quote's API (deprecated, use quote instead)
      * @param quote pass in the quote response from Jupiter quote's API
      * @param txParams
      */
-    async swap({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, reduceOnly, txParams, v6, quote, onlyDirectRoutes = false, }) {
-        const quoteToUse = quote !== null && quote !== void 0 ? quote : v6 === null || v6 === void 0 ? void 0 : v6.quote;
-        const res = await this.getJupiterSwapIxV6({
-            jupiterClient,
-            outMarketIndex,
-            inMarketIndex,
-            outAssociatedTokenAccount,
-            inAssociatedTokenAccount,
-            amount,
-            slippageBps,
-            swapMode,
-            quote: quoteToUse,
-            reduceOnly,
-            onlyDirectRoutes,
-        });
+    async swap({ swapClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, reduceOnly, txParams, v6, quote, onlyDirectRoutes = false, }) {
+        let res;
+        if (swapClient instanceof titanClient_1.TitanClient) {
+            res = await this.getTitanSwapIx({
+                titanClient: swapClient,
+                outMarketIndex,
+                inMarketIndex,
+                outAssociatedTokenAccount,
+                inAssociatedTokenAccount,
+                amount,
+                slippageBps,
+                swapMode,
+                onlyDirectRoutes,
+                reduceOnly,
+            });
+        }
+        else if (swapClient instanceof jupiterClient_1.JupiterClient) {
+            const quoteToUse = quote !== null && quote !== void 0 ? quote : v6 === null || v6 === void 0 ? void 0 : v6.quote;
+            res = await this.getJupiterSwapIxV6({
+                jupiterClient: swapClient,
+                outMarketIndex,
+                inMarketIndex,
+                outAssociatedTokenAccount,
+                inAssociatedTokenAccount,
+                amount,
+                slippageBps,
+                swapMode,
+                quote: quoteToUse,
+                reduceOnly,
+                onlyDirectRoutes,
+            });
+        }
+        else {
+            throw new Error('Invalid swap client type. Must be TitanClient or JupiterClient.');
+        }
         const ixs = res.ixs;
         const lookupTables = res.lookupTables;
         const tx = (await this.buildTransaction(ixs, txParams, 0, lookupTables));
@@ -3138,6 +3160,60 @@ class DriftClient {
         this.spotMarketLastSlotCache.set(inMarketIndex, slot);
         return txSig;
     }
+    async getTitanSwapIx({ titanClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, onlyDirectRoutes, reduceOnly, userAccountPublicKey, }) {
+        const outMarket = this.getSpotMarketAccount(outMarketIndex);
+        const inMarket = this.getSpotMarketAccount(inMarketIndex);
+        const isExactOut = swapMode === 'ExactOut';
+        const exactOutBufferedAmountIn = amount.muln(1001).divn(1000); // Add 10bp buffer
+        const preInstructions = [];
+        if (!outAssociatedTokenAccount) {
+            const tokenProgram = this.getTokenProgramForSpotMarket(outMarket);
+            outAssociatedTokenAccount = await this.getAssociatedTokenAccount(outMarket.marketIndex, false, tokenProgram);
+            const accountInfo = await this.connection.getAccountInfo(outAssociatedTokenAccount);
+            if (!accountInfo) {
+                preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(outAssociatedTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, outMarket.mint, tokenProgram));
+            }
+        }
+        if (!inAssociatedTokenAccount) {
+            const tokenProgram = this.getTokenProgramForSpotMarket(inMarket);
+            inAssociatedTokenAccount = await this.getAssociatedTokenAccount(inMarket.marketIndex, false, tokenProgram);
+            const accountInfo = await this.connection.getAccountInfo(inAssociatedTokenAccount);
+            if (!accountInfo) {
+                preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(inAssociatedTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, inMarket.mint, tokenProgram));
+            }
+        }
+        const { beginSwapIx, endSwapIx } = await this.getSwapIx({
+            outMarketIndex,
+            inMarketIndex,
+            amountIn: isExactOut ? exactOutBufferedAmountIn : amount,
+            inTokenAccount: inAssociatedTokenAccount,
+            outTokenAccount: outAssociatedTokenAccount,
+            reduceOnly,
+            userAccountPublicKey,
+        });
+        const { transactionMessage, lookupTables } = await titanClient.getSwap({
+            inputMint: inMarket.mint,
+            outputMint: outMarket.mint,
+            amount,
+            userPublicKey: this.provider.wallet.publicKey,
+            slippageBps,
+            swapMode: isExactOut ? titanClient_1.SwapMode.ExactOut : titanClient_1.SwapMode.ExactIn,
+            onlyDirectRoutes,
+            sizeConstraint: utils_2.MAX_TX_BYTE_SIZE - 375, // buffer for drift instructions
+        });
+        const titanInstructions = titanClient.getTitanInstructions({
+            transactionMessage,
+            inputMint: inMarket.mint,
+            outputMint: outMarket.mint,
+        });
+        const ixs = [
+            ...preInstructions,
+            beginSwapIx,
+            ...titanInstructions,
+            endSwapIx,
+        ];
+        return { ixs, lookupTables };
+    }
     async getJupiterSwapIxV6({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, onlyDirectRoutes, quote, reduceOnly, userAccountPublicKey, }) {
         const outMarket = this.getSpotMarketAccount(outMarketIndex);
         const inMarket = this.getSpotMarketAccount(inMarketIndex);

package/lib/browser/titan/titanClient.d.ts

@@ -0,0 +1,86 @@
+/// <reference types="bn.js" />
+import { Connection, PublicKey, TransactionMessage, AddressLookupTableAccount, TransactionInstruction } from '@solana/web3.js';
+import { BN } from '@coral-xyz/anchor';
+export declare enum SwapMode {
+    ExactIn = "ExactIn",
+    ExactOut = "ExactOut"
+}
+export interface QuoteResponse {
+    inputMint: string;
+    inAmount: string;
+    outputMint: string;
+    outAmount: string;
+    swapMode: SwapMode;
+    slippageBps: number;
+    platformFee?: {
+        amount?: string;
+        feeBps?: number;
+    };
+    routePlan: Array<{
+        swapInfo: any;
+        percent: number;
+    }>;
+    contextSlot?: number;
+    timeTaken?: number;
+    error?: string;
+    errorCode?: string;
+}
+export declare class TitanClient {
+    authToken: string;
+    url: string;
+    connection: Connection;
+    constructor({ connection, authToken, url, }: {
+        connection: Connection;
+        authToken: string;
+        url?: string;
+    });
+    /**
+     * Get routes for a swap
+     */
+    getQuote({ inputMint, outputMint, amount, userPublicKey, maxAccounts, // 50 is an estimated amount with buffer
+    slippageBps, swapMode, onlyDirectRoutes, excludeDexes, sizeConstraint, accountsLimitWritable, }: {
+        inputMint: PublicKey;
+        outputMint: PublicKey;
+        amount: BN;
+        userPublicKey: PublicKey;
+        maxAccounts?: number;
+        slippageBps?: number;
+        swapMode?: string;
+        onlyDirectRoutes?: boolean;
+        excludeDexes?: string[];
+        sizeConstraint?: number;
+        accountsLimitWritable?: number;
+    }): Promise<QuoteResponse>;
+    /**
+     * Get a swap transaction for quote
+     */
+    getSwap({ inputMint, outputMint, amount, userPublicKey, maxAccounts, // 50 is an estimated amount with buffer
+    slippageBps, swapMode, onlyDirectRoutes, excludeDexes, sizeConstraint, accountsLimitWritable, }: {
+        inputMint: PublicKey;
+        outputMint: PublicKey;
+        amount: BN;
+        userPublicKey: PublicKey;
+        maxAccounts?: number;
+        slippageBps?: number;
+        swapMode?: SwapMode;
+        onlyDirectRoutes?: boolean;
+        excludeDexes?: string[];
+        sizeConstraint?: number;
+        accountsLimitWritable?: number;
+    }): Promise<{
+        transactionMessage: TransactionMessage;
+        lookupTables: AddressLookupTableAccount[];
+    }>;
+    /**
+     * Get the titan instructions from transaction by filtering out instructions to compute budget and associated token programs
+     * @param transactionMessage the transaction message
+     * @param inputMint the input mint
+     * @param outputMint the output mint
+     */
+    getTitanInstructions({ transactionMessage, inputMint, outputMint, }: {
+        transactionMessage: TransactionMessage;
+        inputMint: PublicKey;
+        outputMint: PublicKey;
+    }): TransactionInstruction[];
+    private getTransactionMessageAndLookupTables;
+}

package/lib/browser/titan/titanClient.js

@@ -0,0 +1,214 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TitanClient = exports.SwapMode = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const msgpack_1 = require("@msgpack/msgpack");
+var SwapMode;
+(function (SwapMode) {
+    SwapMode["ExactIn"] = "ExactIn";
+    SwapMode["ExactOut"] = "ExactOut";
+})(SwapMode || (exports.SwapMode = SwapMode = {}));
+const TITAN_API_URL = 'https://api.titan.exchange';
+class TitanClient {
+    constructor({ connection, authToken, url, }) {
+        this.connection = connection;
+        this.authToken = authToken;
+        this.url = url !== null && url !== void 0 ? url : TITAN_API_URL;
+    }
+    /**
+     * Get routes for a swap
+     */
+    async getQuote({ inputMint, outputMint, amount, userPublicKey, maxAccounts = 50, // 50 is an estimated amount with buffer
+    slippageBps, swapMode, onlyDirectRoutes, excludeDexes, sizeConstraint, accountsLimitWritable, }) {
+        var _a;
+        const params = new URLSearchParams({
+            inputMint: inputMint.toString(),
+            outputMint: outputMint.toString(),
+            amount: amount.toString(),
+            userPublicKey: userPublicKey.toString(),
+            ...(slippageBps && { slippageBps: slippageBps.toString() }),
+            ...(swapMode && {
+                swapMode: swapMode === 'ExactOut' ? SwapMode.ExactOut : SwapMode.ExactIn,
+            }),
+            ...(onlyDirectRoutes && {
+                onlyDirectRoutes: onlyDirectRoutes.toString(),
+            }),
+            ...(maxAccounts && { accountsLimitTotal: maxAccounts.toString() }),
+            ...(excludeDexes && { excludeDexes: excludeDexes.join(',') }),
+            ...(sizeConstraint && { sizeConstraint: sizeConstraint.toString() }),
+            ...(accountsLimitWritable && {
+                accountsLimitWritable: accountsLimitWritable.toString(),
+            }),
+        });
+        const response = await fetch(`${this.url}/api/v1/quote/swap?${params.toString()}`, {
+            headers: {
+                Accept: 'application/vnd.msgpack',
+                'Accept-Encoding': 'gzip, deflate, br',
+                Authorization: `Bearer ${this.authToken}`,
+            },
+        });
+        if (!response.ok) {
+            throw new Error(`Titan API error: ${response.status} ${response.statusText}`);
+        }
+        const buffer = await response.arrayBuffer();
+        const data = (0, msgpack_1.decode)(buffer);
+        const route = data.quotes[Object.keys(data.quotes).find((key) => key.toLowerCase() === 'titan') ||
+            ''];
+        if (!route) {
+            throw new Error('No routes available');
+        }
+        return {
+            inputMint: inputMint.toString(),
+            inAmount: amount.toString(),
+            outputMint: outputMint.toString(),
+            outAmount: route.outAmount.toString(),
+            swapMode: data.swapMode,
+            slippageBps: route.slippageBps,
+            platformFee: route.platformFee
+                ? {
+                    amount: route.platformFee.amount.toString(),
+                    feeBps: route.platformFee.fee_bps,
+                }
+                : undefined,
+            routePlan: ((_a = route.steps) === null || _a === void 0 ? void 0 : _a.map((step) => {
+                var _a;
+                return ({
+                    swapInfo: {
+                        ammKey: new web3_js_1.PublicKey(step.ammKey).toString(),
+                        label: step.label,
+                        inputMint: new web3_js_1.PublicKey(step.inputMint).toString(),
+                        outputMint: new web3_js_1.PublicKey(step.outputMint).toString(),
+                        inAmount: step.inAmount.toString(),
+                        outAmount: step.outAmount.toString(),
+                        feeAmount: ((_a = step.feeAmount) === null || _a === void 0 ? void 0 : _a.toString()) || '0',
+                        feeMint: step.feeMint ? new web3_js_1.PublicKey(step.feeMint).toString() : '',
+                    },
+                    percent: 100,
+                });
+            })) || [],
+            contextSlot: route.contextSlot,
+            timeTaken: route.timeTaken,
+        };
+    }
+    /**
+     * Get a swap transaction for quote
+     */
+    async getSwap({ inputMint, outputMint, amount, userPublicKey, maxAccounts = 50, // 50 is an estimated amount with buffer
+    slippageBps, swapMode, onlyDirectRoutes, excludeDexes, sizeConstraint, accountsLimitWritable, }) {
+        const params = new URLSearchParams({
+            inputMint: inputMint.toString(),
+            outputMint: outputMint.toString(),
+            amount: amount.toString(),
+            userPublicKey: userPublicKey.toString(),
+            ...(slippageBps && { slippageBps: slippageBps.toString() }),
+            ...(swapMode && { swapMode: swapMode }),
+            ...(maxAccounts && { accountsLimitTotal: maxAccounts.toString() }),
+            ...(excludeDexes && { excludeDexes: excludeDexes.join(',') }),
+            ...(onlyDirectRoutes && {
+                onlyDirectRoutes: onlyDirectRoutes.toString(),
+            }),
+            ...(sizeConstraint && { sizeConstraint: sizeConstraint.toString() }),
+            ...(accountsLimitWritable && {
+                accountsLimitWritable: accountsLimitWritable.toString(),
+            }),
+        });
+        const response = await fetch(`${this.url}/api/v1/quote/swap?${params.toString()}`, {
+            headers: {
+                Accept: 'application/vnd.msgpack',
+                'Accept-Encoding': 'gzip, deflate, br',
+                Authorization: `Bearer ${this.authToken}`,
+            },
+        });
+        if (!response.ok) {
+            if (response.status === 404) {
+                throw new Error('No routes available');
+            }
+            throw new Error(`Titan API error: ${response.status} ${response.statusText}`);
+        }
+        const buffer = await response.arrayBuffer();
+        const data = (0, msgpack_1.decode)(buffer);
+        const route = data.quotes[Object.keys(data.quotes).find((key) => key.toLowerCase() === 'titan') ||
+            ''];
+        if (!route) {
+            throw new Error('No routes available');
+        }
+        if (route.instructions && route.instructions.length > 0) {
+            try {
+                const { transactionMessage, lookupTables } = await this.getTransactionMessageAndLookupTables(route, userPublicKey);
+                return { transactionMessage, lookupTables };
+            }
+            catch (err) {
+                throw new Error('Something went wrong with creating the Titan swap transaction. Please try again.');
+            }
+        }
+        throw new Error('No instructions provided in the route');
+    }
+    /**
+     * Get the titan instructions from transaction by filtering out instructions to compute budget and associated token programs
+     * @param transactionMessage the transaction message
+     * @param inputMint the input mint
+     * @param outputMint the output mint
+     */
+    getTitanInstructions({ transactionMessage, inputMint, outputMint, }) {
+        // Filter out common system instructions that can be handled by DriftClient
+        const filteredInstructions = transactionMessage.instructions.filter((instruction) => {
+            const programId = instruction.programId.toString();
+            // Filter out system programs
+            if (programId === 'ComputeBudget111111111111111111111111111111') {
+                return false;
+            }
+            if (programId === 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA') {
+                return false;
+            }
+            if (programId === '11111111111111111111111111111111') {
+                return false;
+            }
+            // Filter out Associated Token Account creation for input/output mints
+            if (programId === 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL') {
+                if (instruction.keys.length > 3) {
+                    const mint = instruction.keys[3].pubkey;
+                    if (mint.equals(inputMint) || mint.equals(outputMint)) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        });
+        return filteredInstructions;
+    }
+    async getTransactionMessageAndLookupTables(route, userPublicKey) {
+        const solanaInstructions = route.instructions.map((instruction) => ({
+            programId: new web3_js_1.PublicKey(instruction.p),
+            keys: instruction.a.map((meta) => ({
+                pubkey: new web3_js_1.PublicKey(meta.p),
+                isSigner: meta.s,
+                isWritable: meta.w,
+            })),
+            data: Buffer.from(instruction.d),
+        }));
+        // Get recent blockhash
+        const { blockhash } = await this.connection.getLatestBlockhash();
+        // Build address lookup tables if provided
+        const addressLookupTables = [];
+        if (route.addressLookupTables && route.addressLookupTables.length > 0) {
+            for (const altPubkey of route.addressLookupTables) {
+                try {
+                    const altAccount = await this.connection.getAddressLookupTable(new web3_js_1.PublicKey(altPubkey));
+                    if (altAccount.value) {
+                        addressLookupTables.push(altAccount.value);
+                    }
+                }
+                catch (err) {
+                    console.warn(`Failed to fetch address lookup table:`, err);
+                }
+            }
+        }
+        const transactionMessage = new web3_js_1.TransactionMessage({
+            payerKey: userPublicKey,
+            recentBlockhash: blockhash,
+            instructions: solanaInstructions,
+        });
+        return { transactionMessage, lookupTables: addressLookupTables };
+    }
+}
+exports.TitanClient = TitanClient;

package/lib/node/accounts/grpcDriftClientAccountSubscriberV2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grpcDriftClientAccountSubscriberV2.d.ts","sourceRoot":"","sources":["../../../src/accounts/grpcDriftClientAccountSubscriberV2.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"grpcDriftClientAccountSubscriberV2.d.ts","sourceRoot":"","sources":["../../../src/accounts/grpcDriftClientAccountSubscriberV2.ts"],"names":[],"mappings":"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"}

package/lib/node/accounts/grpcDriftClientAccountSubscriberV2.js

@@ -413,18 +413,6 @@ class grpcDriftClientAccountSubscriberV2 {
         // Remove accounts in batches - perp markets
         if (perpMarketPubkeysToRemove.length > 0) {
             await this.perpMarketsSubscriber.removeAccounts(perpMarketPubkeysToRemove);
-            // Clean up the mapping for removed perp markets
-            for (const pubkey of perpMarketPubkeysToRemove) {
-                const pubkeyString = pubkey.toBase58();
-                for (const [marketIndex, accountPubkey,] of this.perpMarketIndexToAccountPubkeyMap.entries()) {
-                    if (accountPubkey === pubkeyString) {
-                        this.perpMarketIndexToAccountPubkeyMap.delete(marketIndex);
-                        this.perpOracleMap.delete(marketIndex);
-                        this.perpOracleStringMap.delete(marketIndex);
-                        break;
-                    }
-                }
-            }
         }
         // Remove accounts in batches - oracles
         if (oraclePubkeysToRemove.length > 0) {

package/lib/node/driftClient.d.ts

@@ -26,6 +26,11 @@ import { PythSolanaReceiver } from '@pythnetwork/pyth-solana-receiver/lib/idl/py
 import { Slothash } from './slot/SlothashSubscriber';
 import { SignedMsgOrderParams } from './types';
 import { RevenueShareEscrowMap } from './userMap/revenueShareEscrowMap';
+import { TitanClient } from './titan/titanClient';
+/**
+ * Union type for swap clients (Titan and Jupiter)
+ */
+export type SwapClient = TitanClient | JupiterClient;
 type RemainingAccountParams = {
     userAccounts: UserAccount[];
     writablePerpMarketIndexes?: number[];
@@ -531,23 +536,23 @@ export declare class DriftClient {
     addPhoenixRemainingAccounts(marketIndex: number, remainingAccounts: AccountMeta[], fulfillmentConfig: PhoenixV1FulfillmentConfigAccount): void;
     addOpenbookRemainingAccounts(marketIndex: number, remainingAccounts: AccountMeta[], fulfillmentConfig: OpenbookV2FulfillmentConfigAccount): void;
     /**
-     * Swap tokens in drift account using jupiter
-     * @param jupiterClient jupiter client to find routes and jupiter instructions
+     * Swap tokens in drift account using titan or jupiter
+     * @param swapClient swap client to find routes and instructions (Titan or Jupiter)
      * @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 jupiter
+     * @param outAssociatedTokenAccount the token account to receive the token being sold on titan or jupiter
      * @param inAssociatedTokenAccount the token account to
      * @param amount the amount of TokenIn, regardless of swapMode
-     * @param slippageBps the max slippage passed to jupiter api
-     * @param swapMode jupiter swapMode (ExactIn or ExactOut), default is ExactIn
-     * @param route the jupiter route to use for the swap
+     * @param slippageBps the max slippage passed to titan or jupiter api
+     * @param swapMode titan or jupiter swapMode (ExactIn or ExactOut), default is ExactIn
+     * @param route the titan or jupiter route to use for the swap
      * @param reduceOnly specify if In or Out token on the drift account must reduceOnly, checked at end of swap
      * @param v6 pass in the quote response from Jupiter quote's API (deprecated, use quote instead)
      * @param quote pass in the quote response from Jupiter quote's API
      * @param txParams
      */
-    swap({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, reduceOnly, txParams, v6, quote, onlyDirectRoutes, }: {
-        jupiterClient: JupiterClient;
+    swap({ swapClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, reduceOnly, txParams, v6, quote, onlyDirectRoutes, }: {
+        swapClient: SwapClient;
         outMarketIndex: number;
         inMarketIndex: number;
         outAssociatedTokenAccount?: PublicKey;
@@ -563,6 +568,22 @@ export declare class DriftClient {
         };
         quote?: QuoteResponse;
     }): Promise<TransactionSignature>;
+    getTitanSwapIx({ titanClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, onlyDirectRoutes, reduceOnly, userAccountPublicKey, }: {
+        titanClient: TitanClient;
+        outMarketIndex: number;
+        inMarketIndex: number;
+        outAssociatedTokenAccount?: PublicKey;
+        inAssociatedTokenAccount?: PublicKey;
+        amount: BN;
+        slippageBps?: number;
+        swapMode?: string;
+        onlyDirectRoutes?: boolean;
+        reduceOnly?: SwapReduceOnly;
+        userAccountPublicKey?: PublicKey;
+    }): Promise<{
+        ixs: TransactionInstruction[];
+        lookupTables: AddressLookupTableAccount[];
+    }>;
     getJupiterSwapIxV6({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, onlyDirectRoutes, quote, reduceOnly, userAccountPublicKey, }: {
         jupiterClient: JupiterClient;
         outMarketIndex: number;