@drift-labs/sdk 2.48.0-beta.17 → 2.48.0-beta.19

package/VERSION

@@ -1 +1 @@
-2.48.0-beta.17
+2.48.0-beta.19

package/lib/orderSubscriber/OrderSubscriber.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { DriftClient } from '../driftClient';
 import { UserAccount } from '../types';
+import { Commitment } from '@solana/web3.js';
 import { DLOB } from '../dlob/DLOB';
 import { OrderSubscriberConfig, OrderSubscriberEvents } from './types';
 import { PollingSubscription } from './PollingSubscription';
@@ -14,6 +15,7 @@ export declare class OrderSubscriber {
         userAccount: UserAccount;
     }>;
     subscription: PollingSubscription | WebsocketSubscription;
+    commitment: Commitment;
     eventEmitter: StrictEventEmitter<EventEmitter, OrderSubscriberEvents>;
     fetchPromise?: Promise<void>;
     fetchPromiseResolver: () => void;

package/lib/orderSubscriber/OrderSubscriber.js

@@ -12,6 +12,7 @@ class OrderSubscriber {
     constructor(config) {
         this.usersAccounts = new Map();
         this.driftClient = config.driftClient;
+        this.commitment = config.subscriptionConfig.commitment || 'processed';
         if (config.subscriptionConfig.type === 'polling') {
             this.subscription = new PollingSubscription_1.PollingSubscription({
                 orderSubscriber: this,
@@ -21,6 +22,7 @@ class OrderSubscriber {
         else {
             this.subscription = new WebsocketSubscription_1.WebsocketSubscription({
                 orderSubscriber: this,
+                commitment: this.commitment,
                 skipInitialLoad: config.subscriptionConfig.skipInitialLoad,
                 resubTimeoutMs: config.subscriptionConfig.resubTimeoutMs,
             });
@@ -41,7 +43,7 @@ class OrderSubscriber {
             const rpcRequestArgs = [
                 this.driftClient.program.programId.toBase58(),
                 {
-                    commitment: this.driftClient.opts.commitment,
+                    commitment: this.commitment,
                     filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getUserWithOrderFilter)()],
                     encoding: 'base64',
                     withContext: true,

package/lib/orderSubscriber/WebsocketSubscription.d.ts

@@ -1,11 +1,14 @@
 import { OrderSubscriber } from './OrderSubscriber';
+import { Commitment } from '@solana/web3.js';
 export declare class WebsocketSubscription {
     private orderSubscriber;
+    private commitment;
     private skipInitialLoad;
     private resubTimeoutMs?;
     private subscriber;
-    constructor({ orderSubscriber, skipInitialLoad, resubTimeoutMs, }: {
+    constructor({ orderSubscriber, commitment, skipInitialLoad, resubTimeoutMs, }: {
         orderSubscriber: OrderSubscriber;
+        commitment: Commitment;
         skipInitialLoad?: boolean;
         resubTimeoutMs?: number;
     });

package/lib/orderSubscriber/WebsocketSubscription.js

@@ -4,8 +4,9 @@ exports.WebsocketSubscription = void 0;
 const memcmp_1 = require("../memcmp");
 const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 class WebsocketSubscription {
-    constructor({ orderSubscriber, skipInitialLoad = false, resubTimeoutMs, }) {
+    constructor({ orderSubscriber, commitment, skipInitialLoad = false, resubTimeoutMs, }) {
         this.orderSubscriber = orderSubscriber;
+        this.commitment = commitment;
         this.skipInitialLoad = skipInitialLoad;
         this.resubTimeoutMs = resubTimeoutMs;
     }
@@ -13,7 +14,7 @@ class WebsocketSubscription {
         if (!this.subscriber) {
             this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('OrderSubscriber', 'User', this.orderSubscriber.driftClient.program, this.orderSubscriber.driftClient.program.account.user.coder.accounts.decode.bind(this.orderSubscriber.driftClient.program.account.user.coder.accounts), {
                 filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getNonIdleUserFilter)()],
-                commitment: this.orderSubscriber.driftClient.opts.commitment,
+                commitment: this.commitment,
             }, this.resubTimeoutMs);
         }
         await this.subscriber.subscribe((accountId, account, context) => {

package/lib/orderSubscriber/types.d.ts

@@ -1,4 +1,4 @@
-import { PublicKey } from '@solana/web3.js';
+import { Commitment, PublicKey } from '@solana/web3.js';
 import { Order, UserAccount } from '../types';
 import { DriftClient } from '../driftClient';
 export type OrderSubscriberConfig = {
@@ -6,10 +6,12 @@ export type OrderSubscriberConfig = {
     subscriptionConfig: {
         type: 'polling';
         frequency: number;
+        commitment?: Commitment;
     } | {
         type: 'websocket';
         skipInitialLoad?: boolean;
         resubTimeoutMs?: number;
+        commitment?: Commitment;
     };
 };
 export interface OrderSubscriberEvents {

package/lib/user.js

@@ -22,7 +22,7 @@ class User {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         this._isSubscribed = false;
         this.driftClient = config.driftClient;
         this.userAccountPublicKey = config.userAccountPublicKey;
@@ -33,7 +33,7 @@ class User {
             this.accountSubscriber = config.accountSubscription.userAccountSubscriber;
         }
         else {
-            this.accountSubscriber = new webSocketUserAccountSubscriber_1.WebSocketUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey, config.accountSubscription.resubTimeoutMs, config.accountSubscription.commitment);
+            this.accountSubscriber = new webSocketUserAccountSubscriber_1.WebSocketUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey, (_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.resubTimeoutMs, (_d = config.accountSubscription) === null || _d === void 0 ? void 0 : _d.commitment);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
     }

package/package.json

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

package/src/orderSubscriber/OrderSubscriber.ts

@@ -1,7 +1,7 @@
 import { DriftClient } from '../driftClient';
 import { UserAccount } from '../types';
 import { getUserFilter, getUserWithOrderFilter } from '../memcmp';
-import { PublicKey, RpcResponseAndContext } from '@solana/web3.js';
+import { Commitment, PublicKey, RpcResponseAndContext } from '@solana/web3.js';
 import { Buffer } from 'buffer';
 import { DLOB } from '../dlob/DLOB';
 import { OrderSubscriberConfig, OrderSubscriberEvents } from './types';
@@ -14,6 +14,7 @@ export class OrderSubscriber {
 	driftClient: DriftClient;
 	usersAccounts = new Map<string, { slot: number; userAccount: UserAccount }>();
 	subscription: PollingSubscription | WebsocketSubscription;
+	commitment: Commitment;
 	eventEmitter: StrictEventEmitter<EventEmitter, OrderSubscriberEvents>;
 
 	fetchPromise?: Promise<void>;
@@ -23,6 +24,7 @@ export class OrderSubscriber {
 
 	constructor(config: OrderSubscriberConfig) {
 		this.driftClient = config.driftClient;
+		this.commitment = config.subscriptionConfig.commitment || 'processed';
 		if (config.subscriptionConfig.type === 'polling') {
 			this.subscription = new PollingSubscription({
 				orderSubscriber: this,
@@ -31,6 +33,7 @@ export class OrderSubscriber {
 		} else {
 			this.subscription = new WebsocketSubscription({
 				orderSubscriber: this,
+				commitment: this.commitment,
 				skipInitialLoad: config.subscriptionConfig.skipInitialLoad,
 				resubTimeoutMs: config.subscriptionConfig.resubTimeoutMs,
 			});
@@ -55,7 +58,7 @@ export class OrderSubscriber {
 			const rpcRequestArgs = [
 				this.driftClient.program.programId.toBase58(),
 				{
-					commitment: this.driftClient.opts.commitment,
+					commitment: this.commitment,
 					filters: [getUserFilter(), getUserWithOrderFilter()],
 					encoding: 'base64',
 					withContext: true,

package/src/orderSubscriber/WebsocketSubscription.ts

@@ -2,10 +2,11 @@ import { OrderSubscriber } from './OrderSubscriber';
 import { getNonIdleUserFilter, getUserFilter } from '../memcmp';
 import { WebSocketProgramAccountSubscriber } from '../accounts/webSocketProgramAccountSubscriber';
 import { UserAccount } from '../types';
-import { Context, PublicKey } from '@solana/web3.js';
+import { Commitment, Context, PublicKey } from '@solana/web3.js';
 
 export class WebsocketSubscription {
 	private orderSubscriber: OrderSubscriber;
+	private commitment: Commitment;
 	private skipInitialLoad: boolean;
 	private resubTimeoutMs?: number;
 
@@ -13,14 +14,17 @@ export class WebsocketSubscription {
 
 	constructor({
 		orderSubscriber,
+		commitment,
 		skipInitialLoad = false,
 		resubTimeoutMs,
 	}: {
 		orderSubscriber: OrderSubscriber;
+		commitment: Commitment;
 		skipInitialLoad?: boolean;
 		resubTimeoutMs?: number;
 	}) {
 		this.orderSubscriber = orderSubscriber;
+		this.commitment = commitment;
 		this.skipInitialLoad = skipInitialLoad;
 		this.resubTimeoutMs = resubTimeoutMs;
 	}
@@ -36,7 +40,7 @@ export class WebsocketSubscription {
 				),
 				{
 					filters: [getUserFilter(), getNonIdleUserFilter()],
-					commitment: this.orderSubscriber.driftClient.opts.commitment,
+					commitment: this.commitment,
 				},
 				this.resubTimeoutMs
 			);

package/src/orderSubscriber/types.ts

@@ -1,4 +1,4 @@
-import { PublicKey } from '@solana/web3.js';
+import { Commitment, PublicKey } from '@solana/web3.js';
 import { Order, UserAccount } from '../types';
 import { DriftClient } from '../driftClient';
 
@@ -8,11 +8,13 @@ export type OrderSubscriberConfig = {
 		| {
 				type: 'polling';
 				frequency: number;
+				commitment?: Commitment;
 		  }
 		| {
 				type: 'websocket';
 				skipInitialLoad?: boolean;
 				resubTimeoutMs?: number;
+				commitment?: Commitment;
 		  };
 };
 

package/src/user.ts

@@ -113,8 +113,8 @@ export class User {
 			this.accountSubscriber = new WebSocketUserAccountSubscriber(
 				config.driftClient.program,
 				config.userAccountPublicKey,
-				config.accountSubscription.resubTimeoutMs,
-				config.accountSubscription.commitment
+				config.accountSubscription?.resubTimeoutMs,
+				config.accountSubscription?.commitment
 			);
 		}
 		this.eventEmitter = this.accountSubscriber.eventEmitter;