@drift-labs/sdk 2.146.0-beta.8 → 2.147.0-beta.0

package/VERSION

@@ -1 +1 @@
-2.146.0-beta.8
+2.147.0-beta.0

package/lib/browser/accounts/grpcMultiUserAccountSubscriber.js

@@ -76,7 +76,10 @@ class grpcMultiUserAccountSubscriber {
                 this.listeners.set(key, new Set());
                 this.keyToPk.set(key, userAccountPublicKey);
                 this.pendingAddKeys.add(key);
-                this.scheduleFlush();
+                if (this.isMultiSubscribed) {
+                    // only schedule flush if already subscribed to the multi-subscriber
+                    this.scheduleFlush();
+                }
             }
         };
         const perUser = {
@@ -110,6 +113,10 @@ class grpcMultiUserAccountSubscriber {
                 this.updateData(account, 0);
             },
             updateData(userAccount, slot) {
+                const existingData = parent.userData.get(key);
+                if (existingData && existingData.slot > slot) {
+                    return;
+                }
                 parent.userData.set(key, { data: userAccount, slot });
                 perUserEmitter.emit('userAccountUpdate', userAccount);
                 perUserEmitter.emit('update');

package/lib/browser/adminClient.d.ts

@@ -22,11 +22,11 @@ export declare class AdminClient extends DriftClient {
     initializeOpenbookV2FulfillmentConfig(marketIndex: number, openbookMarket: PublicKey): Promise<TransactionSignature>;
     getInitializeOpenbookV2FulfillmentConfigIx(marketIndex: number, openbookMarket: PublicKey): Promise<TransactionInstruction>;
     initializePerpMarket(marketIndex: number, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, oracleSource?: OracleSource, contractTier?: ContractTier, marginRatioInitial?: number, marginRatioMaintenance?: number, liquidatorFee?: number, ifLiquidatorFee?: number, imfFactor?: number, activeStatus?: boolean, baseSpread?: number, maxSpread?: number, maxOpenInterest?: BN, maxRevenueWithdrawPerPeriod?: BN, quoteMaxInsurance?: BN, orderStepSize?: BN, orderTickSize?: BN, minOrderSize?: BN, concentrationCoefScale?: BN, curveUpdateIntensity?: number, ammJitIntensity?: number, name?: string, lpPoolId?: number): Promise<TransactionSignature>;
-    getInitializePerpMarketIx(marketIndex: number, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, oracleSource?: OracleSource, contractTier?: ContractTier, marginRatioInitial?: number, marginRatioMaintenance?: number, liquidatorFee?: number, ifLiquidatorFee?: number, imfFactor?: number, activeStatus?: boolean, baseSpread?: number, maxSpread?: number, maxOpenInterest?: BN, maxRevenueWithdrawPerPeriod?: BN, quoteMaxInsurance?: BN, orderStepSize?: BN, orderTickSize?: BN, minOrderSize?: BN, concentrationCoefScale?: BN, curveUpdateIntensity?: number, ammJitIntensity?: number, name?: string, lpPoolId?: number, includeInitAmmCacheIx?: boolean): Promise<TransactionInstruction[]>;
+    getInitializePerpMarketIx(marketIndex: number, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, oracleSource?: OracleSource, contractTier?: ContractTier, marginRatioInitial?: number, marginRatioMaintenance?: number, liquidatorFee?: number, ifLiquidatorFee?: number, imfFactor?: number, activeStatus?: boolean, baseSpread?: number, maxSpread?: number, maxOpenInterest?: BN, maxRevenueWithdrawPerPeriod?: BN, quoteMaxInsurance?: BN, orderStepSize?: BN, orderTickSize?: BN, minOrderSize?: BN, concentrationCoefScale?: BN, curveUpdateIntensity?: number, ammJitIntensity?: number, name?: string, lpPoolId?: number): Promise<TransactionInstruction[]>;
     initializeAmmCache(txParams?: TxParams): Promise<TransactionSignature>;
     getInitializeAmmCacheIx(): Promise<TransactionInstruction>;
-    resizeAmmCache(txParams?: TxParams): Promise<TransactionSignature>;
-    getResizeAmmCacheIx(): Promise<TransactionInstruction>;
+    addMarketToAmmCache(perpMarketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
+    getAddMarketToAmmCacheIx(perpMarketIndex: number): Promise<TransactionInstruction>;
     deleteAmmCache(txParams?: TxParams): Promise<TransactionSignature>;
     getDeleteAmmCacheIx(): Promise<TransactionInstruction>;
     updateInitialAmmCacheInfo(perpMarketIndexes: number[], txParams?: TxParams): Promise<TransactionSignature>;

package/lib/browser/adminClient.js

@@ -207,10 +207,7 @@ class AdminClient extends driftClient_1.DriftClient {
     }
     async initializePerpMarket(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, oracleSource = types_1.OracleSource.PYTH, contractTier = types_1.ContractTier.SPECULATIVE, marginRatioInitial = 2000, marginRatioMaintenance = 500, liquidatorFee = 0, ifLiquidatorFee = 10000, imfFactor = 0, activeStatus = true, baseSpread = 0, maxSpread = 142500, maxOpenInterest = numericConstants_1.ZERO, maxRevenueWithdrawPerPeriod = numericConstants_1.ZERO, quoteMaxInsurance = numericConstants_1.ZERO, orderStepSize = numericConstants_1.BASE_PRECISION.divn(10000), orderTickSize = numericConstants_1.PRICE_PRECISION.divn(100000), minOrderSize = numericConstants_1.BASE_PRECISION.divn(10000), concentrationCoefScale = numericConstants_1.ONE, curveUpdateIntensity = 0, ammJitIntensity = 0, name = userName_1.DEFAULT_MARKET_NAME, lpPoolId = 0) {
         const currentPerpMarketIndex = this.getStateAccount().numberOfMarkets;
-        const ammCachePublicKey = (0, pda_1.getAmmCachePublicKey)(this.program.programId);
-        const ammCacheAccount = await this.connection.getAccountInfo(ammCachePublicKey);
-        const mustInitializeAmmCache = (ammCacheAccount === null || ammCacheAccount === void 0 ? void 0 : ammCacheAccount.data) == null;
-        const initializeMarketIxs = await this.getInitializePerpMarketIx(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, oracleSource, contractTier, marginRatioInitial, marginRatioMaintenance, liquidatorFee, ifLiquidatorFee, imfFactor, activeStatus, baseSpread, maxSpread, maxOpenInterest, maxRevenueWithdrawPerPeriod, quoteMaxInsurance, orderStepSize, orderTickSize, minOrderSize, concentrationCoefScale, curveUpdateIntensity, ammJitIntensity, name, lpPoolId, mustInitializeAmmCache);
+        const initializeMarketIxs = await this.getInitializePerpMarketIx(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, oracleSource, contractTier, marginRatioInitial, marginRatioMaintenance, liquidatorFee, ifLiquidatorFee, imfFactor, activeStatus, baseSpread, maxSpread, maxOpenInterest, maxRevenueWithdrawPerPeriod, quoteMaxInsurance, orderStepSize, orderTickSize, minOrderSize, concentrationCoefScale, curveUpdateIntensity, ammJitIntensity, name, lpPoolId);
         const tx = await this.buildTransaction(initializeMarketIxs);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         while (this.getStateAccount().numberOfMarkets <= currentPerpMarketIndex) {
@@ -224,12 +221,9 @@ class AdminClient extends driftClient_1.DriftClient {
         await this.accountSubscriber.setPerpOracleMap();
         return txSig;
     }
-    async getInitializePerpMarketIx(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, oracleSource = types_1.OracleSource.PYTH, contractTier = types_1.ContractTier.SPECULATIVE, marginRatioInitial = 2000, marginRatioMaintenance = 500, liquidatorFee = 0, ifLiquidatorFee = 10000, imfFactor = 0, activeStatus = true, baseSpread = 0, maxSpread = 142500, maxOpenInterest = numericConstants_1.ZERO, maxRevenueWithdrawPerPeriod = numericConstants_1.ZERO, quoteMaxInsurance = numericConstants_1.ZERO, orderStepSize = numericConstants_1.BASE_PRECISION.divn(10000), orderTickSize = numericConstants_1.PRICE_PRECISION.divn(100000), minOrderSize = numericConstants_1.BASE_PRECISION.divn(10000), concentrationCoefScale = numericConstants_1.ONE, curveUpdateIntensity = 0, ammJitIntensity = 0, name = userName_1.DEFAULT_MARKET_NAME, lpPoolId = 0, includeInitAmmCacheIx = false) {
+    async getInitializePerpMarketIx(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, oracleSource = types_1.OracleSource.PYTH, contractTier = types_1.ContractTier.SPECULATIVE, marginRatioInitial = 2000, marginRatioMaintenance = 500, liquidatorFee = 0, ifLiquidatorFee = 10000, imfFactor = 0, activeStatus = true, baseSpread = 0, maxSpread = 142500, maxOpenInterest = numericConstants_1.ZERO, maxRevenueWithdrawPerPeriod = numericConstants_1.ZERO, quoteMaxInsurance = numericConstants_1.ZERO, orderStepSize = numericConstants_1.BASE_PRECISION.divn(10000), orderTickSize = numericConstants_1.PRICE_PRECISION.divn(100000), minOrderSize = numericConstants_1.BASE_PRECISION.divn(10000), concentrationCoefScale = numericConstants_1.ONE, curveUpdateIntensity = 0, ammJitIntensity = 0, name = userName_1.DEFAULT_MARKET_NAME, lpPoolId = 0) {
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex);
         const ixs = [];
-        if (includeInitAmmCacheIx) {
-            ixs.push(await this.getInitializeAmmCacheIx());
-        }
         const nameBuffer = (0, userName_1.encodeName)(name);
         const initPerpIx = await this.program.instruction.initializePerpMarket(marketIndex, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, oracleSource, contractTier, marginRatioInitial, marginRatioMaintenance, liquidatorFee, ifLiquidatorFee, imfFactor, activeStatus, baseSpread, maxSpread, maxOpenInterest, maxRevenueWithdrawPerPeriod, quoteMaxInsurance, orderStepSize, orderTickSize, minOrderSize, concentrationCoefScale, curveUpdateIntensity, ammJitIntensity, nameBuffer, lpPoolId, {
             accounts: {
@@ -239,7 +233,6 @@ class AdminClient extends driftClient_1.DriftClient {
                     : this.wallet.publicKey,
                 oracle: priceOracle,
                 perpMarket: perpMarketPublicKey,
-                ammCache: (0, pda_1.getAmmCachePublicKey)(this.program.programId),
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                 systemProgram: anchor.web3.SystemProgram.programId,
             },
@@ -260,25 +253,26 @@ class AdminClient extends driftClient_1.DriftClient {
                 admin: this.useHotWalletAdmin
                     ? this.wallet.publicKey
                     : this.getStateAccount().admin,
-                ammCache: (0, pda_1.getAmmCachePublicKey)(this.program.programId),
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                ammCache: (0, pda_1.getAmmCachePublicKey)(this.program.programId),
                 systemProgram: anchor.web3.SystemProgram.programId,
             },
         });
     }
-    async resizeAmmCache(txParams) {
-        const initializeAmmCacheIx = await this.getResizeAmmCacheIx();
+    async addMarketToAmmCache(perpMarketIndex, txParams) {
+        const initializeAmmCacheIx = await this.getAddMarketToAmmCacheIx(perpMarketIndex);
         const tx = await this.buildTransaction(initializeAmmCacheIx, txParams);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getResizeAmmCacheIx() {
-        return await this.program.instruction.resizeAmmCache({
+    async getAddMarketToAmmCacheIx(perpMarketIndex) {
+        return await this.program.instruction.addMarketToAmmCache({
             accounts: {
                 state: await this.getStatePublicKey(),
                 admin: this.useHotWalletAdmin
                     ? this.wallet.publicKey
                     : this.getStateAccount().admin,
+                perpMarket: this.getPerpMarketAccount(perpMarketIndex).pubkey,
                 ammCache: (0, pda_1.getAmmCachePublicKey)(this.program.programId),
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                 systemProgram: anchor.web3.SystemProgram.programId,
@@ -295,7 +289,9 @@ class AdminClient extends driftClient_1.DriftClient {
         return await this.program.instruction.deleteAmmCache({
             accounts: {
                 state: await this.getStatePublicKey(),
-                admin: this.getStateAccount().admin,
+                admin: this.useHotWalletAdmin
+                    ? this.wallet.publicKey
+                    : this.getStateAccount().admin,
                 ammCache: (0, pda_1.getAmmCachePublicKey)(this.program.programId),
             },
         });
@@ -2857,7 +2853,7 @@ class AdminClient extends driftClient_1.DriftClient {
             quote = fetchedQuote;
         }
         if (!quote) {
-            throw new Error("Could not fetch Jupiter's quote. Please try again.");
+            throw new Error('Could not fetch swap quote. Please try again.');
         }
         const isExactOut = swapMode === 'ExactOut' || quote.swapMode === 'ExactOut';
         const amountIn = new anchor_1.BN(quote.inAmount);
@@ -2895,7 +2891,7 @@ class AdminClient extends driftClient_1.DriftClient {
             amountIn: isExactOut ? exactOutBufferedAmountIn : amountIn,
             inTokenAccount: inAssociatedTokenAccount,
             outTokenAccount: outAssociatedTokenAccount,
-        });
+        }, true);
         const ixs = [
             ...preInstructions,
             beginSwapIx,

package/lib/browser/constants/numericConstants.d.ts

@@ -71,3 +71,5 @@ export declare const FUEL_WINDOW: BN;
 export declare const FUEL_START_TS: BN;
 export declare const MAX_PREDICTION_PRICE: BN;
 export declare const GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE = 99;
+export declare const MAX_I64: BN;
+export declare const MIN_I64: BN;

package/lib/browser/constants/numericConstants.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MARGIN_PRECISION = exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.PRICE_DIV_PEG = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION_EXP = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_RATE_BUFFER_PRECISION = exports.FUNDING_RATE_PRECISION = exports.PRICE_PRECISION = exports.QUOTE_PRECISION = exports.LIQUIDATION_FEE_PRECISION = exports.SPOT_MARKET_IMF_PRECISION = exports.SPOT_MARKET_IMF_PRECISION_EXP = exports.SPOT_MARKET_BALANCE_PRECISION = exports.SPOT_MARKET_BALANCE_PRECISION_EXP = exports.SPOT_MARKET_WEIGHT_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION_EXP = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP = exports.SPOT_MARKET_RATE_PRECISION = exports.SPOT_MARKET_RATE_PRECISION_EXP = exports.AMM_RESERVE_PRECISION_EXP = exports.PEG_PRECISION_EXP = exports.FUNDING_RATE_PRECISION_EXP = exports.PRICE_PRECISION_EXP = exports.FUNDING_RATE_BUFFER_PRECISION_EXP = exports.QUOTE_PRECISION_EXP = exports.CONCENTRATION_PRECISION = exports.PERCENTAGE_PRECISION = exports.PERCENTAGE_PRECISION_EXP = exports.MAX_LEVERAGE_ORDER_SIZE = exports.MAX_LEVERAGE = exports.TEN_MILLION = exports.BN_MAX = exports.TEN_THOUSAND = exports.TEN = exports.NINE = exports.EIGHT = exports.SEVEN = exports.SIX = exports.FIVE = exports.FOUR = exports.THREE = exports.TWO = exports.ONE = exports.ZERO = void 0;
-exports.GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE = exports.MAX_PREDICTION_PRICE = exports.FUEL_START_TS = exports.FUEL_WINDOW = exports.DUST_POSITION_SIZE = exports.SLOT_TIME_ESTIMATE_MS = exports.IDLE_TIME_SLOTS = exports.ACCOUNT_AGE_DELETION_CUTOFF_SECONDS = exports.DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT = exports.OPEN_ORDER_MARGIN_REQUIREMENT = exports.LAMPORTS_EXP = exports.LAMPORTS_PRECISION = exports.GOV_SPOT_MARKET_INDEX = exports.QUOTE_SPOT_MARKET_INDEX = exports.ONE_YEAR = exports.ONE_HOUR = exports.FIVE_MINUTE = exports.PRICE_TIMES_AMM_TO_QUOTE_PRECISION_RATIO = exports.FUNDING_RATE_OFFSET_DENOMINATOR = exports.LIQUIDATION_PCT_PRECISION = exports.BID_ASK_SPREAD_PRECISION = void 0;
+exports.MIN_I64 = exports.MAX_I64 = exports.GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE = exports.MAX_PREDICTION_PRICE = exports.FUEL_START_TS = exports.FUEL_WINDOW = exports.DUST_POSITION_SIZE = exports.SLOT_TIME_ESTIMATE_MS = exports.IDLE_TIME_SLOTS = exports.ACCOUNT_AGE_DELETION_CUTOFF_SECONDS = exports.DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT = exports.OPEN_ORDER_MARGIN_REQUIREMENT = exports.LAMPORTS_EXP = exports.LAMPORTS_PRECISION = exports.GOV_SPOT_MARKET_INDEX = exports.QUOTE_SPOT_MARKET_INDEX = exports.ONE_YEAR = exports.ONE_HOUR = exports.FIVE_MINUTE = exports.PRICE_TIMES_AMM_TO_QUOTE_PRECISION_RATIO = exports.FUNDING_RATE_OFFSET_DENOMINATOR = exports.LIQUIDATION_PCT_PRECISION = exports.BID_ASK_SPREAD_PRECISION = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const anchor_1 = require("@coral-xyz/anchor");
+const bigNum_1 = require("../factory/bigNum");
 exports.ZERO = new anchor_1.BN(0);
 exports.ONE = new anchor_1.BN(1);
 exports.TWO = new anchor_1.BN(2);
@@ -75,3 +76,6 @@ exports.FUEL_WINDOW = new anchor_1.BN(60 * 60 * 24 * 28); // 28 days
 exports.FUEL_START_TS = new anchor_1.BN(1723147200); // unix timestamp
 exports.MAX_PREDICTION_PRICE = exports.PRICE_PRECISION;
 exports.GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE = 99;
+// integer constants
+exports.MAX_I64 = bigNum_1.BigNum.fromPrint('9223372036854775807').val;
+exports.MIN_I64 = bigNum_1.BigNum.fromPrint('-9223372036854775808').val;

package/lib/browser/constants/perpMarkets.d.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from '@solana/web3.js';
-import { OracleSource } from '../types';
+import { MarketStatus, OracleSource } from '../types';
 import { DriftEnv } from '../config';
 export type PerpMarketConfig = {
     fullName?: string;
@@ -12,6 +12,7 @@ export type PerpMarketConfig = {
     oracleSource: OracleSource;
     pythFeedId?: string;
     pythLazerId?: number;
+    marketStatus?: MarketStatus;
 };
 export declare const DevnetPerpMarkets: PerpMarketConfig[];
 export declare const MainnetPerpMarkets: PerpMarketConfig[];

package/lib/browser/constants/perpMarkets.js

@@ -558,6 +558,7 @@ exports.MainnetPerpMarkets = [
         launchTs: 1699265968000,
         oracleSource: types_1.OracleSource.PYTH_PULL,
         pythFeedId: '0x2f2d17abbc1e781bd87b4a5d52c8b2856886f5c482fa3593cebf6795040ab0b6',
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'Pyth',
@@ -654,6 +655,7 @@ exports.MainnetPerpMarkets = [
         oracleSource: types_1.OracleSource.PYTH_LAZER,
         pythFeedId: '0xa9f3b2a89c6f85a6c20a9518abde39b944e839ca49a0c92307c65974d3f14a57',
         pythLazerId: 83,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'BITTENSOR',
@@ -738,6 +740,7 @@ exports.MainnetPerpMarkets = [
         oracleSource: types_1.OracleSource.PYTH_LAZER,
         pythFeedId: '0x82595d1509b770fa52681e260af4dda9752b87316d7c048535d8ead3fa856eb1',
         pythLazerId: 90,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'ZEX',
@@ -749,6 +752,7 @@ exports.MainnetPerpMarkets = [
         launchTs: 1719415157000,
         oracleSource: types_1.OracleSource.PYTH_PULL,
         pythFeedId: '0x3d63be09d1b88f6dffe6585d0170670592124fd9fa4e0fe8a09ff18464f05e3a',
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'POPCAT',
@@ -772,6 +776,7 @@ exports.MainnetPerpMarkets = [
         launchTs: 1720633344000,
         oracleSource: types_1.OracleSource.PYTH_1K_PULL,
         pythFeedId: '0x5169491cd7e2a44c98353b779d5eb612e4ac32e073f5cc534303d86307c2f1bc',
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'TRUMP-WIN-2024-BET',
@@ -782,6 +787,7 @@ exports.MainnetPerpMarkets = [
         oracle: new web3_js_1.PublicKey('7YrQUxmxGdbk8pvns9KcL5ojbZSL2eHj62hxRqggtEUR'),
         launchTs: 1723996800000,
         oracleSource: types_1.OracleSource.Prelaunch,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'KAMALA-POPULAR-VOTE-2024-BET',
@@ -792,6 +798,7 @@ exports.MainnetPerpMarkets = [
         oracle: new web3_js_1.PublicKey('AowFw1dCVjS8kngvTCoT3oshiUyL69k7P1uxqXwteWH4'),
         launchTs: 1723996800000,
         oracleSource: types_1.OracleSource.Prelaunch,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'FED-CUT-50-SEPT-2024-BET',
@@ -802,6 +809,7 @@ exports.MainnetPerpMarkets = [
         oracle: new web3_js_1.PublicKey('5QzgqAbEhJ1cPnLX4tSZEXezmW7sz7PPVVg2VanGi8QQ'),
         launchTs: 1724250126000,
         oracleSource: types_1.OracleSource.Prelaunch,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'REPUBLICAN-POPULAR-AND-WIN-BET',
@@ -812,6 +820,7 @@ exports.MainnetPerpMarkets = [
         oracle: new web3_js_1.PublicKey('BtUUSUc9rZSzBmmKhQq4no65zHQTzMFeVYss7xcMRD53'),
         launchTs: 1724250126000,
         oracleSource: types_1.OracleSource.Prelaunch,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'BREAKPOINT-IGGYERIC-BET',
@@ -822,6 +831,7 @@ exports.MainnetPerpMarkets = [
         oracle: new web3_js_1.PublicKey('2ftYxoSupperd4ULxy9xyS2Az38wfAe7Lm8FCAPwjjVV'),
         launchTs: 1724250126000,
         oracleSource: types_1.OracleSource.Prelaunch,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'DEMOCRATS-WIN-MICHIGAN-BET',
@@ -832,6 +842,7 @@ exports.MainnetPerpMarkets = [
         oracle: new web3_js_1.PublicKey('8HTDLjhb2esGU5mu11v3pq3eWeFqmvKPkQNCnTTwKAyB'),
         launchTs: 1725551484000,
         oracleSource: types_1.OracleSource.Prelaunch,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'TON',
@@ -854,6 +865,7 @@ exports.MainnetPerpMarkets = [
         oracle: new web3_js_1.PublicKey('DpJz7rjTJLxxnuqrqZTUjMWtnaMFAEfZUv5ATdb9HTh1'),
         launchTs: 1726646453000,
         oracleSource: types_1.OracleSource.Prelaunch,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'MOTHER',
@@ -866,6 +878,7 @@ exports.MainnetPerpMarkets = [
         oracleSource: types_1.OracleSource.PYTH_LAZER,
         pythFeedId: '0x62742a997d01f7524f791fdb2dd43aaf0e567d765ebf8fd0406a994239e874d4',
         pythLazerId: 501,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'MOODENG',
@@ -878,6 +891,7 @@ exports.MainnetPerpMarkets = [
         oracleSource: types_1.OracleSource.PYTH_LAZER,
         pythFeedId: '0xffff73128917a90950cd0473fd2551d7cd274fd5a6cc45641881bbcc6ee73417',
         pythLazerId: 500,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'WARWICK-FIGHT-WIN-BET',
@@ -888,6 +902,7 @@ exports.MainnetPerpMarkets = [
         oracle: new web3_js_1.PublicKey('Dz5Nvxo1hv7Zfyu11hy8e97twLMRKk6heTWCDGXytj7N'),
         launchTs: 1727965864000,
         oracleSource: types_1.OracleSource.Prelaunch,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'DeBridge',
@@ -899,6 +914,7 @@ exports.MainnetPerpMarkets = [
         launchTs: 1728574493000,
         oracleSource: types_1.OracleSource.PYTH_PULL,
         pythFeedId: '0xf788488fe2df341b10a498e0a789f03209c0938d9ed04bc521f8224748d6d236',
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'WLF-5B-1W',
@@ -909,6 +925,7 @@ exports.MainnetPerpMarkets = [
         oracle: new web3_js_1.PublicKey('7LpRfPaWR7cQqN7CMkCmZjEQpWyqso5LGuKCvDXH5ZAr'),
         launchTs: 1728574493000,
         oracleSource: types_1.OracleSource.Prelaunch,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'VRSTPN-WIN-F1-24-DRVRS-CHMP',
@@ -919,6 +936,7 @@ exports.MainnetPerpMarkets = [
         oracle: new web3_js_1.PublicKey('E36rvXEwysWeiToXCpWfHVADd8bzzyR4w83ZSSwxAxqG'),
         launchTs: 1729209600000,
         oracleSource: types_1.OracleSource.Prelaunch,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'LNDO-WIN-F1-24-US-GP',
@@ -929,6 +947,7 @@ exports.MainnetPerpMarkets = [
         oracle: new web3_js_1.PublicKey('6AVy1y9SnJECnosQaiK2uY1kcT4ZEBf1F4DMvhxgvhUo'),
         launchTs: 1729209600000,
         oracleSource: types_1.OracleSource.Prelaunch,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: '1KMEW',
@@ -941,6 +960,7 @@ exports.MainnetPerpMarkets = [
         oracleSource: types_1.OracleSource.PYTH_LAZER_1K,
         pythFeedId: '0x514aed52ca5294177f20187ae883cec4a018619772ddce41efcc36a6448f5d5d',
         pythLazerId: 137,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'MICHI',
@@ -952,6 +972,7 @@ exports.MainnetPerpMarkets = [
         launchTs: 1730402722000,
         oracleSource: types_1.OracleSource.PYTH_PULL,
         pythFeedId: '0x63a45218d6b13ffd28ca04748615511bf70eff80a3411c97d96b8ed74a6decab',
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'GOAT',
@@ -964,6 +985,7 @@ exports.MainnetPerpMarkets = [
         oracleSource: types_1.OracleSource.PYTH_LAZER,
         pythFeedId: '0xf7731dc812590214d3eb4343bfb13d1b4cfa9b1d4e020644b5d5d8e07d60c66c',
         pythLazerId: 437,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'FWOG',
@@ -975,6 +997,7 @@ exports.MainnetPerpMarkets = [
         launchTs: 1731443152000,
         oracleSource: types_1.OracleSource.PYTH_PULL,
         pythFeedId: '0x656cc2a39dd795bdecb59de810d4f4d1e74c25fe4c42d0bf1c65a38d74df48e9',
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'PNUT',
@@ -987,6 +1010,7 @@ exports.MainnetPerpMarkets = [
         oracleSource: types_1.OracleSource.PYTH_LAZER,
         pythFeedId: '0x116da895807f81f6b5c5f01b109376e7f6834dc8b51365ab7cdfa66634340e54',
         pythLazerId: 77,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'RAY',
@@ -1009,6 +1033,7 @@ exports.MainnetPerpMarkets = [
         oracle: new web3_js_1.PublicKey('GfTeKKnBxeLSB1Hm24ArjduQM4yqaAgoGgiC99gq5E2P'),
         launchTs: 1732721897000,
         oracleSource: types_1.OracleSource.Prelaunch,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'SUPERBOWL-LIX-CHIEFS',
@@ -1019,6 +1044,7 @@ exports.MainnetPerpMarkets = [
         oracle: new web3_js_1.PublicKey('EdB17Nyu4bnEBiSEfFrwvp4VCUvtq9eDJHc6Ujys3Jwd'),
         launchTs: 1732721897000,
         oracleSource: types_1.OracleSource.Prelaunch,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'Hyperliquid',
@@ -1079,6 +1105,7 @@ exports.MainnetPerpMarkets = [
         oracleSource: types_1.OracleSource.PYTH_LAZER,
         pythFeedId: '0x2551eca7784671173def2c41e6f3e51e11cd87494863f1d208fdd8c64a1f85ae',
         pythLazerId: 171,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'TRUMP',
@@ -1103,6 +1130,7 @@ exports.MainnetPerpMarkets = [
         oracleSource: types_1.OracleSource.PYTH_LAZER,
         pythFeedId: '0x8fef7d52c7f4e3a6258d663f9d27e64a1b6fd95ab5f7d545dbf9a515353d0064',
         pythLazerId: 145,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'BERA',
@@ -1125,6 +1153,7 @@ exports.MainnetPerpMarkets = [
         oracle: new web3_js_1.PublicKey('HieNNSAy9tjtU2mLEcGtgCMViCeZ1881fX7tfezL7wdV'),
         launchTs: 1739463226000,
         oracleSource: types_1.OracleSource.Prelaunch,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'NBAFINALS25-BOS',
@@ -1135,6 +1164,7 @@ exports.MainnetPerpMarkets = [
         oracle: new web3_js_1.PublicKey('HorrnsG8RBMv7dhzbgPX4wqcWbUTV5NwV8r59UwTu4CJ'),
         launchTs: 1739463226000,
         oracleSource: types_1.OracleSource.Prelaunch,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'KAITO',
@@ -1202,8 +1232,7 @@ exports.MainnetPerpMarkets = [
         oracle: new web3_js_1.PublicKey('GAzR3C5cn7gGVvuqJB57wSYTPWP3n2Lw4mRJRxvTvqYy'),
         launchTs: 1747318237000,
         oracleSource: types_1.OracleSource.PYTH_LAZER,
-        pythFeedId: '0x6d74813ee17291d5be18a355fe4d43fd300d625caea6554d49f740e7d112141e',
-        pythLazerId: 1571,
+        marketStatus: types_1.MarketStatus.DELISTED,
     },
     {
         fullName: 'PUMP',

package/lib/browser/constants/spotMarkets.d.ts

@@ -3,6 +3,7 @@ import { PublicKey } from '@solana/web3.js';
 import { OracleSource } from '../types';
 import { BN } from '@coral-xyz/anchor';
 import { DriftEnv } from '../config';
+import { MarketStatus } from '@ellipsis-labs/phoenix-sdk';
 export type SpotMarketConfig = {
     symbol: string;
     marketIndex: number;
@@ -18,6 +19,7 @@ export type SpotMarketConfig = {
     launchTs?: number;
     pythFeedId?: string;
     pythLazerId?: number;
+    marketStatus?: MarketStatus;
 };
 export declare const WRAPPED_SOL_MINT: PublicKey;
 export declare const DevnetSpotMarkets: SpotMarketConfig[];

package/lib/browser/driftClient.d.ts

@@ -19,7 +19,7 @@ import { UserSubscriptionConfig } from './userConfig';
 import { DriftEnv } from './config';
 import { UserStats } from './userStats';
 import { JupiterClient, QuoteResponse } from './jupiter/jupiterClient';
-import { SwapMode } from './swap/UnifiedSwapClient';
+import { SwapMode, UnifiedQuoteResponse } from './swap/UnifiedSwapClient';
 import { UserStatsSubscriptionConfig } from './userStatsConfig';
 import { TxHandler } from './tx/txHandler';
 import { WormholeCoreBridgeSolana } from '@pythnetwork/pyth-solana-receiver/lib/idl/wormhole_core_bridge_solana';
@@ -234,7 +234,11 @@ export declare class DriftClient {
         subAccountId: number;
     }[], txParams?: TxParams): Promise<TransactionSignature>;
     getUpdateUserCustomMarginRatioIx(marginRatio: number, subAccountId?: number): Promise<TransactionInstruction>;
-    getUpdateUserPerpPositionCustomMarginRatioIx(perpMarketIndex: number, marginRatio: number, subAccountId?: number): Promise<TransactionInstruction>;
+    getUpdateUserPerpPositionCustomMarginRatioIx(perpMarketIndex: number, marginRatio: number, subAccountId?: number, overrides?: {
+        userAccountPublicKey?: PublicKey;
+        authority?: PublicKey;
+        signingAuthority?: PublicKey;
+    }): Promise<TransactionInstruction>;
     updateUserPerpPositionCustomMarginRatio(perpMarketIndex: number, marginRatio: number, subAccountId?: number, txParams?: TxParams, enterHighLeverageMode?: boolean): Promise<TransactionSignature>;
     getUpdateUserMarginTradingEnabledIx(marginTradingEnabled: boolean, subAccountId?: number, userAccountPublicKey?: PublicKey): Promise<TransactionInstruction>;
     updateUserMarginTradingEnabled(updates: {
@@ -542,21 +546,24 @@ export declare 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
+     * @param outAssociatedTokenAccount the token account to receive the token being sold on the swap provider
      * @param inAssociatedTokenAccount the token account to
      * @param amount the amount of TokenIn, regardless of swapMode
-     * @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 slippageBps the max slippage passed to the swap provider api
+     * @param swapMode swap provider swapMode (ExactIn or ExactOut), default is ExactIn
+     * @param route the swap provider 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 v6 pass in the quote response from swap provider quote's API (deprecated, use quote instead)
+     * @param quote pass in the quote response from swap provider quote's API
      * @param txParams
      */
-    swap({ swapClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, reduceOnly, txParams, v6, quote, onlyDirectRoutes, }: {
-        swapClient: UnifiedSwapClient | SwapClient;
+    swap({ swapClient, jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, reduceOnly, txParams, v6, quote, onlyDirectRoutes, }: {
+        swapClient?: UnifiedSwapClient | SwapClient;
+        /** @deprecated Use swapClient instead. Legacy parameter for backward compatibility */
+        jupiterClient?: JupiterClient;
         outMarketIndex: number;
         inMarketIndex: number;
         outAssociatedTokenAccount?: PublicKey;
@@ -570,7 +577,7 @@ export declare class DriftClient {
         v6?: {
             quote?: QuoteResponse;
         };
-        quote?: QuoteResponse;
+        quote?: UnifiedQuoteResponse;
     }): Promise<TransactionSignature>;
     getTitanSwapIx({ titanClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, onlyDirectRoutes, reduceOnly, userAccountPublicKey, }: {
         titanClient: TitanClient;
@@ -641,7 +648,7 @@ export declare class DriftClient {
         swapMode?: SwapMode;
         onlyDirectRoutes?: boolean;
         reduceOnly?: SwapReduceOnly;
-        quote?: QuoteResponse;
+        quote?: UnifiedQuoteResponse;
         v6?: {
             quote?: QuoteResponse;
         };
@@ -1086,6 +1093,9 @@ export declare class DriftClient {
         isMakingNewAccount: boolean;
         depositMarketIndex: number;
         orderMarketIndex: number;
+    }, overrides?: {
+        user?: User;
+        signingAuthority?: PublicKey;
     }): Promise<TransactionInstruction>;
     disableUserHighLeverageMode(user: PublicKey, userAccount?: UserAccount, txParams?: TxParams): Promise<TransactionSignature>;
     getDisableHighLeverageModeIx(user: PublicKey, userAccount?: UserAccount, maintenance?: boolean): Promise<TransactionInstruction>;