@drift-labs/sdk 2.43.0-beta.9 → 2.44.0-beta.0

package/lib/driftClient.js

@@ -418,14 +418,15 @@ class DriftClient {
         return result;
     }
     async initializeUserAccount(subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, referrerInfo) {
+        const initializeIxs = [];
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
-        const tx = new web3_js_1.Transaction();
         if (subAccountId === 0) {
             if (!(await this.checkIfAccountExists(this.getUserStatsAccountPublicKey()))) {
-                tx.add(await this.getInitializeUserStatsIx());
+                initializeIxs.push(await this.getInitializeUserStatsIx());
             }
         }
-        tx.add(initializeUserAccountIx);
+        initializeIxs.push(initializeUserAccountIx);
+        const tx = await this.buildTransaction(initializeIxs);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         await this.addUser(subAccountId);
         return [txSig, userAccountPublicKey];
@@ -1052,18 +1053,19 @@ class DriftClient {
      */
     async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, fromSubAccountId, referrerInfo, txParams) {
         var _a;
+        const ixs = [];
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
         const additionalSigners = [];
         const spotMarket = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarket.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
-        const tx = new web3_js_1.Transaction();
-        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
-            units: (_a = txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits) !== null && _a !== void 0 ? _a : 600000,
-        }));
+        let params = {
+            computeUnits: (_a = txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits) !== null && _a !== void 0 ? _a : 600000,
+        };
         if (txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice) {
-            tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                microLamports: txParams.computeUnitsPrice,
-            }));
+            params = {
+                ...params,
+                computeUnitsPrice: txParams.computeUnitsPrice,
+            };
         }
         const authority = this.wallet.publicKey;
         const isFromSubaccount = fromSubAccountId !== null &&
@@ -1073,40 +1075,41 @@ class DriftClient {
         if (createWSOLTokenAccount) {
             const { ixs: startIxs, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
             userTokenAccount = pubkey;
-            startIxs.forEach((ix) => {
-                tx.add(ix);
-            });
+            ixs.push(...startIxs);
         }
         const depositCollateralIx = isFromSubaccount
             ? await this.getTransferDepositIx(amount, marketIndex, fromSubAccountId, subAccountId)
             : await this.getDepositInstruction(amount, marketIndex, userTokenAccount, subAccountId, false, false);
         if (subAccountId === 0) {
             if (!(await this.checkIfAccountExists(this.getUserStatsAccountPublicKey()))) {
-                tx.add(await this.getInitializeUserStatsIx());
+                ixs.push(await this.getInitializeUserStatsIx());
             }
         }
-        tx.add(initializeUserAccountIx).add(depositCollateralIx);
+        ixs.push(initializeUserAccountIx, depositCollateralIx);
         // Close the wrapped sol account at the end of the transaction
         if (createWSOLTokenAccount) {
-            tx.add((0, spl_token_1.createCloseAccountInstruction)(userTokenAccount, authority, authority, []));
+            ixs.push((0, spl_token_1.createCloseAccountInstruction)(userTokenAccount, authority, authority, []));
         }
+        const tx = await this.buildTransaction(ixs, params);
         const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
         this.spotMarketLastSlotCache.set(marketIndex, slot);
         await this.addUser(subAccountId);
         return [txSig, userAccountPublicKey];
     }
     async initializeUserAccountForDevnet(subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, marketIndex, tokenFaucet, amount, referrerInfo) {
+        const ixs = [];
         const [associateTokenPublicKey, createAssociatedAccountIx, mintToIx] = await tokenFaucet.createAssociatedTokenAccountAndMintToInstructions(this.wallet.publicKey, amount);
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
         const depositCollateralIx = await this.getDepositInstruction(amount, marketIndex, associateTokenPublicKey, subAccountId, false, false);
-        const tx = new web3_js_1.Transaction().add(createAssociatedAccountIx).add(mintToIx);
+        ixs.push(createAssociatedAccountIx, mintToIx);
         if (subAccountId === 0) {
             if (!(await this.checkIfAccountExists(this.getUserStatsAccountPublicKey()))) {
-                tx.add(await this.getInitializeUserStatsIx());
+                ixs.push(await this.getInitializeUserStatsIx());
             }
         }
-        tx.add(initializeUserAccountIx).add(depositCollateralIx);
-        const txSig = await this.program.provider.sendAndConfirm(tx, []);
+        ixs.push(initializeUserAccountIx, depositCollateralIx);
+        const tx = await this.buildTransaction(ixs);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
         await this.addUser(subAccountId);
         return [txSig, userAccountPublicKey];
     }
@@ -1118,10 +1121,7 @@ class DriftClient {
      * @param reduceOnly
      */
     async withdraw(amount, marketIndex, associatedTokenAddress, reduceOnly = false) {
-        const tx = new web3_js_1.Transaction();
-        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
-            units: 600000,
-        }));
+        const withdrawIxs = [];
         const additionalSigners = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
