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

package/lib/tx/whileValidTxSender.js

@@ -4,11 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WhileValidTxSender = void 0;
-const anchor_1 = require("@coral-xyz/anchor");
+const web3_js_1 = require("@solana/web3.js");
 const baseTxSender_1 = require("./baseTxSender");
 const bs58_1 = __importDefault(require("bs58"));
+const config_1 = require("../config");
 const DEFAULT_RETRY = 2000;
-const VALID_BLOCK_HEIGHT_OFFSET = -150; // This is a bit of weirdness but the lastValidBlockHeight value returned from connection.getLatestBlockhash is always 300 blocks ahead of the current block, even though the transaction actually expires after 150 blocks. This accounts for that so that we can at least accuractely estimate the transaction expiry.
 class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
     async checkAndSetUseBlockHeightOffset() {
         this.connection.getVersion().then((version) => {
@@ -29,7 +29,7 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
             }
         });
     }
-    constructor({ connection, wallet, opts = { ...anchor_1.AnchorProvider.defaultOptions(), maxRetries: 0 }, retrySleep = DEFAULT_RETRY, additionalConnections = new Array(), additionalTxSenderCallbacks = [], blockhashCommitment = 'finalized', txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }) {
+    constructor({ connection, wallet, opts = { ...config_1.DEFAULT_CONFIRMATION_OPTS, maxRetries: 0 }, retrySleep = DEFAULT_RETRY, additionalConnections = new Array(), additionalTxSenderCallbacks = [], txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }) {
         super({
             connection,
             wallet,
@@ -45,7 +45,6 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
         this.untilValid = new Map();
         this.useBlockHeightOffset = true;
         this.retrySleep = retrySleep;
-        this.blockhashCommitment = blockhashCommitment;
         this.checkAndSetUseBlockHeightOffset();
     }
     async sleep(reference) {
@@ -69,7 +68,7 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
             latestBlockhash = tx.SIGNATURE_BLOCK_AND_EXPIRY;
         }
         // handle subclass-specific side effects
-        const txSig = bs58_1.default.encode(((_a = signedTx.signatures[0]) === null || _a === void 0 ? void 0 : _a.signature) || signedTx.signatures[0]);
+        const txSig = bs58_1.default.encode((signedTx === null || signedTx === void 0 ? void 0 : signedTx.signature) || ((_a = signedTx.signatures[0]) === null || _a === void 0 ? void 0 : _a.signature));
         this.untilValid.set(txSig, latestBlockhash);
         return signedTx;
     }
@@ -104,11 +103,13 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
         }
         const txSig = bs58_1.default.encode(signedTx.signatures[0]);
         this.untilValid.set(txSig, latestBlockhash);
+        console.debug(`preflight_commitment`, `sending_tx_with_preflight_commitment::${opts === null || opts === void 0 ? void 0 : opts.preflightCommitment}`);
         return this.sendRawTransaction(signedTx.serialize(), opts);
     }
     async sendRawTransaction(rawTransaction, opts) {
-        var _a, _b;
+        var _a, _b, _c;
         const startTime = this.getTimestamp();
+        console.debug(`preflight_commitment`, `sending_tx_with_preflight_commitment::${opts === null || opts === void 0 ? void 0 : opts.preflightCommitment}`);
         const txid = await this.connection.sendRawTransaction(rawTransaction, opts);
         (_a = this.txSigCache) === null || _a === void 0 ? void 0 : _a.set(txid, false);
         this.sendToAdditionalConnections(rawTransaction, opts);
@@ -138,19 +139,17 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
         })();
         let slot;
         try {
-            const { blockhash, lastValidBlockHeight } = this.untilValid.get(txid);
-            const result = await this.connection.confirmTransaction({
-                signature: txid,
-                blockhash,
-                lastValidBlockHeight: this.useBlockHeightOffset
-                    ? lastValidBlockHeight + VALID_BLOCK_HEIGHT_OFFSET
-                    : lastValidBlockHeight,
-            }, opts === null || opts === void 0 ? void 0 : opts.commitment);
-            if (!result) {
-                throw new Error(`Couldn't get signature status for txid: ${txid}`);
-            }
+            const result = await this.confirmTransaction(txid, opts.commitment);
             (_b = this.txSigCache) === null || _b === void 0 ? void 0 : _b.set(txid, true);
             await this.checkConfirmationResultForError(txid, result.value);
+            if ((_c = result === null || result === void 0 ? void 0 : result.value) === null || _c === void 0 ? void 0 : _c.err) {
+                // Fallback error handling if there's a problem reporting the error in checkConfirmationResultForError
+                throw new web3_js_1.SendTransactionError({
+                    action: 'send',
+                    signature: txid,
+                    transactionMessage: `Transaction Failed`,
+                });
+            }
             slot = result.context.slot;
             // eslint-disable-next-line no-useless-catch
         }

