@drift-labs/sdk 2.82.0-beta.1 → 2.82.0-beta.2

package/VERSION

@@ -1 +1 @@
-2.82.0-beta.1
+2.82.0-beta.2

package/lib/driftClient.d.ts

@@ -650,7 +650,8 @@ export declare class DriftClient {
     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>;
+    settleRevenueToInsuranceFund(spotMarketIndex: number, subAccountId?: number, txParams?: TxParams): Promise<TransactionSignature>;
+    getSettleRevenueToInsuranceFundIx(spotMarketIndex: number, subAccountId?: number): Promise<TransactionInstruction>;
     resolvePerpPnlDeficit(spotMarketIndex: number, perpMarketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     getResolvePerpPnlDeficitIx(spotMarketIndex: number, perpMarketIndex: number): Promise<TransactionInstruction>;
     getDepositIntoSpotMarketRevenuePoolIx(marketIndex: number, amount: BN, userTokenAccountPublicKey: PublicKey): Promise<TransactionInstruction>;

package/lib/driftClient.js

@@ -3465,14 +3465,19 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(tx, additionalSigners, this.opts);
         return txSig;
     }
-    async settleRevenueToInsuranceFund(marketIndex) {
-        const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+    async settleRevenueToInsuranceFund(spotMarketIndex, subAccountId, txParams) {
+        const tx = await this.buildTransaction(await this.getSettleRevenueToInsuranceFundIx(spotMarketIndex, subAccountId), txParams);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getSettleRevenueToInsuranceFundIx(spotMarketIndex, subAccountId) {
+        const spotMarketAccount = this.getSpotMarketAccount(spotMarketIndex);
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount()],
+            userAccounts: [this.getUserAccount(subAccountId)],
             useMarketLastSlotCache: true,
-            writableSpotMarketIndexes: [marketIndex],
+            writableSpotMarketIndexes: [spotMarketIndex],
         });
-        const ix = await this.program.instruction.settleRevenueToInsuranceFund(marketIndex, {
+        const ix = await this.program.instruction.settleRevenueToInsuranceFund(spotMarketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 spotMarket: spotMarketAccount.pubkey,
@@ -3483,9 +3488,7 @@ class DriftClient {
             },
             remainingAccounts,
         });
-        const tx = await this.buildTransaction(ix);
-        const { txSig } = await this.sendTransaction(tx, [], this.opts);
-        return txSig;
+        return ix;
     }
     async resolvePerpPnlDeficit(spotMarketIndex, perpMarketIndex, txParams) {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getResolvePerpPnlDeficitIx(spotMarketIndex, perpMarketIndex), txParams), [], this.opts);

package/package.json

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

package/src/blockhashSubscriber/types.ts

@@ -1,8 +1,12 @@
 import { Commitment, Connection } from '@solana/web3.js';
 
 export type BlockhashSubscriberConfig = {
+	/// rpcUrl to poll block hashes from, one of rpcUrl or Connection must provided
 	rpcUrl?: string;
+	/// connection to poll block hashes from, one of rpcUrl or Connection must provided
 	connection?: Connection;
+	/// commitment to poll block hashes with, default is 'confirmed'
 	commitment?: Commitment;
+	/// interval to poll block hashes, default is 1000 ms
 	updateIntervalMs?: number;
 };

package/src/driftClient.ts

@@ -6488,18 +6488,33 @@ export class DriftClient {
 	}
 
 	public async settleRevenueToInsuranceFund(
-		marketIndex: number
+		spotMarketIndex: number,
+		subAccountId?: number,
+		txParams?: TxParams
 	): Promise<TransactionSignature> {
-		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+		const tx = await this.buildTransaction(
+			await this.getSettleRevenueToInsuranceFundIx(
+				spotMarketIndex,
+				subAccountId
+			),
+			txParams
+		);
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
+	}
 
+	public async getSettleRevenueToInsuranceFundIx(
+		spotMarketIndex: number,
+		subAccountId?: number
+	): Promise<TransactionInstruction> {
+		const spotMarketAccount = this.getSpotMarketAccount(spotMarketIndex);
 		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts: [this.getUserAccount()],
+			userAccounts: [this.getUserAccount(subAccountId)],
 			useMarketLastSlotCache: true,
-			writableSpotMarketIndexes: [marketIndex],
+			writableSpotMarketIndexes: [spotMarketIndex],
 		});
-
 		const ix = await this.program.instruction.settleRevenueToInsuranceFund(
-			marketIndex,
+			spotMarketIndex,
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),
@@ -6512,11 +6527,7 @@ export class DriftClient {
 				remainingAccounts,
 			}
 		);
-
-		const tx = await this.buildTransaction(ix);
-
-		const { txSig } = await this.sendTransaction(tx, [], this.opts);
-		return txSig;
+		return ix;
 	}
 
 	public async resolvePerpPnlDeficit(

package/tests/dlob/helpers.ts

@@ -142,6 +142,10 @@ export const mockAMM: AMM = {
 	bidQuoteAssetReserve: new BN(0),
 	askBaseAssetReserve: new BN(0),
 	askQuoteAssetReserve: new BN(0),
+
+	netUnsettledFundingPnl: new BN(0),
+	quoteAssetAmountWithUnsettledLp: new BN(0),
+	referencePriceOffset: 0,
 };
 
 export const mockPerpMarkets: Array<PerpMarketAccount> = [