@drift-labs/sdk 2.43.0-beta.14 → 2.43.0-beta.16

package/VERSION

@@ -1 +1 @@
-2.43.0-beta.14
+2.43.0-beta.16

package/lib/driftClient.d.ts

@@ -275,7 +275,7 @@ export declare class DriftClient {
      * @param makerInfo
      * @param txParams
      * @param bracketOrdersParams
-     * @param cancelExistingOrders - Builds and returns an extra transaciton to cancel the existing orders in the same market. Intended use is to auto-cancel TP/SL orders when closing a position
+     * @param cancelExistingOrders - Builds and returns an extra transaciton to cancel the existing orders in the same perp market. Intended use is to auto-cancel TP/SL orders when closing a position. Ignored if orderParams.marketType is not MarketType.PERP
      * @returns
      */
     sendMarketOrderAndGetSignedFillTx(orderParams: OptionalOrderParams, userAccountPublicKey: PublicKey, userAccount: UserAccount, makerInfo?: MakerInfo | MakerInfo[], txParams?: TxParams, bracketOrdersParams?: OptionalOrderParams[], referrerInfo?: ReferrerInfo, cancelExistingOrders?: boolean): Promise<{

package/lib/driftClient.js

@@ -1366,7 +1366,7 @@ class DriftClient {
      * @param makerInfo
      * @param txParams
      * @param bracketOrdersParams
-     * @param cancelExistingOrders - Builds and returns an extra transaciton to cancel the existing orders in the same market. Intended use is to auto-cancel TP/SL orders when closing a position
+     * @param cancelExistingOrders - Builds and returns an extra transaciton to cancel the existing orders in the same perp market. Intended use is to auto-cancel TP/SL orders when closing a position. Ignored if orderParams.marketType is not MarketType.PERP
      * @returns
      */
     async sendMarketOrderAndGetSignedFillTx(orderParams, userAccountPublicKey, userAccount, makerInfo, txParams, bracketOrdersParams = new Array(), referrerInfo, cancelExistingOrders) {
@@ -1384,7 +1384,7 @@ class DriftClient {
         }, makerInfo, referrerInfo);
         let cancelOrdersIx;
         let cancelExistingOrdersTx;
-        if (cancelExistingOrders) {
+        if (cancelExistingOrders && (0, types_1.isVariant)(orderParams.marketType, 'perp')) {
             cancelOrdersIx = await this.getCancelOrdersIx(orderParams.marketType, orderParams.marketIndex, null);
             //@ts-ignore
             cancelExistingOrdersTx = await this.buildTransaction([cancelOrdersIx], txParams, this.txVersion);
@@ -1600,7 +1600,7 @@ class DriftClient {
         const userAccountPublicKey = await this.getUserAccountPublicKey();
         let readablePerpMarketIndex = undefined;
         let readableSpotMarketIndexes = undefined;
-        if (marketIndex) {
+        if (typeof marketIndex === 'number') {
             if (marketType && (0, types_1.isVariant)(marketType, 'perp')) {
                 readablePerpMarketIndex = marketIndex;
             }
@@ -2120,6 +2120,9 @@ class DriftClient {
             });
             quote = fetchedQuote;
         }
+        if (!quote) {
+            throw new Error("Could not fetch Jupiter's quote. Please try again.");
+        }
         const transaction = await jupiterClient.getSwap({
             quote,
             userPublicKey: this.provider.wallet.publicKey,

package/lib/jupiter/jupiterClient.js

@@ -65,6 +65,9 @@ class JupiterClient {
      * @param slippageBps the slippage tolerance in basis points
      */
     async getSwap({ quote, userPublicKey, slippageBps = 50, }) {
+        if (!quote) {
+            throw new Error('Jupiter swap quote not provided. Please try again.');
+        }
         const resp = await (await (0, node_fetch_1.default)(`${this.url}/v6/swap`, {
             method: 'POST',
             headers: {
@@ -77,8 +80,13 @@ class JupiterClient {
             }),
         })).json();
         const { swapTransaction } = resp;
-        const swapTransactionBuf = Buffer.from(swapTransaction, 'base64');
-        return web3_js_1.VersionedTransaction.deserialize(swapTransactionBuf);
+        try {
+            const swapTransactionBuf = Buffer.from(swapTransaction, 'base64');
+            return web3_js_1.VersionedTransaction.deserialize(swapTransactionBuf);
+        }
+        catch (err) {
+            throw new Error('Something went wrong with creating the Jupiter swap transaction. Please try again.');
+        }
     }
     /**
      * ** @deprecated - use getSwap

package/lib/tx/fastSingleTxSender.js

@@ -20,7 +20,12 @@ class FastSingleTxSender extends baseTxSender_1.BaseTxSender {
     }
     startBlockhashRefreshLoop() {
         setInterval(async () => {
-            this.recentBlockhash = (await this.connection.getLatestBlockhash(this.opts)).blockhash;
+            try {
+                this.recentBlockhash = (await this.connection.getLatestBlockhash(this.opts)).blockhash;
+            }
+            catch (e) {
+                console.error('Error in startBlockhashRefreshLoop: ', e);
+            }
         }, this.blockhashRefreshInterval);
     }
     async prepareTx(tx, additionalSigners, opts) {

package/package.json

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

package/src/driftClient.ts

@@ -2448,7 +2448,7 @@ export class DriftClient {
 	 * @param makerInfo
 	 * @param txParams
 	 * @param bracketOrdersParams
-	 * @param cancelExistingOrders - Builds and returns an extra transaciton to cancel the existing orders in the same market. Intended use is to auto-cancel TP/SL orders when closing a position
+	 * @param cancelExistingOrders - Builds and returns an extra transaciton to cancel the existing orders in the same perp market. Intended use is to auto-cancel TP/SL orders when closing a position. Ignored if orderParams.marketType is not MarketType.PERP
 	 * @returns
 	 */
 	public async sendMarketOrderAndGetSignedFillTx(
@@ -2491,7 +2491,7 @@ export class DriftClient {
 
 		let cancelOrdersIx: TransactionInstruction;
 		let cancelExistingOrdersTx: Transaction;
-		if (cancelExistingOrders) {
+		if (cancelExistingOrders && isVariant(orderParams.marketType, 'perp')) {
 			cancelOrdersIx = await this.getCancelOrdersIx(
 				orderParams.marketType,
 				orderParams.marketIndex,
@@ -2896,7 +2896,8 @@ export class DriftClient {
 
 		let readablePerpMarketIndex = undefined;
 		let readableSpotMarketIndexes = undefined;
-		if (marketIndex) {
+
+		if (typeof marketIndex === 'number') {
 			if (marketType && isVariant(marketType, 'perp')) {
 				readablePerpMarketIndex = marketIndex;
 			} else if (marketType && isVariant(marketType, 'spot')) {
@@ -3733,6 +3734,10 @@ export class DriftClient {
 			quote = fetchedQuote;
 		}
 
+		if (!quote) {
+			throw new Error("Could not fetch Jupiter's quote. Please try again.");
+		}
+
 		const transaction = await jupiterClient.getSwap({
 			quote,
 			userPublicKey: this.provider.wallet.publicKey,

package/src/jupiter/jupiterClient.ts

@@ -319,6 +319,10 @@ export class JupiterClient {
 		userPublicKey: PublicKey;
 		slippageBps?: number;
 	}): Promise<VersionedTransaction> {
+		if (!quote) {
+			throw new Error('Jupiter swap quote not provided. Please try again.');
+		}
+
 		const resp = await (
 			await fetch(`${this.url}/v6/swap`, {
 				method: 'POST',
@@ -334,8 +338,14 @@ export class JupiterClient {
 		).json();
 		const { swapTransaction } = resp;
 
-		const swapTransactionBuf = Buffer.from(swapTransaction, 'base64');
-		return VersionedTransaction.deserialize(swapTransactionBuf);
+		try {
+			const swapTransactionBuf = Buffer.from(swapTransaction, 'base64');
+			return VersionedTransaction.deserialize(swapTransactionBuf);
+		} catch (err) {
+			throw new Error(
+				'Something went wrong with creating the Jupiter swap transaction. Please try again.'
+			);
+		}
 	}
 
 	/**

package/src/tx/fastSingleTxSender.ts

@@ -54,9 +54,13 @@ export class FastSingleTxSender extends BaseTxSender {
 
 	startBlockhashRefreshLoop(): void {
 		setInterval(async () => {
-			this.recentBlockhash = (
-				await this.connection.getLatestBlockhash(this.opts)
-			).blockhash;
+			try {
+				this.recentBlockhash = (
+					await this.connection.getLatestBlockhash(this.opts)
+				).blockhash;
+			} catch (e) {
+				console.error('Error in startBlockhashRefreshLoop: ', e);
+			}
 		}, this.blockhashRefreshInterval);
 	}