@@ -1130,23 +1130,24 @@ class DriftClient {
         if (createWSOLTokenAccount) {
             const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, false);
             associatedTokenAddress = pubkey;
-            ixs.forEach((ix) => {
-                tx.add(ix);
-            });
+            withdrawIxs.push(...ixs);
         }
         else {
             const accountExists = await this.checkIfAccountExists(associatedTokenAddress);
             if (!accountExists) {
                 const createAssociatedTokenAccountIx = this.getAssociatedTokenAccountCreationIx(spotMarketAccount.mint, associatedTokenAddress);
-                tx.add(createAssociatedTokenAccountIx);
+                withdrawIxs.push(createAssociatedTokenAccountIx);
             }
         }
-        const withdrawCollateral = await this.getWithdrawIx(amount, spotMarketAccount.marketIndex, associatedTokenAddress, reduceOnly);
-        tx.add(withdrawCollateral);
+        const withdrawCollateralIx = await this.getWithdrawIx(amount, spotMarketAccount.marketIndex, associatedTokenAddress, reduceOnly);
+        withdrawIxs.push(withdrawCollateralIx);
         // Close the wrapped sol account at the end of the transaction
         if (createWSOLTokenAccount) {
-            tx.add((0, spl_token_1.createCloseAccountInstruction)(associatedTokenAddress, authority, authority, []));
+            withdrawIxs.push((0, spl_token_1.createCloseAccountInstruction)(associatedTokenAddress, authority, authority, []));
         }
+        const tx = await this.buildTransaction(withdrawIxs, {
+            computeUnits: 600000,
+        });
         const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
         this.spotMarketLastSlotCache.set(marketIndex, slot);
         return txSig;
@@ -1365,9 +1366,10 @@ class DriftClient {
      * @param makerInfo
      * @param txParams
      * @param bracketOrdersParams
+     * @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) {
+    async sendMarketOrderAndGetSignedFillTx(orderParams, userAccountPublicKey, userAccount, makerInfo, txParams, bracketOrdersParams = new Array(), referrerInfo, cancelExistingOrders) {
         const marketIndex = orderParams.marketIndex;
         const orderId = userAccount.nextOrderId;
         const bracketOrderIxs = [];
@@ -1380,20 +1382,31 @@ class DriftClient {
             orderId,
             marketIndex,
         }, makerInfo, referrerInfo);
+        let cancelOrdersIx;
+        let cancelExistingOrdersTx;
+        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);
+        }
         // use versioned transactions if there is a lookup table account and wallet is compatible
         if (this.txVersion === 0) {
             const versionedMarketOrderTx = await this.buildTransaction([placePerpOrderIx].concat(bracketOrderIxs), txParams, 0);
             const versionedFillTx = await this.buildTransaction([fillPerpOrderIx], txParams, 0);
-            const [signedVersionedMarketOrderTx, signedVersionedFillTx] = await this.provider.wallet.signAllTransactions([
-                //@ts-ignore
+            const [signedVersionedMarketOrderTx, signedVersionedFillTx, signedCancelExistingOrdersTx,] = await this.provider.wallet.signAllTransactions([
                 versionedMarketOrderTx,
-                //@ts-ignore
                 versionedFillTx,
-            ]);
+                cancelExistingOrdersTx,
+            ].filter((tx) => tx !== undefined));
             const { txSig, slot } = await this.txSender.sendRawTransaction(signedVersionedMarketOrderTx.serialize(), this.opts);
             this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
-            // @ts-ignore
-            return { txSig, signedFillTx: signedVersionedFillTx };
+            return {
+                txSig,
+                // @ts-ignore
+                signedFillTx: signedVersionedFillTx,
+                // @ts-ignore
+                signedCancelExistingOrdersTx,
+            };
         }
         else {
             const marketOrderTx = (0, utils_1.wrapInTx)(placePerpOrderIx, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice);
@@ -1407,10 +1420,10 @@ class DriftClient {
             fillTx.recentBlockhash = currentBlockHash;
             marketOrderTx.feePayer = userAccount.authority;
             fillTx.feePayer = userAccount.authority;
-            const [signedMarketOrderTx, signedFillTx] = await this.provider.wallet.signAllTransactions([marketOrderTx, fillTx]);
+            const [signedMarketOrderTx, signedFillTx, signedCancelExistingOrdersTx] = await this.provider.wallet.signAllTransactions([marketOrderTx, fillTx, cancelExistingOrdersTx].filter((tx) => tx !== undefined));
             const { txSig, slot } = await this.sendTransaction(signedMarketOrderTx, [], this.opts, true);
             this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
-            return { txSig, signedFillTx };
+            return { txSig, signedFillTx, signedCancelExistingOrdersTx };
         }
     }
     async placePerpOrder(orderParams, txParams) {
@@ -1587,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;
             }
