@drift-labs/sdk 2.142.0-beta.0 → 2.142.0-beta.2

package/lib/browser/driftClient.js

@@ -86,7 +86,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, _20, _21, _22, _23;
+        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, _20, _21, _22, _23, _24, _25;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -208,17 +208,18 @@ class DriftClient {
             this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_6 = config.perpMarketIndexes) !== null && _6 !== void 0 ? _6 : [], (_7 = config.spotMarketIndexes) !== null && _7 !== void 0 ? _7 : [], (_8 = config.oracleInfos) !== null && _8 !== void 0 ? _8 : [], noMarketsAndOraclesSpecified, delistedMarketSetting);
         }
         else if (((_9 = config.accountSubscription) === null || _9 === void 0 ? void 0 : _9.type) === 'grpc') {
-            this.accountSubscriber = new grpcDriftClientAccountSubscriber_1.gprcDriftClientAccountSubscriber(config.accountSubscription.grpcConfigs, this.program, (_10 = config.perpMarketIndexes) !== null && _10 !== void 0 ? _10 : [], (_11 = config.spotMarketIndexes) !== null && _11 !== void 0 ? _11 : [], (_12 = config.oracleInfos) !== null && _12 !== void 0 ? _12 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
-                resubTimeoutMs: (_13 = config.accountSubscription) === null || _13 === void 0 ? void 0 : _13.resubTimeoutMs,
-                logResubMessages: (_14 = config.accountSubscription) === null || _14 === void 0 ? void 0 : _14.logResubMessages,
+            const accountSubscriberClass = (_11 = (_10 = config.accountSubscription) === null || _10 === void 0 ? void 0 : _10.driftClientAccountSubscriber) !== null && _11 !== void 0 ? _11 : grpcDriftClientAccountSubscriber_1.grpcDriftClientAccountSubscriber;
+            this.accountSubscriber = new accountSubscriberClass(config.accountSubscription.grpcConfigs, this.program, (_12 = config.perpMarketIndexes) !== null && _12 !== void 0 ? _12 : [], (_13 = config.spotMarketIndexes) !== null && _13 !== void 0 ? _13 : [], (_14 = config.oracleInfos) !== null && _14 !== void 0 ? _14 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
+                resubTimeoutMs: (_15 = config.accountSubscription) === null || _15 === void 0 ? void 0 : _15.resubTimeoutMs,
+                logResubMessages: (_16 = config.accountSubscription) === null || _16 === void 0 ? void 0 : _16.logResubMessages,
             });
         }
         else {
-            const accountSubscriberClass = (_16 = (_15 = config.accountSubscription) === null || _15 === void 0 ? void 0 : _15.driftClientAccountSubscriber) !== null && _16 !== void 0 ? _16 : webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber;
-            this.accountSubscriber = new accountSubscriberClass(this.program, (_17 = config.perpMarketIndexes) !== null && _17 !== void 0 ? _17 : [], (_18 = config.spotMarketIndexes) !== null && _18 !== void 0 ? _18 : [], (_19 = config.oracleInfos) !== null && _19 !== void 0 ? _19 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
-                resubTimeoutMs: (_20 = config.accountSubscription) === null || _20 === void 0 ? void 0 : _20.resubTimeoutMs,
-                logResubMessages: (_21 = config.accountSubscription) === null || _21 === void 0 ? void 0 : _21.logResubMessages,
-            }, (_22 = config.accountSubscription) === null || _22 === void 0 ? void 0 : _22.commitment);
+            const accountSubscriberClass = (_18 = (_17 = config.accountSubscription) === null || _17 === void 0 ? void 0 : _17.driftClientAccountSubscriber) !== null && _18 !== void 0 ? _18 : webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber;
+            this.accountSubscriber = new accountSubscriberClass(this.program, (_19 = config.perpMarketIndexes) !== null && _19 !== void 0 ? _19 : [], (_20 = config.spotMarketIndexes) !== null && _20 !== void 0 ? _20 : [], (_21 = config.oracleInfos) !== null && _21 !== void 0 ? _21 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
+                resubTimeoutMs: (_22 = config.accountSubscription) === null || _22 === void 0 ? void 0 : _22.resubTimeoutMs,
+                logResubMessages: (_23 = config.accountSubscription) === null || _23 === void 0 ? void 0 : _23.logResubMessages,
+            }, (_24 = config.accountSubscription) === null || _24 === void 0 ? void 0 : _24.commitment);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
         this.metricsEventEmitter = new events_1.EventEmitter();
