@drift-labs/sdk-browser 2.142.0-beta.9 → 2.143.0-beta.1

package/VERSION

@@ -1 +1 @@
-2.142.0-beta.9
+2.143.0-beta.1

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

@@ -1,24 +1,65 @@
-import { WebSocketDriftClientAccountSubscriber } from './webSocketDriftClientAccountSubscriber';
-import { OracleInfo } from '../oracles/types';
+/// <reference types="node" />
+import StrictEventEmitter from 'strict-event-emitter-types';
+import { EventEmitter } from 'events';
+import { OracleInfo, OraclePriceData } 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 {
+import { PublicKey } from '@solana/web3.js';
+import { AccountSubscriber, DataAndSlot, DelistedMarketSetting, DriftClientAccountEvents, DriftClientAccountSubscriber, GrpcConfigs, ResubOpts } from './types';
+import { PerpMarketAccount, SpotMarketAccount, StateAccount } from '../types';
+import { OracleClientCache } from '../oracles/oracleClientCache';
+export declare class grpcDriftClientAccountSubscriberV2 implements DriftClientAccountSubscriber {
     private grpcConfigs;
     private perpMarketsSubscriber?;
     private spotMarketsSubscriber?;
     private oracleMultiSubscriber?;
     private perpMarketIndexToAccountPubkeyMap;
     private spotMarketIndexToAccountPubkeyMap;
+    private delistedMarketSetting;
+    eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
+    isSubscribed: boolean;
+    isSubscribing: boolean;
+    program: Program;
+    perpMarketIndexes: number[];
+    spotMarketIndexes: number[];
+    shouldFindAllMarketsAndOracles: boolean;
+    oracleInfos: OracleInfo[];
+    initialPerpMarketAccountData: Map<number, PerpMarketAccount>;
+    initialSpotMarketAccountData: Map<number, SpotMarketAccount>;
+    initialOraclePriceData: Map<string, OraclePriceData>;
+    perpOracleMap: Map<number, PublicKey>;
+    perpOracleStringMap: Map<number, string>;
+    spotOracleMap: Map<number, PublicKey>;
+    spotOracleStringMap: Map<number, string>;
+    private oracleIdToOracleDataMap;
+    stateAccountSubscriber?: AccountSubscriber<StateAccount>;
+    oracleClientCache: OracleClientCache;
+    private resubOpts?;
+    private subscriptionPromise;
+    protected subscriptionPromiseResolver: (val: boolean) => void;
     constructor(grpcConfigs: GrpcConfigs, program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting, resubOpts?: ResubOpts);
+    chunks: <T>(array: readonly T[], size: number) => T[][];
+    setInitialData(): Promise<void>;
+    addPerpMarket(_marketIndex: number): Promise<boolean>;
+    addSpotMarket(_marketIndex: number): Promise<boolean>;
+    addOracle(oracleInfo: OracleInfo): Promise<boolean>;
     subscribe(): Promise<boolean>;
+    fetch(): Promise<void>;
+    private assertIsSubscribed;
+    getStateAccountAndSlot(): DataAndSlot<StateAccount>;
+    getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[];
+    getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
     getMarketAccountAndSlot(marketIndex: number): DataAndSlot<PerpMarketAccount> | undefined;
     getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
+    getOraclePriceDataAndSlot(oracleId: string): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     setPerpOracleMap(): Promise<void>;
     setSpotOracleMap(): Promise<void>;
     subscribeToPerpMarketAccounts(): Promise<boolean>;
     subscribeToSpotMarketAccounts(): Promise<boolean>;
     subscribeToOracles(): Promise<boolean>;
+    handleDelistedMarkets(): Promise<void>;
+    removeInitialData(): void;
     unsubscribeFromOracles(): Promise<void>;
     unsubscribe(): Promise<void>;
 }

package/lib/browser/accounts/grpcDriftClientAccountSubscriberV2.js

@@ -1,19 +1,117 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.grpcDriftClientAccountSubscriberV2 = void 0;
-const webSocketDriftClientAccountSubscriber_1 = require("./webSocketDriftClientAccountSubscriber");
+const events_1 = require("events");
 const web3_js_1 = require("@solana/web3.js");
 const config_1 = require("../config");
 const pda_1 = require("../addresses/pda");
+const types_1 = require("./types");
 const grpcAccountSubscriber_1 = require("./grpcAccountSubscriber");
 const grpcMultiAccountSubscriber_1 = require("./grpcMultiAccountSubscriber");
 const oracleId_1 = require("../oracles/oracleId");
-class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber {
+const oracleClientCache_1 = require("../oracles/oracleClientCache");
+const utils_1 = require("./utils");
+class grpcDriftClientAccountSubscriberV2 {
     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.perpOracleMap = new Map();
+        this.perpOracleStringMap = new Map();
+        this.spotOracleMap = new Map();
+        this.spotOracleStringMap = new Map();
+        this.oracleIdToOracleDataMap = new Map();
+        this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
+        this.chunks = (array, size) => {
+            return new Array(Math.ceil(array.length / size))
+                .fill(null)
+                .map((_, index) => index * size)
+                .map((begin) => array.slice(begin, begin + size));
+        };
+        this.eventEmitter = new events_1.EventEmitter();
+        this.isSubscribed = false;
+        this.isSubscribing = false;
+        this.program = program;
+        this.perpMarketIndexes = perpMarketIndexes;
+        this.spotMarketIndexes = spotMarketIndexes;
+        this.shouldFindAllMarketsAndOracles = shouldFindAllMarketsAndOracles;
+        this.oracleInfos = oracleInfos;
+        this.initialPerpMarketAccountData = new Map();
+        this.initialSpotMarketAccountData = new Map();
+        this.initialOraclePriceData = new Map();
+        this.perpOracleMap = new Map();
+        this.perpOracleStringMap = new Map();
+        this.spotOracleMap = new Map();
+        this.spotOracleStringMap = new Map();
         this.grpcConfigs = grpcConfigs;
+        this.resubOpts = resubOpts;
+        this.delistedMarketSetting = delistedMarketSetting;
+    }
+    async setInitialData() {
+        const connection = this.program.provider.connection;
+        if (!this.initialPerpMarketAccountData ||
+            this.initialPerpMarketAccountData.size === 0) {
+            const perpMarketPublicKeys = this.perpMarketIndexes.map((marketIndex) => (0, pda_1.getPerpMarketPublicKeySync)(this.program.programId, marketIndex));
+            const perpMarketPublicKeysChunks = this.chunks(perpMarketPublicKeys, 75);
+            const perpMarketAccountInfos = (await Promise.all(perpMarketPublicKeysChunks.map((perpMarketPublicKeysChunk) => connection.getMultipleAccountsInfo(perpMarketPublicKeysChunk)))).flat();
+            this.initialPerpMarketAccountData = new Map(perpMarketAccountInfos
+                .filter((accountInfo) => !!accountInfo)
+                .map((accountInfo) => {
+                const perpMarket = this.program.coder.accounts.decode('PerpMarket', accountInfo.data);
+                return [perpMarket.marketIndex, perpMarket];
+            }));
+        }
+        if (!this.initialSpotMarketAccountData ||
+            this.initialSpotMarketAccountData.size === 0) {
+            const spotMarketPublicKeys = this.spotMarketIndexes.map((marketIndex) => (0, pda_1.getSpotMarketPublicKeySync)(this.program.programId, marketIndex));
+            const spotMarketPublicKeysChunks = this.chunks(spotMarketPublicKeys, 75);
+            const spotMarketAccountInfos = (await Promise.all(spotMarketPublicKeysChunks.map((spotMarketPublicKeysChunk) => connection.getMultipleAccountsInfo(spotMarketPublicKeysChunk)))).flat();
+            this.initialSpotMarketAccountData = new Map(spotMarketAccountInfos
+                .filter((accountInfo) => !!accountInfo)
+                .map((accountInfo) => {
+                const spotMarket = this.program.coder.accounts.decode('SpotMarket', accountInfo.data);
+                return [spotMarket.marketIndex, spotMarket];
+            }));
+        }
+        const oracleAccountPubkeyChunks = this.chunks(this.oracleInfos.map((oracleInfo) => oracleInfo.publicKey), 75);
+        const oracleAccountInfos = (await Promise.all(oracleAccountPubkeyChunks.map((oracleAccountPublicKeysChunk) => connection.getMultipleAccountsInfo(oracleAccountPublicKeysChunk)))).flat();
+        this.initialOraclePriceData = new Map(this.oracleInfos.reduce((result, oracleInfo, i) => {
+            if (!oracleAccountInfos[i]) {
+                return result;
+            }
+            const oracleClient = this.oracleClientCache.get(oracleInfo.source, connection, this.program);
+            const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(oracleAccountInfos[i].data);
+            result.push([
+                (0, oracleId_1.getOracleId)(oracleInfo.publicKey, oracleInfo.source),
+                oraclePriceData,
+            ]);
+            return result;
+        }, []));
+    }
+    async addPerpMarket(_marketIndex) {
+        if (!this.perpMarketIndexes.includes(_marketIndex)) {
+            this.perpMarketIndexes = this.perpMarketIndexes.concat(_marketIndex);
+        }
+        return true;
+    }
+    async addSpotMarket(_marketIndex) {
+        return true;
+    }
+    async addOracle(oracleInfo) {
+        var _a, _c;
+        if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.logResubMessages) {
+            console.log('[grpcDriftClientAccountSubscriberV2] addOracle');
+        }
+        if (oracleInfo.publicKey.equals(web3_js_1.PublicKey.default)) {
+            return true;
+        }
+        const exists = this.oracleInfos.some((o) => o.source === oracleInfo.source &&
+            o.publicKey.equals(oracleInfo.publicKey));
+        if (exists) {
+            return true; // Already exists, don't add duplicate
+        }
+        this.oracleInfos = this.oracleInfos.concat(oracleInfo);
+        (_c = this.oracleMultiSubscriber) === null || _c === void 0 ? void 0 : _c.addAccounts([oracleInfo.publicKey]);
+        return true;
     }
     async subscribe() {
         if (this.isSubscribed) {
@@ -61,6 +159,32 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
         this.removeInitialData();
         return true;
     }
+    async fetch() {
+        var _a, _c, _d, _e;
+        await ((_a = this.stateAccountSubscriber) === null || _a === void 0 ? void 0 : _a.fetch());
+        await ((_c = this.perpMarketsSubscriber) === null || _c === void 0 ? void 0 : _c.fetch());
+        await ((_d = this.spotMarketsSubscriber) === null || _d === void 0 ? void 0 : _d.fetch());
+        await ((_e = this.oracleMultiSubscriber) === null || _e === void 0 ? void 0 : _e.fetch());
+    }
+    assertIsSubscribed() {
+        if (!this.isSubscribed) {
+            throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');
+        }
+    }
+    getStateAccountAndSlot() {
+        this.assertIsSubscribed();
+        return this.stateAccountSubscriber.dataAndSlot;
+    }
+    getMarketAccountsAndSlots() {
+        var _a, _c;
+        const map = (_a = this.perpMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountDataMap();
+        return Array.from((_c = map === null || map === void 0 ? void 0 : map.values()) !== null && _c !== void 0 ? _c : []);
+    }
+    getSpotMarketAccountsAndSlots() {
+        var _a, _c;
+        const map = (_a = this.spotMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountDataMap();
+        return Array.from((_c = map === null || map === void 0 ? void 0 : map.values()) !== null && _c !== void 0 ? _c : []);
+    }
     getMarketAccountAndSlot(marketIndex) {
         var _a;
         return (_a = this.perpMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountData(this.perpMarketIndexToAccountPubkeyMap.get(marketIndex));
@@ -69,8 +193,40 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
         var _a;
         return (_a = this.spotMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountData(this.spotMarketIndexToAccountPubkeyMap.get(marketIndex));
     }
+    getOraclePriceDataAndSlot(oracleId) {
+        this.assertIsSubscribed();
+        // we need to rely on a map we store in this class because the grpcMultiAccountSubscriber does not track a mapping or oracle ID.
+        // DO NOT call getAccountData on the oracleMultiSubscriber, it will not return the correct data in certain cases(BONK spot and perp market subscribed too at once).
+        return this.oracleIdToOracleDataMap.get(oracleId);
+    }
+    getOraclePriceDataAndSlotForPerpMarket(marketIndex) {
+        const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
+        const oracle = this.perpOracleMap.get(marketIndex);
+        const oracleId = this.perpOracleStringMap.get(marketIndex);
+        if (!perpMarketAccount || !oracleId) {
+            return undefined;
+        }
+        if (!perpMarketAccount.data.amm.oracle.equals(oracle)) {
+            // If the oracle has changed, we need to update the oracle map in background
+            this.setPerpOracleMap();
+        }
+        return this.getOraclePriceDataAndSlot(oracleId);
+    }
+    getOraclePriceDataAndSlotForSpotMarket(marketIndex) {
+        const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
+        const oracle = this.spotOracleMap.get(marketIndex);
+        const oracleId = this.spotOracleStringMap.get(marketIndex);
+        if (!spotMarketAccount || !oracleId) {
+            return undefined;
+        }
+        if (!spotMarketAccount.data.oracle.equals(oracle)) {
+            // If the oracle has changed, we need to update the oracle map in background
+            this.setSpotOracleMap();
+        }
+        return this.getOraclePriceDataAndSlot(oracleId);
+    }
     async setPerpOracleMap() {
-        var _a;
+        var _a, _c;
         const perpMarketsMap = (_a = this.perpMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountDataMap();
         const perpMarkets = Array.from(perpMarketsMap.values());
         const addOraclePromises = [];
@@ -82,7 +238,7 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
             const perpMarketIndex = perpMarketAccount.marketIndex;
             const oracle = perpMarketAccount.amm.oracle;
             const oracleId = (0, oracleId_1.getOracleId)(oracle, perpMarket.data.amm.oracleSource);
-            if (!this.oracleSubscribers.has(oracleId)) {
+            if (!((_c = this.oracleMultiSubscriber) === null || _c === void 0 ? void 0 : _c.getAccountDataMap().has(oracleId))) {
                 addOraclePromises.push(this.addOracle({
                     publicKey: oracle,
                     source: perpMarket.data.amm.oracleSource,
@@ -94,7 +250,7 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
         await Promise.all(addOraclePromises);
     }
     async setSpotOracleMap() {
-        var _a;
+        var _a, _c;
         const spotMarketsMap = (_a = this.spotMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountDataMap();
         const spotMarkets = Array.from(spotMarketsMap.values());
         const addOraclePromises = [];
@@ -106,7 +262,7 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
             const spotMarketIndex = spotMarketAccount.marketIndex;
             const oracle = spotMarketAccount.oracle;
             const oracleId = (0, oracleId_1.getOracleId)(oracle, spotMarketAccount.oracleSource);
-            if (!this.oracleSubscribers.has(oracleId)) {
+            if (!((_c = this.oracleMultiSubscriber) === null || _c === void 0 ? void 0 : _c.getAccountDataMap().has(oracleId))) {
                 addOraclePromises.push(this.addOracle({
                     publicKey: oracle,
                     source: spotMarketAccount.oracleSource,
@@ -118,6 +274,10 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
         await Promise.all(addOraclePromises);
     }
     async subscribeToPerpMarketAccounts() {
+        var _a;
+        if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.logResubMessages) {
+            console.log('[grpcDriftClientAccountSubscriberV2] subscribeToPerpMarketAccounts');
+        }
         const perpMarketIndexToAccountPubkeys = await Promise.all(this.perpMarketIndexes.map(async (marketIndex) => [
             marketIndex,
             await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex),
@@ -149,6 +309,10 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
         return true;
     }
     async subscribeToSpotMarketAccounts() {
+        var _a;
+        if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.logResubMessages) {
+            console.log('[grpcDriftClientAccountSubscriberV2] subscribeToSpotMarketAccounts');
+        }
         const spotMarketIndexToAccountPubkeys = await Promise.all(this.spotMarketIndexes.map(async (marketIndex) => [
             marketIndex,
             await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex),
@@ -180,64 +344,133 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
         return true;
     }
     async subscribeToOracles() {
-        // Build list of unique oracle pubkeys and a lookup for sources
-        const uniqueOraclePubkeys = new Map();
+        var _a;
+        if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.logResubMessages) {
+            console.log('grpcDriftClientAccountSubscriberV2 subscribeToOracles');
+        }
+        const oraclePubkeyToInfosMap = 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 pubkey = info.publicKey.toBase58();
+            if (!oraclePubkeyToInfosMap.has(pubkey)) {
+                oraclePubkeyToInfosMap.set(pubkey, []);
             }
+            oraclePubkeyToInfosMap.get(pubkey).push(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);
+        const oraclePubkeys = Array.from(new Set(this.oracleInfos.map((info) => info.publicKey)));
+        this.oracleMultiSubscriber = await grpcMultiAccountSubscriber_1.grpcMultiAccountSubscriber.create(this.grpcConfigs, 'oracle', this.program, (buffer, pubkey, accountProps) => {
+            if (!pubkey) {
+                throw new Error('Oracle pubkey missing in decode');
+            }
+            const client = this.oracleClientCache.get(accountProps.source, this.program.provider.connection, this.program);
+            const price = client.getOraclePriceDataFromBuffer(buffer);
+            return price;
+        }, 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);
+            }
+        }, oraclePubkeyToInfosMap);
         for (const data of this.initialOraclePriceData.entries()) {
             const { publicKey } = (0, oracleId_1.getPublicKeyAndSourceFromOracleId)(data[0]);
             this.oracleMultiSubscriber.setAccountData(publicKey.toBase58(), data[1]);
+            this.oracleIdToOracleDataMap.set(data[0], {
+                data: data[1],
+                slot: 0,
+            });
         }
-        await this.oracleMultiSubscriber.subscribe(oraclePubkeys, (accountId, data) => {
-            const source = pubkeyToSource.get(accountId.toBase58());
-            this.eventEmitter.emit('oraclePriceUpdate', accountId, source, data);
+        await this.oracleMultiSubscriber.subscribe(oraclePubkeys, (accountId, data, context, _b, accountProps) => {
+            const oracleId = (0, oracleId_1.getOracleId)(accountId, accountProps.source);
+            this.oracleIdToOracleDataMap.set(oracleId, {
+                data,
+                slot: context.slot,
+            });
+            this.eventEmitter.emit('oraclePriceUpdate', accountId, accountProps.source, data);
             this.eventEmitter.emit('update');
         });
         return true;
     }
+    async handleDelistedMarkets() {
+        var _a, _c;
+        if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Subscribe) {
+            return;
+        }
+        const { perpMarketIndexes, oracles } = (0, utils_1.findDelistedPerpMarketsAndOracles)(Array.from(((_a = this.perpMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountDataMap().values()) || []), Array.from(((_c = this.spotMarketsSubscriber) === null || _c === void 0 ? void 0 : _c.getAccountDataMap().values()) || []));
+        // Build array of perp market pubkeys to remove
+        const perpMarketPubkeysToRemove = perpMarketIndexes
+            .map((marketIndex) => {
+            const pubkeyString = this.perpMarketIndexToAccountPubkeyMap.get(marketIndex);
+            return pubkeyString ? new web3_js_1.PublicKey(pubkeyString) : null;
+        })
+            .filter((pubkey) => pubkey !== null);
+        // Build array of oracle pubkeys to remove
+        const oraclePubkeysToRemove = oracles.map((oracle) => oracle.publicKey);
+        // Remove accounts in batches - perp markets
+        if (perpMarketPubkeysToRemove.length > 0) {
+            await this.perpMarketsSubscriber.removeAccounts(perpMarketPubkeysToRemove);
+            // Clean up the mapping for removed perp markets
+            for (const pubkey of perpMarketPubkeysToRemove) {
+                const pubkeyString = pubkey.toBase58();
+                for (const [marketIndex, accountPubkey,] of this.perpMarketIndexToAccountPubkeyMap.entries()) {
+                    if (accountPubkey === pubkeyString) {
+                        this.perpMarketIndexToAccountPubkeyMap.delete(marketIndex);
+                        this.perpOracleMap.delete(marketIndex);
+                        this.perpOracleStringMap.delete(marketIndex);
+                        break;
+                    }
+                }
+            }
+        }
+        // Remove accounts in batches - oracles
+        if (oraclePubkeysToRemove.length > 0) {
+            await this.oracleMultiSubscriber.removeAccounts(oraclePubkeysToRemove);
+            // Clean up oracle data for removed oracles by finding their sources
+            for (const pubkey of oraclePubkeysToRemove) {
+                // Find the oracle source by checking oracleInfos
+                const oracleInfo = this.oracleInfos.find((info) => info.publicKey.equals(pubkey));
+                if (oracleInfo) {
+                    const oracleId = (0, oracleId_1.getOracleId)(pubkey, oracleInfo.source);
+                    this.oracleIdToOracleDataMap.delete(oracleId);
+                }
+            }
+        }
+    }
+    removeInitialData() {
+        this.initialPerpMarketAccountData = new Map();
+        this.initialSpotMarketAccountData = new Map();
+        this.initialOraclePriceData = new Map();
+    }
     async unsubscribeFromOracles() {
         if (this.oracleMultiSubscriber) {
             await this.oracleMultiSubscriber.unsubscribe();
             this.oracleMultiSubscriber = undefined;
             return;
         }
-        await super.unsubscribeFromOracles();
     }
     async unsubscribe() {
-        if (this.isSubscribed) {
+        var _a, _c, _d;
+        if (!this.isSubscribed) {
             return;
         }
-        await this.stateAccountSubscriber.unsubscribe();
+        this.isSubscribed = false;
+        this.isSubscribing = false;
+        await ((_a = this.stateAccountSubscriber) === null || _a === void 0 ? void 0 : _a.unsubscribe());
+        await this.unsubscribeFromOracles();
+        await ((_c = this.perpMarketsSubscriber) === null || _c === void 0 ? void 0 : _c.unsubscribe());
+        await ((_d = this.spotMarketsSubscriber) === null || _d === void 0 ? void 0 : _d.unsubscribe());
+        // Clean up all maps to prevent memory leaks
+        this.perpMarketIndexToAccountPubkeyMap.clear();
+        this.spotMarketIndexToAccountPubkeyMap.clear();
+        this.oracleIdToOracleDataMap.clear();
+        this.perpOracleMap.clear();
+        this.perpOracleStringMap.clear();
+        this.spotOracleMap.clear();
+        this.spotOracleStringMap.clear();
     }
 }
 exports.grpcDriftClientAccountSubscriberV2 = grpcDriftClientAccountSubscriberV2;

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

@@ -4,7 +4,7 @@ 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> {
+export declare class grpcMultiAccountSubscriber<T, U = undefined> {
     private client;
     private stream;
     private commitmentLevel;
@@ -20,12 +20,15 @@ export declare class grpcMultiAccountSubscriber<T> {
     private subscribedAccounts;
     private onChangeMap;
     private dataMap;
+    private accountPropsMap;
+    private bufferMap;
     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>>;
+    static create<T, U = undefined>(grpcConfigs: GrpcConfigs, accountName: string, program: Program, decodeBuffer?: (buffer: Buffer, pubkey?: string, accountProps?: U) => T, resubOpts?: ResubOpts, clientProp?: Client, onUnsubscribe?: () => Promise<void>, accountPropsMap?: Map<string, U | Array<U>>): Promise<grpcMultiAccountSubscriber<T, U>>;
     setAccountData(accountPubkey: string, data: T, slot?: number): void;
     getAccountData(accountPubkey: string): DataAndSlot<T> | undefined;
     getAccountDataMap(): Map<string, DataAndSlot<T>>;
-    subscribe(accounts: PublicKey[], onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void): Promise<void>;
+    fetch(): Promise<void>;
+    subscribe(accounts: PublicKey[], onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer, accountProps: U) => void): Promise<void>;
     addAccounts(accounts: PublicKey[]): Promise<void>;
     removeAccounts(accounts: PublicKey[]): Promise<void>;
     unsubscribe(): Promise<void>;