@@ -2107,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,
@@ -2623,12 +2639,12 @@ class DriftClient {
             oraclePriceOffset: newOraclePriceOffset || null,
             triggerPrice: newTriggerPrice || null,
             triggerCondition: newTriggerCondition || null,
-            auctionDuration: auctionDuration || null,
-            auctionStartPrice: auctionStartPrice || null,
-            auctionEndPrice: auctionEndPrice || null,
-            reduceOnly: reduceOnly || null,
+            auctionDuration: auctionDuration || 0,
+            auctionStartPrice: auctionStartPrice || numericConstants_1.ZERO,
+            auctionEndPrice: auctionEndPrice || numericConstants_1.ZERO,
+            reduceOnly: reduceOnly || false,
             postOnly: postOnly || null,
-            immediateOrCancel: immediateOrCancel || null,
+            immediateOrCancel: immediateOrCancel || false,
             policy: policy || null,
             maxTs: maxTs || null,
         };
@@ -2677,12 +2693,12 @@ class DriftClient {
             oraclePriceOffset: newOraclePriceOffset || null,
             triggerPrice: newTriggerPrice || null,
             triggerCondition: newTriggerCondition || null,
-            auctionDuration: auctionDuration || null,
-            auctionStartPrice: auctionStartPrice || null,
-            auctionEndPrice: auctionEndPrice || null,
-            reduceOnly: reduceOnly || null,
+            auctionDuration: auctionDuration || 0,
+            auctionStartPrice: auctionStartPrice || numericConstants_1.ZERO,
+            auctionEndPrice: auctionEndPrice || numericConstants_1.ZERO,
+            reduceOnly: reduceOnly || false,
             postOnly: postOnly || null,
-            immediateOrCancel: immediateOrCancel || null,
+            immediateOrCancel: immediateOrCancel || false,
             policy: policy || null,
             maxTs: maxTs || null,
         };
