@drift-labs/sdk 2.43.0-beta.10 → 2.43.0-beta.12

package/VERSION

@@ -1 +1 @@
-2.43.0-beta.10
+2.43.0-beta.12

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;
@@ -2698,11 +2699,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 +3027,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 +3037,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 +3045,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 +3068,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 +3079,7 @@ class DriftClient {
             },
             remainingAccounts,
         });
+        const tx = await this.buildTransaction(ix);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
@@ -3092,7 +3091,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 +3102,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 +3118,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 +3143,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 +3159,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 +3170,7 @@ class DriftClient {
             },
             remainingAccounts,
         });
+        const tx = await this.buildTransaction(ix);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }

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.10",
+	"version": "2.43.0-beta.12",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/driftClient.ts

@@ -708,6 +708,8 @@ export class DriftClient {
 		name = DEFAULT_USER_NAME,
 		referrerInfo?: ReferrerInfo
 	): Promise<[TransactionSignature, PublicKey]> {
+		const initializeIxs = [];
+
 		const [userAccountPublicKey, initializeUserAccountIx] =
 			await this.getInitializeUserInstructions(
 				subAccountId,
@@ -715,15 +717,16 @@ export class DriftClient {
 				referrerInfo
 			);
 
-		const tx = new 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);
@@ -1800,6 +1803,8 @@ export class DriftClient {
 		referrerInfo?: ReferrerInfo,
 		txParams?: TxParams
 	): Promise<[TransactionSignature, PublicKey]> {
+		const ixs = [];
+
 		const [userAccountPublicKey, initializeUserAccountIx] =
 			await this.getInitializeUserInstructions(
 				subAccountId,
@@ -1813,20 +1818,15 @@ export class DriftClient {
 
 		const isSolMarket = spotMarket.mint.equals(WRAPPED_SOL_MINT);
 
-		const tx = new Transaction();
-
-		tx.add(
-			ComputeBudgetProgram.setComputeUnitLimit({
-				units: txParams?.computeUnits ?? 600_000,
-			})
-		);
+		let params: TxParams = {
+			computeUnits: txParams?.computeUnits ?? 600_000,
+		};
 
 		if (txParams?.computeUnitsPrice) {
-			tx.add(
-				ComputeBudgetProgram.setComputeUnitPrice({
-					microLamports: txParams.computeUnitsPrice,
-				})
-			);
+			params = {
+				...params,
+				computeUnitsPrice: txParams.computeUnitsPrice,
+			};
 		}
 
 		const authority = this.wallet.publicKey;
@@ -1845,9 +1845,7 @@ export class DriftClient {
 
 			userTokenAccount = pubkey;
 
-			startIxs.forEach((ix) => {
-				tx.add(ix);
-			});
+			ixs.push(...startIxs);
 		}
 
 		const depositCollateralIx = isFromSubaccount
@@ -1870,14 +1868,14 @@ export class DriftClient {
 			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(
+			ixs.push(
 				createCloseAccountInstruction(
 					userTokenAccount,
 					authority,
@@ -1887,6 +1885,8 @@ export class DriftClient {
 			);
 		}
 
+		const tx = await this.buildTransaction(ixs, params);
+
 		const { txSig, slot } = await this.sendTransaction(
 			tx,
 			additionalSigners,
@@ -1907,6 +1907,8 @@ export class DriftClient {
 		amount: BN,
 		referrerInfo?: ReferrerInfo
 	): Promise<[TransactionSignature, PublicKey]> {
+		const ixs = [];
+
 		const [associateTokenPublicKey, createAssociatedAccountIx, mintToIx] =
 			await tokenFaucet.createAssociatedTokenAccountAndMintToInstructions(
 				this.wallet.publicKey,
@@ -1929,18 +1931,20 @@ export class DriftClient {
 			false
 		);
 
-		const tx = new 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);
+		ixs.push(initializeUserAccountIx, depositCollateralIx);
+
+		const tx = await this.buildTransaction(ixs);
 
-		const txSig = await this.program.provider.sendAndConfirm(tx, []);
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 
 		await this.addUser(subAccountId);
 
@@ -1960,12 +1964,7 @@ export class DriftClient {
 		associatedTokenAddress: PublicKey,
 		reduceOnly = false
 	): Promise<TransactionSignature> {
-		const tx = new Transaction();
-		tx.add(
-			ComputeBudgetProgram.setComputeUnitLimit({
-				units: 600_000,
-			})
-		);
+		const withdrawIxs = [];
 
 		const additionalSigners: Array<Signer> = [];
 
@@ -1986,9 +1985,7 @@ export class DriftClient {
 
 			associatedTokenAddress = pubkey;
 
-			ixs.forEach((ix) => {
-				tx.add(ix);
-			});
+			withdrawIxs.push(...ixs);
 		} else {
 			const accountExists = await this.checkIfAccountExists(
 				associatedTokenAddress
@@ -2001,22 +1998,22 @@ export class DriftClient {
 						associatedTokenAddress
 					);
 
-				tx.add(createAssociatedTokenAccountIx);
+				withdrawIxs.push(createAssociatedTokenAccountIx);
 			}
 		}
 
-		const withdrawCollateral = await this.getWithdrawIx(
+		const withdrawCollateralIx = await this.getWithdrawIx(
 			amount,
 			spotMarketAccount.marketIndex,
 			associatedTokenAddress,
 			reduceOnly
 		);
 
-		tx.add(withdrawCollateral);
+		withdrawIxs.push(withdrawCollateralIx);
 
 		// Close the wrapped sol account at the end of the transaction
 		if (createWSOLTokenAccount) {
-			tx.add(
+			withdrawIxs.push(
 				createCloseAccountInstruction(
 					associatedTokenAddress,
 					authority,
@@ -2026,6 +2023,9 @@ export class DriftClient {
 			);
 		}
 
+		const tx = await this.buildTransaction(withdrawIxs, {
+			computeUnits: 600_000,
+		});
 		const { txSig, slot } = await this.sendTransaction(
 			tx,
 			additionalSigners,
@@ -4758,13 +4758,8 @@ export class DriftClient {
 		marketIndexes: number[]
 	): Promise<TransactionSignature> {
 		const ixs = await this.getSettlePNLsIxs(users, marketIndexes);
-		const tx = new Transaction()
-			.add(
-				ComputeBudgetProgram.setComputeUnitLimit({
-					units: 1_000_000,
-				})
-			)
-			.add(...ixs);
+
+		const tx = await this.buildTransaction(ixs, { computeUnits: 1_000_000 });
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;
@@ -5484,7 +5479,7 @@ export class DriftClient {
 		 */
 		fromSubaccount?: boolean;
 	}): Promise<TransactionSignature> {
-		const tx = new Transaction();
+		const addIfStakeIxs = [];
 
 		const additionalSigners: Array<Signer> = [];
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
@@ -5501,7 +5496,7 @@ export class DriftClient {
 			);
 			tokenAccount = pubkey;
 			ixs.forEach((ix) => {
-				tx.add(ix);
+				addIfStakeIxs.push(ix);
 			});
 		} else {
 			tokenAccount = collateralAccountPublicKey;
@@ -5513,14 +5508,14 @@ export class DriftClient {
 				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(
@@ -5529,10 +5524,10 @@ export class DriftClient {
 			tokenAccount
 		);
 
-		tx.add(addFundsIx);
+		addIfStakeIxs.push(addFundsIx);
 
 		if (createWSOLTokenAccount) {
-			tx.add(
+			addIfStakeIxs.push(
 				createCloseAccountInstruction(
 					tokenAccount,
 					this.wallet.publicKey,
@@ -5542,6 +5537,8 @@ export class DriftClient {
 			);
 		}
 
+		const tx = await this.buildTransaction(addIfStakeIxs);
+
 		const { txSig } = await this.sendTransaction(
 			tx,
 			additionalSigners,
@@ -5568,7 +5565,7 @@ export class DriftClient {
 			writableSpotMarketIndexes: [marketIndex],
 		});
 
-		const tx = await this.program.transaction.requestRemoveInsuranceFundStake(
+		const ix = await this.program.instruction.requestRemoveInsuranceFundStake(
 			marketIndex,
 			amount,
 			{
@@ -5584,6 +5581,8 @@ export class DriftClient {
 			}
 		);
 
+		const tx = await this.buildTransaction(ix);
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;
 	}
@@ -5604,8 +5603,8 @@ export class DriftClient {
 			writableSpotMarketIndexes: [marketIndex],
 		});
 
-		const tx =
-			await this.program.transaction.cancelRequestRemoveInsuranceFundStake(
+		const ix =
+			await this.program.instruction.cancelRequestRemoveInsuranceFundStake(
 				marketIndex,
 				{
 					accounts: {
@@ -5620,6 +5619,8 @@ export class DriftClient {
 				}
 			);
 
+		const tx = await this.buildTransaction(ix);
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;
 	}
@@ -5628,7 +5629,7 @@ export class DriftClient {
 		marketIndex: number,
 		collateralAccountPublicKey: PublicKey
 	): Promise<TransactionSignature> {
-		const tx = new Transaction();
+		const removeIfStakeIxs = [];
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
 		const ifStakeAccountPublicKey = getInsuranceFundStakeAccountPublicKey(
 			this.program.programId,
@@ -5650,7 +5651,7 @@ export class DriftClient {
 			);
 			tokenAccount = pubkey;
 			ixs.forEach((ix) => {
-				tx.add(ix);
+				removeIfStakeIxs.push(ix);
 			});
 		} else {
 			tokenAccount = collateralAccountPublicKey;
@@ -5678,11 +5679,11 @@ export class DriftClient {
 				remainingAccounts,
 			});
 
-		tx.add(removeStakeIx);
+		removeIfStakeIxs.push(removeStakeIx);
 
 		// Close the wrapped sol account at the end of the transaction
 		if (createWSOLTokenAccount) {
-			tx.add(
+			removeIfStakeIxs.push(
 				createCloseAccountInstruction(
 					tokenAccount,
 					this.wallet.publicKey,
@@ -5692,6 +5693,8 @@ export class DriftClient {
 			);
 		}
 
+		const tx = await this.buildTransaction(removeIfStakeIxs);
+
 		const { txSig } = await this.sendTransaction(
 			tx,
 			additionalSigners,
@@ -5711,7 +5714,7 @@ export class DriftClient {
 			writableSpotMarketIndexes: [marketIndex],
 		});
 
-		const tx = await this.program.transaction.settleRevenueToInsuranceFund(
+		const ix = await this.program.instruction.settleRevenueToInsuranceFund(
 			marketIndex,
 			{
 				accounts: {
@@ -5726,6 +5729,8 @@ export class DriftClient {
 			}
 		);
 
+		const tx = await this.buildTransaction(ix);
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;
 	}

package/src/user.ts

@@ -48,6 +48,7 @@ import {
 	calculateReservePrice,
 	calculateSpotMarketMarginRatio,
 	calculateUnrealizedAssetWeight,
+	divCeil,
 	getBalance,
 	getSignedTokenAmount,
 	getStrictTokenValue,
@@ -3054,14 +3055,17 @@ export class User {
 			'Initial'
 		);
 
-		const amountWithdrawable = assetWeight.eq(ZERO)
-			? userDepositAmount
-			: freeCollateral
-					.mul(MARGIN_PRECISION)
-					.div(assetWeight)
-					.mul(PRICE_PRECISION)
-					.div(oracleData.price)
-					.mul(precisionIncrease);
+		let amountWithdrawable;
+		if (assetWeight.eq(ZERO)) {
+			amountWithdrawable = userDepositAmount;
+		} else {
+			amountWithdrawable = divCeil(
+				divCeil(freeCollateral.mul(MARGIN_PRECISION), assetWeight).mul(
+					PRICE_PRECISION
+				),
+				oracleData.price
+			).mul(precisionIncrease);
+		}
 
 		const maxWithdrawValue = BN.min(
 			BN.min(amountWithdrawable, userDepositAmount),