package/lib/types.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="bn.js" />
-import { PublicKey, Transaction, VersionedTransaction } from '@solana/web3.js';
+import { Keypair, PublicKey, Transaction, VersionedTransaction } from '@solana/web3.js';
 import { BN } from '.';
 export type MappedRecord<A extends Record<string, unknown>, B> = {
     [K in keyof A]: B;
@@ -1096,6 +1096,20 @@ export declare class ModifyOrderPolicy {
     };
 }
 export declare const DefaultOrderParams: OrderParams;
+export type SwiftServerMessage = {
+    slot: BN;
+    swiftOrderSignature: Uint8Array;
+};
+export type SwiftOrderParamsMessage = {
+    swiftOrderParams: OptionalOrderParams;
+    expectedOrderId: number;
+    takeProfitOrderParams: SwiftTriggerOrderParams | null;
+    stopLossOrderParams: SwiftTriggerOrderParams | null;
+};
+export type SwiftTriggerOrderParams = {
+    triggerPrice: BN;
+    baseAssetAmount: BN;
+};
 export type MakerInfo = {
     maker: PublicKey;
     makerStats: PublicKey;
@@ -1112,6 +1126,10 @@ export type ReferrerInfo = {
     referrer: PublicKey;
     referrerStats: PublicKey;
 };
+export declare enum PlaceAndTakeOrderSuccessCondition {
+    PartialFill = 1,
+    FullFill = 2
+}
 type ExactType<T> = Pick<T, keyof T>;
 export type BaseTxParams = ExactType<{
     computeUnits?: number;
@@ -1137,11 +1155,13 @@ export interface IWallet {
     signTransaction(tx: Transaction): Promise<Transaction>;
     signAllTransactions(txs: Transaction[]): Promise<Transaction[]>;
     publicKey: PublicKey;
+    payer?: Keypair;
 }
 export interface IVersionedWallet {
     signVersionedTransaction(tx: VersionedTransaction): Promise<VersionedTransaction>;
     signAllVersionedTransactions(txs: VersionedTransaction[]): Promise<VersionedTransaction[]>;
     publicKey: PublicKey;
+    payer?: Keypair;
 }
 export type FeeStructure = {
     feeTiers: FeeTier[];

package/lib/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SwapReduceOnly = exports.DefaultOrderParams = exports.ModifyOrderPolicy = exports.PostOnlyParams = exports.LiquidationType = exports.LPAction = exports.TradeSide = exports.getVariant = exports.isOneOfVariant = exports.isVariant = exports.SettlePnlMode = exports.StakeAction = exports.SpotFulfillmentConfigStatus = exports.SettlePnlExplanation = exports.DepositExplanation = exports.SpotFulfillmentStatus = exports.SpotFulfillmentType = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderStatus = exports.MarketType = exports.OrderType = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.SpotBalanceType = exports.SwapDirection = exports.AssetTier = exports.ContractTier = exports.ContractType = exports.UserStatus = exports.InsuranceFundOperation = exports.SpotOperation = exports.PerpOperation = exports.MarketStatus = exports.ExchangeStatus = void 0;
+exports.SwapReduceOnly = exports.PlaceAndTakeOrderSuccessCondition = exports.DefaultOrderParams = exports.ModifyOrderPolicy = exports.PostOnlyParams = exports.LiquidationType = exports.LPAction = exports.TradeSide = exports.getVariant = exports.isOneOfVariant = exports.isVariant = exports.SettlePnlMode = exports.StakeAction = exports.SpotFulfillmentConfigStatus = exports.SettlePnlExplanation = exports.DepositExplanation = exports.SpotFulfillmentStatus = exports.SpotFulfillmentType = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderStatus = exports.MarketType = exports.OrderType = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.SpotBalanceType = exports.SwapDirection = exports.AssetTier = exports.ContractTier = exports.ContractType = exports.UserStatus = exports.InsuranceFundOperation = exports.SpotOperation = exports.PerpOperation = exports.MarketStatus = exports.ExchangeStatus = void 0;
 const _1 = require(".");
 // # Utility Types / Enums / Constants
 var ExchangeStatus;
@@ -325,6 +325,11 @@ exports.DefaultOrderParams = {
     auctionStartPrice: null,
     auctionEndPrice: null,
 };
+var PlaceAndTakeOrderSuccessCondition;
+(function (PlaceAndTakeOrderSuccessCondition) {
+    PlaceAndTakeOrderSuccessCondition[PlaceAndTakeOrderSuccessCondition["PartialFill"] = 1] = "PartialFill";
+    PlaceAndTakeOrderSuccessCondition[PlaceAndTakeOrderSuccessCondition["FullFill"] = 2] = "FullFill";
+})(PlaceAndTakeOrderSuccessCondition = exports.PlaceAndTakeOrderSuccessCondition || (exports.PlaceAndTakeOrderSuccessCondition = {}));
 class SwapReduceOnly {
 }
 exports.SwapReduceOnly = SwapReduceOnly;

package/lib/user.d.ts

@@ -265,9 +265,10 @@ export declare class User {
      * @param estimatedEntryPrice
      * @param marginCategory // allow Initial to be passed in if we are trying to calculate price for DLP de-risking
      * @param includeOpenOrders
+     * @param offsetCollateral // allows calculating the liquidation price after this offset collateral is added to the user's account (e.g. : what will the liquidation price be for this position AFTER I deposit $x worth of collateral)
      * @returns Precision : PRICE_PRECISION
      */
-    liquidationPrice(marketIndex: number, positionBaseSizeChange?: BN, estimatedEntryPrice?: BN, marginCategory?: MarginCategory, includeOpenOrders?: boolean): BN;
+    liquidationPrice(marketIndex: number, positionBaseSizeChange?: BN, estimatedEntryPrice?: BN, marginCategory?: MarginCategory, includeOpenOrders?: boolean, offsetCollateral?: BN): BN;
     calculateEntriesEffectOnFreeCollateral(market: PerpMarketAccount, oraclePrice: BN, perpPosition: PerpPosition, positionBaseSizeChange: BN, estimatedEntryPrice: BN, includeOpenOrders: boolean): BN;
     calculateFreeCollateralDeltaForPerp(market: PerpMarketAccount, perpPosition: PerpPosition, positionBaseSizeChange: BN, oraclePrice: BN, marginCategory?: MarginCategory, includeOpenOrders?: boolean): BN | undefined;
     calculateFreeCollateralDeltaForSpot(market: SpotMarketAccount, signedTokenAmount: BN, marginCategory?: MarginCategory): BN;
@@ -278,6 +279,8 @@ export declare class User {
      * @returns : Precision PRICE_PRECISION
      */
     liquidationPriceAfterClose(positionMarketIndex: number, closeQuoteAmount: BN, estimatedEntryPrice?: BN): BN;
+    getMarginUSDCRequiredForTrade(targetMarketIndex: number, baseSize: BN): BN;
+    getCollateralDepositRequiredForTrade(targetMarketIndex: number, baseSize: BN, collateralIndex: number): BN;
     /**
      * Get the maximum trade size for a given market, taking into account the user's current leverage, positions, collateral, etc.
      *

package/lib/user.js

@@ -15,7 +15,6 @@ const oracles_1 = require("./math/oracles");
 const tiers_1 = require("./math/tiers");
 const strictOraclePrice_1 = require("./oracles/strictOraclePrice");
 const fuel_1 = require("./math/fuel");
-const grpcUserAccountSubscriber_1 = require("./accounts/grpcUserAccountSubscriber");
 class User {
     get isSubscribed() {
         return this._isSubscribed && this.accountSubscriber.isSubscribed;
@@ -24,7 +23,7 @@ class User {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e;
         this._isSubscribed = false;
         this.driftClient = config.driftClient;
         this.userAccountPublicKey = config.userAccountPublicKey;
@@ -34,17 +33,11 @@ class User {
         else if (((_b = config.accountSubscription) === null || _b === void 0 ? void 0 : _b.type) === 'custom') {
             this.accountSubscriber = config.accountSubscription.userAccountSubscriber;
         }
-        else if (((_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.type) === 'grpc') {
-            this.accountSubscriber = new grpcUserAccountSubscriber_1.grpcUserAccountSubscriber(config.accountSubscription.configs, config.driftClient.program, config.userAccountPublicKey, {
-                resubTimeoutMs: (_d = config.accountSubscription) === null || _d === void 0 ? void 0 : _d.resubTimeoutMs,
-                logResubMessages: (_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.logResubMessages,
-            });
-        }
         else {
             this.accountSubscriber = new webSocketUserAccountSubscriber_1.WebSocketUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey, {
-                resubTimeoutMs: (_f = config.accountSubscription) === null || _f === void 0 ? void 0 : _f.resubTimeoutMs,
-                logResubMessages: (_g = config.accountSubscription) === null || _g === void 0 ? void 0 : _g.logResubMessages,
-            }, (_h = config.accountSubscription) === null || _h === void 0 ? void 0 : _h.commitment);
+                resubTimeoutMs: (_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.resubTimeoutMs,
+                logResubMessages: (_d = config.accountSubscription) === null || _d === void 0 ? void 0 : _d.logResubMessages,
+            }, (_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.commitment);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
     }
@@ -1209,12 +1202,13 @@ class User {
      * @param estimatedEntryPrice
      * @param marginCategory // allow Initial to be passed in if we are trying to calculate price for DLP de-risking
      * @param includeOpenOrders
+     * @param offsetCollateral // allows calculating the liquidation price after this offset collateral is added to the user's account (e.g. : what will the liquidation price be for this position AFTER I deposit $x worth of collateral)
      * @returns Precision : PRICE_PRECISION
      */
-    liquidationPrice(marketIndex, positionBaseSizeChange = numericConstants_1.ZERO, estimatedEntryPrice = numericConstants_1.ZERO, marginCategory = 'Maintenance', includeOpenOrders = false) {
+    liquidationPrice(marketIndex, positionBaseSizeChange = numericConstants_1.ZERO, estimatedEntryPrice = numericConstants_1.ZERO, marginCategory = 'Maintenance', includeOpenOrders = false, offsetCollateral = numericConstants_1.ZERO) {
         const totalCollateral = this.getTotalCollateral(marginCategory);
         const marginRequirement = this.getMarginRequirement(marginCategory, undefined, false, includeOpenOrders);
-        let freeCollateral = _1.BN.max(numericConstants_1.ZERO, totalCollateral.sub(marginRequirement));
+        let freeCollateral = _1.BN.max(numericConstants_1.ZERO, totalCollateral.sub(marginRequirement)).add(offsetCollateral);
         const oracle = this.driftClient.getPerpMarketAccount(marketIndex).amm.oracle;
         const oraclePrice = this.driftClient.getOracleDataForPerpMarket(marketIndex).price;
         const market = this.driftClient.getPerpMarketAccount(marketIndex);
@@ -1374,6 +1368,12 @@ class User {
             .neg();
         return this.liquidationPrice(positionMarketIndex, closeBaseAmount, estimatedEntryPrice);
     }
+    getMarginUSDCRequiredForTrade(targetMarketIndex, baseSize) {
+        return (0, margin_1.calculateMarginUSDCRequiredForTrade)(this.driftClient, targetMarketIndex, baseSize, this.getUserAccount().maxMarginRatio);
+    }
+    getCollateralDepositRequiredForTrade(targetMarketIndex, baseSize, collateralIndex) {
+        return (0, margin_1.calculateCollateralDepositRequiredForTrade)(this.driftClient, targetMarketIndex, baseSize, collateralIndex, this.getUserAccount().maxMarginRatio);
+    }
     /**
      * Get the maximum trade size for a given market, taking into account the user's current leverage, positions, collateral, etc.
      *

package/lib/userConfig.d.ts

@@ -1,7 +1,7 @@
 import { DriftClient } from './driftClient';
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
-import { GrpcConfigs, UserAccountSubscriber } from './accounts/types';
+import { UserAccountSubscriber } from './accounts/types';
 export type UserConfig = {
     accountSubscription?: UserSubscriptionConfig;
     driftClient: DriftClient;
@@ -18,9 +18,4 @@ export type UserSubscriptionConfig = {
 } | {
     type: 'custom';
     userAccountSubscriber: UserAccountSubscriber;
-} | {
-    type: 'grpc';
-    resubTimeoutMs?: number;
-    logResubMessages?: boolean;
-    configs: GrpcConfigs;
 };

package/lib/userMap/userMap.js

@@ -9,7 +9,6 @@ const memcmp_1 = require("../memcmp");
 const WebsocketSubscription_1 = require("./WebsocketSubscription");
 const PollingSubscription_1 = require("./PollingSubscription");
 const user_1 = require("../decode/user");
-const grpcSubscription_1 = require("./grpcSubscription");
 const MAX_USER_ACCOUNT_SIZE_BYTES = 4376;
 class UserMap {
     /**
@@ -53,19 +52,6 @@ class UserMap {
                 skipInitialLoad: config.skipInitialLoad,
             });
         }
-        else if (config.subscriptionConfig.type === 'grpc') {
-            this.subscription = new grpcSubscription_1.grpcSubscription({
-                configs: config.subscriptionConfig.configs,
-                userMap: this,
-                commitment: this.commitment,
-                resubOpts: {
-                    resubTimeoutMs: config.subscriptionConfig.resubTimeoutMs,
-                    logResubMessages: config.subscriptionConfig.logResubMessages,
-                },
-                skipInitialLoad: config.skipInitialLoad,
-                decodeFn,
-            });
-        }
         else {
             this.subscription = new WebsocketSubscription_1.WebsocketSubscription({
                 userMap: this,

package/lib/userMap/userMapConfig.d.ts

@@ -1,6 +1,5 @@
 import { Commitment, Connection } from '@solana/web3.js';
 import { DriftClient } from '../driftClient';
-import { GrpcConfigs } from '../accounts/types';
 export type UserAccountFilterCriteria = {
     hasOpenOrders: boolean;
 };
@@ -18,12 +17,6 @@ export type UserMapConfig = {
         type: 'polling';
         frequency: number;
         commitment?: Commitment;
-    } | {
-        type: 'grpc';
-        configs: GrpcConfigs;
-        resubTimeoutMs?: number;
-        logResubMessages?: boolean;
-        commitment?: Commitment;
     } | {
         type: 'websocket';
         resubTimeoutMs?: number;

package/lib/userStatsConfig.d.ts

@@ -1,7 +1,6 @@
 import { DriftClient } from './driftClient';
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
-import { GrpcConfigs } from './accounts/types';
 export type UserStatsConfig = {
     accountSubscription?: UserStatsSubscriptionConfig;
     driftClient: DriftClient;
@@ -17,9 +16,4 @@ export type UserStatsSubscriptionConfig = {
     accountLoader: BulkAccountLoader;
 } | {
     type: 'custom';
-} | {
-    type: 'grpc';
-    resubTimeoutMs?: number;
-    logResubMessages?: boolean;
-    configs: GrpcConfigs;
 };

package/lib/util/TransactionConfirmationManager.d.ts

@@ -0,0 +1,14 @@
+import { Connection, SignatureStatus, TransactionConfirmationStatus } from '@solana/web3.js';
+/**
+ * Class to await for transaction confirmations in an optimised manner. It tracks a shared list of all pending transactions and fetches them in bulk in a shared RPC request whenever they have an "overlapping" polling interval. E.g. tx1 with an interval of 200ms and tx2 with an interval of 300ms (if sent at the same time) will be fetched together at at 600ms, 1200ms, 1800ms, etc.
+ */
+export declare class TransactionConfirmationManager {
+    private connection;
+    private pendingConfirmations;
+    private intervalId;
+    constructor(connection: Connection);
+    confirmTransaction(txSig: string, desiredConfirmationStatus?: TransactionConfirmationStatus, timeout?: number, pollInterval?: number, searchTransactionHistory?: boolean): Promise<SignatureStatus>;
+    private startConfirmationLoop;
+    private checkPendingConfirmations;
+    private checkTransactionStatuses;
+}

package/lib/util/TransactionConfirmationManager.js

@@ -0,0 +1,96 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransactionConfirmationManager = void 0;
+const config_1 = require("../config");
+const confirmationStatusValues = {
+    processed: 0,
+    confirmed: 1,
+    finalized: 2,
+};
+/**
+ * Class to await for transaction confirmations in an optimised manner. It tracks a shared list of all pending transactions and fetches them in bulk in a shared RPC request whenever they have an "overlapping" polling interval. E.g. tx1 with an interval of 200ms and tx2 with an interval of 300ms (if sent at the same time) will be fetched together at at 600ms, 1200ms, 1800ms, etc.
+ */
+class TransactionConfirmationManager {
+    constructor(connection) {
+        this.pendingConfirmations = new Map();
+        this.intervalId = null;
+        this.connection = connection;
+    }
+    async confirmTransaction(txSig, desiredConfirmationStatus = config_1.DEFAULT_CONFIRMATION_OPTS.commitment, timeout = 30000, pollInterval = 1000, searchTransactionHistory = false) {
+        // Interval must be > 400ms and a multiple of 100ms
+        if (pollInterval < 400 || pollInterval % 100 !== 0) {
+            throw new Error('Transaction confirmation polling interval must be at least 400ms and a multiple of 100ms');
+        }
+        return new Promise((resolve, reject) => {
+            this.pendingConfirmations.set(txSig, {
+                txSig,
+                desiredConfirmationStatus,
+                timeout,
+                pollInterval,
+                searchTransactionHistory,
+                startTime: Date.now(),
+                resolve,
+                reject,
+            });
+            if (!this.intervalId) {
+                this.startConfirmationLoop();
+            }
+        });
+    }
+    startConfirmationLoop() {
+        this.intervalId = setInterval(() => this.checkPendingConfirmations(), 100);
+    }
+    async checkPendingConfirmations() {
+        const now = Date.now();
+        const transactionsToCheck = [];
+        for (const [txSig, request] of this.pendingConfirmations.entries()) {
+            if (now - request.startTime >= request.timeout) {
+                request.reject(new Error(`Transaction confirmation timeout after ${request.timeout}ms`));
+                this.pendingConfirmations.delete(txSig);
+            }
+            else if ((now - request.startTime) % request.pollInterval < 100) {
+                transactionsToCheck.push(request);
+            }
+        }
+        if (transactionsToCheck.length > 0) {
+            await this.checkTransactionStatuses(transactionsToCheck);
+        }
+        if (this.pendingConfirmations.size === 0 && this.intervalId) {
+            clearInterval(this.intervalId);
+            this.intervalId = null;
+        }
+    }
+    async checkTransactionStatuses(requests) {
+        const txSigs = requests.map((request) => request.txSig);
+        const { value: statuses } = await this.connection.getSignatureStatuses(txSigs, {
+            searchTransactionHistory: requests.some((req) => req.searchTransactionHistory),
+        });
+        if (!statuses || statuses.length !== txSigs.length) {
+            throw new Error('Failed to get signature statuses');
+        }
+        for (let i = 0; i < statuses.length; i++) {
+            const status = statuses[i];
+            const request = requests[i];
+            if (status === null) {
+                continue;
+            }
+            if (status.err) {
+                request.reject(new Error(`Transaction failed: ${JSON.stringify(status.err)}`));
+                this.pendingConfirmations.delete(request.txSig);
+                continue;
+            }
+            if (confirmationStatusValues[status.confirmationStatus] === undefined ||
+                confirmationStatusValues[request.desiredConfirmationStatus] ===
+                    undefined) {
+                throw new Error(`Invalid confirmation status when awaiting confirmation: ${status.confirmationStatus}`);
+            }
+            if (status.confirmationStatus &&
+                confirmationStatusValues[status.confirmationStatus] >=
+                    confirmationStatusValues[request.desiredConfirmationStatus]) {
+                request.resolve(status);
+                this.pendingConfirmations.delete(request.txSig);
+            }
+        }
+    }
+}
+exports.TransactionConfirmationManager = TransactionConfirmationManager;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.96.0-beta.2",
+	"version": "2.96.0-beta.20",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -37,16 +37,14 @@
 		"@coral-xyz/anchor": "0.28.0",
 		"@coral-xyz/anchor-30": "npm:@coral-xyz/anchor@0.30.1",
 		"@ellipsis-labs/phoenix-sdk": "^1.4.2",
-		"@grpc/grpc-js": "^1.11.2",
-		"@openbook-dex/openbook-v2": "^0.2.10",
+		"@openbook-dex/openbook-v2": "0.2.10",
 		"@project-serum/serum": "^0.13.38",
 		"@pythnetwork/client": "2.5.3",
 		"@pythnetwork/price-service-sdk": "^1.7.1",
 		"@pythnetwork/pyth-solana-receiver": "^0.7.0",
 		"@solana/spl-token": "0.3.7",
 		"@solana/web3.js": "1.92.3",
-		"@switchboard-xyz/on-demand": "1.2.32",
-		"@triton-one/yellowstone-grpc": "^0.6.0",
+		"@switchboard-xyz/on-demand": "1.2.42",
 		"anchor-bankrun": "^0.3.0",
 		"node-cache": "^5.1.2",
 		"rpc-websockets": "7.5.1",
@@ -58,6 +56,7 @@
 	"devDependencies": {
 		"@types/big.js": "^6.2.0",
 		"@types/bn.js": "^5.1.3",
+		"@types/bs58": "^4.0.4",
 		"@types/chai": "^4.3.1",
 		"@types/jest": "^28.1.3",
 		"@types/mocha": "^9.1.1",

package/src/accounts/pollingDriftClientAccountSubscriber.ts

@@ -1,6 +1,7 @@
 import {
-	DataAndSlot,
 	AccountToPoll,
+	DataAndSlot,
+	DelistedMarketSetting,
 	DriftClientAccountEvents,
 	DriftClientAccountSubscriber,
 	NotSubscribedError,
@@ -10,18 +11,18 @@ import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import {
-	SpotMarketAccount,
 	PerpMarketAccount,
+	SpotMarketAccount,
 	StateAccount,
 	UserAccount,
 } from '../types';
 import {
 	getDriftStateAccountPublicKey,
-	getSpotMarketPublicKey,
 	getPerpMarketPublicKey,
+	getSpotMarketPublicKey,
 } from '../addresses/pda';
 import { BulkAccountLoader } from './bulkAccountLoader';
-import { capitalize } from './utils';
+import { capitalize, findDelistedPerpMarketsAndOracles } from './utils';
 import { PublicKey } from '@solana/web3.js';
 import { OracleInfo, OraclePriceData } from '../oracles/types';
 import { OracleClientCache } from '../oracles/oracleClientCache';
@@ -58,6 +59,7 @@ export class PollingDriftClientAccountSubscriber
 	spotOracleStringMap = new Map<number, string>();
 	oracles = new Map<string, DataAndSlot<OraclePriceData>>();
 	user?: DataAndSlot<UserAccount>;
+	delistedMarketSetting: DelistedMarketSetting;
 
 	private isSubscribing = false;
 	private subscriptionPromise: Promise<boolean>;
@@ -69,7 +71,8 @@ export class PollingDriftClientAccountSubscriber
 		perpMarketIndexes: number[],
 		spotMarketIndexes: number[],
 		oracleInfos: OracleInfo[],
-		shouldFindAllMarketsAndOracles: boolean
+		shouldFindAllMarketsAndOracles: boolean,
+		delistedMarketSetting: DelistedMarketSetting
 	) {
 		this.isSubscribed = false;
 		this.program = program;
@@ -79,6 +82,7 @@ export class PollingDriftClientAccountSubscriber
 		this.spotMarketIndexes = spotMarketIndexes;
 		this.oracleInfos = oracleInfos;
 		this.shouldFindAllMarketsAndOracles = shouldFindAllMarketsAndOracles;
+		this.delistedMarketSetting = delistedMarketSetting;
 	}
 
 	public async subscribe(): Promise<boolean> {
@@ -120,6 +124,8 @@ export class PollingDriftClientAccountSubscriber
 			this.eventEmitter.emit('update');
 		}
 
+		this.handleDelistedMarkets();
+
 		await Promise.all([this.setPerpOracleMap(), this.setSpotOracleMap()]);
 
 		this.isSubscribing = false;
@@ -500,6 +506,36 @@ export class PollingDriftClientAccountSubscriber
 		await Promise.all(oraclePromises);
 	}
 
+	handleDelistedMarkets(): void {
+		if (this.delistedMarketSetting === DelistedMarketSetting.Subscribe) {
+			return;
+		}
+
+		const { perpMarketIndexes, oracles } = 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 === 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 === DelistedMarketSetting.Discard) {
+				this.oracles.delete(oracle.toBase58());
+			}
+		}
+	}
+
 	assertIsSubscribed(): void {
 		if (!this.isSubscribed) {
 			throw new NotSubscribedError(

package/src/accounts/types.ts

@@ -12,8 +12,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>;
@@ -86,6 +84,12 @@ export interface DriftClientAccountSubscriber {
 	updateAccountLoaderPollingFrequency?: (pollingFrequency: number) => void;
 }
 
+export enum DelistedMarketSetting {
+	Unsubscribe,
+	Subscribe,
+	Discard,
+}
+
 export interface UserAccountEvents {
 	userAccountUpdate: (payload: UserAccount) => void;
 	update: void;
@@ -203,10 +207,3 @@ export interface UserStatsAccountSubscriber {
 
 	getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount>;
 }
-
-export type GrpcConfigs = {
-	endpoint: string;
-	token: string;
-	commitmentLevel?: CommitmentLevel;
-	channelOptions?: ChannelOptions;
-};

package/src/accounts/utils.ts

@@ -1,3 +1,45 @@
+import { PublicKey } from '@solana/web3.js';
+import { DataAndSlot } from './types';
+import { isVariant, PerpMarketAccount, SpotMarketAccount } from '../types';
+
 export function capitalize(value: string): string {
 	return value[0].toUpperCase() + value.slice(1);
 }
+
+export function findDelistedPerpMarketsAndOracles(
+	perpMarkets: DataAndSlot<PerpMarketAccount>[],
+	spotMarkets: DataAndSlot<SpotMarketAccount>[]
+): { perpMarketIndexes: number[]; oracles: PublicKey[] } {
+	const delistedPerpMarketIndexes = [];
+	const delistedOracles = [];
+	for (const perpMarket of perpMarkets) {
+		if (!perpMarket.data) {
+			continue;
+		}
+
+		if (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,
+	};
+}