@drift-labs/sdk 2.96.0-beta.2 → 2.96.0-beta.20

package/README.md

@@ -22,6 +22,7 @@ npm i @drift-labs/sdk
 Documentation:
 
 - [API docs](https://drift-labs.github.io/v2-teacher/)
+- [Typescript API docs](https://drift-labs.github.io/protocol-v2/sdk/)
 - [overview docs](https://docs.drift.trade/)
 
 The below is a light overview of using solana and drift's typescript sdk, but not as comprehensive as the [API docs](https://drift-labs.github.io/v2-teacher/).

package/VERSION

@@ -1 +1 @@
-2.96.0-beta.2
+2.96.0-beta.20

package/lib/accounts/pollingDriftClientAccountSubscriber.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
-import { DataAndSlot, AccountToPoll, DriftClientAccountEvents, DriftClientAccountSubscriber, OraclesToPoll } from './types';
+import { AccountToPoll, DataAndSlot, DelistedMarketSetting, DriftClientAccountEvents, DriftClientAccountSubscriber, OraclesToPoll } from './types';
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
-import { SpotMarketAccount, PerpMarketAccount, StateAccount, UserAccount } from '../types';
+import { PerpMarketAccount, SpotMarketAccount, StateAccount, UserAccount } from '../types';
 import { BulkAccountLoader } from './bulkAccountLoader';
 import { PublicKey } from '@solana/web3.js';
 import { OracleInfo, OraclePriceData } from '../oracles/types';
@@ -30,10 +30,11 @@ export declare class PollingDriftClientAccountSubscriber implements DriftClientA
     spotOracleStringMap: Map<number, string>;
     oracles: Map<string, DataAndSlot<OraclePriceData>>;
     user?: DataAndSlot<UserAccount>;
+    delistedMarketSetting: DelistedMarketSetting;
     private isSubscribing;
     private subscriptionPromise;
     private subscriptionPromiseResolver;
-    constructor(program: Program, accountLoader: BulkAccountLoader, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean);
+    constructor(program: Program, accountLoader: BulkAccountLoader, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting);
     subscribe(): Promise<boolean>;
     updateAccountsToPoll(): Promise<void>;
     updatePerpMarketAccountsToPoll(): Promise<boolean>;
@@ -54,6 +55,7 @@ export declare class PollingDriftClientAccountSubscriber implements DriftClientA
     private pauseForOracleToBeAdded;
     setPerpOracleMap(): Promise<void>;
     setSpotOracleMap(): Promise<void>;
+    handleDelistedMarkets(): void;
     assertIsSubscribed(): void;
     getStateAccountAndSlot(): DataAndSlot<StateAccount>;
     getMarketAccountAndSlot(marketIndex: number): DataAndSlot<PerpMarketAccount> | undefined;

package/lib/accounts/pollingDriftClientAccountSubscriber.js

@@ -11,7 +11,7 @@ const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
 const config_1 = require("../config");
 const ORACLE_DEFAULT_KEY = web3_js_1.PublicKey.default.toBase58();
 class PollingDriftClientAccountSubscriber {
-    constructor(program, accountLoader, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles) {
+    constructor(program, accountLoader, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, delistedMarketSetting) {
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
         this.accountsToPoll = new Map();
         this.oraclesToPoll = new Map();
@@ -31,6 +31,7 @@ class PollingDriftClientAccountSubscriber {
         this.spotMarketIndexes = spotMarketIndexes;
         this.oracleInfos = oracleInfos;
         this.shouldFindAllMarketsAndOracles = shouldFindAllMarketsAndOracles;
+        this.delistedMarketSetting = delistedMarketSetting;
     }
     async subscribe() {
         if (this.isSubscribed) {
@@ -62,6 +63,7 @@ class PollingDriftClientAccountSubscriber {
         if (subscriptionSucceeded) {
             this.eventEmitter.emit('update');
         }
+        this.handleDelistedMarkets();
         await Promise.all([this.setPerpOracleMap(), this.setSpotOracleMap()]);
         this.isSubscribing = false;
         this.isSubscribed = subscriptionSucceeded;
@@ -325,6 +327,27 @@ class PollingDriftClientAccountSubscriber {
         }
         await Promise.all(oraclePromises);
     }
+    handleDelistedMarkets() {
+        if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Subscribe) {
+            return;
+        }
+        const { perpMarketIndexes, oracles } = (0, utils_1.findDelistedPerpMarketsAndOracles)(this.getMarketAccountsAndSlots(), this.getSpotMarketAccountsAndSlots());
+        for (const perpMarketIndex of perpMarketIndexes) {
+            const perpMarketPubkey = this.perpMarket.get(perpMarketIndex).data.pubkey;
+            const callbackId = this.accountsToPoll.get(perpMarketPubkey.toBase58()).callbackId;
+            this.accountLoader.removeAccount(perpMarketPubkey, callbackId);
+            if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Discard) {
+                this.perpMarket.delete(perpMarketIndex);
+            }
+        }
+        for (const oracle of oracles) {
+            const callbackId = this.oraclesToPoll.get(oracle.toBase58()).callbackId;
+            this.accountLoader.removeAccount(oracle, callbackId);
+            if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Discard) {
+                this.oracles.delete(oracle.toBase58());
+            }
+        }
+    }
     assertIsSubscribed() {
         if (!this.isSubscribed) {
             throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');

package/lib/accounts/types.d.ts

@@ -6,8 +6,6 @@ import { EventEmitter } from 'events';
 import { Context, PublicKey } from '@solana/web3.js';
 import { Account } from '@solana/spl-token';
 import { OracleInfo, OraclePriceData } from '..';
-import { CommitmentLevel } from '@triton-one/yellowstone-grpc';
-import { ChannelOptions } from '@grpc/grpc-js';
 export interface AccountSubscriber<T> {
     dataAndSlot?: DataAndSlot<T>;
     subscribe(onChange: (data: T) => void): Promise<void>;
@@ -52,6 +50,11 @@ export interface DriftClientAccountSubscriber {
     getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     updateAccountLoaderPollingFrequency?: (pollingFrequency: number) => void;
 }
+export declare enum DelistedMarketSetting {
+    Unsubscribe = 0,
+    Subscribe = 1,
+    Discard = 2
+}
 export interface UserAccountEvents {
     userAccountUpdate: (payload: UserAccount) => void;
     update: void;
@@ -142,9 +145,3 @@ export interface UserStatsAccountSubscriber {
     unsubscribe(): Promise<void>;
     getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount>;
 }
-export type GrpcConfigs = {
-    endpoint: string;
-    token: string;
-    commitmentLevel?: CommitmentLevel;
-    channelOptions?: ChannelOptions;
-};

package/lib/accounts/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NotSubscribedError = void 0;
+exports.DelistedMarketSetting = exports.NotSubscribedError = void 0;
 class NotSubscribedError extends Error {
     constructor() {
         super(...arguments);
@@ -8,3 +8,9 @@ class NotSubscribedError extends Error {
     }
 }
 exports.NotSubscribedError = NotSubscribedError;
+var DelistedMarketSetting;
+(function (DelistedMarketSetting) {
+    DelistedMarketSetting[DelistedMarketSetting["Unsubscribe"] = 0] = "Unsubscribe";
+    DelistedMarketSetting[DelistedMarketSetting["Subscribe"] = 1] = "Subscribe";
+    DelistedMarketSetting[DelistedMarketSetting["Discard"] = 2] = "Discard";
+})(DelistedMarketSetting = exports.DelistedMarketSetting || (exports.DelistedMarketSetting = {}));

package/lib/accounts/utils.d.ts

@@ -1 +1,8 @@
+import { PublicKey } from '@solana/web3.js';
+import { DataAndSlot } from './types';
+import { PerpMarketAccount, SpotMarketAccount } from '../types';
 export declare function capitalize(value: string): string;
+export declare function findDelistedPerpMarketsAndOracles(perpMarkets: DataAndSlot<PerpMarketAccount>[], spotMarkets: DataAndSlot<SpotMarketAccount>[]): {
+    perpMarketIndexes: number[];
+    oracles: PublicKey[];
+};

package/lib/accounts/utils.js

@@ -1,7 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.capitalize = void 0;
+exports.findDelistedPerpMarketsAndOracles = exports.capitalize = void 0;
+const types_1 = require("../types");
 function capitalize(value) {
     return value[0].toUpperCase() + value.slice(1);
 }
 exports.capitalize = capitalize;
+function findDelistedPerpMarketsAndOracles(perpMarkets, spotMarkets) {
+    const delistedPerpMarketIndexes = [];
+    const delistedOracles = [];
+    for (const perpMarket of perpMarkets) {
+        if (!perpMarket.data) {
+            continue;
+        }
+        if ((0, types_1.isVariant)(perpMarket.data.status, 'delisted')) {
+            delistedPerpMarketIndexes.push(perpMarket.data.marketIndex);
+            delistedOracles.push(perpMarket.data.amm.oracle);
+        }
+    }
+    // make sure oracle isn't used by spot market
+    const filteredDelistedOracles = [];
+    for (const delistedOracle of delistedOracles) {
+        for (const spotMarket of spotMarkets) {
+            if (!spotMarket.data) {
+                continue;
+            }
+            if (spotMarket.data.oracle.equals(delistedOracle)) {
+                break;
+            }
+        }
+        filteredDelistedOracles.push(delistedOracle);
+    }
+    return {
+        perpMarketIndexes: delistedPerpMarketIndexes,
+        oracles: filteredDelistedOracles,
+    };
+}
+exports.findDelistedPerpMarketsAndOracles = findDelistedPerpMarketsAndOracles;

package/lib/accounts/webSocketAccountSubscriber.d.ts

@@ -20,7 +20,7 @@ export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<
     constructor(accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => T, resubOpts?: ResubOpts, commitment?: Commitment);
     subscribe(onChange: (data: T) => void): Promise<void>;
     setData(data: T, slot?: number): void;
-    protected setTimeout(): void;
+    private setTimeout;
     fetch(): Promise<void>;
     handleRpcResponse(context: Context, accountInfo?: AccountInfo<Buffer>): void;
     decodeBuffer(buffer: Buffer): T;

package/lib/accounts/webSocketDriftClientAccountSubscriber.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" />
-import { DriftClientAccountSubscriber, DriftClientAccountEvents, DataAndSlot, ResubOpts } from './types';
-import { AccountSubscriber } from './types';
-import { SpotMarketAccount, PerpMarketAccount, StateAccount } from '../types';
+import { AccountSubscriber, DataAndSlot, DelistedMarketSetting, DriftClientAccountEvents, DriftClientAccountSubscriber, ResubOpts } from './types';
+import { PerpMarketAccount, SpotMarketAccount, StateAccount } from '../types';
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
@@ -27,13 +26,14 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     spotOracleMap: Map<number, PublicKey>;
     spotOracleStringMap: Map<number, string>;
     oracleSubscribers: Map<string, AccountSubscriber<OraclePriceData>>;
+    delistedMarketSetting: DelistedMarketSetting;
     initialPerpMarketAccountData: Map<number, PerpMarketAccount>;
     initialSpotMarketAccountData: Map<number, SpotMarketAccount>;
     initialOraclePriceData: Map<string, OraclePriceData>;
-    protected isSubscribing: boolean;
-    protected subscriptionPromise: Promise<boolean>;
-    protected subscriptionPromiseResolver: (val: boolean) => void;
-    constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, resubOpts?: ResubOpts, commitment?: Commitment);
+    private isSubscribing;
+    private subscriptionPromise;
+    private subscriptionPromiseResolver;
+    constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting, resubOpts?: ResubOpts, commitment?: Commitment);
     subscribe(): Promise<boolean>;
     setInitialData(): Promise<void>;
     removeInitialData(): void;
@@ -53,6 +53,7 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     addOracle(oracleInfo: OracleInfo): Promise<boolean>;
     setPerpOracleMap(): Promise<void>;
     setSpotOracleMap(): Promise<void>;
+    handleDelistedMarkets(): Promise<void>;
     assertIsSubscribed(): void;
     getStateAccountAndSlot(): DataAndSlot<StateAccount>;
     getMarketAccountAndSlot(marketIndex: number): DataAndSlot<PerpMarketAccount> | undefined;

package/lib/accounts/webSocketDriftClientAccountSubscriber.js

@@ -9,9 +9,10 @@ const web3_js_1 = require("@solana/web3.js");
 const oracleClientCache_1 = require("../oracles/oracleClientCache");
 const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
 const config_1 = require("../config");
+const utils_1 = require("./utils");
 const ORACLE_DEFAULT_KEY = web3_js_1.PublicKey.default.toBase58();
 class WebSocketDriftClientAccountSubscriber {
-    constructor(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, resubOpts, commitment) {
+    constructor(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, delistedMarketSetting, resubOpts, commitment) {
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
         this.perpMarketAccountSubscribers = new Map();
         this.perpOracleMap = new Map();
@@ -28,6 +29,7 @@ class WebSocketDriftClientAccountSubscriber {
         this.spotMarketIndexes = spotMarketIndexes;
         this.oracleInfos = oracleInfos;
         this.shouldFindAllMarketsAndOracles = shouldFindAllMarketsAndOracles;
+        this.delistedMarketSetting = delistedMarketSetting;
         this.resubOpts = resubOpts;
         this.commitment = commitment;
     }
@@ -69,6 +71,7 @@ class WebSocketDriftClientAccountSubscriber {
             this.subscribeToOracles(),
         ]);
         this.eventEmitter.emit('update');
+        await this.handleDelistedMarkets();
         await Promise.all([this.setPerpOracleMap(), this.setSpotOracleMap()]);
         this.isSubscribing = false;
         this.isSubscribed = true;
@@ -263,6 +266,26 @@ class WebSocketDriftClientAccountSubscriber {
         }
         await Promise.all(addOraclePromises);
     }
+    async handleDelistedMarkets() {
+        if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Subscribe) {
+            return;
+        }
+        const { perpMarketIndexes, oracles } = (0, utils_1.findDelistedPerpMarketsAndOracles)(this.getMarketAccountsAndSlots(), this.getSpotMarketAccountsAndSlots());
+        for (const perpMarketIndex of perpMarketIndexes) {
+            await this.perpMarketAccountSubscribers
+                .get(perpMarketIndex)
+                .unsubscribe();
+            if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Discard) {
+                this.perpMarketAccountSubscribers.delete(perpMarketIndex);
+            }
+        }
+        for (const oracle of oracles) {
+            await this.oracleSubscribers.get(oracle.toBase58()).unsubscribe();
+            if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Discard) {
+                this.oracleSubscribers.delete(oracle.toBase58());
+            }
+        }
+    }
     assertIsSubscribed() {
         if (!this.isSubscribed) {
             throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');

package/lib/accounts/webSocketProgramAccountSubscriber.d.ts

@@ -27,7 +27,7 @@ export declare class WebSocketProgramAccountSubscriber<T> implements ProgramAcco
         commitment?: Commitment;
     }, resubOpts?: ResubOpts);
     subscribe(onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void): Promise<void>;
-    protected setTimeout(): void;
+    private setTimeout;
     handleRpcResponse(context: Context, keyedAccountInfo: KeyedAccountInfo): void;
     unsubscribe(onResub?: boolean): Promise<void>;
 }

package/lib/config.d.ts

@@ -1,4 +1,5 @@
-import { PerpMarketAccount, SpotMarketAccount } from '.';
+import { ConfirmOptions } from '@solana/web3.js';
+import { PerpMarketAccount, PublicKey, SpotMarketAccount } from '.';
 import { PerpMarketConfig } from './constants/perpMarkets';
 import { SpotMarketConfig } from './constants/spotMarkets';
 import { OracleInfo } from './oracles/types';
@@ -19,10 +20,13 @@ type DriftConfig = {
     MARKET_LOOKUP_TABLE: string;
     SERUM_LOOKUP_TABLE?: string;
     PYTH_PULL_ORACLE_LOOKUP_TABLE?: string;
+    SB_ON_DEMAND_PID: PublicKey;
 };
 export type DriftEnv = 'devnet' | 'mainnet-beta';
 export declare const DRIFT_PROGRAM_ID = "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH";
 export declare const DRIFT_ORACLE_RECEIVER_ID = "G6EoTTTgpkNBtVXo96EQp2m6uwwVh2Kt6YidjkmQqoha";
+export declare const SWIFT_ID = "SW1fThqrxLzVprnCMpiybiqYQfoNCdduC5uWsSUKChS";
+export declare const DEFAULT_CONFIRMATION_OPTS: ConfirmOptions;
 export declare const configs: {
     [key in DriftEnv]: DriftConfig;
 };

package/lib/config.js

@@ -1,10 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findAllMarketAndOracles = exports.getMarketsAndOraclesForSubscription = exports.initialize = exports.getConfig = exports.configs = exports.DRIFT_ORACLE_RECEIVER_ID = exports.DRIFT_PROGRAM_ID = void 0;
+exports.findAllMarketAndOracles = exports.getMarketsAndOraclesForSubscription = exports.initialize = exports.getConfig = exports.configs = exports.DEFAULT_CONFIRMATION_OPTS = exports.SWIFT_ID = exports.DRIFT_ORACLE_RECEIVER_ID = exports.DRIFT_PROGRAM_ID = void 0;
 const perpMarkets_1 = require("./constants/perpMarkets");
 const spotMarkets_1 = require("./constants/spotMarkets");
+const on_demand_1 = require("@switchboard-xyz/on-demand");
 exports.DRIFT_PROGRAM_ID = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
 exports.DRIFT_ORACLE_RECEIVER_ID = 'G6EoTTTgpkNBtVXo96EQp2m6uwwVh2Kt6YidjkmQqoha';
+exports.SWIFT_ID = 'SW1fThqrxLzVprnCMpiybiqYQfoNCdduC5uWsSUKChS';
+exports.DEFAULT_CONFIRMATION_OPTS = {
+    preflightCommitment: 'confirmed',
+    commitment: 'confirmed',
+};
 exports.configs = {
     devnet: {
         ENV: 'devnet',
@@ -20,6 +26,7 @@ exports.configs = {
         SPOT_MARKETS: spotMarkets_1.DevnetSpotMarkets,
         MARKET_LOOKUP_TABLE: 'FaMS3U4uBojvGn5FSDEPimddcXsCfwkKsFgMVVnDdxGb',
         DRIFT_ORACLE_RECEIVER_ID: exports.DRIFT_ORACLE_RECEIVER_ID,
+        SB_ON_DEMAND_PID: on_demand_1.ON_DEMAND_DEVNET_PID,
     },
     'mainnet-beta': {
         ENV: 'mainnet-beta',
@@ -36,6 +43,7 @@ exports.configs = {
         MARKET_LOOKUP_TABLE: 'D9cnvzswDikQDf53k4HpQ3KJ9y1Fv3HGGDFYMXnK5T6c',
         SERUM_LOOKUP_TABLE: 'GPZkp76cJtNL2mphCvT6FXkJCVPpouidnacckR6rzKDN',
         DRIFT_ORACLE_RECEIVER_ID: exports.DRIFT_ORACLE_RECEIVER_ID,
+        SB_ON_DEMAND_PID: on_demand_1.ON_DEMAND_MAINNET_PID,
     },
 };
 let currentConfig = exports.configs.devnet;

package/lib/constants/perpMarkets.js

@@ -778,6 +778,27 @@ exports.MainnetPerpMarkets = [
         oracleSource: __1.OracleSource.PYTH_PULL,
         pythFeedId: '0x8963217838ab4cf5cadc172203c1f0b763fbaa45f346d8ee50ba994bbcac3026',
     },
+    {
+        fullName: 'LANDO-F1-SGP-WIN-BET',
+        category: ['Prediction', 'Sports'],
+        symbol: 'LANDO-F1-SGP-WIN-BET',
+        baseAssetSymbol: 'LANDO-F1-SGP-WIN',
+        marketIndex: 43,
+        oracle: new web3_js_1.PublicKey('DpJz7rjTJLxxnuqrqZTUjMWtnaMFAEfZUv5ATdb9HTh1'),
+        launchTs: 1726646453000,
+        oracleSource: __1.OracleSource.Prelaunch,
+    },
+    {
+        fullName: 'MOTHER',
+        category: ['Solana', 'Meme'],
+        symbol: 'MOTHER-PERP',
+        baseAssetSymbol: 'MOTHER',
+        marketIndex: 44,
+        oracle: new web3_js_1.PublicKey('56ap2coZG7FPWUigVm9XrpQs3xuCwnwQaWtjWZcffEUG'),
+        launchTs: 1727291859000,
+        oracleSource: __1.OracleSource.PYTH_PULL,
+        pythFeedId: '0x62742a997d01f7524f791fdb2dd43aaf0e567d765ebf8fd0406a994239e874d4',
+    },
 ];
 exports.PerpMarkets = {
     devnet: exports.DevnetPerpMarkets,

package/lib/constants/spotMarkets.js

@@ -94,7 +94,7 @@ exports.MainnetSpotMarkets = [
         precision: new __1.BN(10).pow(numericConstants_1.EIGHT),
         precisionExp: numericConstants_1.EIGHT,
         serumMarket: new web3_js_1.PublicKey('3BAKsQd3RuhZKES2DGysMhjBdwjZYKYmxRqnSMtZ4KSN'),
-        pythFeedId: '0xe62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43',
+        pythFeedId: '0xc9d8b075a5c69303365ae23633d4e085199bf5c520a3b90fed1322a0342ffc33',
     },
     {
         symbol: 'wETH',
@@ -280,6 +280,7 @@ exports.MainnetSpotMarkets = [
         precision: new __1.BN(10).pow(numericConstants_1.SIX),
         precisionExp: numericConstants_1.SIX,
         launchTs: 1719415157000,
+        pythFeedId: '0xc811abc82b4bad1f9bd711a2773ccaa935b03ecef974236942cec5e0eb845a3a',
     },
     {
         symbol: 'POPCAT',
@@ -343,6 +344,16 @@ exports.MainnetSpotMarkets = [
         precisionExp: numericConstants_1.LAMPORTS_EXP,
         pythFeedId: '0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d',
     },
+    {
+        symbol: 'MOTHER',
+        marketIndex: 26,
+        oracle: new web3_js_1.PublicKey('56ap2coZG7FPWUigVm9XrpQs3xuCwnwQaWtjWZcffEUG'),
+        oracleSource: __1.OracleSource.PYTH_PULL,
+        mint: new web3_js_1.PublicKey('3S8qX1MsMqRbiwKg2cQyx7nis1oHMgaCuc9c4VfvVdPN'),
+        precision: new __1.BN(10).pow(numericConstants_1.SIX),
+        precisionExp: numericConstants_1.SIX,
+        pythFeedId: '0x62742a997d01f7524f791fdb2dd43aaf0e567d765ebf8fd0406a994239e874d4',
+    },
 ];
 exports.SpotMarkets = {
     devnet: exports.DevnetSpotMarkets,

package/lib/driftClient.d.ts

@@ -1,16 +1,15 @@
 /// <reference types="node" />
 /// <reference types="bn.js" />
 /// <reference types="node" />
+import * as anchor from '@coral-xyz/anchor';
 import { AnchorProvider, BN, Program, ProgramAccount } from '@coral-xyz/anchor';
 import { Idl as Idl30, Program as Program30 } from '@coral-xyz/anchor-30';
-import { StateAccount, IWallet, PositionDirection, UserAccount, PerpMarketAccount, OrderParams, Order, SpotMarketAccount, SpotPosition, MakerInfo, TakerInfo, OptionalOrderParams, ReferrerInfo, MarketType, TxParams, SerumV3FulfillmentConfigAccount, ReferrerNameAccount, OrderTriggerCondition, PerpMarketExtendedInfo, UserStatsAccount, PhoenixV1FulfillmentConfigAccount, ModifyOrderPolicy, SwapReduceOnly, SettlePnlMode, SignedTxData, MappedRecord, OpenbookV2FulfillmentConfigAccount } from './types';
-import * as anchor from '@coral-xyz/anchor';
-import { Connection, PublicKey, TransactionSignature, ConfirmOptions, Transaction, TransactionInstruction, AccountMeta, Signer, AddressLookupTableAccount, TransactionVersion, VersionedTransaction, BlockhashWithExpiryBlockHeight } from '@solana/web3.js';
+import { DriftClientMetricsEvents, IWallet, MakerInfo, MappedRecord, MarketType, ModifyOrderPolicy, OpenbookV2FulfillmentConfigAccount, OptionalOrderParams, Order, OrderParams, OrderTriggerCondition, PerpMarketAccount, PerpMarketExtendedInfo, PhoenixV1FulfillmentConfigAccount, PlaceAndTakeOrderSuccessCondition, PositionDirection, ReferrerInfo, ReferrerNameAccount, SerumV3FulfillmentConfigAccount, SettlePnlMode, SignedTxData, SpotMarketAccount, SpotPosition, StateAccount, SwapReduceOnly, SwiftOrderParamsMessage, SwiftServerMessage, TakerInfo, TxParams, UserAccount, UserStatsAccount } from './types';
+import { AccountMeta, AddressLookupTableAccount, BlockhashWithExpiryBlockHeight, ConfirmOptions, Connection, Keypair, PublicKey, Signer, Transaction, TransactionInstruction, TransactionSignature, TransactionVersion, VersionedTransaction } from '@solana/web3.js';
 import { TokenFaucet } from './tokenFaucet';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
-import { DriftClientAccountSubscriber, DriftClientAccountEvents, DataAndSlot } from './accounts/types';
-import { DriftClientMetricsEvents } from './types';
+import { DataAndSlot, DriftClientAccountEvents, DriftClientAccountSubscriber } from './accounts/types';
 import { TxSender, TxSigAndSlot } from './tx/types';
 import { OraclePriceData } from './oracles/types';
 import { DriftClientConfig } from './driftClientConfig';
@@ -66,6 +65,7 @@ export declare class DriftClient {
     txHandler: TxHandler;
     receiverProgram?: Program<PythSolanaReceiver>;
     wormholeProgram?: Program<WormholeCoreBridgeSolana>;
+    sbOnDemandProgramdId: PublicKey;
     sbOnDemandProgram?: Program30<Idl30>;
     sbProgramFeedConfigs?: Map<string, any>;
     get isSubscribed(): boolean;
@@ -239,6 +239,7 @@ export declare class DriftClient {
      */
     getAssociatedTokenAccount(marketIndex: number, useNative?: boolean, tokenProgram?: anchor.web3.PublicKey): Promise<PublicKey>;
     createAssociatedTokenAccountIdempotentInstruction(account: PublicKey, payer: PublicKey, owner: PublicKey, mint: PublicKey, tokenProgram?: anchor.web3.PublicKey): TransactionInstruction;
+    getDepositTxnIx(amount: BN, marketIndex: number, associatedTokenAccount: PublicKey, subAccountId?: number, reduceOnly?: boolean): Promise<TransactionInstruction[]>;
     createDepositTxn(amount: BN, marketIndex: number, associatedTokenAccount: PublicKey, subAccountId?: number, reduceOnly?: boolean, txParams?: TxParams): Promise<VersionedTransaction | Transaction>;
     /**
      * Deposit funds into the given spot market
@@ -261,6 +262,10 @@ export declare class DriftClient {
     getTokenProgramForSpotMarket(spotMarketAccount: SpotMarketAccount): PublicKey;
     addTokenMintToRemainingAccounts(spotMarketAccount: SpotMarketAccount, remainingAccounts: AccountMeta[]): void;
     getAssociatedTokenAccountCreationIx(tokenMintAddress: PublicKey, associatedTokenAddress: PublicKey, tokenProgram: PublicKey): anchor.web3.TransactionInstruction;
+    createInitializeUserAccountAndDepositCollateralIxs(amount: BN, userTokenAccount: PublicKey, marketIndex?: number, subAccountId?: number, name?: string, fromSubAccountId?: number, referrerInfo?: ReferrerInfo, donateAmount?: BN, customMaxMarginRatio?: number): Promise<{
+        ixs: TransactionInstruction[];
+        userAccountPublicKey: PublicKey;
+    }>;
     createInitializeUserAccountAndDepositCollateral(amount: BN, userTokenAccount: PublicKey, marketIndex?: number, subAccountId?: number, name?: string, fromSubAccountId?: number, referrerInfo?: ReferrerInfo, donateAmount?: BN, txParams?: TxParams, customMaxMarginRatio?: number): Promise<[Transaction | VersionedTransaction, PublicKey]>;
     /**
      * Creates the User account for a user, and deposits some initial collateral
@@ -340,7 +345,10 @@ export declare class DriftClient {
         signedSettlePnlTx?: Transaction;
     }>;
     placePerpOrder(orderParams: OptionalOrderParams, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
-    getPlacePerpOrderIx(orderParams: OptionalOrderParams, subAccountId?: number): Promise<TransactionInstruction>;
+    getPlacePerpOrderIx(orderParams: OptionalOrderParams, subAccountId?: number, depositToTradeArgs?: {
+        isMakingNewAccount: boolean;
+        depositMarketIndex: number;
+    }): Promise<TransactionInstruction>;
     updateAMMs(marketIndexes: number[], txParams?: TxParams): Promise<TransactionSignature>;
     getUpdateAMMsIx(marketIndexes: number[]): Promise<TransactionInstruction>;
     settleExpiredMarket(marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
@@ -483,7 +491,7 @@ export declare class DriftClient {
     getUpdateUserIdleIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, fillerPublicKey?: PublicKey): Promise<TransactionInstruction>;
     updateUserOpenOrdersCount(userAccountPublicKey: PublicKey, user: UserAccount, txParams?: TxParams, fillerPublicKey?: PublicKey): Promise<TransactionSignature>;
     getUpdateUserOpenOrdersCountIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, fillerPublicKey?: PublicKey): Promise<TransactionInstruction>;
-    placeAndTakePerpOrder(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
+    placeAndTakePerpOrder(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, successCondition?: PlaceAndTakeOrderSuccessCondition, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
     preparePlaceAndTakePerpOrderWithAdditionalOrders(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, bracketOrdersParams?: OptionalOrderParams[], txParams?: TxParams, subAccountId?: number, cancelExistingOrders?: boolean, settlePnl?: boolean, exitEarlyIfSimFails?: boolean): Promise<{
         placeAndTakeTx: Transaction | VersionedTransaction;
         cancelExistingOrdersTx: Transaction | VersionedTransaction;
@@ -494,9 +502,36 @@ export declare class DriftClient {
         signedCancelExistingOrdersTx?: Transaction;
         signedSettlePnlTx?: Transaction;
     }>;
-    getPlaceAndTakePerpOrderIx(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, subAccountId?: number): Promise<TransactionInstruction>;
+    getPlaceAndTakePerpOrderIx(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, successCondition?: PlaceAndTakeOrderSuccessCondition, subAccountId?: number): Promise<TransactionInstruction>;
     placeAndMakePerpOrder(orderParams: OptionalOrderParams, takerInfo: TakerInfo, referrerInfo?: ReferrerInfo, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
     getPlaceAndMakePerpOrderIx(orderParams: OptionalOrderParams, takerInfo: TakerInfo, referrerInfo?: ReferrerInfo, subAccountId?: number): Promise<TransactionInstruction>;
+    encodeSwiftServerMessage(message: SwiftServerMessage): Buffer;
+    decodeSwiftServerMessage(encodedMessage: Buffer): SwiftServerMessage;
+    signSwiftServerMessage(message: SwiftServerMessage): Promise<Buffer>;
+    signSwiftOrderParamsMessage(orderParamsMessage: SwiftOrderParamsMessage): Promise<Buffer>;
+    encodeSwiftOrderParamsMessage(orderParamsMessage: SwiftOrderParamsMessage): Buffer;
+    decodeSwiftOrderParamsMessage(encodedMessage: Buffer): SwiftOrderParamsMessage;
+    signMessage(message: Uint8Array, keypair?: Keypair): Promise<Buffer>;
+    placeSwiftTakerOrder(swiftServerMessage: Buffer, swiftSignature: Buffer, swiftOrderParamsMessage: Buffer, swiftOrderParamsSignature: Buffer, marketIndex: number, takerInfo: {
+        taker: PublicKey;
+        takerStats: PublicKey;
+        takerUserAccount: UserAccount;
+    }, txParams?: TxParams): Promise<TransactionSignature>;
+    getPlaceSwiftTakerPerpOrderIxs(encodedSwiftServerMessage: Buffer, swiftSignature: Buffer, encodedSwiftOrderParamsMessage: Buffer, swiftOrderParamsSignature: Buffer, marketIndex: number, takerInfo: {
+        taker: PublicKey;
+        takerStats: PublicKey;
+        takerUserAccount: UserAccount;
+    }): Promise<TransactionInstruction[]>;
+    placeAndMakeSwiftPerpOrder(encodedSwiftMessage: Buffer, swiftSignature: Buffer, encodedSwiftOrderParamsMessage: Buffer, swiftOrderParamsSignature: Buffer, takerExpectedOrderId: number, takerInfo: {
+        taker: PublicKey;
+        takerStats: PublicKey;
+        takerUserAccount: UserAccount;
+    }, orderParams: OptionalOrderParams, referrerInfo?: ReferrerInfo, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
+    getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftMessage: Buffer, swiftSignature: Buffer, encodedSwiftOrderParamsMessage: Buffer, swiftOrderParamsSignature: Buffer, takerExpectedOrderId: number, takerInfo: {
+        taker: PublicKey;
+        takerStats: PublicKey;
+        takerUserAccount: UserAccount;
+    }, orderParams: OptionalOrderParams, referrerInfo?: ReferrerInfo, subAccountId?: number): Promise<TransactionInstruction[]>;
     preparePlaceAndTakeSpotOrder(orderParams: OptionalOrderParams, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo, txParams?: TxParams, subAccountId?: number): Promise<{
         placeAndTakeSpotOrderTx: anchor.web3.Transaction | anchor.web3.VersionedTransaction;
     }>;
@@ -735,7 +770,7 @@ export declare class DriftClient {
         marketType: MarketType;
     } | undefined;
     getReceiverProgram(): Program<PythSolanaReceiver>;
-    getSwitchboardOnDemandProgram(): Program30<Idl30>;
+    getSwitchboardOnDemandProgram(): Promise<Program30<Idl30>>;
     postPythPullOracleUpdateAtomic(vaaString: string, feedId: string): Promise<TransactionSignature>;
     postMultiPythPullOracleUpdatesAtomic(vaaString: string, feedIds: string[]): Promise<TransactionSignature>;
     getPostPythPullOracleUpdateAtomicIxs(vaaString: string, feedIds: string | string[], numSignatures?: number): Promise<TransactionInstruction[]>;