@@ -2698,11 +2714,7 @@ class DriftClient {
     }
     async settlePNLs(users, marketIndexes) {
         const ixs = await this.getSettlePNLsIxs(users, marketIndexes);
-        const tx = new web3_js_1.Transaction()
-            .add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
-            units: 1000000,
-        }))
-            .add(...ixs);
+        const tx = await this.buildTransaction(ixs, { computeUnits: 1000000 });
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
@@ -3030,7 +3042,7 @@ class DriftClient {
      * Add to an insurance fund stake and optionally initialize the account
      */
     async addInsuranceFundStake({ marketIndex, amount, collateralAccountPublicKey, initializeStakeAccount, fromSubaccount, }) {
-        const tx = new web3_js_1.Transaction();
+        const addIfStakeIxs = [];
         const additionalSigners = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
@@ -3040,7 +3052,7 @@ class DriftClient {
             const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
             tokenAccount = pubkey;
             ixs.forEach((ix) => {
-                tx.add(ix);
+                addIfStakeIxs.push(ix);
             });
         }
         else {
@@ -3048,17 +3060,18 @@ class DriftClient {
         }
         if (fromSubaccount) {
             const withdrawIx = await this.getWithdrawIx(amount, marketIndex, tokenAccount);
-            tx.add(withdrawIx);
+            addIfStakeIxs.push(withdrawIx);
         }
         if (initializeStakeAccount) {
             const initializeIx = await this.getInitializeInsuranceFundStakeIx(marketIndex);
-            tx.add(initializeIx);
+            addIfStakeIxs.push(initializeIx);
         }
         const addFundsIx = await this.getAddInsuranceFundStakeIx(marketIndex, amount, tokenAccount);
-        tx.add(addFundsIx);
+        addIfStakeIxs.push(addFundsIx);
         if (createWSOLTokenAccount) {
-            tx.add((0, spl_token_1.createCloseAccountInstruction)(tokenAccount, this.wallet.publicKey, this.wallet.publicKey, []));
+            addIfStakeIxs.push((0, spl_token_1.createCloseAccountInstruction)(tokenAccount, this.wallet.publicKey, this.wallet.publicKey, []));
         }
+        const tx = await this.buildTransaction(addIfStakeIxs);
         const { txSig } = await this.sendTransaction(tx, additionalSigners, this.opts);
         return txSig;
     }
@@ -3070,7 +3083,7 @@ class DriftClient {
             useMarketLastSlotCache: true,
             writableSpotMarketIndexes: [marketIndex],
         });
-        const tx = await this.program.transaction.requestRemoveInsuranceFundStake(marketIndex, amount, {
+        const ix = await this.program.instruction.requestRemoveInsuranceFundStake(marketIndex, amount, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 spotMarket: spotMarketAccount.pubkey,
@@ -3081,6 +3094,7 @@ class DriftClient {
             },
             remainingAccounts,
         });
+        const tx = await this.buildTransaction(ix);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
@@ -3092,7 +3106,7 @@ class DriftClient {
             useMarketLastSlotCache: true,
             writableSpotMarketIndexes: [marketIndex],
         });
-        const tx = await this.program.transaction.cancelRequestRemoveInsuranceFundStake(marketIndex, {
+        const ix = await this.program.instruction.cancelRequestRemoveInsuranceFundStake(marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 spotMarket: spotMarketAccount.pubkey,
@@ -3103,11 +3117,12 @@ class DriftClient {
             },
             remainingAccounts,
         });
+        const tx = await this.buildTransaction(ix);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
     async removeInsuranceFundStake(marketIndex, collateralAccountPublicKey) {
-        const tx = new web3_js_1.Transaction();
+        const removeIfStakeIxs = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
         const additionalSigners = [];
@@ -3118,7 +3133,7 @@ class DriftClient {
             const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(numericConstants_1.ZERO, true);
             tokenAccount = pubkey;
             ixs.forEach((ix) => {
-                tx.add(ix);
+                removeIfStakeIxs.push(ix);
             });
         }
         else {
@@ -3143,11 +3158,12 @@ class DriftClient {
             },
             remainingAccounts,
         });
-        tx.add(removeStakeIx);
+        removeIfStakeIxs.push(removeStakeIx);
         // Close the wrapped sol account at the end of the transaction
         if (createWSOLTokenAccount) {
-            tx.add((0, spl_token_1.createCloseAccountInstruction)(tokenAccount, this.wallet.publicKey, this.wallet.publicKey, []));
+            removeIfStakeIxs.push((0, spl_token_1.createCloseAccountInstruction)(tokenAccount, this.wallet.publicKey, this.wallet.publicKey, []));
         }
+        const tx = await this.buildTransaction(removeIfStakeIxs);
         const { txSig } = await this.sendTransaction(tx, additionalSigners, this.opts);
         return txSig;
     }
@@ -3158,7 +3174,7 @@ class DriftClient {
             useMarketLastSlotCache: true,
             writableSpotMarketIndexes: [marketIndex],
         });
