@drift-labs/sdk 2.96.0-beta.13 → 2.96.0-beta.15

package/VERSION

@@ -1 +1 @@
-2.96.0-beta.13
+2.96.0-beta.15

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

@@ -50,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;

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/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>;
     private isSubscribing;
     private subscriptionPromise;
     private subscriptionPromiseResolver;
-    constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, resubOpts?: ResubOpts, commitment?: Commitment);
+    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/config.d.ts

@@ -1,3 +1,4 @@
+import { ConfirmOptions } from '@solana/web3.js';
 import { PerpMarketAccount, SpotMarketAccount } from '.';
 import { PerpMarketConfig } from './constants/perpMarkets';
 import { SpotMarketConfig } from './constants/spotMarkets';
@@ -23,6 +24,7 @@ type DriftConfig = {
 export type DriftEnv = 'devnet' | 'mainnet-beta';
 export declare const DRIFT_PROGRAM_ID = "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH";
 export declare const DRIFT_ORACLE_RECEIVER_ID = "G6EoTTTgpkNBtVXo96EQp2m6uwwVh2Kt6YidjkmQqoha";
+export declare const DEFAULT_CONFIRMATION_OPTS: ConfirmOptions;
 export declare const configs: {
     [key in DriftEnv]: DriftConfig;
 };

package/lib/config.js

@@ -1,10 +1,14 @@
 "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.DRIFT_ORACLE_RECEIVER_ID = exports.DRIFT_PROGRAM_ID = void 0;
 const perpMarkets_1 = require("./constants/perpMarkets");
 const spotMarkets_1 = require("./constants/spotMarkets");
 exports.DRIFT_PROGRAM_ID = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
 exports.DRIFT_ORACLE_RECEIVER_ID = 'G6EoTTTgpkNBtVXo96EQp2m6uwwVh2Kt6YidjkmQqoha';
+exports.DEFAULT_CONFIRMATION_OPTS = {
+    preflightCommitment: 'confirmed',
+    commitment: 'confirmed',
+};
 exports.configs = {
     devnet: {
         ENV: 'devnet',

package/lib/constants/spotMarkets.js

@@ -344,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, SwiftOrderParamsMessage } 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, TakerInfo, TxParams, UserAccount, UserStatsAccount } from './types';
+import { AccountMeta, AddressLookupTableAccount, BlockhashWithExpiryBlockHeight, ConfirmOptions, Connection, 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';
@@ -491,7 +490,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;
@@ -502,7 +501,7 @@ 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>;
     signTakerOrderParams(orderParamsMessage: SwiftOrderParamsMessage): Promise<Buffer>;

package/lib/driftClient.js

@@ -27,16 +27,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DriftClient = void 0;
+const anchor = __importStar(require("@coral-xyz/anchor"));
 const anchor_1 = require("@coral-xyz/anchor");
 const anchor_30_1 = require("@coral-xyz/anchor-30");
 const bs58_1 = __importDefault(require("bs58"));
 const spl_token_1 = require("@solana/spl-token");
 const types_1 = require("./types");
-const anchor = __importStar(require("@coral-xyz/anchor"));
 const drift_json_1 = __importDefault(require("./idl/drift.json"));
 const web3_js_1 = require("@solana/web3.js");
 const events_1 = require("events");
 const pda_1 = require("./addresses/pda");
+const types_2 = require("./accounts/types");
 const numericConstants_1 = require("./constants/numericConstants");
 const position_1 = require("./math/position");
 const spotBalance_1 = require("./math/spotBalance");
@@ -62,7 +63,6 @@ const txHandler_1 = require("./tx/txHandler");
 const pyth_solana_receiver_1 = require("@pythnetwork/pyth-solana-receiver");
 const price_service_sdk_1 = require("@pythnetwork/price-service-sdk");
 const address_1 = require("@pythnetwork/pyth-solana-receiver/lib/address");
-const config_2 = require("./config");
 const pythPullOracleUtils_1 = require("./util/pythPullOracleUtils");
 const utils_2 = require("./tx/utils");
 const pyth_solana_receiver_json_1 = __importDefault(require("./idl/pyth_solana_receiver.json"));
@@ -91,7 +91,7 @@ class DriftClient {
         this.connection = config.connection;
         this.wallet = config.wallet;
         this.opts = config.opts || {
-            ...anchor_1.AnchorProvider.defaultOptions(),
+            ...config_1.DEFAULT_CONFIRMATION_OPTS,
             commitment: (_a = config === null || config === void 0 ? void 0 : config.connection) === null || _a === void 0 ? void 0 : _a.commitment,
             preflightCommitment: (_b = config === null || config === void 0 ? void 0 : config.connection) === null || _b === void 0 ? void 0 : _b.commitment, // At the moment this ensures that our transaction simulations (which use Connection object) will use the same commitment level as our Transaction blockhashes (which use these opts)
         };
@@ -170,14 +170,15 @@ class DriftClient {
         if (config.env && !this.marketLookupTable) {
             this.marketLookupTable = new web3_js_1.PublicKey(config_1.configs[config.env].MARKET_LOOKUP_TABLE);
         }
+        const delistedMarketSetting = config.delistedMarketSetting || types_2.DelistedMarketSetting.Subscribe;
         const noMarketsAndOraclesSpecified = config.perpMarketIndexes === undefined &&
             config.spotMarketIndexes === undefined &&
             config.oracleInfos === undefined;
         if (((_w = config.accountSubscription) === null || _w === void 0 ? void 0 : _w.type) === 'polling') {
-            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_x = config.perpMarketIndexes) !== null && _x !== void 0 ? _x : [], (_y = config.spotMarketIndexes) !== null && _y !== void 0 ? _y : [], (_z = config.oracleInfos) !== null && _z !== void 0 ? _z : [], noMarketsAndOraclesSpecified);
+            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_x = config.perpMarketIndexes) !== null && _x !== void 0 ? _x : [], (_y = config.spotMarketIndexes) !== null && _y !== void 0 ? _y : [], (_z = config.oracleInfos) !== null && _z !== void 0 ? _z : [], noMarketsAndOraclesSpecified, delistedMarketSetting);
         }
         else {
-            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_0 = config.perpMarketIndexes) !== null && _0 !== void 0 ? _0 : [], (_1 = config.spotMarketIndexes) !== null && _1 !== void 0 ? _1 : [], (_2 = config.oracleInfos) !== null && _2 !== void 0 ? _2 : [], noMarketsAndOraclesSpecified, {
+            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_0 = config.perpMarketIndexes) !== null && _0 !== void 0 ? _0 : [], (_1 = config.spotMarketIndexes) !== null && _1 !== void 0 ? _1 : [], (_2 = config.oracleInfos) !== null && _2 !== void 0 ? _2 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
                 resubTimeoutMs: (_3 = config.accountSubscription) === null || _3 === void 0 ? void 0 : _3.resubTimeoutMs,
                 logResubMessages: (_4 = config.accountSubscription) === null || _4 === void 0 ? void 0 : _4.logResubMessages,
             }, (_5 = config.accountSubscription) === null || _5 === void 0 ? void 0 : _5.commitment);
