@drift-labs/sdk 2.69.0-beta.0 → 2.70.0-beta.1

package/VERSION

@@ -1 +1 @@
-2.69.0-beta.0
+2.70.0-beta.1

package/lib/driftClient.d.ts

@@ -435,7 +435,7 @@ export declare class DriftClient {
     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>;
-    placeAndTakePerpWithAdditionalOrders(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, bracketOrdersParams?: OptionalOrderParams[], txParams?: TxParams, subAccountId?: number, cancelExistingOrders?: boolean, settlePnl?: boolean): Promise<{
+    placeAndTakePerpWithAdditionalOrders(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, bracketOrdersParams?: OptionalOrderParams[], txParams?: TxParams, subAccountId?: number, cancelExistingOrders?: boolean, settlePnl?: boolean, simulateFirst?: boolean): Promise<{
         txSig: TransactionSignature;
         signedCancelExistingOrdersTx?: Transaction;
         signedSettlePnlTx?: Transaction;
@@ -613,7 +613,7 @@ export declare class DriftClient {
     /**
      * Add to an insurance fund stake and optionally initialize the account
      */
-    addInsuranceFundStake({ marketIndex, amount, collateralAccountPublicKey, initializeStakeAccount, fromSubaccount, }: {
+    addInsuranceFundStake({ marketIndex, amount, collateralAccountPublicKey, initializeStakeAccount, fromSubaccount, txParams, }: {
         /**
          * Spot market index
          */
@@ -631,10 +631,11 @@ export declare class DriftClient {
          * Optional -- withdraw from current subaccount to fund stake amount, instead of wallet balance
          */
         fromSubaccount?: boolean;
+        txParams?: TxParams;
     }): Promise<TransactionSignature>;
-    requestRemoveInsuranceFundStake(marketIndex: number, amount: BN): Promise<TransactionSignature>;
-    cancelRequestRemoveInsuranceFundStake(marketIndex: number): Promise<TransactionSignature>;
-    removeInsuranceFundStake(marketIndex: number, collateralAccountPublicKey: PublicKey): Promise<TransactionSignature>;
+    requestRemoveInsuranceFundStake(marketIndex: number, amount: BN, txParams?: TxParams): Promise<TransactionSignature>;
+    cancelRequestRemoveInsuranceFundStake(marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
+    removeInsuranceFundStake(marketIndex: number, collateralAccountPublicKey: PublicKey, txParams?: TxParams): Promise<TransactionSignature>;
     settleRevenueToInsuranceFund(marketIndex: number): Promise<TransactionSignature>;
     resolvePerpPnlDeficit(spotMarketIndex: number, perpMarketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     getResolvePerpPnlDeficitIx(spotMarketIndex: number, perpMarketIndex: number): Promise<TransactionInstruction>;

package/lib/driftClient.js

@@ -2492,7 +2492,21 @@ class DriftClient {
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
-    async placeAndTakePerpWithAdditionalOrders(orderParams, makerInfo, referrerInfo, bracketOrdersParams = new Array(), txParams, subAccountId, cancelExistingOrders, settlePnl) {
+    async placeAndTakePerpWithAdditionalOrders(orderParams, makerInfo, referrerInfo, bracketOrdersParams = new Array(), txParams, subAccountId, cancelExistingOrders, settlePnl, simulateFirst) {
+        const ixs = [];
+        const placeAndTakeIx = await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo, subAccountId);
+        ixs.push(placeAndTakeIx);
+        if (bracketOrdersParams.length > 0) {
+            const bracketOrdersIx = await this.getPlaceOrdersIx(bracketOrdersParams, subAccountId);
+            ixs.push(bracketOrdersIx);
+        }
+        const placeAndTakeTx = (await this.buildTransaction(ixs, txParams));
+        // if param is passed, return early before the tx fails so ui can fallback to placeOrder
+        if (simulateFirst) {
+            const success = await this.txSender.simulateTransaction(placeAndTakeTx);
+            if (!success)
+                return;
+        }
         let cancelExistingOrdersTx;
         if (cancelExistingOrders && (0, types_1.isVariant)(orderParams.marketType, 'perp')) {
             const cancelOrdersIx = await this.getCancelOrdersIx(orderParams.marketType, orderParams.marketIndex, null, subAccountId);
@@ -2507,14 +2521,6 @@ class DriftClient {
             //@ts-ignore
             settlePnlTx = await this.buildTransaction([settlePnlIx], txParams, this.txVersion);
         }
-        const ixs = [];
-        const placeAndTakeIx = await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo, subAccountId);
-        ixs.push(placeAndTakeIx);
-        if (bracketOrdersParams.length > 0) {
-            const bracketOrdersIx = await this.getPlaceOrdersIx(bracketOrdersParams, subAccountId);
-            ixs.push(bracketOrdersIx);
-        }
-        const placeAndTakeTx = await this.buildTransaction(ixs, txParams);
         const allPossibleTxs = [
             placeAndTakeTx,
             cancelExistingOrdersTx,
@@ -3221,7 +3227,7 @@ class DriftClient {
     /**
      * Add to an insurance fund stake and optionally initialize the account
      */
-    async addInsuranceFundStake({ marketIndex, amount, collateralAccountPublicKey, initializeStakeAccount, fromSubaccount, }) {
+    async addInsuranceFundStake({ marketIndex, amount, collateralAccountPublicKey, initializeStakeAccount, fromSubaccount, txParams, }) {
         const addIfStakeIxs = [];
         const additionalSigners = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
@@ -3251,11 +3257,11 @@ class DriftClient {
         if (createWSOLTokenAccount) {
             addIfStakeIxs.push((0, spl_token_1.createCloseAccountInstruction)(tokenAccount, this.wallet.publicKey, this.wallet.publicKey, []));
         }
-        const tx = await this.buildTransaction(addIfStakeIxs);
+        const tx = await this.buildTransaction(addIfStakeIxs, txParams);
         const { txSig } = await this.sendTransaction(tx, additionalSigners, this.opts);
         return txSig;
     }
-    async requestRemoveInsuranceFundStake(marketIndex, amount) {
+    async requestRemoveInsuranceFundStake(marketIndex, amount, txParams) {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
         const remainingAccounts = this.getRemainingAccounts({
@@ -3274,11 +3280,11 @@ class DriftClient {
             },
             remainingAccounts,
         });
-        const tx = await this.buildTransaction(ix);
+        const tx = await this.buildTransaction(ix, txParams);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async cancelRequestRemoveInsuranceFundStake(marketIndex) {
+    async cancelRequestRemoveInsuranceFundStake(marketIndex, txParams) {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
         const remainingAccounts = this.getRemainingAccounts({
@@ -3297,11 +3303,11 @@ class DriftClient {
             },
             remainingAccounts,
         });
-        const tx = await this.buildTransaction(ix);
+        const tx = await this.buildTransaction(ix, txParams);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async removeInsuranceFundStake(marketIndex, collateralAccountPublicKey) {
+    async removeInsuranceFundStake(marketIndex, collateralAccountPublicKey, txParams) {
         var _a, _b;
         const removeIfStakeIxs = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
@@ -3351,7 +3357,7 @@ class DriftClient {
         if (createWSOLTokenAccount) {
             removeIfStakeIxs.push((0, spl_token_1.createCloseAccountInstruction)(tokenAccount, this.wallet.publicKey, this.wallet.publicKey, []));
         }
-        const tx = await this.buildTransaction(removeIfStakeIxs);
+        const tx = await this.buildTransaction(removeIfStakeIxs, txParams);
         const { txSig } = await this.sendTransaction(tx, additionalSigners, this.opts);
         return txSig;
     }

package/lib/factory/oracleClient.js

@@ -6,7 +6,6 @@ const pythClient_1 = require("../oracles/pythClient");
 // import { SwitchboardClient } from '../oracles/switchboardClient';
 const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
 const anchor_1 = require("@coral-xyz/anchor");
-const switchboardClient_1 = require("../oracles/switchboardClient");
 function getOracleClient(oracleSource, connection) {
     if ((0, types_1.isVariant)(oracleSource, 'pyth')) {
         return new pythClient_1.PythClient(connection);
@@ -20,9 +19,9 @@ function getOracleClient(oracleSource, connection) {
     if ((0, types_1.isVariant)(oracleSource, 'pythStableCoin')) {
         return new pythClient_1.PythClient(connection, undefined, true);
     }
-    if ((0, types_1.isVariant)(oracleSource, 'switchboard')) {
-        return new switchboardClient_1.SwitchboardClient(connection);
-    }
+    // if (isVariant(oracleSource, 'switchboard')) {
+    // 	return new SwitchboardClient(connection);
+    // }
     if ((0, types_1.isVariant)(oracleSource, 'quoteAsset')) {
         return new quoteAssetOracleClient_1.QuoteAssetOracleClient();
     }

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.68.0",
+    "version": "2.69.0",
     "name": "drift",
     "instructions": [
         {

package/lib/tx/baseTxSender.d.ts

@@ -25,6 +25,7 @@ export declare abstract class BaseTxSender implements TxSender {
     getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<VersionedTransaction>;
     sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean, extraConfirmationOptions?: ExtraConfirmationOptions): Promise<TxSigAndSlot>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
+    simulateTransaction(tx: VersionedTransaction): Promise<boolean>;
     confirmTransactionWebSocket(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult>>;
     confirmTransactionPolling(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult> | undefined>;
     confirmTransaction(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult>>;

package/lib/tx/baseTxSender.js

@@ -95,6 +95,21 @@ class BaseTxSender {
     opts) {
         throw new Error('Must be implemented by subclass');
     }
+    /* Simulate the tx and return a boolean for success value */
+    async simulateTransaction(tx) {
+        try {
+            const result = await this.connection.simulateTransaction(tx);
+            if (result.value.err != null) {
+                console.error('Error in transaction simulation: ', result.value.err);
+                return false;
+            }
+            return true;
+        }
+        catch (e) {
+            console.error('Error calling simulateTransaction: ', e);
+            return false;
+        }
+    }
     async confirmTransactionWebSocket(signature, commitment) {
         var _a;
         let decodedSignature;

package/lib/tx/types.d.ts

@@ -19,5 +19,6 @@ export interface TxSender {
     sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean, extraConfirmationOptions?: ExtraConfirmationOptions): Promise<TxSigAndSlot>;
     getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<VersionedTransaction>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
+    simulateTransaction(tx: VersionedTransaction): Promise<boolean>;
     getTimeoutCount(): number;
 }

package/lib/types.d.ts

@@ -143,9 +143,6 @@ export declare class OracleSource {
     static readonly PYTH_1M: {
         pyth1M: {};
     };
-    static readonly SWITCHBOARD: {
-        switchboard: {};
-    };
     static readonly QUOTE_ASSET: {
         quoteAsset: {};
     };

package/lib/types.js

@@ -95,7 +95,7 @@ exports.OracleSource = OracleSource;
 OracleSource.PYTH = { pyth: {} };
 OracleSource.PYTH_1K = { pyth1K: {} };
 OracleSource.PYTH_1M = { pyth1M: {} };
-OracleSource.SWITCHBOARD = { switchboard: {} };
+// static readonly SWITCHBOARD = { switchboard: {} };
 OracleSource.QUOTE_ASSET = { quoteAsset: {} };
 OracleSource.PYTH_STABLE_COIN = { pythStableCoin: {} };
 class OrderType {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.69.0-beta.0",
+	"version": "2.70.0-beta.1",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/driftClient.ts

@@ -4476,12 +4476,43 @@ export class DriftClient {
 		txParams?: TxParams,
 		subAccountId?: number,
 		cancelExistingOrders?: boolean,
-		settlePnl?: boolean
+		settlePnl?: boolean,
+		simulateFirst?: boolean
 	): Promise<{
 		txSig: TransactionSignature;
 		signedCancelExistingOrdersTx?: Transaction;
 		signedSettlePnlTx?: Transaction;
 	}> {
+		const ixs = [];
+
+		const placeAndTakeIx = await this.getPlaceAndTakePerpOrderIx(
+			orderParams,
+			makerInfo,
+			referrerInfo,
+			subAccountId
+		);
+
+		ixs.push(placeAndTakeIx);
+
+		if (bracketOrdersParams.length > 0) {
+			const bracketOrdersIx = await this.getPlaceOrdersIx(
+				bracketOrdersParams,
+				subAccountId
+			);
+			ixs.push(bracketOrdersIx);
+		}
+
+		const placeAndTakeTx = (await this.buildTransaction(
+			ixs,
+			txParams
+		)) as VersionedTransaction;
+
+		// if param is passed, return early before the tx fails so ui can fallback to placeOrder
+		if (simulateFirst) {
+			const success = await this.txSender.simulateTransaction(placeAndTakeTx);
+			if (!success) return;
+		}
+
 		let cancelExistingOrdersTx: Transaction;
 		if (cancelExistingOrders && isVariant(orderParams.marketType, 'perp')) {
 			const cancelOrdersIx = await this.getCancelOrdersIx(
@@ -4520,27 +4551,6 @@ export class DriftClient {
 			);
 		}
 
-		const ixs = [];
-
-		const placeAndTakeIx = await this.getPlaceAndTakePerpOrderIx(
-			orderParams,
-			makerInfo,
-			referrerInfo,
-			subAccountId
-		);
-
-		ixs.push(placeAndTakeIx);
-
-		if (bracketOrdersParams.length > 0) {
-			const bracketOrdersIx = await this.getPlaceOrdersIx(
-				bracketOrdersParams,
-				subAccountId
-			);
-			ixs.push(bracketOrdersIx);
-		}
-
-		const placeAndTakeTx = await this.buildTransaction(ixs, txParams);
-
 		const allPossibleTxs = [
 			placeAndTakeTx,
 			cancelExistingOrdersTx,
@@ -5975,6 +5985,7 @@ export class DriftClient {
 		collateralAccountPublicKey,
 		initializeStakeAccount,
 		fromSubaccount,
+		txParams,
 	}: {
 		/**
 		 * Spot market index
@@ -5993,6 +6004,7 @@ export class DriftClient {
 		 * Optional -- withdraw from current subaccount to fund stake amount, instead of wallet balance
 		 */
 		fromSubaccount?: boolean;
+		txParams?: TxParams;
 	}): Promise<TransactionSignature> {
 		const addIfStakeIxs = [];
 
@@ -6052,7 +6064,7 @@ export class DriftClient {
 			);
 		}
 
-		const tx = await this.buildTransaction(addIfStakeIxs);
+		const tx = await this.buildTransaction(addIfStakeIxs, txParams);
 
 		const { txSig } = await this.sendTransaction(
 			tx,
@@ -6065,7 +6077,8 @@ export class DriftClient {
 
 	public async requestRemoveInsuranceFundStake(
 		marketIndex: number,
-		amount: BN
+		amount: BN,
+		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
 		const ifStakeAccountPublicKey = getInsuranceFundStakeAccountPublicKey(
@@ -6096,14 +6109,15 @@ export class DriftClient {
 			}
 		);
 
-		const tx = await this.buildTransaction(ix);
+		const tx = await this.buildTransaction(ix, txParams);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;
 	}
 
 	public async cancelRequestRemoveInsuranceFundStake(
-		marketIndex: number
+		marketIndex: number,
+		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
 		const ifStakeAccountPublicKey = getInsuranceFundStakeAccountPublicKey(
@@ -6134,7 +6148,7 @@ export class DriftClient {
 				}
 			);
 
-		const tx = await this.buildTransaction(ix);
+		const tx = await this.buildTransaction(ix, txParams);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;
@@ -6142,7 +6156,8 @@ export class DriftClient {
 
 	public async removeInsuranceFundStake(
 		marketIndex: number,
-		collateralAccountPublicKey: PublicKey
+		collateralAccountPublicKey: PublicKey,
+		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const removeIfStakeIxs = [];
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
@@ -6223,7 +6238,7 @@ export class DriftClient {
 			);
 		}
 
-		const tx = await this.buildTransaction(removeIfStakeIxs);
+		const tx = await this.buildTransaction(removeIfStakeIxs, txParams);
 
 		const { txSig } = await this.sendTransaction(
 			tx,

package/src/factory/oracleClient.ts

@@ -5,7 +5,6 @@ import { PythClient } from '../oracles/pythClient';
 // import { SwitchboardClient } from '../oracles/switchboardClient';
 import { QuoteAssetOracleClient } from '../oracles/quoteAssetOracleClient';
 import { BN } from '@coral-xyz/anchor';
-import { SwitchboardClient } from '../oracles/switchboardClient';
 
 export function getOracleClient(
 	oracleSource: OracleSource,
@@ -27,9 +26,9 @@ export function getOracleClient(
 		return new PythClient(connection, undefined, true);
 	}
 
-	if (isVariant(oracleSource, 'switchboard')) {
-		return new SwitchboardClient(connection);
-	}
+	// if (isVariant(oracleSource, 'switchboard')) {
+	// 	return new SwitchboardClient(connection);
+	// }
 
 	if (isVariant(oracleSource, 'quoteAsset')) {
 		return new QuoteAssetOracleClient();

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.68.0",
+  "version": "2.69.0",
   "name": "drift",
   "instructions": [
     {

package/src/tx/baseTxSender.ts

@@ -179,6 +179,21 @@ export abstract class BaseTxSender implements TxSender {
 		throw new Error('Must be implemented by subclass');
 	}
 
+	/* Simulate the tx and return a boolean for success value */
+	async simulateTransaction(tx: VersionedTransaction): Promise<boolean> {
+		try {
+			const result = await this.connection.simulateTransaction(tx);
+			if (result.value.err != null) {
+				console.error('Error in transaction simulation: ', result.value.err);
+				return false;
+			}
+			return true;
+		} catch (e) {
+			console.error('Error calling simulateTransaction: ', e);
+			return false;
+		}
+	}
+
 	async confirmTransactionWebSocket(
 		signature: TransactionSignature,
 		commitment?: Commitment

package/src/tx/types.ts

@@ -55,5 +55,7 @@ export interface TxSender {
 		opts: ConfirmOptions
 	): Promise<TxSigAndSlot>;
 
+	simulateTransaction(tx: VersionedTransaction): Promise<boolean>;
+
 	getTimeoutCount(): number;
 }

package/src/types.ts

@@ -93,7 +93,7 @@ export class OracleSource {
 	static readonly PYTH = { pyth: {} };
 	static readonly PYTH_1K = { pyth1K: {} };
 	static readonly PYTH_1M = { pyth1M: {} };
-	static readonly SWITCHBOARD = { switchboard: {} };
+	// static readonly SWITCHBOARD = { switchboard: {} };
 	static readonly QUOTE_ASSET = { quoteAsset: {} };
 	static readonly PYTH_STABLE_COIN = { pythStableCoin: {} };
 }