-        const tx = await this.program.transaction.settleRevenueToInsuranceFund(marketIndex, {
+        const ix = await this.program.instruction.settleRevenueToInsuranceFund(marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 spotMarket: spotMarketAccount.pubkey,
@@ -3169,6 +3185,7 @@ class DriftClient {
             },
             remainingAccounts,
         });
+        const tx = await this.buildTransaction(ix);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.42.0",
+    "version": "2.43.0",
     "name": "drift",
     "instructions": [
         {
@@ -4098,6 +4098,27 @@
                 }
             ]
         },
+        {
+            "name": "updateLiquidationMarginBufferRatio",
+            "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "liquidationMarginBufferRatio",
+                    "type": "u32"
+                }
+            ]
+        },
         {
             "name": "updateOracleGuardRails",
             "accounts": [

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/math/amm.js

@@ -410,7 +410,8 @@ function calculateSpreadReserves(amm, oraclePriceData, now) {
                 quoteAssetReserve: amm.quoteAssetReserve,
             };
         }
-        const quoteAssetReserveDelta = amm.quoteAssetReserve.div(numericConstants_1.BID_ASK_SPREAD_PRECISION.div(new anchor_1.BN(spread / 2)));
+        const spreadFraction = anchor_1.BN.max(new anchor_1.BN(spread / 2), numericConstants_1.ONE);
+        const quoteAssetReserveDelta = amm.quoteAssetReserve.div(numericConstants_1.BID_ASK_SPREAD_PRECISION.div(spreadFraction));
         let quoteAssetReserve;
         if ((0, types_1.isVariant)(direction, 'long')) {
             quoteAssetReserve = amm.quoteAssetReserve.add(quoteAssetReserveDelta);

package/lib/math/trade.js

@@ -415,14 +415,12 @@ function calculateEstimatedPerpEntryPrice(assetType, amount, direction, market,
             limitOrder = limitOrders.next().value;
         }
     }
-    const entryPrice = cumulativeQuoteFilled
-        .mul(numericConstants_1.BASE_PRECISION)
-        .div(cumulativeBaseFilled);
-    const priceImpact = entryPrice
-        .sub(bestPrice)
-        .mul(numericConstants_1.PRICE_PRECISION)
-        .div(bestPrice)
-        .abs();
+    const entryPrice = cumulativeBaseFilled && cumulativeBaseFilled.gt(numericConstants_1.ZERO)
+        ? cumulativeQuoteFilled.mul(numericConstants_1.BASE_PRECISION).div(cumulativeBaseFilled)
+        : numericConstants_1.ZERO;
+    const priceImpact = bestPrice && bestPrice.gt(numericConstants_1.ZERO)
+        ? entryPrice.sub(bestPrice).mul(numericConstants_1.PRICE_PRECISION).div(bestPrice).abs()
+        : numericConstants_1.ZERO;
     return {
         entryPrice,
         priceImpact,
@@ -551,14 +549,12 @@ function calculateEstimatedSpotEntryPrice(assetType, amount, direction, market,
             }
         }
     }
-    const entryPrice = cumulativeQuoteFilled
-        .mul(basePrecision)
-        .div(cumulativeBaseFilled);
-    const priceImpact = entryPrice
-        .sub(bestPrice)
-        .mul(numericConstants_1.PRICE_PRECISION)
-        .div(bestPrice)
-        .abs();
+    const entryPrice = cumulativeBaseFilled && cumulativeBaseFilled.gt(numericConstants_1.ZERO)
+        ? cumulativeQuoteFilled.mul(basePrecision).div(cumulativeBaseFilled)
+        : numericConstants_1.ZERO;
+    const priceImpact = bestPrice && bestPrice.gt(numericConstants_1.ZERO)
+        ? entryPrice.sub(bestPrice).mul(numericConstants_1.PRICE_PRECISION).div(bestPrice).abs()
+        : numericConstants_1.ZERO;
     return {
         entryPrice,
         priceImpact,
@@ -609,14 +605,12 @@ function calculateEstimatedEntryPriceWithL2(assetType, amount, direction, basePr
             nextLevel = levels.shift();
         }
     }
