@drift-labs/sdk 2.96.0-beta.2 → 2.96.0-beta.3

package/VERSION

@@ -1 +1 @@
-2.96.0-beta.2
+2.96.0-beta.3

package/lib/accounts/types.d.ts

@@ -6,8 +6,6 @@ import { EventEmitter } from 'events';
 import { Context, PublicKey } from '@solana/web3.js';
 import { Account } from '@solana/spl-token';
 import { OracleInfo, OraclePriceData } from '..';
-import { CommitmentLevel } from '@triton-one/yellowstone-grpc';
-import { ChannelOptions } from '@grpc/grpc-js';
 export interface AccountSubscriber<T> {
     dataAndSlot?: DataAndSlot<T>;
     subscribe(onChange: (data: T) => void): Promise<void>;
@@ -142,9 +140,3 @@ export interface UserStatsAccountSubscriber {
     unsubscribe(): Promise<void>;
     getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount>;
 }
-export type GrpcConfigs = {
-    endpoint: string;
-    token: string;
-    commitmentLevel?: CommitmentLevel;
-    channelOptions?: ChannelOptions;
-};

package/lib/accounts/webSocketAccountSubscriber.d.ts

@@ -20,7 +20,7 @@ export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<
     constructor(accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => T, resubOpts?: ResubOpts, commitment?: Commitment);
     subscribe(onChange: (data: T) => void): Promise<void>;
     setData(data: T, slot?: number): void;
-    protected setTimeout(): void;
+    private setTimeout;
     fetch(): Promise<void>;
     handleRpcResponse(context: Context, accountInfo?: AccountInfo<Buffer>): void;
     decodeBuffer(buffer: Buffer): T;

package/lib/accounts/webSocketDriftClientAccountSubscriber.d.ts

@@ -30,9 +30,9 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     initialPerpMarketAccountData: Map<number, PerpMarketAccount>;
     initialSpotMarketAccountData: Map<number, SpotMarketAccount>;
     initialOraclePriceData: Map<string, OraclePriceData>;
-    protected isSubscribing: boolean;
-    protected subscriptionPromise: Promise<boolean>;
-    protected subscriptionPromiseResolver: (val: boolean) => void;
+    private isSubscribing;
+    private subscriptionPromise;
+    private subscriptionPromiseResolver;
     constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, resubOpts?: ResubOpts, commitment?: Commitment);
     subscribe(): Promise<boolean>;
     setInitialData(): Promise<void>;

package/lib/accounts/webSocketProgramAccountSubscriber.d.ts

@@ -27,7 +27,7 @@ export declare class WebSocketProgramAccountSubscriber<T> implements ProgramAcco
         commitment?: Commitment;
     }, resubOpts?: ResubOpts);
     subscribe(onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void): Promise<void>;
-    protected setTimeout(): void;
+    private setTimeout;
     handleRpcResponse(context: Context, keyedAccountInfo: KeyedAccountInfo): void;
     unsubscribe(onResub?: boolean): Promise<void>;
 }

package/lib/driftClient.js

@@ -68,7 +68,6 @@ const utils_2 = require("./tx/utils");
 const pyth_solana_receiver_json_1 = __importDefault(require("./idl/pyth_solana_receiver.json"));
 const on_demand_1 = require("@switchboard-xyz/on-demand");
 const switchboard_on_demand_30_json_1 = __importDefault(require("./idl/switchboard_on_demand_30.json"));
