@drift-labs/sdk 2.25.0 → 2.25.2

package/lib/driftClient.d.ts

@@ -361,7 +361,11 @@ export declare class DriftClient {
     }): Promise<TransactionSignature>;
     requestRemoveInsuranceFundStake(marketIndex: number, amount: BN): Promise<TransactionSignature>;
     cancelRequestRemoveInsuranceFundStake(marketIndex: number): Promise<TransactionSignature>;
-    removeInsuranceFundStake(marketIndex: number, collateralAccountPublicKey: PublicKey): Promise<TransactionSignature>;
+    removeInsuranceFundStake(marketIndex: number, collateralAccountPublicKey: PublicKey, 
+    /**
+     * If unstaking SOL, it's required to pass in the amount
+     */
+    amount?: BN): 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

@@ -2474,26 +2474,29 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async removeInsuranceFundStake(marketIndex, collateralAccountPublicKey) {
+    async removeInsuranceFundStake(marketIndex, collateralAccountPublicKey, 
+    /**
+     * If unstaking SOL, it's required to pass in the amount
+     */
+    amount) {
         const tx = new web3_js_1.Transaction();
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
-        const tokenAccount = collateralAccountPublicKey;
-        // Todo wsol remove iF stake... how do we determine the amount?
-        // const amount = // get balance here...?
-        // const additionalSigners: Array<Signer> = [];
-        // const isSolMarket = spotMarketAccount.mint.equals(WRAPPED_SOL_MINT);
-        // const createWSOLTokenAccount =
-        // 	isSolMarket && collateralAccountPublicKey.equals(this.wallet.publicKey);
-        // if (createWSOLTokenAccount) {
-        // 	const { ixs, signers, pubkey } =
-        // 		await this.getWrappedSolAccountCreationIxs(amount, true);
-        // 	tokenAccount = pubkey;
-        // 	ixs.forEach((ix) => {
-        // 		tx.add(ix);
-        // 	});
-        // 	signers.forEach((signer) => additionalSigners.push(signer));
-        // }
+        const additionalSigners = [];
+        const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
+        const createWSOLTokenAccount = isSolMarket && collateralAccountPublicKey.equals(this.wallet.publicKey);
+        let tokenAccount;
+        if (createWSOLTokenAccount) {
+            const { ixs, signers, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
+            tokenAccount = pubkey;
+            ixs.forEach((ix) => {
+                tx.add(ix);
+            });
+            signers.forEach((signer) => additionalSigners.push(signer));
+        }
+        else {
+            tokenAccount = collateralAccountPublicKey;
+        }
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [this.getUserAccount()],
             useMarketLastSlotCache: true,
@@ -2514,6 +2517,10 @@ class DriftClient {
             remainingAccounts,
         });
         tx.add(removeStakeIx);
+        // Close the wrapped sol account at the end of the transaction
+        if (createWSOLTokenAccount) {
+            tx.add(spl_token_1.Token.createCloseAccountInstruction(spl_token_1.TOKEN_PROGRAM_ID, tokenAccount, this.wallet.publicKey, this.wallet.publicKey, []));
+        }
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.25.0",
+    "version": "2.25.2",
     "name": "drift",
     "instructions": [
         {

package/package.json

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

package/src/driftClient.ts

@@ -4404,7 +4404,11 @@ export class DriftClient {
 
 	public async removeInsuranceFundStake(
 		marketIndex: number,
-		collateralAccountPublicKey: PublicKey
+		collateralAccountPublicKey: PublicKey,
+		/**
+		 * If unstaking SOL, it's required to pass in the amount
+		 */
+		amount?: BN
 	): Promise<TransactionSignature> {
 		const tx = new Transaction();
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
@@ -4413,26 +4417,26 @@ export class DriftClient {
 			this.wallet.publicKey,
 			marketIndex
 		);
-		const tokenAccount = collateralAccountPublicKey;
 
-		// Todo wsol remove iF stake... how do we determine the amount?
-		// const amount = // get balance here...?
+		const additionalSigners: Array<Signer> = [];
+		const isSolMarket = spotMarketAccount.mint.equals(WRAPPED_SOL_MINT);
+		const createWSOLTokenAccount =
+			isSolMarket && collateralAccountPublicKey.equals(this.wallet.publicKey);
 
-		// const additionalSigners: Array<Signer> = [];
-		// const isSolMarket = spotMarketAccount.mint.equals(WRAPPED_SOL_MINT);
-		// const createWSOLTokenAccount =
-		// 	isSolMarket && collateralAccountPublicKey.equals(this.wallet.publicKey);
+		let tokenAccount;
 
-		// if (createWSOLTokenAccount) {
-		// 	const { ixs, signers, pubkey } =
-		// 		await this.getWrappedSolAccountCreationIxs(amount, true);
-		// 	tokenAccount = pubkey;
-		// 	ixs.forEach((ix) => {
-		// 		tx.add(ix);
-		// 	});
+		if (createWSOLTokenAccount) {
+			const { ixs, signers, pubkey } =
+				await this.getWrappedSolAccountCreationIxs(amount, true);
+			tokenAccount = pubkey;
+			ixs.forEach((ix) => {
+				tx.add(ix);
+			});
 
-		// 	signers.forEach((signer) => additionalSigners.push(signer));
-		// }
+			signers.forEach((signer) => additionalSigners.push(signer));
+		} else {
+			tokenAccount = collateralAccountPublicKey;
+		}
 
 		const remainingAccounts = this.getRemainingAccounts({
 			userAccounts: [this.getUserAccount()],
@@ -4458,6 +4462,19 @@ export class DriftClient {
 
 		tx.add(removeStakeIx);
 
+		// Close the wrapped sol account at the end of the transaction
+		if (createWSOLTokenAccount) {
+			tx.add(
+				Token.createCloseAccountInstruction(
+					TOKEN_PROGRAM_ID,
+					tokenAccount,
+					this.wallet.publicKey,
+					this.wallet.publicKey,
+					[]
+				)
+			);
+		}
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;
 	}

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.25.0",
+  "version": "2.25.2",
   "name": "drift",
   "instructions": [
     {