-    const entryPrice = cumulativeQuoteFilled
-        .mul(basePrecision)
-        .div(cumulativeBaseFilled);
-    const priceImpact = entryPrice
-        .sub(bestPrice)
-        .mul(numericConstants_1.PRICE_PRECISION)
-        .div(bestPrice)
-        .abs();
+    const entryPrice = cumulativeBaseFilled && cumulativeBaseFilled.gt(numericConstants_1.ZERO)
+        ? cumulativeQuoteFilled.mul(basePrecision).div(cumulativeBaseFilled)
+        : numericConstants_1.ZERO;
+    const priceImpact = bestPrice && bestPrice.gt(numericConstants_1.ZERO)
+        ? entryPrice.sub(bestPrice).mul(numericConstants_1.PRICE_PRECISION).div(bestPrice).abs()
+        : numericConstants_1.ZERO;
     return {
         entryPrice,
         priceImpact,

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/lib/user.js

@@ -1677,14 +1677,13 @@ class User {
             withdrawLimit = _1.BN.max(withdrawLimit, userDepositAmount);
         }
         const assetWeight = (0, spotBalance_1.calculateAssetWeight)(userDepositAmount, oracleData.price, spotMarket, 'Initial');
-        const amountWithdrawable = assetWeight.eq(numericConstants_1.ZERO)
-            ? userDepositAmount
-            : freeCollateral
-                .mul(numericConstants_1.MARGIN_PRECISION)
-                .div(assetWeight)
-                .mul(numericConstants_1.PRICE_PRECISION)
-                .div(oracleData.price)
-                .mul(precisionIncrease);
+        let amountWithdrawable;
+        if (assetWeight.eq(numericConstants_1.ZERO)) {
+            amountWithdrawable = userDepositAmount;
+        }
+        else {
+            amountWithdrawable = (0, _1.divCeil)((0, _1.divCeil)(freeCollateral.mul(numericConstants_1.MARGIN_PRECISION), assetWeight).mul(numericConstants_1.PRICE_PRECISION), oracleData.price).mul(precisionIncrease);
+        }
         const maxWithdrawValue = _1.BN.min(_1.BN.min(amountWithdrawable, userDepositAmount), withdrawLimit.abs());
         if (reduceOnly) {
             return _1.BN.max(maxWithdrawValue, numericConstants_1.ZERO);

package/package.json

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

package/src/accounts/webSocketAccountSubscriber.ts

@@ -14,6 +14,8 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 	onChange: (data: T) => void;
 	listenerId?: number;
 	resubTimeoutMs?: number;
+	isUnsubscribing = false;
+
 	timeoutId?: NodeJS.Timeout;
 
 	receivingData: boolean;
@@ -34,7 +36,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 	}
 
 	async subscribe(onChange: (data: T) => void): Promise<void> {
-		if (this.listenerId) {
+		if (this.listenerId || this.isUnsubscribing) {
 			return;
 		}
 
@@ -80,6 +82,11 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 			throw new Error('onChange callback function must be set');
 		}
 		this.timeoutId = setTimeout(async () => {
+			if (this.isUnsubscribing) {
+				// If we are in the process of unsubscribing, do not attempt to resubscribe
+				return;
+			}
+
 			if (this.receivingData) {
 				console.log(
 					`No ws data from ${this.accountName} in ${this.resubTimeoutMs}ms, resubscribing`
@@ -154,13 +161,20 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 	}
 
 	unsubscribe(): Promise<void> {
+		this.isUnsubscribing = true;
+		clearTimeout(this.timeoutId);
+		this.timeoutId = undefined;
+
 		if (this.listenerId) {
-			const promise =
-				this.program.provider.connection.removeAccountChangeListener(
-					this.listenerId
-				);
-			this.listenerId = undefined;
+			const promise = this.program.provider.connection
+				.removeAccountChangeListener(this.listenerId)
+				.then(() => {
+					this.listenerId = undefined;
+					this.isUnsubscribing = false;
+				});
 			return promise;
+		} else {
+			this.isUnsubscribing = false;
 		}
 	}
 }