-const grpcDriftClientAccountSubscriber_1 = require("./accounts/grpcDriftClientAccountSubscriber");
 /**
  * # DriftClient
  * This class is the main way to interact with Drift Protocol. It allows you to subscribe to the various accounts where the Market's state is stored, as well as: opening positions, liquidating, settling funding, depositing & withdrawing, and more.
@@ -81,7 +80,7 @@ class DriftClient {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -144,32 +143,18 @@ class DriftClient {
                 accountLoader: config.accountSubscription.accountLoader,
             };
         }
-        else if (((_q = config.accountSubscription) === null || _q === void 0 ? void 0 : _q.type) === 'grpc') {
-            this.userAccountSubscriptionConfig = {
-                type: 'grpc',
-                resubTimeoutMs: (_r = config.accountSubscription) === null || _r === void 0 ? void 0 : _r.resubTimeoutMs,
-                logResubMessages: (_s = config.accountSubscription) === null || _s === void 0 ? void 0 : _s.logResubMessages,
-                configs: (_t = config.accountSubscription) === null || _t === void 0 ? void 0 : _t.configs,
-            };
-            this.userStatsAccountSubscriptionConfig = {
-                type: 'grpc',
-                resubTimeoutMs: (_u = config.accountSubscription) === null || _u === void 0 ? void 0 : _u.resubTimeoutMs,
-                logResubMessages: (_v = config.accountSubscription) === null || _v === void 0 ? void 0 : _v.logResubMessages,
-                configs: (_w = config.accountSubscription) === null || _w === void 0 ? void 0 : _w.configs,
-            };
-        }
         else {
             this.userAccountSubscriptionConfig = {
                 type: 'websocket',
-                resubTimeoutMs: (_x = config.accountSubscription) === null || _x === void 0 ? void 0 : _x.resubTimeoutMs,
-                logResubMessages: (_y = config.accountSubscription) === null || _y === void 0 ? void 0 : _y.logResubMessages,
-                commitment: (_z = config.accountSubscription) === null || _z === void 0 ? void 0 : _z.commitment,
+                resubTimeoutMs: (_q = config.accountSubscription) === null || _q === void 0 ? void 0 : _q.resubTimeoutMs,
+                logResubMessages: (_r = config.accountSubscription) === null || _r === void 0 ? void 0 : _r.logResubMessages,
+                commitment: (_s = config.accountSubscription) === null || _s === void 0 ? void 0 : _s.commitment,
             };
             this.userStatsAccountSubscriptionConfig = {
                 type: 'websocket',
-                resubTimeoutMs: (_0 = config.accountSubscription) === null || _0 === void 0 ? void 0 : _0.resubTimeoutMs,
-                logResubMessages: (_1 = config.accountSubscription) === null || _1 === void 0 ? void 0 : _1.logResubMessages,
-                commitment: (_2 = config.accountSubscription) === null || _2 === void 0 ? void 0 : _2.commitment,
+                resubTimeoutMs: (_t = config.accountSubscription) === null || _t === void 0 ? void 0 : _t.resubTimeoutMs,
+                logResubMessages: (_u = config.accountSubscription) === null || _u === void 0 ? void 0 : _u.logResubMessages,
+                commitment: (_v = config.accountSubscription) === null || _v === void 0 ? void 0 : _v.commitment,
             };
         }
         if (config.userStats) {
@@ -186,20 +171,14 @@ class DriftClient {
         const noMarketsAndOraclesSpecified = config.perpMarketIndexes === undefined &&
             config.spotMarketIndexes === undefined &&
             config.oracleInfos === undefined;
-        if (((_3 = config.accountSubscription) === null || _3 === void 0 ? void 0 : _3.type) === 'polling') {
-            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_4 = config.perpMarketIndexes) !== null && _4 !== void 0 ? _4 : [], (_5 = config.spotMarketIndexes) !== null && _5 !== void 0 ? _5 : [], (_6 = config.oracleInfos) !== null && _6 !== void 0 ? _6 : [], noMarketsAndOraclesSpecified);
-        }
-        else if (((_7 = config.accountSubscription) === null || _7 === void 0 ? void 0 : _7.type) === 'grpc') {
-            this.accountSubscriber = new grpcDriftClientAccountSubscriber_1.gprcDriftClientAccountSubscriber(config.accountSubscription.configs, this.program, (_8 = config.perpMarketIndexes) !== null && _8 !== void 0 ? _8 : [], (_9 = config.spotMarketIndexes) !== null && _9 !== void 0 ? _9 : [], (_10 = config.oracleInfos) !== null && _10 !== void 0 ? _10 : [], noMarketsAndOraclesSpecified, {
-                resubTimeoutMs: (_11 = config.accountSubscription) === null || _11 === void 0 ? void 0 : _11.resubTimeoutMs,
-                logResubMessages: (_12 = config.accountSubscription) === null || _12 === void 0 ? void 0 : _12.logResubMessages,
-            });
+        if (((_w = config.accountSubscription) === null || _w === void 0 ? void 0 : _w.type) === 'polling') {
+            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_x = config.perpMarketIndexes) !== null && _x !== void 0 ? _x : [], (_y = config.spotMarketIndexes) !== null && _y !== void 0 ? _y : [], (_z = config.oracleInfos) !== null && _z !== void 0 ? _z : [], noMarketsAndOraclesSpecified);
         }
         else {
-            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_13 = config.perpMarketIndexes) !== null && _13 !== void 0 ? _13 : [], (_14 = config.spotMarketIndexes) !== null && _14 !== void 0 ? _14 : [], (_15 = config.oracleInfos) !== null && _15 !== void 0 ? _15 : [], noMarketsAndOraclesSpecified, {
-                resubTimeoutMs: (_16 = config.accountSubscription) === null || _16 === void 0 ? void 0 : _16.resubTimeoutMs,
-                logResubMessages: (_17 = config.accountSubscription) === null || _17 === void 0 ? void 0 : _17.logResubMessages,
-            }, (_18 = config.accountSubscription) === null || _18 === void 0 ? void 0 : _18.commitment);
+            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_0 = config.perpMarketIndexes) !== null && _0 !== void 0 ? _0 : [], (_1 = config.spotMarketIndexes) !== null && _1 !== void 0 ? _1 : [], (_2 = config.oracleInfos) !== null && _2 !== void 0 ? _2 : [], noMarketsAndOraclesSpecified, {
+                resubTimeoutMs: (_3 = config.accountSubscription) === null || _3 === void 0 ? void 0 : _3.resubTimeoutMs,
+                logResubMessages: (_4 = config.accountSubscription) === null || _4 === void 0 ? void 0 : _4.logResubMessages,
+            }, (_5 = config.accountSubscription) === null || _5 === void 0 ? void 0 : _5.commitment);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
         this.metricsEventEmitter = new events_1.EventEmitter();
@@ -207,7 +186,7 @@ class DriftClient {
             this.enableMetricsEvents = true;
         }
         this.txSender =
-            (_19 = config.txSender) !== null && _19 !== void 0 ? _19 : new retryTxSender_1.RetryTxSender({
+            (_6 = config.txSender) !== null && _6 !== void 0 ? _6 : new retryTxSender_1.RetryTxSender({
                 connection: this.connection,
                 wallet: this.wallet,
                 opts: this.opts,

package/lib/driftClientConfig.d.ts

@@ -5,7 +5,6 @@ import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { DriftEnv } from './config';
 import { TxSender } from './tx/types';
 import { TxHandler, TxHandlerConfig } from './tx/txHandler';
-import { GrpcConfigs } from './accounts/types';
 export type DriftClientConfig = {
     connection: Connection;
     wallet: IWallet;
@@ -39,9 +38,4 @@ export type DriftClientSubscriptionConfig = {
 } | {
     type: 'polling';
     accountLoader: BulkAccountLoader;
-} | {
-    type: 'grpc';
-    configs: GrpcConfigs;
-    resubTimeoutMs?: number;
-    logResubMessages?: boolean;
 };

package/lib/orderSubscriber/OrderSubscriber.d.ts

@@ -10,14 +10,13 @@ import { PollingSubscription } from './PollingSubscription';
 import { WebsocketSubscription } from './WebsocketSubscription';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
-import { grpcSubscription } from './grpcSubscription';
 export declare class OrderSubscriber {
     driftClient: DriftClient;
     usersAccounts: Map<string, {
         slot: number;
         userAccount: UserAccount;
     }>;
-    subscription: PollingSubscription | WebsocketSubscription | grpcSubscription;
+    subscription: PollingSubscription | WebsocketSubscription;
     commitment: Commitment;
     eventEmitter: StrictEventEmitter<EventEmitter, OrderSubscriberEvents>;
     fetchPromise?: Promise<void>;

package/lib/orderSubscriber/OrderSubscriber.js

@@ -10,10 +10,9 @@ const WebsocketSubscription_1 = require("./WebsocketSubscription");
 const events_1 = require("events");
 const index_1 = require("../index");
 const user_1 = require("../decode/user");
-const grpcSubscription_1 = require("./grpcSubscription");
 class OrderSubscriber {
     constructor(config) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c;
         this.usersAccounts = new Map();
         this.driftClient = config.driftClient;
         this.commitment = config.subscriptionConfig.commitment || 'processed';
@@ -23,34 +22,20 @@ class OrderSubscriber {
                 frequency: config.subscriptionConfig.frequency,
             });
         }
-        else if (config.subscriptionConfig.type === 'grpc') {
-            this.subscription = new grpcSubscription_1.grpcSubscription({
-                grpcConfigs: config.subscriptionConfig.configs,
-                orderSubscriber: this,
-                commitment: this.commitment,
-                skipInitialLoad: config.subscriptionConfig.skipInitialLoad,
-                resubOpts: {
-                    resubTimeoutMs: (_a = config.subscriptionConfig) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs,
-                    logResubMessages: (_b = config.subscriptionConfig) === null || _b === void 0 ? void 0 : _b.logResubMessages,
-                },
-                resyncIntervalMs: config.subscriptionConfig.resyncIntervalMs,
-                decoded: config.decodeData,
-            });
-        }
         else {
             this.subscription = new WebsocketSubscription_1.WebsocketSubscription({
                 orderSubscriber: this,
                 commitment: this.commitment,
                 skipInitialLoad: config.subscriptionConfig.skipInitialLoad,
                 resubOpts: {
-                    resubTimeoutMs: (_c = config.subscriptionConfig) === null || _c === void 0 ? void 0 : _c.resubTimeoutMs,
-                    logResubMessages: (_d = config.subscriptionConfig) === null || _d === void 0 ? void 0 : _d.logResubMessages,
+                    resubTimeoutMs: (_a = config.subscriptionConfig) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs,
+                    logResubMessages: (_b = config.subscriptionConfig) === null || _b === void 0 ? void 0 : _b.logResubMessages,
                 },
                 resyncIntervalMs: config.subscriptionConfig.resyncIntervalMs,
                 decoded: config.decodeData,
             });
         }
-        if ((_e = config.fastDecode) !== null && _e !== void 0 ? _e : true) {
+        if ((_c = config.fastDecode) !== null && _c !== void 0 ? _c : true) {
             this.decodeFn = (name, data) => (0, user_1.decodeUser)(data);
         }
         else {

package/lib/orderSubscriber/types.d.ts

@@ -1,21 +1,12 @@
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { Order, UserAccount } from '../types';
 import { DriftClient } from '../driftClient';
-import { GrpcConfigs } from '../accounts/types';
 export type OrderSubscriberConfig = {
     driftClient: DriftClient;
     subscriptionConfig: {
         type: 'polling';
         frequency: number;
         commitment?: Commitment;
-    } | {
-        type: 'grpc';
-        skipInitialLoad?: boolean;
-        resubTimeoutMs?: number;
-        logResubMessages?: boolean;
-        resyncIntervalMs?: number;
-        configs: GrpcConfigs;
-        commitment?: Commitment;
     } | {
         type: 'websocket';
         skipInitialLoad?: boolean;

package/lib/user.js

@@ -15,7 +15,6 @@ const oracles_1 = require("./math/oracles");
 const tiers_1 = require("./math/tiers");
 const strictOraclePrice_1 = require("./oracles/strictOraclePrice");
 const fuel_1 = require("./math/fuel");
-const grpcUserAccountSubscriber_1 = require("./accounts/grpcUserAccountSubscriber");
 class User {
     get isSubscribed() {
         return this._isSubscribed && this.accountSubscriber.isSubscribed;
@@ -24,7 +23,7 @@ class User {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e;
         this._isSubscribed = false;
         this.driftClient = config.driftClient;
         this.userAccountPublicKey = config.userAccountPublicKey;
@@ -34,17 +33,11 @@ class User {
         else if (((_b = config.accountSubscription) === null || _b === void 0 ? void 0 : _b.type) === 'custom') {
             this.accountSubscriber = config.accountSubscription.userAccountSubscriber;
         }
-        else if (((_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.type) === 'grpc') {
-            this.accountSubscriber = new grpcUserAccountSubscriber_1.grpcUserAccountSubscriber(config.accountSubscription.configs, config.driftClient.program, config.userAccountPublicKey, {
-                resubTimeoutMs: (_d = config.accountSubscription) === null || _d === void 0 ? void 0 : _d.resubTimeoutMs,
-                logResubMessages: (_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.logResubMessages,
-            });
-        }
         else {
             this.accountSubscriber = new webSocketUserAccountSubscriber_1.WebSocketUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey, {
-                resubTimeoutMs: (_f = config.accountSubscription) === null || _f === void 0 ? void 0 : _f.resubTimeoutMs,
-                logResubMessages: (_g = config.accountSubscription) === null || _g === void 0 ? void 0 : _g.logResubMessages,
-            }, (_h = config.accountSubscription) === null || _h === void 0 ? void 0 : _h.commitment);
+                resubTimeoutMs: (_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.resubTimeoutMs,
+                logResubMessages: (_d = config.accountSubscription) === null || _d === void 0 ? void 0 : _d.logResubMessages,
+            }, (_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.commitment);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
     }

package/lib/userConfig.d.ts

@@ -1,7 +1,7 @@
 import { DriftClient } from './driftClient';
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
-import { GrpcConfigs, UserAccountSubscriber } from './accounts/types';
+import { UserAccountSubscriber } from './accounts/types';
 export type UserConfig = {
     accountSubscription?: UserSubscriptionConfig;
     driftClient: DriftClient;
@@ -18,9 +18,4 @@ export type UserSubscriptionConfig = {
 } | {
     type: 'custom';
     userAccountSubscriber: UserAccountSubscriber;
-} | {
-    type: 'grpc';
-    resubTimeoutMs?: number;
-    logResubMessages?: boolean;
-    configs: GrpcConfigs;
 };

package/lib/userMap/userMap.js

@@ -9,7 +9,6 @@ const memcmp_1 = require("../memcmp");
 const WebsocketSubscription_1 = require("./WebsocketSubscription");
 const PollingSubscription_1 = require("./PollingSubscription");
 const user_1 = require("../decode/user");
-const grpcSubscription_1 = require("./grpcSubscription");
 const MAX_USER_ACCOUNT_SIZE_BYTES = 4376;
 class UserMap {
     /**
@@ -53,19 +52,6 @@ class UserMap {
                 skipInitialLoad: config.skipInitialLoad,
             });
         }
-        else if (config.subscriptionConfig.type === 'grpc') {
-            this.subscription = new grpcSubscription_1.grpcSubscription({
-                configs: config.subscriptionConfig.configs,
-                userMap: this,
-                commitment: this.commitment,
-                resubOpts: {
-                    resubTimeoutMs: config.subscriptionConfig.resubTimeoutMs,
-                    logResubMessages: config.subscriptionConfig.logResubMessages,
-                },
-                skipInitialLoad: config.skipInitialLoad,
-                decodeFn,
-            });
-        }
         else {
             this.subscription = new WebsocketSubscription_1.WebsocketSubscription({
                 userMap: this,

package/lib/userMap/userMapConfig.d.ts

@@ -1,6 +1,5 @@
 import { Commitment, Connection } from '@solana/web3.js';
 import { DriftClient } from '../driftClient';
-import { GrpcConfigs } from '../accounts/types';
 export type UserAccountFilterCriteria = {
     hasOpenOrders: boolean;
 };
@@ -18,12 +17,6 @@ export type UserMapConfig = {
         type: 'polling';
         frequency: number;
         commitment?: Commitment;
-    } | {
-        type: 'grpc';
-        configs: GrpcConfigs;
-        resubTimeoutMs?: number;
-        logResubMessages?: boolean;
-        commitment?: Commitment;
     } | {
         type: 'websocket';
         resubTimeoutMs?: number;

package/lib/userStatsConfig.d.ts

@@ -1,7 +1,6 @@
 import { DriftClient } from './driftClient';
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
-import { GrpcConfigs } from './accounts/types';
 export type UserStatsConfig = {
     accountSubscription?: UserStatsSubscriptionConfig;
     driftClient: DriftClient;
@@ -17,9 +16,4 @@ export type UserStatsSubscriptionConfig = {
     accountLoader: BulkAccountLoader;
 } | {
     type: 'custom';
-} | {
-    type: 'grpc';
-    resubTimeoutMs?: number;
-    logResubMessages?: boolean;
-    configs: GrpcConfigs;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.96.0-beta.2",
+	"version": "2.96.0-beta.3",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -37,7 +37,6 @@
 		"@coral-xyz/anchor": "0.28.0",
 		"@coral-xyz/anchor-30": "npm:@coral-xyz/anchor@0.30.1",
 		"@ellipsis-labs/phoenix-sdk": "^1.4.2",
-		"@grpc/grpc-js": "^1.11.2",
 		"@openbook-dex/openbook-v2": "^0.2.10",
 		"@project-serum/serum": "^0.13.38",
 		"@pythnetwork/client": "2.5.3",
@@ -46,7 +45,6 @@
 		"@solana/spl-token": "0.3.7",
 		"@solana/web3.js": "1.92.3",
 		"@switchboard-xyz/on-demand": "1.2.32",
-		"@triton-one/yellowstone-grpc": "^0.6.0",
 		"anchor-bankrun": "^0.3.0",
 		"node-cache": "^5.1.2",
 		"rpc-websockets": "7.5.1",

package/src/accounts/types.ts

@@ -12,8 +12,6 @@ import { EventEmitter } from 'events';
 import { Context, PublicKey } from '@solana/web3.js';
 import { Account } from '@solana/spl-token';
 import { OracleInfo, OraclePriceData } from '..';
-import { CommitmentLevel } from '@triton-one/yellowstone-grpc';
-import { ChannelOptions } from '@grpc/grpc-js';
 
 export interface AccountSubscriber<T> {
 	dataAndSlot?: DataAndSlot<T>;
@@ -203,10 +201,3 @@ export interface UserStatsAccountSubscriber {
 
 	getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount>;
 }
-
-export type GrpcConfigs = {
-	endpoint: string;
-	token: string;
-	commitmentLevel?: CommitmentLevel;
-	channelOptions?: ChannelOptions;
-};

package/src/accounts/webSocketAccountSubscriber.ts

@@ -94,7 +94,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 		};
 	}
 
-	protected setTimeout(): void {
+	private setTimeout(): void {
 		if (!this.onChange) {
 			throw new Error('onChange callback function must be set');
 		}

package/src/accounts/webSocketDriftClientAccountSubscriber.ts

@@ -60,9 +60,9 @@ export class WebSocketDriftClientAccountSubscriber
 	initialSpotMarketAccountData: Map<number, SpotMarketAccount>;
 	initialOraclePriceData: Map<string, OraclePriceData>;
 
-	protected isSubscribing = false;
-	protected subscriptionPromise: Promise<boolean>;
-	protected subscriptionPromiseResolver: (val: boolean) => void;
+	private isSubscribing = false;
+	private subscriptionPromise: Promise<boolean>;
+	private subscriptionPromiseResolver: (val: boolean) => void;
 
 	public constructor(
 		program: Program,

package/src/accounts/webSocketProgramAccountSubscriber.ts

@@ -98,7 +98,7 @@ export class WebSocketProgramAccountSubscriber<T>
 		}
 	}
 
-	protected setTimeout(): void {
+	private setTimeout(): void {
 		if (!this.onChange) {
 			throw new Error('onChange callback function must be set');
 		}

package/src/driftClient.ts

@@ -152,7 +152,6 @@ import { isVersionedTransaction } from './tx/utils';
 import pythSolanaReceiverIdl from './idl/pyth_solana_receiver.json';
 import { asV0Tx, PullFeed } from '@switchboard-xyz/on-demand';
 import switchboardOnDemandIdl from './idl/switchboard_on_demand_30.json';
-import { gprcDriftClientAccountSubscriber } from './accounts/grpcDriftClientAccountSubscriber';
 
 type RemainingAccountParams = {
 	userAccounts: UserAccount[];
@@ -293,19 +292,6 @@ export class DriftClient {
 				type: 'polling',
 				accountLoader: config.accountSubscription.accountLoader,
 			};
-		} else if (config.accountSubscription?.type === 'grpc') {
-			this.userAccountSubscriptionConfig = {
-				type: 'grpc',
-				resubTimeoutMs: config.accountSubscription?.resubTimeoutMs,
-				logResubMessages: config.accountSubscription?.logResubMessages,
-				configs: config.accountSubscription?.configs,
-			};
-			this.userStatsAccountSubscriptionConfig = {
-				type: 'grpc',
-				resubTimeoutMs: config.accountSubscription?.resubTimeoutMs,
-				logResubMessages: config.accountSubscription?.logResubMessages,
-				configs: config.accountSubscription?.configs,
-			};
 		} else {
 			this.userAccountSubscriptionConfig = {
 				type: 'websocket',
@@ -352,19 +338,6 @@ export class DriftClient {
 				config.oracleInfos ?? [],
 				noMarketsAndOraclesSpecified
 			);
-		} else if (config.accountSubscription?.type === 'grpc') {
-			this.accountSubscriber = new gprcDriftClientAccountSubscriber(
-				config.accountSubscription.configs,
-				this.program,
-				config.perpMarketIndexes ?? [],
-				config.spotMarketIndexes ?? [],
-				config.oracleInfos ?? [],
-				noMarketsAndOraclesSpecified,
-				{
-					resubTimeoutMs: config.accountSubscription?.resubTimeoutMs,
-					logResubMessages: config.accountSubscription?.logResubMessages,
-				}
-			);
 		} else {
 			this.accountSubscriber = new WebSocketDriftClientAccountSubscriber(
 				this.program,
@@ -379,7 +352,6 @@ export class DriftClient {
 				config.accountSubscription?.commitment
 			);
 		}
-
 		this.eventEmitter = this.accountSubscriber.eventEmitter;
 
 		this.metricsEventEmitter = new EventEmitter();

package/src/driftClientConfig.ts

@@ -11,7 +11,6 @@ import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { DriftEnv } from './config';
 import { TxSender } from './tx/types';
 import { TxHandler, TxHandlerConfig } from './tx/txHandler';
-import { GrpcConfigs } from './accounts/types';
 
 export type DriftClientConfig = {
 	connection: Connection;
@@ -49,10 +48,4 @@ export type DriftClientSubscriptionConfig =
 	| {
 			type: 'polling';
 			accountLoader: BulkAccountLoader;
-	  }
-	| {
-			type: 'grpc';
-			configs: GrpcConfigs;
-			resubTimeoutMs?: number;
-			logResubMessages?: boolean;
 	  };

package/src/orderSubscriber/OrderSubscriber.ts

@@ -11,12 +11,11 @@ import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { BN } from '../index';
 import { decodeUser } from '../decode/user';
-import { grpcSubscription } from './grpcSubscription';
 
 export class OrderSubscriber {
 	driftClient: DriftClient;
 	usersAccounts = new Map<string, { slot: number; userAccount: UserAccount }>();
-	subscription: PollingSubscription | WebsocketSubscription | grpcSubscription;
+	subscription: PollingSubscription | WebsocketSubscription;
 	commitment: Commitment;
 	eventEmitter: StrictEventEmitter<EventEmitter, OrderSubscriberEvents>;
 
@@ -35,19 +34,6 @@ export class OrderSubscriber {
 				orderSubscriber: this,
 				frequency: config.subscriptionConfig.frequency,
 			});
-		} else if (config.subscriptionConfig.type === 'grpc') {
-			this.subscription = new grpcSubscription({
-				grpcConfigs: config.subscriptionConfig.configs,
-				orderSubscriber: this,
-				commitment: this.commitment,
-				skipInitialLoad: config.subscriptionConfig.skipInitialLoad,
-				resubOpts: {
-					resubTimeoutMs: config.subscriptionConfig?.resubTimeoutMs,
-					logResubMessages: config.subscriptionConfig?.logResubMessages,
-				},
-				resyncIntervalMs: config.subscriptionConfig.resyncIntervalMs,
-				decoded: config.decodeData,
-			});
 		} else {
 			this.subscription = new WebsocketSubscription({
 				orderSubscriber: this,

package/src/orderSubscriber/types.ts

@@ -1,7 +1,6 @@
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { Order, UserAccount } from '../types';
 import { DriftClient } from '../driftClient';
-import { GrpcConfigs } from '../accounts/types';
 
 export type OrderSubscriberConfig = {
 	driftClient: DriftClient;
@@ -11,15 +10,6 @@ export type OrderSubscriberConfig = {
 				frequency: number;
 				commitment?: Commitment;
 		  }
-		| {
-				type: 'grpc';
-				skipInitialLoad?: boolean;
-				resubTimeoutMs?: number;
-				logResubMessages?: boolean;
-				resyncIntervalMs?: number;
-				configs: GrpcConfigs;
-				commitment?: Commitment;
-		  }
 		| {
 				type: 'websocket';
 				skipInitialLoad?: boolean;

package/src/user.ts

@@ -98,7 +98,6 @@ import {
 	calculatePerpFuelBonus,
 	calculateInsuranceFuelBonus,
 } from './math/fuel';
-import { grpcUserAccountSubscriber } from './accounts/grpcUserAccountSubscriber';
 
 export class User {
 	driftClient: DriftClient;
@@ -129,16 +128,6 @@ export class User {
 			);
 		} else if (config.accountSubscription?.type === 'custom') {
 			this.accountSubscriber = config.accountSubscription.userAccountSubscriber;
-		} else if (config.accountSubscription?.type === 'grpc') {
-			this.accountSubscriber = new grpcUserAccountSubscriber(
-				config.accountSubscription.configs,
-				config.driftClient.program,
-				config.userAccountPublicKey,
-				{
-					resubTimeoutMs: config.accountSubscription?.resubTimeoutMs,
-					logResubMessages: config.accountSubscription?.logResubMessages,
-				}
-			);
 		} else {
 			this.accountSubscriber = new WebSocketUserAccountSubscriber(
 				config.driftClient.program,

package/src/userConfig.ts

@@ -1,7 +1,7 @@
 import { DriftClient } from './driftClient';
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
-import { GrpcConfigs, UserAccountSubscriber } from './accounts/types';
+import { UserAccountSubscriber } from './accounts/types';
 
 export type UserConfig = {
 	accountSubscription?: UserSubscriptionConfig;
@@ -23,10 +23,4 @@ export type UserSubscriptionConfig =
 	| {
 			type: 'custom';
 			userAccountSubscriber: UserAccountSubscriber;
-	  }
-	| {
-			type: 'grpc';
-			resubTimeoutMs?: number;
-			logResubMessages?: boolean;
-			configs: GrpcConfigs;
 	  };