@@ -1608,7 +1609,7 @@ class DriftClient {
             direction,
             baseAssetAmount: amount,
             price: limitPrice,
-        }, undefined, undefined, undefined, subAccountId);
+        }, undefined, undefined, undefined, undefined, subAccountId);
     }
     async sendSignedTx(tx, opts) {
         const { txSig } = await this.sendTransaction(tx, undefined, opts !== null && opts !== void 0 ? opts : this.opts, true);
@@ -2726,8 +2727,8 @@ class DriftClient {
             remainingAccounts,
         });
     }
-    async placeAndTakePerpOrder(orderParams, makerInfo, referrerInfo, txParams, subAccountId) {
-        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo, subAccountId), txParams), [], this.opts);
+    async placeAndTakePerpOrder(orderParams, makerInfo, referrerInfo, successCondition, txParams, subAccountId) {
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo, successCondition, subAccountId), txParams), [], this.opts);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
@@ -2743,7 +2744,7 @@ class DriftClient {
         let earlyExitFailedPlaceAndTakeSim = false;
         const prepPlaceAndTakeTx = async () => {
             var _a;
-            const placeAndTakeIx = await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo, subAccountId);
+            const placeAndTakeIx = await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo, undefined, subAccountId);
             placeAndTakeIxs.push(placeAndTakeIx);
             if (bracketOrdersParams.length > 0) {
                 const bracketOrdersIx = await this.getPlaceOrdersIx(bracketOrdersParams, subAccountId);
@@ -2813,7 +2814,7 @@ class DriftClient {
             signedSettlePnlTx: signedTxs.settlePnlTx,
         };
     }
