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

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,13 +63,11 @@ 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"));
 const on_demand_1 = require("@switchboard-xyz/on-demand");
-const switchboard_on_demand_30_json_1 = __importDefault(require("./idl/switchboard_on_demand_30.json"));
-const grpcDriftClientAccountSubscriber_1 = require("./accounts/grpcDriftClientAccountSubscriber");
+const ed = __importStar(require("@noble/ed25519"));
 /**
  * # DriftClient
  * This class is the main way to interact with Drift Protocol. It allows you to subscribe to the various accounts where the Market's state is stored, as well as: opening positions, liquidating, settling funding, depositing & withdrawing, and more.
@@ -81,7 +80,7 @@ class DriftClient {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -91,7 +90,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)
         };
@@ -110,6 +109,7 @@ class DriftClient {
         this.txHandler =
             (_m = config === null || config === void 0 ? void 0 : config.txHandler) !== null && _m !== void 0 ? _m : new txHandler_1.TxHandler({
                 connection: this.connection,
+                // @ts-ignore
                 wallet: this.provider.wallet,
                 confirmationOptions: this.opts,
                 opts: {
@@ -144,32 +144,18 @@ class DriftClient {
                 accountLoader: config.accountSubscription.accountLoader,
             };
         }
-        else if (((_q = config.accountSubscription) === null || _q === void 0 ? void 0 : _q.type) === 'grpc') {
-            this.userAccountSubscriptionConfig = {
-                type: 'grpc',
-                resubTimeoutMs: (_r = config.accountSubscription) === null || _r === void 0 ? void 0 : _r.resubTimeoutMs,
-                logResubMessages: (_s = config.accountSubscription) === null || _s === void 0 ? void 0 : _s.logResubMessages,
-                configs: (_t = config.accountSubscription) === null || _t === void 0 ? void 0 : _t.configs,
-            };
-            this.userStatsAccountSubscriptionConfig = {
-                type: 'grpc',
-                resubTimeoutMs: (_u = config.accountSubscription) === null || _u === void 0 ? void 0 : _u.resubTimeoutMs,
-                logResubMessages: (_v = config.accountSubscription) === null || _v === void 0 ? void 0 : _v.logResubMessages,
-                configs: (_w = config.accountSubscription) === null || _w === void 0 ? void 0 : _w.configs,
-            };
-        }
         else {
             this.userAccountSubscriptionConfig = {
                 type: 'websocket',
-                resubTimeoutMs: (_x = config.accountSubscription) === null || _x === void 0 ? void 0 : _x.resubTimeoutMs,
-                logResubMessages: (_y = config.accountSubscription) === null || _y === void 0 ? void 0 : _y.logResubMessages,
-                commitment: (_z = config.accountSubscription) === null || _z === void 0 ? void 0 : _z.commitment,
+                resubTimeoutMs: (_q = config.accountSubscription) === null || _q === void 0 ? void 0 : _q.resubTimeoutMs,
+                logResubMessages: (_r = config.accountSubscription) === null || _r === void 0 ? void 0 : _r.logResubMessages,
+                commitment: (_s = config.accountSubscription) === null || _s === void 0 ? void 0 : _s.commitment,
             };
             this.userStatsAccountSubscriptionConfig = {
                 type: 'websocket',
-                resubTimeoutMs: (_0 = config.accountSubscription) === null || _0 === void 0 ? void 0 : _0.resubTimeoutMs,
-                logResubMessages: (_1 = config.accountSubscription) === null || _1 === void 0 ? void 0 : _1.logResubMessages,
-                commitment: (_2 = config.accountSubscription) === null || _2 === void 0 ? void 0 : _2.commitment,
+                resubTimeoutMs: (_t = config.accountSubscription) === null || _t === void 0 ? void 0 : _t.resubTimeoutMs,
+                logResubMessages: (_u = config.accountSubscription) === null || _u === void 0 ? void 0 : _u.logResubMessages,
+                commitment: (_v = config.accountSubscription) === null || _v === void 0 ? void 0 : _v.commitment,
             };
         }
         if (config.userStats) {
@@ -183,23 +169,18 @@ 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 (((_3 = config.accountSubscription) === null || _3 === void 0 ? void 0 : _3.type) === 'polling') {
-            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_4 = config.perpMarketIndexes) !== null && _4 !== void 0 ? _4 : [], (_5 = config.spotMarketIndexes) !== null && _5 !== void 0 ? _5 : [], (_6 = config.oracleInfos) !== null && _6 !== void 0 ? _6 : [], noMarketsAndOraclesSpecified);
-        }
-        else if (((_7 = config.accountSubscription) === null || _7 === void 0 ? void 0 : _7.type) === 'grpc') {
-            this.accountSubscriber = new grpcDriftClientAccountSubscriber_1.gprcDriftClientAccountSubscriber(config.accountSubscription.configs, this.program, (_8 = config.perpMarketIndexes) !== null && _8 !== void 0 ? _8 : [], (_9 = config.spotMarketIndexes) !== null && _9 !== void 0 ? _9 : [], (_10 = config.oracleInfos) !== null && _10 !== void 0 ? _10 : [], noMarketsAndOraclesSpecified, {
-                resubTimeoutMs: (_11 = config.accountSubscription) === null || _11 === void 0 ? void 0 : _11.resubTimeoutMs,
-                logResubMessages: (_12 = config.accountSubscription) === null || _12 === void 0 ? void 0 : _12.logResubMessages,
-            });
+        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, delistedMarketSetting);
         }
         else {
-            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_13 = config.perpMarketIndexes) !== null && _13 !== void 0 ? _13 : [], (_14 = config.spotMarketIndexes) !== null && _14 !== void 0 ? _14 : [], (_15 = config.oracleInfos) !== null && _15 !== void 0 ? _15 : [], noMarketsAndOraclesSpecified, {
-                resubTimeoutMs: (_16 = config.accountSubscription) === null || _16 === void 0 ? void 0 : _16.resubTimeoutMs,
-                logResubMessages: (_17 = config.accountSubscription) === null || _17 === void 0 ? void 0 : _17.logResubMessages,
-            }, (_18 = config.accountSubscription) === null || _18 === void 0 ? void 0 : _18.commitment);
+            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);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
         this.metricsEventEmitter = new events_1.EventEmitter();
@@ -207,12 +188,14 @@ class DriftClient {
             this.enableMetricsEvents = true;
         }
         this.txSender =
-            (_19 = config.txSender) !== null && _19 !== void 0 ? _19 : new retryTxSender_1.RetryTxSender({
+            (_6 = config.txSender) !== null && _6 !== void 0 ? _6 : new retryTxSender_1.RetryTxSender({
                 connection: this.connection,
                 wallet: this.wallet,
                 opts: this.opts,
                 txHandler: this.txHandler,
             });
+        this.sbOnDemandProgramdId =
+            config_1.configs[(_7 = config.env) !== null && _7 !== void 0 ? _7 : 'mainnet-beta'].SB_ON_DEMAND_PID;
     }
     getUserMapKey(subAccountId, authority) {
         return `${subAccountId}_${authority.toString()}`;
@@ -1139,7 +1122,7 @@ class DriftClient {
             data: Buffer.from([0x1]),
         });
     }
-    async createDepositTxn(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly = false, txParams) {
+    async getDepositTxnIx(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly = false) {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
         const signerAuthority = this.wallet.publicKey;
@@ -1156,6 +1139,10 @@ class DriftClient {
         if (createWSOLTokenAccount) {
             instructions.push((0, spl_token_1.createCloseAccountInstruction)(associatedTokenAccount, signerAuthority, signerAuthority, []));
         }
+        return instructions;
+    }
+    async createDepositTxn(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly = false, txParams) {
+        const instructions = await this.getDepositTxnIx(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly);
         txParams = { ...(txParams !== null && txParams !== void 0 ? txParams : this.txParams), computeUnits: 600000 };
         const tx = await this.buildTransaction(instructions, txParams);
         return tx;
@@ -1263,7 +1250,7 @@ class DriftClient {
     getAssociatedTokenAccountCreationIx(tokenMintAddress, associatedTokenAddress, tokenProgram) {
         return (0, spl_token_1.createAssociatedTokenAccountInstruction)(this.wallet.publicKey, associatedTokenAddress, this.wallet.publicKey, tokenMintAddress, tokenProgram);
     }
-    async createInitializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name, fromSubAccountId, referrerInfo, donateAmount, txParams, customMaxMarginRatio) {
+    async createInitializeUserAccountAndDepositCollateralIxs(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name, fromSubAccountId, referrerInfo, donateAmount, customMaxMarginRatio) {
         const ixs = [];
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
         const spotMarket = this.getSpotMarketAccount(marketIndex);
@@ -1309,6 +1296,13 @@ class DriftClient {
         if (createWSOLTokenAccount) {
             ixs.push((0, spl_token_1.createCloseAccountInstruction)(wsolTokenAccount, authority, authority, []));
         }
+        return {
+            ixs,
+            userAccountPublicKey,
+        };
+    }
+    async createInitializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name, fromSubAccountId, referrerInfo, donateAmount, txParams, customMaxMarginRatio) {
+        const { ixs, userAccountPublicKey } = await this.createInitializeUserAccountAndDepositCollateralIxs(amount, userTokenAccount, marketIndex, subAccountId, name, fromSubAccountId, referrerInfo, donateAmount, customMaxMarginRatio);
         const tx = await this.buildTransaction(ixs, txParams);
         return [tx, userAccountPublicKey];
     }
@@ -1616,7 +1610,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);
@@ -1684,13 +1678,21 @@ class DriftClient {
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
-    async getPlacePerpOrderIx(orderParams, subAccountId) {
+    async getPlacePerpOrderIx(orderParams, subAccountId, depositToTradeArgs) {
         orderParams = (0, orderParams_1.getOrderParams)(orderParams, { marketType: types_1.MarketType.PERP });
-        const user = await this.getUserAccountPublicKey(subAccountId);
+        const isDepositToTradeTx = depositToTradeArgs !== undefined;
+        const user = isDepositToTradeTx
+            ? (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.authority, subAccountId)
+            : await this.getUserAccountPublicKey(subAccountId);
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(subAccountId)],
-            useMarketLastSlotCache: true,
+            userAccounts: (depositToTradeArgs === null || depositToTradeArgs === void 0 ? void 0 : depositToTradeArgs.isMakingNewAccount)
+                ? []
+                : [this.getUserAccount(subAccountId)],
+            useMarketLastSlotCache: false,
             readablePerpMarketIndex: orderParams.marketIndex,
+            readableSpotMarketIndexes: isDepositToTradeTx
+                ? [depositToTradeArgs === null || depositToTradeArgs === void 0 ? void 0 : depositToTradeArgs.depositMarketIndex]
+                : undefined,
         });
         return await this.program.instruction.placePerpOrder(orderParams, {
             accounts: {
@@ -2726,8 +2728,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 +2745,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);
@@ -2802,7 +2804,9 @@ class DriftClient {
         if (!txsToSign) {
             return null;
         }
-        const signedTxs = (await this.txHandler.getSignedTransactionMap(txsToSign, this.provider.wallet)).signedTxMap;
+        const signedTxs = (await this.txHandler.getSignedTransactionMap(txsToSign, 
+        // @ts-ignore
+        this.provider.wallet)).signedTxMap;
         const { txSig, slot } = await this.sendTransaction(signedTxs.placeAndTakeTx, [], this.opts, true);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return {
@@ -2811,7 +2815,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);
@@ -2857,7 +2861,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,
@@ -2909,6 +2913,123 @@ class DriftClient {
             remainingAccounts,
         });
     }
+    encodeSwiftServerMessage(message) {
+        const messageWithBuffer = {
+            slot: message.slot,
+            swiftOrderSignature: message.swiftOrderSignature,
+        };
+        return this.program.coder.types.encode('SwiftServerMessage', messageWithBuffer);
+    }
+    decodeSwiftServerMessage(encodedMessage) {
+        const decodedSwiftMessage = this.program.coder.types.decode('SwiftServerMessage', encodedMessage);
+        return {
+            slot: decodedSwiftMessage.slot,
+            swiftOrderSignature: decodedSwiftMessage.swiftSignature,
+        };
+    }
+    async signSwiftServerMessage(message) {
+        const swiftServerMessage = Uint8Array.from(this.encodeSwiftServerMessage(message));
+        return await this.signMessage(swiftServerMessage);
+    }
+    async signSwiftOrderParamsMessage(orderParamsMessage) {
+        const takerOrderParamsMessage = Uint8Array.from(this.encodeSwiftOrderParamsMessage(orderParamsMessage));
+        return await this.signMessage(takerOrderParamsMessage);
+    }
+    encodeSwiftOrderParamsMessage(orderParamsMessage) {
+        return this.program.coder.types.encode('SwiftOrderParamsMessage', orderParamsMessage);
+    }
+    decodeSwiftOrderParamsMessage(encodedMessage) {
+        return this.program.coder.types.decode('SwiftOrderParamsMessage', encodedMessage);
+    }
+    async signMessage(message, keypair = this.wallet.payer) {
+        return Buffer.from(await ed.sign(message, keypair.secretKey.slice(0, 32)));
+    }
+    async placeSwiftTakerOrder(swiftServerMessage, swiftSignature, swiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo, txParams) {
+        const ixs = await this.getPlaceSwiftTakerPerpOrderIxs(swiftServerMessage, swiftSignature, swiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(ixs, txParams), [], this.opts);
+        return txSig;
+    }
+    async getPlaceSwiftTakerPerpOrderIxs(encodedSwiftServerMessage, swiftSignature, encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo) {
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [takerInfo.takerUserAccount],
+            useMarketLastSlotCache: true,
+            readablePerpMarketIndex: marketIndex,
+        });
+        const swiftServerSignatureIx = web3_js_1.Ed25519Program.createInstructionWithPublicKey({
+            publicKey: new web3_js_1.PublicKey(config_1.SWIFT_ID).toBytes(),
+            signature: Uint8Array.from(swiftSignature),
+            message: Uint8Array.from(encodedSwiftServerMessage),
+        });
+        const swiftOrderParamsSignatureIx = web3_js_1.Ed25519Program.createInstructionWithPublicKey({
+            publicKey: takerInfo.takerUserAccount.authority.toBytes(),
+            signature: Uint8Array.from(swiftOrderParamsSignature),
+            message: Uint8Array.from(encodedSwiftOrderParamsMessage),
+        });
+        const placeTakerSwiftPerpOrderIx = await this.program.instruction.placeSwiftTakerOrder(encodedSwiftServerMessage, encodedSwiftOrderParamsMessage, swiftSignature, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                user: takerInfo.taker,
+                userStats: takerInfo.takerStats,
+                authority: this.wallet.publicKey,
+                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+            },
+            remainingAccounts,
+        });
+        return [
+            swiftServerSignatureIx,
+            swiftOrderParamsSignatureIx,
+            placeTakerSwiftPerpOrderIx,
+        ];
+    }
+    async placeAndMakeSwiftPerpOrder(encodedSwiftMessage, swiftSignature, encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, takerExpectedOrderId, takerInfo, orderParams, referrerInfo, txParams, subAccountId) {
+        const ixs = await this.getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftMessage, swiftSignature, encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, takerExpectedOrderId, takerInfo, orderParams, referrerInfo, subAccountId);
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(ixs, txParams), [], this.opts);
+        this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
+        return txSig;
+    }
+    async getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftMessage, swiftSignature, encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, takerExpectedOrderId, takerInfo, orderParams, referrerInfo, subAccountId) {
+        const [swiftServerSignatureIx, swiftOrderSignatureIx, placeTakerSwiftPerpOrderIx,] = await this.getPlaceSwiftTakerPerpOrderIxs(encodedSwiftMessage, swiftSignature, encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, orderParams.marketIndex, takerInfo);
+        orderParams = (0, orderParams_1.getOrderParams)(orderParams, { marketType: types_1.MarketType.PERP });
+        const userStatsPublicKey = this.getUserStatsAccountPublicKey();
+        const user = await this.getUserAccountPublicKey(subAccountId);
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [
+                this.getUserAccount(subAccountId),
+                takerInfo.takerUserAccount,
+            ],
+            useMarketLastSlotCache: true,
+            writablePerpMarketIndexes: [orderParams.marketIndex],
+        });
+        if (referrerInfo) {
+            remainingAccounts.push({
+                pubkey: referrerInfo.referrer,
+                isWritable: true,
+                isSigner: false,
+            });
+            remainingAccounts.push({
+                pubkey: referrerInfo.referrerStats,
+                isWritable: true,
+                isSigner: false,
+            });
+        }
+        const placeAndMakeIx = await this.program.instruction.placeAndMakePerpOrder(orderParams, takerExpectedOrderId, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                user,
+                userStats: userStatsPublicKey,
+                taker: takerInfo.taker,
+                takerStats: takerInfo.takerStats,
+                authority: this.wallet.publicKey,
+            },
+            remainingAccounts,
+        });
+        return [
+            swiftServerSignatureIx,
+            swiftOrderSignatureIx,
+            placeTakerSwiftPerpOrderIx,
+            placeAndMakeIx,
+        ];
+    }
     async preparePlaceAndTakeSpotOrder(orderParams, fulfillmentConfig, makerInfo, referrerInfo, txParams, subAccountId) {
         const tx = await this.buildTransaction(await this.getPlaceAndTakeSpotOrderIx(orderParams, fulfillmentConfig, makerInfo, referrerInfo, subAccountId), txParams);
         return {
@@ -3036,7 +3157,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.
@@ -3930,9 +4051,10 @@ class DriftClient {
         }
         return this.receiverProgram;
     }
-    getSwitchboardOnDemandProgram() {
+    async getSwitchboardOnDemandProgram() {
+        const idl = (await anchor_30_1.Program.fetchIdl(this.sbOnDemandProgramdId, this.provider));
         if (this.sbOnDemandProgram === undefined) {
-            this.sbOnDemandProgram = new anchor_30_1.Program(switchboard_on_demand_30_json_1.default, this.provider);
+            this.sbOnDemandProgram = new anchor_30_1.Program(idl, this.provider);
         }
         return this.sbOnDemandProgram;
     }
@@ -3973,7 +4095,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,
@@ -3996,7 +4118,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),
             },
@@ -4024,14 +4146,14 @@ 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),
             },
         });
     }
     async getPostSwitchboardOnDemandUpdateAtomicIx(feed, numSignatures = 3) {
-        const program = this.getSwitchboardOnDemandProgram();
+        const program = await this.getSwitchboardOnDemandProgram();
         const feedAccount = new on_demand_1.PullFeed(program, feed);
         if (!this.sbProgramFeedConfigs) {
             this.sbProgramFeedConfigs = new Map();
@@ -4042,8 +4164,6 @@ class DriftClient {
         }
         const [pullIx, _responses, success] = await feedAccount.fetchUpdateIx({
             numSignatures,
-            // @ts-ignore :: TODO someone needs to look at this
-            feedConfigs: this.sbProgramFeedConfigs.get(feed.toString()),
         });
         if (!success) {
             return undefined;

package/lib/driftClientConfig.d.ts

@@ -5,7 +5,7 @@ import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { DriftEnv } from './config';
 import { TxSender } from './tx/types';
 import { TxHandler, TxHandlerConfig } from './tx/txHandler';
-import { GrpcConfigs } from './accounts/types';
+import { DelistedMarketSetting } from './accounts/types';
 export type DriftClientConfig = {
     connection: Connection;
     wallet: IWallet;
@@ -30,6 +30,7 @@ export type DriftClientConfig = {
     txParams?: TxParams;
     enableMetricsEvents?: boolean;
     txHandlerConfig?: TxHandlerConfig;
+    delistedMarketSetting?: DelistedMarketSetting;
 };
 export type DriftClientSubscriptionConfig = {
     type: 'websocket';
@@ -39,9 +40,4 @@ export type DriftClientSubscriptionConfig = {
 } | {
     type: 'polling';
     accountLoader: BulkAccountLoader;
-} | {
-    type: 'grpc';
-    configs: GrpcConfigs;
-    resubTimeoutMs?: number;
-    logResubMessages?: boolean;
 };

package/lib/events/eventSubscriber.js

@@ -28,23 +28,24 @@ class EventSubscriber {
         this.initializeLogProvider();
     }
     initializeLogProvider(subscribe = false) {
+        const logProviderConfig = this.options.logProviderConfig;
         if (this.currentProviderType === 'websocket') {
-            const logProviderConfig = this.options
-                .logProviderConfig;
             this.logProvider = new webSocketLogProvider_1.WebSocketLogProvider(
             // @ts-ignore
-            this.connection, this.address, this.options.commitment, logProviderConfig.resubTimeoutMs);
+            this.connection, this.address, this.options.commitment, this.options.logProviderConfig.resubTimeoutMs);
         }
         else if (this.currentProviderType === 'polling') {
-            const logProviderConfig = this.options
-                .logProviderConfig;
+            const frequency = 'frequency' in logProviderConfig
+                ? logProviderConfig.frequency
+                : logProviderConfig.fallbackFrequency;
+            const batchSize = 'batchSize' in logProviderConfig
+                ? logProviderConfig.batchSize
+                : logProviderConfig.fallbackBatchSize;
             this.logProvider = new pollingLogProvider_1.PollingLogProvider(
             // @ts-ignore
-            this.connection, this.address, this.options.commitment, logProviderConfig.frequency, logProviderConfig.batchSize);
+            this.connection, this.address, this.options.commitment, frequency, batchSize);
         }
         else if (this.currentProviderType === 'events-server') {
-            const logProviderConfig = this.options
-                .logProviderConfig;
             this.logProvider = new eventsServerLogProvider_1.EventsServerLogProvider(logProviderConfig.url, this.options.eventTypes, this.options.address ? this.options.address.toString() : undefined);
         }
         else {

package/lib/events/types.js

@@ -25,10 +25,6 @@ exports.DefaultEventSubscriptionOptions = {
     commitment: 'confirmed',
     maxTx: 4096,
     logProviderConfig: {
-        type: 'events-server',
-        url: 'wss://events.drift.trade/ws',
-        maxReconnectAttempts: 5,
-        fallbackFrequency: 1000,
-        fallbackBatchSize: 100,
+        type: 'websocket',
     },
 };