@drift-labs/sdk 2.142.0-beta.1 → 2.142.0-beta.3

package/VERSION

@@ -1 +1 @@
-2.142.0-beta.1
+2.142.0-beta.3

package/bun.lock

@@ -7,7 +7,7 @@
         "@coral-xyz/anchor": "0.29.0",
         "@coral-xyz/anchor-30": "npm:@coral-xyz/anchor@0.30.1",
         "@ellipsis-labs/phoenix-sdk": "1.4.5",
-        "@grpc/grpc-js": "1.12.6",
+        "@grpc/grpc-js": "1.14.0",
         "@openbook-dex/openbook-v2": "0.2.10",
         "@project-serum/serum": "0.13.65",
         "@pythnetwork/client": "2.5.3",
@@ -17,7 +17,7 @@
         "@solana/web3.js": "1.98.0",
         "@switchboard-xyz/common": "3.0.14",
         "@switchboard-xyz/on-demand": "2.4.1",
-        "@triton-one/yellowstone-grpc": "1.3.0",
+        "@triton-one/yellowstone-grpc": "1.4.1",
         "anchor-bankrun": "0.3.0",
         "gill": "^0.10.2",
         "helius-laserstream": "0.1.8",
@@ -59,15 +59,24 @@
     },
   },
   "overrides": {
-    "debug": "<4.4.2",
-    "supports-color": "7.2.0",
     "ansi-regex": "5.0.1",
-    "color-convert": "<3.1.1",
     "ansi-styles": "4.3.0",
-    "wrap-ansi": "7.0.0",
+    "backslash": "<0.2.1",
     "chalk": "4.1.2",
-    "strip-ansi": "6.0.1",
+    "chalk-template": "<1.1.1",
+    "color-convert": "<3.1.1",
     "color-name": "<2.0.1",
+    "color-string": "<2.1.1",
+    "debug": "<4.4.2",
+    "error-ex": "<1.3.3",
+    "has-ansi": "<6.0.1",
+    "is-arrayish": "<0.3.3",
+    "simple-swizzle": "<0.2.3",
+    "slice-ansi": "3.0.0",
+    "strip-ansi": "6.0.1",
+    "supports-color": "7.2.0",
+    "supports-hyperlinks": "<4.1.1",
+    "wrap-ansi": "7.0.0",
   },
   "packages": {
     "@babel/code-frame": ["@babel/code-frame@7.26.2", "", { "dependencies": { "@babel/helper-validator-identifier": "^7.25.9", "js-tokens": "^4.0.0", "picocolors": "^1.0.0" } }, "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ=="],
@@ -104,9 +113,9 @@
 
     "@eslint/js": ["@eslint/js@8.57.0", "", {}, "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g=="],
 
-    "@grpc/grpc-js": ["@grpc/grpc-js@1.12.6", "", { "dependencies": { "@grpc/proto-loader": "^0.7.13", "@js-sdsl/ordered-map": "^4.4.2" } }, "sha512-JXUj6PI0oqqzTGvKtzOkxtpsyPRNsrmhh41TtIz/zEB6J+AUiZZ0dxWzcMwO9Ns5rmSPuMdghlTbUuqIM48d3Q=="],
+    "@grpc/grpc-js": ["@grpc/grpc-js@1.14.0", "", { "dependencies": { "@grpc/proto-loader": "^0.8.0", "@js-sdsl/ordered-map": "^4.4.2" } }, "sha512-N8Jx6PaYzcTRNzirReJCtADVoq4z7+1KQ4E70jTg/koQiMoUSN1kbNjPOqpPbhMFhfU1/l7ixspPl8dNY+FoUg=="],
 
-    "@grpc/proto-loader": ["@grpc/proto-loader@0.7.13", "", { "dependencies": { "lodash.camelcase": "^4.3.0", "long": "^5.0.0", "protobufjs": "^7.2.5", "yargs": "^17.7.2" }, "bin": { "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" } }, "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw=="],
+    "@grpc/proto-loader": ["@grpc/proto-loader@0.8.0", "", { "dependencies": { "lodash.camelcase": "^4.3.0", "long": "^5.0.0", "protobufjs": "^7.5.3", "yargs": "^17.7.2" }, "bin": { "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" } }, "sha512-rc1hOQtjIWGxcxpb9aHAfLpIctjEnsDehj0DAiVfBlmT84uvR0uUtN2hEi/ecvWVjXUGf5qPF4qEgiLOx1YIMQ=="],
 
     "@humanwhocodes/config-array": ["@humanwhocodes/config-array@0.11.14", "", { "dependencies": { "@humanwhocodes/object-schema": "^2.0.2", "debug": "^4.3.1", "minimatch": "^3.0.5" } }, "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg=="],
 
@@ -294,7 +303,7 @@
 
     "@switchboard-xyz/on-demand": ["@switchboard-xyz/on-demand@2.4.1", "", { "dependencies": { "@coral-xyz/anchor-30": "npm:@coral-xyz/anchor@0.30.1", "@isaacs/ttlcache": "^1.4.1", "@switchboard-xyz/common": ">=3.0.0", "axios": "^1.8.3", "bs58": "^6.0.0", "buffer": "^6.0.3", "js-yaml": "^4.1.0" } }, "sha512-eSlBp+c8lxpcSgh0/2xK8OaLHPziTSZlcs8V96gZGdiCJz1KgWJRNE1qnIJDOwaGdFecZdwcmajfQRtLRLED3w=="],
 
-    "@triton-one/yellowstone-grpc": ["@triton-one/yellowstone-grpc@1.3.0", "", { "dependencies": { "@grpc/grpc-js": "^1.8.0" } }, "sha512-tuwHtoYzvqnahsMrecfNNkQceCYwgiY0qKS8RwqtaxvDEgjm0E+0bXwKz2eUD3ZFYifomJmRKDmSBx9yQzAeMQ=="],
+    "@triton-one/yellowstone-grpc": ["@triton-one/yellowstone-grpc@1.4.1", "", { "dependencies": { "@grpc/grpc-js": "^1.8.0" } }, "sha512-ZN49vooxFbOqWttll8u7AOsIVnX+srqX9ddhZ9ttE+OcehUo8c2p2suK8Gr2puab49cgsV0VGjiTn9Gua/ntIw=="],
 
     "@ts-graphviz/adapter": ["@ts-graphviz/adapter@2.0.6", "", { "dependencies": { "@ts-graphviz/common": "^2.1.5" } }, "sha512-kJ10lIMSWMJkLkkCG5gt927SnGZcBuG0s0HHswGzcHTgvtUe7yk5/3zTEr0bafzsodsOq5Gi6FhQeV775nC35Q=="],
 
@@ -1176,6 +1185,8 @@
 
     "@ellipsis-labs/phoenix-sdk/bs58": ["bs58@5.0.0", "", { "dependencies": { "base-x": "^4.0.0" } }, "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ=="],
 
+    "@grpc/proto-loader/protobufjs": ["protobufjs@7.5.4", "", { "dependencies": { "@protobufjs/aspromise": "^1.1.2", "@protobufjs/base64": "^1.1.2", "@protobufjs/codegen": "^2.0.4", "@protobufjs/eventemitter": "^1.1.0", "@protobufjs/fetch": "^1.1.0", "@protobufjs/float": "^1.0.2", "@protobufjs/inquire": "^1.1.0", "@protobufjs/path": "^1.1.2", "@protobufjs/pool": "^1.1.0", "@protobufjs/utf8": "^1.1.0", "@types/node": ">=13.7.0", "long": "^5.0.0" } }, "sha512-CvexbZtbov6jW2eXAvLukXjXUW1TzFaivC46BpWc/3BpcCysb5Vffu+B3XHMm8lVEuy2Mm4XGex8hBSg1yapPg=="],
+
     "@metaplex-foundation/beet-solana/bs58": ["bs58@5.0.0", "", { "dependencies": { "base-x": "^4.0.0" } }, "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ=="],
 
     "@metaplex-foundation/solita/@metaplex-foundation/beet": ["@metaplex-foundation/beet@0.4.0", "", { "dependencies": { "ansicolors": "^0.3.2", "bn.js": "^5.2.0", "debug": "^4.3.3" } }, "sha512-2OAKJnLatCc3mBXNL0QmWVQKAWK2C7XDfepgL0p/9+8oSx4bmRAFHFqptl1A/C0U5O3dxGwKfmKluW161OVGcA=="],
@@ -1248,6 +1259,8 @@
 
     "jayson/ws": ["ws@7.5.10", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": "^5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="],
 
+    "jito-ts/@grpc/grpc-js": ["@grpc/grpc-js@1.12.6", "", { "dependencies": { "@grpc/proto-loader": "^0.7.13", "@js-sdsl/ordered-map": "^4.4.2" } }, "sha512-JXUj6PI0oqqzTGvKtzOkxtpsyPRNsrmhh41TtIz/zEB6J+AUiZZ0dxWzcMwO9Ns5rmSPuMdghlTbUuqIM48d3Q=="],
+
     "jito-ts/@solana/web3.js": ["@solana/web3.js@1.77.4", "", { "dependencies": { "@babel/runtime": "^7.12.5", "@noble/curves": "^1.0.0", "@noble/hashes": "^1.3.0", "@solana/buffer-layout": "^4.0.0", "agentkeepalive": "^4.2.1", "bigint-buffer": "^1.1.5", "bn.js": "^5.0.0", "borsh": "^0.7.0", "bs58": "^4.0.1", "buffer": "6.0.3", "fast-stable-stringify": "^1.0.0", "jayson": "^4.1.0", "node-fetch": "^2.6.7", "rpc-websockets": "^7.5.1", "superstruct": "^0.14.2" } }, "sha512-XdN0Lh4jdY7J8FYMyucxCwzn6Ga2Sr1DHDWRbqVzk7ZPmmpSPOVWHzO67X1cVT+jNi1D6gZi2tgjHgDPuj6e9Q=="],
 
     "jito-ts/dotenv": ["dotenv@16.4.7", "", {}, "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ=="],
@@ -1332,6 +1345,8 @@
 
     "glob/minimatch/brace-expansion": ["brace-expansion@2.0.1", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="],
 
+    "jito-ts/@grpc/grpc-js/@grpc/proto-loader": ["@grpc/proto-loader@0.7.13", "", { "dependencies": { "lodash.camelcase": "^4.3.0", "long": "^5.0.0", "protobufjs": "^7.2.5", "yargs": "^17.7.2" }, "bin": { "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" } }, "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw=="],
+
     "jito-ts/@solana/web3.js/superstruct": ["superstruct@0.14.2", "", {}, "sha512-nPewA6m9mR3d6k7WkZ8N8zpTWfenFH3q9pA2PkuiZxINr9DKB2+40wEQf0ixn8VaGuJ78AB6iWOtStI+/4FKZQ=="],
 
     "mocha/minimatch/brace-expansion": ["brace-expansion@2.0.1", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="],

package/lib/browser/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/browser/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/browser/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/browser/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/browser/accounts/grpcDriftClientAccountSubscriberV2.d.ts

@@ -0,0 +1,22 @@
+import { WebSocketDriftClientAccountSubscriber } from './webSocketDriftClientAccountSubscriber';
+import { OracleInfo } from '../oracles/types';
+import { Program } from '@coral-xyz/anchor';
+import { DataAndSlot, DelistedMarketSetting, GrpcConfigs, ResubOpts } from './types';
+import { PerpMarketAccount, SpotMarketAccount } from '../types';
+export declare class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAccountSubscriber {
+    private grpcConfigs;
+    private perpMarketsSubscriber?;
+    private spotMarketsSubscriber?;
+    private oracleMultiSubscriber?;
+    private perpMarketIndexToAccountPubkeyMap;
+    private spotMarketIndexToAccountPubkeyMap;
+    constructor(grpcConfigs: GrpcConfigs, program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting, resubOpts?: ResubOpts);
+    subscribe(): Promise<boolean>;
+    getMarketAccountAndSlot(marketIndex: number): DataAndSlot<PerpMarketAccount> | undefined;
+    getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
+    subscribeToPerpMarketAccounts(): Promise<boolean>;
+    subscribeToSpotMarketAccounts(): Promise<boolean>;
+    subscribeToOracles(): Promise<boolean>;
+    unsubscribeFromOracles(): Promise<void>;
+    unsubscribe(): Promise<void>;
+}

package/lib/browser/accounts/grpcDriftClientAccountSubscriberV2.js

@@ -0,0 +1,194 @@
+"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.perpMarketIndexToAccountPubkeyMap = new Map();
+        this.spotMarketIndexToAccountPubkeyMap = new Map();
+        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;
+    }
+    getMarketAccountAndSlot(marketIndex) {
+        var _a;
+        return (_a = this.perpMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountData(this.perpMarketIndexToAccountPubkeyMap.get(marketIndex));
+    }
+    getSpotMarketAccountAndSlot(marketIndex) {
+        var _a;
+        return (_a = this.spotMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountData(this.spotMarketIndexToAccountPubkeyMap.get(marketIndex));
+    }
+    async subscribeToPerpMarketAccounts() {
+        const perpMarketIndexToAccountPubkeys = await Promise.all(this.perpMarketIndexes.map(async (marketIndex) => [
+            marketIndex,
+            await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex),
+        ]));
+        for (const [marketIndex, accountPubkey,] of perpMarketIndexToAccountPubkeys) {
+            this.perpMarketIndexToAccountPubkeyMap.set(marketIndex, accountPubkey);
+        }
+        const perpMarketPubkeys = perpMarketIndexToAccountPubkeys.map(([_, accountPubkey]) => accountPubkey);
+        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);
+                }
+            });
+        for (const data of this.initialPerpMarketAccountData.values()) {
+            this.perpMarketsSubscriber.setAccountData(data.pubkey, data);
+        }
+        await this.perpMarketsSubscriber.subscribe(perpMarketPubkeys, (_accountId, data) => {
+            this.eventEmitter.emit('perpMarketAccountUpdate', data);
+            this.eventEmitter.emit('update');
+        });
+        return true;
+    }
+    async subscribeToSpotMarketAccounts() {
+        const spotMarketIndexToAccountPubkeys = await Promise.all(this.spotMarketIndexes.map(async (marketIndex) => [
+            marketIndex,
+            await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex),
+        ]));
+        for (const [marketIndex, accountPubkey,] of spotMarketIndexToAccountPubkeys) {
+            this.spotMarketIndexToAccountPubkeyMap.set(marketIndex, accountPubkey);
+        }
+        const spotMarketPubkeys = spotMarketIndexToAccountPubkeys.map(([_, accountPubkey]) => accountPubkey);
+        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);
+                }
+            });
+        for (const data of this.initialSpotMarketAccountData.values()) {
+            this.spotMarketsSubscriber.setAccountData(data.pubkey, data);
+        }
+        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);
+                }
+            });
+        for (const data of this.initialOraclePriceData.entries()) {
+            this.oracleMultiSubscriber.setAccountData(new web3_js_1.PublicKey(data[0]), data[1]);
+        }
+        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/browser/accounts/grpcMultiAccountSubscriber.d.ts

@@ -0,0 +1,33 @@
+/// <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 { DataAndSlot, 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 dataMap;
+    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>>;
+    setAccountData(accountPubkey: PublicKey, data: T, slot?: number): void;
+    getAccountData(accountPubkey: PublicKey): DataAndSlot<T> | undefined;
+    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;
+}