-    async getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo, subAccountId) {
+    async getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo, successCondition, subAccountId) {
         orderParams = (0, orderParams_1.getOrderParams)(orderParams, { marketType: types_1.MarketType.PERP });
         const userStatsPublicKey = await this.getUserStatsAccountPublicKey();
         const user = await this.getUserAccountPublicKey(subAccountId);
@@ -2859,7 +2860,7 @@ class DriftClient {
                 });
             }
         }
-        return await this.program.instruction.placeAndTakePerpOrder(orderParams, null, {
+        return await this.program.instruction.placeAndTakePerpOrder(orderParams, successCondition !== null && successCondition !== void 0 ? successCondition : null, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 user,
@@ -3133,7 +3134,7 @@ class DriftClient {
             baseAssetAmount: userPosition.baseAssetAmount.abs(),
             reduceOnly: true,
             price: limitPrice,
-        }, undefined, undefined, undefined, subAccountId);
+        }, undefined, undefined, undefined, undefined, subAccountId);
     }
     /**
      * Modifies an open order by closing it and replacing it with a new order.
@@ -4070,7 +4071,7 @@ class DriftClient {
             postIxs.push(this.program.instruction.postMultiPythPullOracleUpdatesAtomic(encodedParams, {
                 accounts: {
                     keeper: this.wallet.publicKey,
-                    pythSolanaReceiver: config_2.DRIFT_ORACLE_RECEIVER_ID,
+                    pythSolanaReceiver: config_1.DRIFT_ORACLE_RECEIVER_ID,
                     guardianSet,
                 },
                 remainingAccounts,
@@ -4093,7 +4094,7 @@ class DriftClient {
         return this.program.instruction.postPythPullOracleUpdateAtomic(feedIdBuffer, encodedParams, {
             accounts: {
                 keeper: this.wallet.publicKey,
-                pythSolanaReceiver: config_2.DRIFT_ORACLE_RECEIVER_ID,
+                pythSolanaReceiver: config_1.DRIFT_ORACLE_RECEIVER_ID,
                 guardianSet,
                 priceFeed: (0, pda_1.getPythPullOraclePublicKey)(this.program.programId, feedIdBuffer),
             },
@@ -4121,7 +4122,7 @@ class DriftClient {
         return this.program.instruction.updatePythPullOracle(feedIdBuffer, encodedParams, {
             accounts: {
                 keeper: this.wallet.publicKey,
-                pythSolanaReceiver: config_2.DRIFT_ORACLE_RECEIVER_ID,
+                pythSolanaReceiver: config_1.DRIFT_ORACLE_RECEIVER_ID,
                 encodedVaa: encodedVaaAddress,
                 priceFeed: (0, pda_1.getPythPullOraclePublicKey)(this.program.programId, feedIdBuffer),
             },

package/lib/driftClientConfig.d.ts

@@ -5,6 +5,7 @@ import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { DriftEnv } from './config';
 import { TxSender } from './tx/types';
 import { TxHandler, TxHandlerConfig } from './tx/txHandler';
+import { DelistedMarketSetting } from './accounts/types';
 export type DriftClientConfig = {
     connection: Connection;
     wallet: IWallet;
@@ -29,6 +30,7 @@ export type DriftClientConfig = {
     txParams?: TxParams;
     enableMetricsEvents?: boolean;
     txHandlerConfig?: TxHandlerConfig;
+    delistedMarketSetting?: DelistedMarketSetting;
 };
 export type DriftClientSubscriptionConfig = {
     type: 'websocket';

package/lib/index.d.ts

@@ -107,5 +107,6 @@ export * from './memcmp';
 export * from './decode/user';
 export * from './blockhashSubscriber';
 export * from './util/chainClock';
+export * from './util/TransactionConfirmationManager';
 export * from './clock/clockSubscriber';
 export { BN, PublicKey, pyth };

package/lib/index.js

@@ -130,4 +130,5 @@ __exportStar(require("./memcmp"), exports);
 __exportStar(require("./decode/user"), exports);
 __exportStar(require("./blockhashSubscriber"), exports);
 __exportStar(require("./util/chainClock"), exports);
+__exportStar(require("./util/TransactionConfirmationManager"), exports);
 __exportStar(require("./clock/clockSubscriber"), exports);

package/lib/tokenFaucet.js

@@ -31,13 +31,14 @@ const anchor = __importStar(require("@coral-xyz/anchor"));
 const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
+const _1 = require(".");
 const token_faucet_json_1 = __importDefault(require("./idl/token_faucet.json"));
 class TokenFaucet {
     constructor(connection, wallet, programId, mint, opts, context) {
         this.connection = connection;
         this.context = context;
         this.wallet = wallet;
-        this.opts = opts || anchor_1.AnchorProvider.defaultOptions();
+        this.opts = opts || _1.DEFAULT_CONFIRMATION_OPTS;
         // @ts-ignore
         const provider = new anchor_1.AnchorProvider(context ? context.connection.toConnection() : this.connection, 
         // @ts-ignore

package/lib/tx/baseTxSender.js

@@ -6,17 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseTxSender = void 0;
 const types_1 = require("./types");
 const web3_js_1 = require("@solana/web3.js");
-const anchor_1 = require("@coral-xyz/anchor");
 const assert_1 = __importDefault(require("assert"));
 const bs58_1 = __importDefault(require("bs58"));
 const txHandler_1 = require("./txHandler");
 const node_cache_1 = __importDefault(require("node-cache"));
+const config_1 = require("../config");
 const BASELINE_TX_LAND_RATE = 0.9;
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_TX_LAND_RATE_LOOKBACK_WINDOW_MINUTES = 10;
 const NOT_CONFIRMED_ERROR_CODE = -1001;
 class BaseTxSender {
-    constructor({ connection, wallet, opts = anchor_1.AnchorProvider.defaultOptions(), timeout = DEFAULT_TIMEOUT, additionalConnections = new Array(), confirmationStrategy = types_1.ConfirmationStrategy.Combo, additionalTxSenderCallbacks, trackTxLandRate, txHandler, txLandRateLookbackWindowMinutes = DEFAULT_TX_LAND_RATE_LOOKBACK_WINDOW_MINUTES, landRateToFeeFunc, }) {
+    constructor({ connection, wallet, opts = config_1.DEFAULT_CONFIRMATION_OPTS, timeout = DEFAULT_TIMEOUT, additionalConnections = new Array(), confirmationStrategy = types_1.ConfirmationStrategy.Combo, additionalTxSenderCallbacks, trackTxLandRate, txHandler, txLandRateLookbackWindowMinutes = DEFAULT_TX_LAND_RATE_LOOKBACK_WINDOW_MINUTES, landRateToFeeFunc, }) {
         this.timeoutCount = 0;
         this.txLandRate = 0;
         this.lastPriorityFeeSuggestion = 1;

package/lib/tx/fastSingleTxSender.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FastSingleTxSender = void 0;
 const types_1 = require("./types");
-const anchor_1 = require("@coral-xyz/anchor");
 const baseTxSender_1 = require("./baseTxSender");
+const config_1 = require("../config");
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_BLOCKHASH_REFRESH = 10000;
 class FastSingleTxSender extends baseTxSender_1.BaseTxSender {
-    constructor({ connection, wallet, opts = { ...anchor_1.AnchorProvider.defaultOptions(), maxRetries: 0 }, timeout = DEFAULT_TIMEOUT, blockhashRefreshInterval = DEFAULT_BLOCKHASH_REFRESH, additionalConnections = new Array(), skipConfirmation = false, confirmInBackground = false, blockhashCommitment = 'finalized', confirmationStrategy = types_1.ConfirmationStrategy.Combo, trackTxLandRate, txHandler, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }) {
+    constructor({ connection, wallet, opts = { ...config_1.DEFAULT_CONFIRMATION_OPTS, maxRetries: 0 }, timeout = DEFAULT_TIMEOUT, blockhashRefreshInterval = DEFAULT_BLOCKHASH_REFRESH, additionalConnections = new Array(), skipConfirmation = false, confirmInBackground = false, blockhashCommitment = 'finalized', confirmationStrategy = types_1.ConfirmationStrategy.Combo, trackTxLandRate, txHandler, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }) {
         super({
             connection,
             wallet,

package/lib/tx/forwardOnlyTxSender.js

@@ -4,15 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ForwardOnlyTxSender = void 0;
-const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
 const bs58_1 = __importDefault(require("bs58"));
 const baseTxSender_1 = require("./baseTxSender");
 const types_1 = require("./types");
+const config_1 = require("../config");
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_RETRY = 5000;
 class ForwardOnlyTxSender extends baseTxSender_1.BaseTxSender {
-    constructor({ connection, wallet, opts = { ...anchor_1.AnchorProvider.defaultOptions(), maxRetries: 0 }, timeout = DEFAULT_TIMEOUT, retrySleep = DEFAULT_RETRY, confirmationStrategy = types_1.ConfirmationStrategy.Combo, additionalTxSenderCallbacks = [], txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }) {
+    constructor({ connection, wallet, opts = { ...config_1.DEFAULT_CONFIRMATION_OPTS, maxRetries: 0 }, timeout = DEFAULT_TIMEOUT, retrySleep = DEFAULT_RETRY, confirmationStrategy = types_1.ConfirmationStrategy.Combo, additionalTxSenderCallbacks = [], txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }) {
         super({
             connection,
             wallet,

package/lib/tx/retryTxSender.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RetryTxSender = void 0;
 const types_1 = require("./types");
-const anchor_1 = require("@coral-xyz/anchor");
 const baseTxSender_1 = require("./baseTxSender");
+const config_1 = require("../config");
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_RETRY = 2000;
 class RetryTxSender extends baseTxSender_1.BaseTxSender {
-    constructor({ connection, wallet, opts = { ...anchor_1.AnchorProvider.defaultOptions(), maxRetries: 0 }, timeout = DEFAULT_TIMEOUT, retrySleep = DEFAULT_RETRY, additionalConnections = new Array(), confirmationStrategy = types_1.ConfirmationStrategy.Combo, additionalTxSenderCallbacks = [], txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }) {
+    constructor({ connection, wallet, opts = { ...config_1.DEFAULT_CONFIRMATION_OPTS, maxRetries: 0 }, timeout = DEFAULT_TIMEOUT, retrySleep = DEFAULT_RETRY, additionalConnections = new Array(), confirmationStrategy = types_1.ConfirmationStrategy.Combo, additionalTxSenderCallbacks = [], txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }) {
         super({
             connection,
             wallet,