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

package/VERSION

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

package/lib/driftClient.d.ts

@@ -228,9 +228,12 @@ export declare class DriftClient {
      * @param subAccountId
      * @param name
      * @param fromSubAccountId
+     * @param referrerInfo
+     * @param donateAmount
+     * @param txParams
      * @returns
      */
-    initializeUserAccountAndDepositCollateral(amount: BN, userTokenAccount: PublicKey, marketIndex?: number, subAccountId?: number, name?: string, fromSubAccountId?: number, referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<[TransactionSignature, PublicKey]>;
+    initializeUserAccountAndDepositCollateral(amount: BN, userTokenAccount: PublicKey, marketIndex?: number, subAccountId?: number, name?: string, fromSubAccountId?: number, referrerInfo?: ReferrerInfo, donateAmount?: BN, txParams?: TxParams): Promise<[TransactionSignature, PublicKey]>;
     initializeUserAccountForDevnet(subAccountId: number, name: string, marketIndex: number, tokenFaucet: TokenFaucet, amount: BN, referrerInfo?: ReferrerInfo): Promise<[TransactionSignature, PublicKey]>;
     /**
      * Withdraws from a user account. If deposit doesn't already exist, creates a borrow
@@ -619,6 +622,7 @@ export declare class DriftClient {
     settleRevenueToInsuranceFund(marketIndex: number): Promise<TransactionSignature>;
     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>;
     depositIntoSpotMarketRevenuePool(marketIndex: number, amount: BN, userTokenAccountPublicKey: PublicKey): Promise<TransactionSignature>;
     getPerpMarketExtendedInfo(marketIndex: number): PerpMarketExtendedInfo;
     /**

package/lib/driftClient.js

@@ -1061,9 +1061,12 @@ class DriftClient {
      * @param subAccountId
      * @param name
      * @param fromSubAccountId
+     * @param referrerInfo
+     * @param donateAmount
+     * @param txParams
      * @returns
      */
-    async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name, fromSubAccountId, referrerInfo, txParams) {
+    async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name, fromSubAccountId, referrerInfo, donateAmount, txParams) {
         var _a;
         const ixs = [];
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
@@ -1083,10 +1086,19 @@ class DriftClient {
         const isFromSubaccount = fromSubAccountId !== null &&
             fromSubAccountId !== undefined &&
             !isNaN(fromSubAccountId);
-        const createWSOLTokenAccount = isSolMarket && userTokenAccount.equals(authority) && !isFromSubaccount;
+        donateAmount = donateAmount ? donateAmount : numericConstants_1.ZERO;
+        const createWSOLTokenAccount = (isSolMarket &&
+            userTokenAccount.equals(authority) &&
+            !isFromSubaccount) ||
+            !donateAmount.eq(numericConstants_1.ZERO);
+        const wSolAmount = isSolMarket ? amount.add(donateAmount) : donateAmount;
+        let wsolTokenAccount;
         if (createWSOLTokenAccount) {
-            const { ixs: startIxs, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
-            userTokenAccount = pubkey;
+            const { ixs: startIxs, pubkey } = await this.getWrappedSolAccountCreationIxs(wSolAmount, true);
+            wsolTokenAccount = pubkey;
+            if (isSolMarket) {
+                userTokenAccount = pubkey;
+            }
             ixs.push(...startIxs);
         }
         const depositCollateralIx = isFromSubaccount
@@ -1098,9 +1110,13 @@ class DriftClient {
             }
         }
         ixs.push(initializeUserAccountIx, depositCollateralIx);
+        if (!donateAmount.eq(numericConstants_1.ZERO)) {
+            const donateIx = await this.getDepositIntoSpotMarketRevenuePoolIx(1, donateAmount, wsolTokenAccount);
+            ixs.push(donateIx);
+        }
         // Close the wrapped sol account at the end of the transaction
         if (createWSOLTokenAccount) {
-            ixs.push((0, spl_token_1.createCloseAccountInstruction)(userTokenAccount, authority, authority, []));
+            ixs.push((0, spl_token_1.createCloseAccountInstruction)(wsolTokenAccount, authority, authority, []));
         }
         const tx = await this.buildTransaction(ixs, params);
         const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
@@ -3237,9 +3253,9 @@ class DriftClient {
             remainingAccounts: remainingAccounts,
         });
     }
-    async depositIntoSpotMarketRevenuePool(marketIndex, amount, userTokenAccountPublicKey) {
+    async getDepositIntoSpotMarketRevenuePoolIx(marketIndex, amount, userTokenAccountPublicKey) {
         const spotMarket = await this.getSpotMarketAccount(marketIndex);
-        const tx = await this.program.transaction.depositIntoSpotMarketRevenuePool(amount, {
+        const ix = await this.program.instruction.depositIntoSpotMarketRevenuePool(amount, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 spotMarket: spotMarket.pubkey,
@@ -3249,6 +3265,11 @@ class DriftClient {
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
         });
+        return ix;
+    }
+    async depositIntoSpotMarketRevenuePool(marketIndex, amount, userTokenAccountPublicKey) {
+        const ix = await this.getDepositIntoSpotMarketRevenuePoolIx(marketIndex, amount, userTokenAccountPublicKey);
+        const tx = await this.buildTransaction([ix]);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }

package/lib/orderSubscriber/OrderSubscriber.js

@@ -83,6 +83,7 @@ class OrderSubscriber {
         if (!this.mostRecentSlot || slot > this.mostRecentSlot) {
             this.mostRecentSlot = slot;
         }
+        this.eventEmitter.emit('updateReceived', new web3_js_1.PublicKey(key), slot, dataType);
         const slotAndUserAccount = this.usersAccounts.get(key);
         if (!slotAndUserAccount || slotAndUserAccount.slot <= slot) {
             let userAccount;
@@ -101,13 +102,14 @@ class OrderSubscriber {
             else {
                 userAccount = data;
             }
+            this.eventEmitter.emit('userUpdated', userAccount, new web3_js_1.PublicKey(key), slot, dataType);
             const newOrders = userAccount.orders.filter((order) => {
                 var _a;
                 return order.slot.toNumber() > ((_a = slotAndUserAccount === null || slotAndUserAccount === void 0 ? void 0 : slotAndUserAccount.slot) !== null && _a !== void 0 ? _a : 0) &&
                     order.slot.toNumber() <= slot;
             });
             if (newOrders.length > 0) {
-                this.eventEmitter.emit('onUpdate', userAccount, newOrders, new web3_js_1.PublicKey(key), slot, dataType);
+                this.eventEmitter.emit('orderCreated', userAccount, newOrders, new web3_js_1.PublicKey(key), slot, dataType);
             }
             if (userAccount.hasOpenOrder) {
                 this.usersAccounts.set(key, { slot, userAccount });

package/lib/orderSubscriber/types.d.ts

@@ -15,5 +15,7 @@ export type OrderSubscriberConfig = {
     };
 };
 export interface OrderSubscriberEvents {
-    onUpdate: (account: UserAccount, updatedOrders: Order[], pubkey: PublicKey, slot: number, dataType: 'raw' | 'decoded') => void;
+    orderCreated: (account: UserAccount, updatedOrders: Order[], pubkey: PublicKey, slot: number, dataType: 'raw' | 'decoded') => void;
+    userUpdated: (account: UserAccount, pubkey: PublicKey, slot: number, dataType: 'raw' | 'decoded') => void;
+    updateReceived: (pubkey: PublicKey, slot: number, dataType: 'raw' | 'decoded') => void;
 }

package/package.json

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

package/src/driftClient.ts

@@ -1811,6 +1811,9 @@ export class DriftClient {
 	 * @param subAccountId
 	 * @param name
 	 * @param fromSubAccountId
+	 * @param referrerInfo
+	 * @param donateAmount
+	 * @param txParams
 	 * @returns
 	 */
 	public async initializeUserAccountAndDepositCollateral(
@@ -1821,6 +1824,7 @@ export class DriftClient {
 		name?: string,
 		fromSubAccountId?: number,
 		referrerInfo?: ReferrerInfo,
+		donateAmount?: BN,
 		txParams?: TxParams
 	): Promise<[TransactionSignature, PublicKey]> {
 		const ixs = [];
@@ -1856,14 +1860,26 @@ export class DriftClient {
 			fromSubAccountId !== undefined &&
 			!isNaN(fromSubAccountId);
 
+		donateAmount = donateAmount ? donateAmount : ZERO;
+
 		const createWSOLTokenAccount =
-			isSolMarket && userTokenAccount.equals(authority) && !isFromSubaccount;
+			(isSolMarket &&
+				userTokenAccount.equals(authority) &&
+				!isFromSubaccount) ||
+			!donateAmount.eq(ZERO);
 
+		const wSolAmount = isSolMarket ? amount.add(donateAmount) : donateAmount;
+
+		let wsolTokenAccount: PublicKey;
 		if (createWSOLTokenAccount) {
 			const { ixs: startIxs, pubkey } =
-				await this.getWrappedSolAccountCreationIxs(amount, true);
+				await this.getWrappedSolAccountCreationIxs(wSolAmount, true);
 
-			userTokenAccount = pubkey;
+			wsolTokenAccount = pubkey;
+
+			if (isSolMarket) {
+				userTokenAccount = pubkey;
+			}
 
 			ixs.push(...startIxs);
 		}
@@ -1893,11 +1909,21 @@ export class DriftClient {
 		}
 		ixs.push(initializeUserAccountIx, depositCollateralIx);
 
+		if (!donateAmount.eq(ZERO)) {
+			const donateIx = await this.getDepositIntoSpotMarketRevenuePoolIx(
+				1,
+				donateAmount,
+				wsolTokenAccount
+			);
+
+			ixs.push(donateIx);
+		}
+
 		// Close the wrapped sol account at the end of the transaction
 		if (createWSOLTokenAccount) {
 			ixs.push(
 				createCloseAccountInstruction(
-					userTokenAccount,
+					wsolTokenAccount,
 					authority,
 					authority,
 					[]
@@ -5995,13 +6021,13 @@ export class DriftClient {
 		);
 	}
 
-	public async depositIntoSpotMarketRevenuePool(
+	public async getDepositIntoSpotMarketRevenuePoolIx(
 		marketIndex: number,
 		amount: BN,
 		userTokenAccountPublicKey: PublicKey
-	): Promise<TransactionSignature> {
+	): Promise<TransactionInstruction> {
 		const spotMarket = await this.getSpotMarketAccount(marketIndex);
-		const tx = await this.program.transaction.depositIntoSpotMarketRevenuePool(
+		const ix = await this.program.instruction.depositIntoSpotMarketRevenuePool(
 			amount,
 			{
 				accounts: {
@@ -6015,6 +6041,21 @@ export class DriftClient {
 			}
 		);
 
+		return ix;
+	}
+
+	public async depositIntoSpotMarketRevenuePool(
+		marketIndex: number,
+		amount: BN,
+		userTokenAccountPublicKey: PublicKey
+	): Promise<TransactionSignature> {
+		const ix = await this.getDepositIntoSpotMarketRevenuePoolIx(
+			marketIndex,
+			amount,
+			userTokenAccountPublicKey
+		);
+		const tx = await this.buildTransaction([ix]);
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;
 	}

package/src/orderSubscriber/OrderSubscriber.ts

@@ -123,6 +123,13 @@ export class OrderSubscriber {
 			this.mostRecentSlot = slot;
 		}
 
+		this.eventEmitter.emit(
+			'updateReceived',
+			new PublicKey(key),
+			slot,
+			dataType
+		);
+
 		const slotAndUserAccount = this.usersAccounts.get(key);
 		if (!slotAndUserAccount || slotAndUserAccount.slot <= slot) {
 			let userAccount: UserAccount;
@@ -152,6 +159,14 @@ export class OrderSubscriber {
 				userAccount = data as UserAccount;
 			}
 
+			this.eventEmitter.emit(
+				'userUpdated',
+				userAccount,
+				new PublicKey(key),
+				slot,
+				dataType
+			);
+
 			const newOrders = userAccount.orders.filter(
 				(order) =>
 					order.slot.toNumber() > (slotAndUserAccount?.slot ?? 0) &&
@@ -159,7 +174,7 @@ export class OrderSubscriber {
 			);
 			if (newOrders.length > 0) {
 				this.eventEmitter.emit(
-					'onUpdate',
+					'orderCreated',
 					userAccount,
 					newOrders,
 					new PublicKey(key),

package/src/orderSubscriber/types.ts

@@ -19,11 +19,22 @@ export type OrderSubscriberConfig = {
 };
 
 export interface OrderSubscriberEvents {
-	onUpdate: (
+	orderCreated: (
 		account: UserAccount,
 		updatedOrders: Order[],
 		pubkey: PublicKey,
 		slot: number,
 		dataType: 'raw' | 'decoded'
 	) => void;
+	userUpdated: (
+		account: UserAccount,
+		pubkey: PublicKey,
+		slot: number,
+		dataType: 'raw' | 'decoded'
+	) => void;
+	updateReceived: (
+		pubkey: PublicKey,
+		slot: number,
+		dataType: 'raw' | 'decoded'
+	) => void;
 }