@@ -226,7 +227,7 @@ class DriftClient {
             this.enableMetricsEvents = true;
         }
         this.txSender =
-            (_23 = config.txSender) !== null && _23 !== void 0 ? _23 : new retryTxSender_1.RetryTxSender({
+            (_25 = config.txSender) !== null && _25 !== void 0 ? _25 : new retryTxSender_1.RetryTxSender({
                 connection: this.connection,
                 wallet: this.wallet,
                 opts: this.opts,

package/lib/browser/driftClientConfig.d.ts

@@ -14,6 +14,8 @@ import { WebSocketAccountSubscriberV2 } from './accounts/webSocketAccountSubscri
 import { WebSocketProgramAccountSubscriber } from './accounts/webSocketProgramAccountSubscriber';
 import { WebSocketDriftClientAccountSubscriberV2 } from './accounts/webSocketDriftClientAccountSubscriberV2';
 import { WebSocketDriftClientAccountSubscriber } from './accounts/webSocketDriftClientAccountSubscriber';
+import { grpcDriftClientAccountSubscriberV2 } from './accounts/grpcDriftClientAccountSubscriberV2';
+import { grpcDriftClientAccountSubscriber } from './accounts/grpcDriftClientAccountSubscriber';
 export type DriftClientConfig = {
     connection: Connection;
     wallet: IWallet;
@@ -49,6 +51,7 @@ export type DriftClientSubscriptionConfig = {
     grpcConfigs: GrpcConfigs;
     resubTimeoutMs?: number;
     logResubMessages?: boolean;
+    driftClientAccountSubscriber?: new (grpcConfigs: GrpcConfigs, program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting) => grpcDriftClientAccountSubscriberV2 | grpcDriftClientAccountSubscriber;
 } | {
     type: 'websocket';
     resubTimeoutMs?: number;

package/lib/browser/index.d.ts

@@ -53,6 +53,7 @@ export * from './events/parse';
 export * from './events/pollingLogProvider';
 export * from './jupiter/jupiterClient';
 export * from './math/auction';
+export * from './math/builder';
 export * from './math/spotMarket';
 export * from './math/conversion';
 export * from './math/exchangeStatus';

package/lib/browser/index.js

@@ -82,6 +82,7 @@ __exportStar(require("./events/parse"), exports);
 __exportStar(require("./events/pollingLogProvider"), exports);
 __exportStar(require("./jupiter/jupiterClient"), exports);
 __exportStar(require("./math/auction"), exports);
+__exportStar(require("./math/builder"), exports);
 __exportStar(require("./math/spotMarket"), exports);
 __exportStar(require("./math/conversion"), exports);
 __exportStar(require("./math/exchangeStatus"), exports);

package/lib/node/accounts/grpcAccountSubscriber.d.ts

@@ -4,13 +4,14 @@ import { ResubOpts, GrpcConfigs } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
+import { Client } from '../isomorphic/grpc';
 export declare class grpcAccountSubscriber<T> extends WebSocketAccountSubscriber<T> {
     private client;
     private stream;
     private commitmentLevel;
     listenerId?: number;
     private constructor();
-    static create<U>(grpcConfigs: GrpcConfigs, accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => U, resubOpts?: ResubOpts): Promise<grpcAccountSubscriber<U>>;
+    static create<U>(grpcConfigs: GrpcConfigs, accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => U, resubOpts?: ResubOpts, clientProp?: Client): Promise<grpcAccountSubscriber<U>>;
     subscribe(onChange: (data: T) => void): Promise<void>;
     unsubscribe(onResub?: boolean): Promise<void>;
 }

package/lib/node/accounts/grpcAccountSubscriber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grpcAccountSubscriber.d.ts","sourceRoot":"","sources":["../../../src/accounts/grpcAccountSubscriber.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAU1E,qBAAa,qBAAqB,CAAC,CAAC,CAAE,SAAQ,0BAA0B,CAAC,CAAC,CAAC;IAC1E,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAwD;IACtE,OAAO,CAAC,eAAe,CAAkB;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IAE3B,OAAO;WAca,MAAM,CAAC,CAAC,EAC3B,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,SAAS,EAC3B,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,CAAC,EACpC,SAAS,CAAC,EAAE,SAAS,GACnB,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAqBrB,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAkFrD,WAAW,CAAC,OAAO,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAsC1D"}
+{"version":3,"file":"grpcAccountSubscriber.d.ts","sourceRoot":"","sources":["../../../src/accounts/grpcAccountSubscriber.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EACN,MAAM,EAMN,MAAM,oBAAoB,CAAC;AAE5B,qBAAa,qBAAqB,CAAC,CAAC,CAAE,SAAQ,0BAA0B,CAAC,CAAC,CAAC;IAC1E,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAwD;IACtE,OAAO,CAAC,eAAe,CAAkB;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IAE3B,OAAO;WAca,MAAM,CAAC,CAAC,EAC3B,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,SAAS,EAC3B,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,CAAC,EACpC,SAAS,CAAC,EAAE,SAAS,EACrB,UAAU,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAuBrB,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAkFrD,WAAW,CAAC,OAAO,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAsC1D"}

package/lib/node/accounts/grpcAccountSubscriber.js

@@ -34,9 +34,11 @@ class grpcAccountSubscriber extends webSocketAccountSubscriber_1.WebSocketAccoun
         this.client = client;
         this.commitmentLevel = commitmentLevel;
     }
-    static async create(grpcConfigs, accountName, program, accountPublicKey, decodeBuffer, resubOpts) {
+    static async create(grpcConfigs, accountName, program, accountPublicKey, decodeBuffer, resubOpts, clientProp) {
         var _a, _b;
-        const client = await (0, grpc_1.createClient)(grpcConfigs.endpoint, grpcConfigs.token, (_a = grpcConfigs.channelOptions) !== null && _a !== void 0 ? _a : {});
+        const client = clientProp
+            ? clientProp
+            : await (0, grpc_1.createClient)(grpcConfigs.endpoint, grpcConfigs.token, (_a = grpcConfigs.channelOptions) !== null && _a !== void 0 ? _a : {});
         const commitmentLevel = 
         // @ts-ignore :: isomorphic exported enum fails typescript but will work at runtime
         (_b = grpcConfigs.commitmentLevel) !== null && _b !== void 0 ? _b : grpc_1.CommitmentLevel.CONFIRMED;

package/lib/node/accounts/grpcDriftClientAccountSubscriber.d.ts

@@ -2,7 +2,7 @@ import { WebSocketDriftClientAccountSubscriber } from './webSocketDriftClientAcc
 import { OracleInfo } from '../oracles/types';
 import { Program } from '@coral-xyz/anchor';
 import { DelistedMarketSetting, GrpcConfigs, ResubOpts } from './types';
-export declare class gprcDriftClientAccountSubscriber extends WebSocketDriftClientAccountSubscriber {
+export declare class grpcDriftClientAccountSubscriber extends WebSocketDriftClientAccountSubscriber {
     private grpcConfigs;
     constructor(grpcConfigs: GrpcConfigs, program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting, resubOpts?: ResubOpts);
     subscribe(): Promise<boolean>;

package/lib/node/accounts/grpcDriftClientAccountSubscriber.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gprcDriftClientAccountSubscriber = void 0;
+exports.grpcDriftClientAccountSubscriber = void 0;
 const webSocketDriftClientAccountSubscriber_1 = require("./webSocketDriftClientAccountSubscriber");
 const config_1 = require("../config");
 const pda_1 = require("../addresses/pda");
 const grpcAccountSubscriber_1 = require("./grpcAccountSubscriber");
 const oracleId_1 = require("../oracles/oracleId");
-class gprcDriftClientAccountSubscriber extends webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber {
+class grpcDriftClientAccountSubscriber extends webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber {
     constructor(grpcConfigs, program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, delistedMarketSetting, resubOpts) {
         super(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, delistedMarketSetting, resubOpts);
         this.grpcConfigs = grpcConfigs;
@@ -96,4 +96,4 @@ class gprcDriftClientAccountSubscriber extends webSocketDriftClientAccountSubscr
         return true;
     }
 }
-exports.gprcDriftClientAccountSubscriber = gprcDriftClientAccountSubscriber;
+exports.grpcDriftClientAccountSubscriber = grpcDriftClientAccountSubscriber;

package/lib/node/accounts/grpcDriftClientAccountSubscriberV2.d.ts

@@ -0,0 +1,18 @@
+import { WebSocketDriftClientAccountSubscriber } from './webSocketDriftClientAccountSubscriber';
+import { OracleInfo } from '../oracles/types';
+import { Program } from '@coral-xyz/anchor';
+import { DelistedMarketSetting, GrpcConfigs, ResubOpts } from './types';
+export declare class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAccountSubscriber {
+    private grpcConfigs;
+    private perpMarketsSubscriber?;
+    private spotMarketsSubscriber?;
+    private oracleMultiSubscriber?;
+    constructor(grpcConfigs: GrpcConfigs, program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting, resubOpts?: ResubOpts);
+    subscribe(): Promise<boolean>;
+    subscribeToPerpMarketAccounts(): Promise<boolean>;
+    subscribeToSpotMarketAccounts(): Promise<boolean>;
+    subscribeToOracles(): Promise<boolean>;
+    unsubscribeFromOracles(): Promise<void>;
+    unsubscribe(): Promise<void>;
+}
+//# sourceMappingURL=grpcDriftClientAccountSubscriberV2.d.ts.map

package/lib/node/accounts/grpcDriftClientAccountSubscriberV2.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"grpcDriftClientAccountSubscriberV2.d.ts","sourceRoot":"","sources":["../../../src/accounts/grpcDriftClientAccountSubscriberV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qCAAqC,EAAE,MAAM,yCAAyC,CAAC;AAChG,OAAO,EAAE,UAAU,EAAmB,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAQ5C,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAMxE,qBAAa,kCAAmC,SAAQ,qCAAqC;IAC5F,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,qBAAqB,CAAC,CAAgD;IAC9E,OAAO,CAAC,qBAAqB,CAAC,CAAgD;IAC9E,OAAO,CAAC,qBAAqB,CAAC,CAA8C;gBAG3E,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO,EAChB,iBAAiB,EAAE,MAAM,EAAE,EAC3B,iBAAiB,EAAE,MAAM,EAAE,EAC3B,WAAW,EAAE,UAAU,EAAE,EACzB,8BAA8B,EAAE,OAAO,EACvC,qBAAqB,EAAE,qBAAqB,EAC5C,SAAS,CAAC,EAAE,SAAS;IAcT,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAiF3B,6BAA6B,IAAI,OAAO,CAAC,OAAO,CAAC;IA0CjD,6BAA6B,IAAI,OAAO,CAAC,OAAO,CAAC;IA0CjD,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC;IAoE/C,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAO3C"}

package/lib/node/accounts/grpcDriftClientAccountSubscriberV2.js

@@ -0,0 +1,161 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.grpcDriftClientAccountSubscriberV2 = void 0;
+const webSocketDriftClientAccountSubscriber_1 = require("./webSocketDriftClientAccountSubscriber");
+const web3_js_1 = require("@solana/web3.js");
+const config_1 = require("../config");
+const pda_1 = require("../addresses/pda");
+const grpcAccountSubscriber_1 = require("./grpcAccountSubscriber");
+const grpcMultiAccountSubscriber_1 = require("./grpcMultiAccountSubscriber");
+const oracleId_1 = require("../oracles/oracleId");
+class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber {
+    constructor(grpcConfigs, program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, delistedMarketSetting, resubOpts) {
+        super(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, delistedMarketSetting, resubOpts);
+        this.grpcConfigs = grpcConfigs;
+    }
+    async subscribe() {
+        if (this.isSubscribed) {
+            return true;
+        }
+        if (this.isSubscribing) {
+            return await this.subscriptionPromise;
+        }
+        this.isSubscribing = true;
+        this.subscriptionPromise = new Promise((res) => {
+            this.subscriptionPromiseResolver = res;
+        });
+        if (this.shouldFindAllMarketsAndOracles) {
+            const { perpMarketIndexes, perpMarketAccounts, spotMarketIndexes, spotMarketAccounts, oracleInfos, } = await (0, config_1.findAllMarketAndOracles)(this.program);
+            this.perpMarketIndexes = perpMarketIndexes;
+            this.spotMarketIndexes = spotMarketIndexes;
+            this.oracleInfos = oracleInfos;
+            // front run and set the initial data here to save extra gma call in set initial data
+            this.initialPerpMarketAccountData = new Map(perpMarketAccounts.map((market) => [market.marketIndex, market]));
+            this.initialSpotMarketAccountData = new Map(spotMarketAccounts.map((market) => [market.marketIndex, market]));
+        }
+        const statePublicKey = await (0, pda_1.getDriftStateAccountPublicKey)(this.program.programId);
+        // create and activate main state account subscription
+        this.stateAccountSubscriber =
+            await grpcAccountSubscriber_1.grpcAccountSubscriber.create(this.grpcConfigs, 'state', this.program, statePublicKey, undefined, undefined);
+        await this.stateAccountSubscriber.subscribe((data) => {
+            this.eventEmitter.emit('stateAccountUpdate', data);
+            this.eventEmitter.emit('update');
+        });
+        // set initial data to avoid spamming getAccountInfo calls in webSocketAccountSubscriber
+        await this.setInitialData();
+        // subscribe to perp + spot markets (separate) and oracles
+        await Promise.all([
+            this.subscribeToPerpMarketAccounts(),
+            this.subscribeToSpotMarketAccounts(),
+            this.subscribeToOracles(),
+        ]);
+        this.eventEmitter.emit('update');
+        await this.handleDelistedMarkets();
+        await Promise.all([this.setPerpOracleMap(), this.setSpotOracleMap()]);
+        this.subscriptionPromiseResolver(true);
+        this.isSubscribing = false;
+        this.isSubscribed = true;
+        // delete initial data
+        this.removeInitialData();
+        return true;
+    }
+    async subscribeToPerpMarketAccounts() {
+        const perpMarketPubkeys = await Promise.all(this.perpMarketIndexes.map((marketIndex) => (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex)));
+        this.perpMarketsSubscriber =
+            await grpcMultiAccountSubscriber_1.grpcMultiAccountSubscriber.create(this.grpcConfigs, 'perpMarket', this.program, undefined, this.resubOpts, undefined, async () => {
+                var _a;
+                try {
+                    if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.logResubMessages) {
+                        console.log('[grpcDriftClientAccountSubscriberV2] perp markets subscriber unsubscribed; resubscribing');
+                    }
+                    await this.subscribeToPerpMarketAccounts();
+                }
+                catch (e) {
+                    console.error('Perp markets resubscribe failed:', e);
+                }
+            });
+        await this.perpMarketsSubscriber.subscribe(perpMarketPubkeys, (_accountId, data) => {
+            this.eventEmitter.emit('perpMarketAccountUpdate', data);
+            this.eventEmitter.emit('update');
+        });
+        return true;
+    }
+    async subscribeToSpotMarketAccounts() {
+        const spotMarketPubkeys = await Promise.all(this.spotMarketIndexes.map((marketIndex) => (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex)));
+        this.spotMarketsSubscriber =
+            await grpcMultiAccountSubscriber_1.grpcMultiAccountSubscriber.create(this.grpcConfigs, 'spotMarket', this.program, undefined, this.resubOpts, undefined, async () => {
+                var _a;
+                try {
+                    if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.logResubMessages) {
+                        console.log('[grpcDriftClientAccountSubscriberV2] spot markets subscriber unsubscribed; resubscribing');
+                    }
+                    await this.subscribeToSpotMarketAccounts();
+                }
+                catch (e) {
+                    console.error('Spot markets resubscribe failed:', e);
+                }
+            });
+        await this.spotMarketsSubscriber.subscribe(spotMarketPubkeys, (_accountId, data) => {
+            this.eventEmitter.emit('spotMarketAccountUpdate', data);
+            this.eventEmitter.emit('update');
+        });
+        return true;
+    }
+    async subscribeToOracles() {
+        // Build list of unique oracle pubkeys and a lookup for sources
+        const uniqueOraclePubkeys = new Map();
+        for (const info of this.oracleInfos) {
+            const id = (0, oracleId_1.getOracleId)(info.publicKey, info.source);
+            if (!uniqueOraclePubkeys.has(id) &&
+                !info.publicKey.equals(web3_js_1.PublicKey.default)) {
+                uniqueOraclePubkeys.set(id, info);
+            }
+        }
+        const oraclePubkeys = Array.from(uniqueOraclePubkeys.values()).map((i) => i.publicKey);
+        const pubkeyToSource = new Map(Array.from(uniqueOraclePubkeys.values()).map((i) => [
+            i.publicKey.toBase58(),
+            i.source,
+        ]));
+        this.oracleMultiSubscriber =
+            await grpcMultiAccountSubscriber_1.grpcMultiAccountSubscriber.create(this.grpcConfigs, 'oracle', this.program, (buffer, pubkey) => {
+                if (!pubkey) {
+                    throw new Error('Oracle pubkey missing in decode');
+                }
+                const source = pubkeyToSource.get(pubkey);
+                const client = this.oracleClientCache.get(source, this.program.provider.connection, this.program);
+                return client.getOraclePriceDataFromBuffer(buffer);
+            }, this.resubOpts, undefined, async () => {
+                var _a;
+                try {
+                    if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.logResubMessages) {
+                        console.log('[grpcDriftClientAccountSubscriberV2] oracle subscriber unsubscribed; resubscribing');
+                    }
+                    await this.subscribeToOracles();
+                }
+                catch (e) {
+                    console.error('Oracle resubscribe failed:', e);
+                }
+            });
+        await this.oracleMultiSubscriber.subscribe(oraclePubkeys, (accountId, data) => {
+            const source = pubkeyToSource.get(accountId.toBase58());
+            this.eventEmitter.emit('oraclePriceUpdate', accountId, source, data);
+            this.eventEmitter.emit('update');
+        });
+        return true;
+    }
+    async unsubscribeFromOracles() {
+        if (this.oracleMultiSubscriber) {
+            await this.oracleMultiSubscriber.unsubscribe();
+            this.oracleMultiSubscriber = undefined;
+            return;
+        }
+        await super.unsubscribeFromOracles();
+    }
+    async unsubscribe() {
+        if (this.isSubscribed) {
+            return;
+        }
+        await this.stateAccountSubscriber.unsubscribe();
+    }
+}
+exports.grpcDriftClientAccountSubscriberV2 = grpcDriftClientAccountSubscriberV2;

package/lib/node/accounts/grpcMultiAccountSubscriber.d.ts

@@ -0,0 +1,31 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import { Program } from '@coral-xyz/anchor';
+import { Context, PublicKey } from '@solana/web3.js';
+import { Client } from '../isomorphic/grpc';
+import { GrpcConfigs, ResubOpts } from './types';
+export declare class grpcMultiAccountSubscriber<T> {
+    private client;
+    private stream;
+    private commitmentLevel;
+    private program;
+    private accountName;
+    private decodeBufferFn?;
+    private resubOpts?;
+    private onUnsubscribe?;
+    listenerId?: number;
+    isUnsubscribing: boolean;
+    private timeoutId?;
+    private receivingData;
+    private subscribedAccounts;
+    private onChangeMap;
+    private constructor();
+    static create<U>(grpcConfigs: GrpcConfigs, accountName: string, program: Program, decodeBuffer?: (buffer: Buffer, pubkey?: string) => U, resubOpts?: ResubOpts, clientProp?: Client, onUnsubscribe?: () => Promise<void>): Promise<grpcMultiAccountSubscriber<U>>;
+    subscribe(accounts: PublicKey[], onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void): Promise<void>;
+    addAccounts(accounts: PublicKey[]): Promise<void>;
+    removeAccounts(accounts: PublicKey[]): Promise<void>;
+    unsubscribe(): Promise<void>;
+    private setTimeout;
+    private capitalize;
+}
+//# sourceMappingURL=grpcMultiAccountSubscriber.d.ts.map

package/lib/node/accounts/grpcMultiAccountSubscriber.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"grpcMultiAccountSubscriber.d.ts","sourceRoot":"","sources":["../../../src/accounts/grpcMultiAccountSubscriber.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAIrD,OAAO,EACN,MAAM,EAMN,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAUjD,qBAAa,0BAA0B,CAAC,CAAC;IACxC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAwD;IACtE,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,cAAc,CAAC,CAAyC;IAChE,OAAO,CAAC,SAAS,CAAC,CAAY;IAC9B,OAAO,CAAC,aAAa,CAAC,CAAsB;IAErC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,UAAS;IAC/B,OAAO,CAAC,SAAS,CAAC,CAAgC;IAClD,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,WAAW,CAGf;IAEJ,OAAO;WAkBa,MAAM,CAAC,CAAC,EAC3B,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,OAAO,EAChB,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,CAAC,EACrD,SAAS,CAAC,EAAE,SAAS,EACrB,UAAU,CAAC,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACjC,OAAO,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC;IAuBnC,SAAS,CACd,QAAQ,EAAE,SAAS,EAAE,EACrB,QAAQ,EAAE,CACT,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,KACV,IAAI,GACP,OAAO,CAAC,IAAI,CAAC;IA+FV,WAAW,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiCjD,cAAc,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmCpD,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IA4ClC,OAAO,CAAC,UAAU;IAelB,OAAO,CAAC,UAAU;CAIlB"}

package/lib/node/accounts/grpcMultiAccountSubscriber.js

@@ -0,0 +1,271 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.grpcMultiAccountSubscriber = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const Buffer = __importStar(require("buffer"));
+const bs58_1 = __importDefault(require("bs58"));
+const grpc_1 = require("../isomorphic/grpc");
+class grpcMultiAccountSubscriber {
+    constructor(client, commitmentLevel, accountName, program, decodeBuffer, resubOpts, onUnsubscribe) {
+        this.isUnsubscribing = false;
+        this.receivingData = false;
+        this.subscribedAccounts = new Set();
+        this.onChangeMap = new Map();
+        this.client = client;
+        this.commitmentLevel = commitmentLevel;
+        this.accountName = accountName;
+        this.program = program;
+        this.decodeBufferFn = decodeBuffer;
+        this.resubOpts = resubOpts;
+        this.onUnsubscribe = onUnsubscribe;
+    }
+    static async create(grpcConfigs, accountName, program, decodeBuffer, resubOpts, clientProp, onUnsubscribe) {
+        var _a, _b;
+        const client = clientProp
+            ? clientProp
+            : await (0, grpc_1.createClient)(grpcConfigs.endpoint, grpcConfigs.token, (_a = grpcConfigs.channelOptions) !== null && _a !== void 0 ? _a : {});
+        const commitmentLevel = 
+        // @ts-ignore :: isomorphic exported enum fails typescript but will work at runtime
+        (_b = grpcConfigs.commitmentLevel) !== null && _b !== void 0 ? _b : grpc_1.CommitmentLevel.CONFIRMED;
+        return new grpcMultiAccountSubscriber(client, commitmentLevel, accountName, program, decodeBuffer, resubOpts, onUnsubscribe);
+    }
+    async subscribe(accounts, onChange) {
+        if (this.listenerId != null || this.isUnsubscribing) {
+            return;
+        }
+        // Track accounts and single onChange for all
+        for (const pk of accounts) {
+            const key = pk.toBase58();
+            this.subscribedAccounts.add(key);
+            this.onChangeMap.set(key, (data, ctx, buffer) => onChange(new web3_js_1.PublicKey(key), data, ctx, buffer));
+        }
+        this.stream =
+            (await this.client.subscribe());
+        const request = {
+            slots: {},
+            accounts: {
+                account: {
+                    account: accounts.map((a) => a.toBase58()),
+                    owner: [],
+                    filters: [],
+                },
+            },
+            transactions: {},
+            blocks: {},
+            blocksMeta: {},
+            accountsDataSlice: [],
+            commitment: this.commitmentLevel,
+            entry: {},
+            transactionsStatus: {},
+        };
+        this.stream.on('data', (chunk) => {
+            var _a;
+            if (!chunk.account) {
+                return;
+            }
+            const slot = Number(chunk.account.slot);
+            const accountPubkeyBytes = chunk.account.account.pubkey;
+            const accountPubkey = bs58_1.default.encode(accountPubkeyBytes);
+            if (!accountPubkey || !this.subscribedAccounts.has(accountPubkey)) {
+                return;
+            }
+            const accountInfo = {
+                owner: new web3_js_1.PublicKey(chunk.account.account.owner),
+                lamports: Number(chunk.account.account.lamports),
+                data: Buffer.Buffer.from(chunk.account.account.data),
+                executable: chunk.account.account.executable,
+                rentEpoch: Number(chunk.account.account.rentEpoch),
+            };
+            const context = { slot };
+            const buffer = accountInfo.data;
+            const data = this.decodeBufferFn
+                ? this.decodeBufferFn(buffer, accountPubkey)
+                : this.program.account[this.accountName].coder.accounts.decode(this.capitalize(this.accountName), buffer);
+            const handler = this.onChangeMap.get(accountPubkey);
+            if (handler) {
+                if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) {
+                    this.receivingData = true;
+                    clearTimeout(this.timeoutId);
+                    handler(data, context, buffer);
+                    this.setTimeout();
+                }
+                else {
+                    handler(data, context, buffer);
+                }
+            }
+        });
+        return new Promise((resolve, reject) => {
+            this.stream.write(request, (err) => {
+                var _a;
+                if (err === null || err === undefined) {
+                    this.listenerId = 1;
+                    if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) {
+                        this.receivingData = true;
+                        this.setTimeout();
+                    }
+                    resolve();
+                }
+                else {
+                    reject(err);
+                }
+            });
+        }).catch((reason) => {
+            console.error(reason);
+            throw reason;
+        });
+    }
+    async addAccounts(accounts) {
+        for (const pk of accounts) {
+            this.subscribedAccounts.add(pk.toBase58());
+        }
+        const request = {
+            slots: {},
+            accounts: {
+                account: {
+                    account: Array.from(this.subscribedAccounts.values()),
+                    owner: [],
+                    filters: [],
+                },
+            },
+            transactions: {},
+            blocks: {},
+            blocksMeta: {},
+            accountsDataSlice: [],
+            commitment: this.commitmentLevel,
+            entry: {},
+            transactionsStatus: {},
+        };
+        await new Promise((resolve, reject) => {
+            this.stream.write(request, (err) => {
+                if (err === null || err === undefined) {
+                    resolve();
+                }
+                else {
+                    reject(err);
+                }
+            });
+        });
+    }
+    async removeAccounts(accounts) {
+        for (const pk of accounts) {
+            const k = pk.toBase58();
+            this.subscribedAccounts.delete(k);
+            this.onChangeMap.delete(k);
+        }
+        const request = {
+            slots: {},
+            accounts: {
+                account: {
+                    account: Array.from(this.subscribedAccounts.values()),
+                    owner: [],
+                    filters: [],
+                },
+            },
+            transactions: {},
+            blocks: {},
+            blocksMeta: {},
+            accountsDataSlice: [],
+            commitment: this.commitmentLevel,
+            entry: {},
+            transactionsStatus: {},
+        };
+        await new Promise((resolve, reject) => {
+            this.stream.write(request, (err) => {
+                if (err === null || err === undefined) {
+                    resolve();
+                }
+                else {
+                    reject(err);
+                }
+            });
+        });
+    }
+    async unsubscribe() {
+        this.isUnsubscribing = true;
+        clearTimeout(this.timeoutId);
+        this.timeoutId = undefined;
+        if (this.listenerId != null) {
+            const promise = new Promise((resolve, reject) => {
+                const request = {
+                    slots: {},
+                    accounts: {},
+                    transactions: {},
+                    blocks: {},
+                    blocksMeta: {},
+                    accountsDataSlice: [],
+                    entry: {},
+                    transactionsStatus: {},
+                };
+                this.stream.write(request, (err) => {
+                    if (err === null || err === undefined) {
+                        this.listenerId = undefined;
+                        this.isUnsubscribing = false;
+                        resolve();
+                    }
+                    else {
+                        reject(err);
+                    }
+                });
+            }).catch((reason) => {
+                console.error(reason);
+                throw reason;
+            });
+            return promise;
+        }
+        else {
+            this.isUnsubscribing = false;
+        }
+        if (this.onUnsubscribe) {
+            try {
+                await this.onUnsubscribe();
+            }
+            catch (e) {
+                console.error(e);
+            }
+        }
+    }
+    setTimeout() {
+        var _a;
+        this.timeoutId = setTimeout(async () => {
+            if (this.isUnsubscribing) {
+                return;
+            }
+            if (this.receivingData) {
+                await this.unsubscribe();
+                this.receivingData = false;
+            }
+        }, (_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs);
+    }
+    capitalize(value) {
+        if (!value)
+            return value;
+        return value.charAt(0).toUpperCase() + value.slice(1);
+    }
+}
+exports.grpcMultiAccountSubscriber = grpcMultiAccountSubscriber;