@velocity-exchange/sdk 0.0.5 → 0.2.0

package/lib/browser/accounts/webSocketInsuranceFundStakeAccountSubscriber.js

@@ -5,6 +5,15 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketInsuranceFundStakeAccountSubscriber {
+    get insuranceFundStakeDataAccountSubscriber() {
+        if (!this._insuranceFundStakeDataAccountSubscriber) {
+            throw new Error('insuranceFundStakeDataAccountSubscriber accessed before subscribe()');
+        }
+        return this._insuranceFundStakeDataAccountSubscriber;
+    }
+    set insuranceFundStakeDataAccountSubscriber(subscriber) {
+        this._insuranceFundStakeDataAccountSubscriber = subscriber;
+    }
     constructor(program, insuranceFundStakeAccountPublicKey, resubTimeoutMs, commitment) {
         this.isSubscribed = false;
         this.program = program;

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

@@ -10,7 +10,9 @@ export declare class WebSocketProgramAccountSubscriber<T> implements ProgramAcco
     bufferAndSlotMap: Map<string, BufferAndSlot>;
     program: VelocityProgram;
     decodeBuffer: (accountName: string, ix: Buffer) => T;
-    onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
+    private _onChange?;
+    get onChange(): (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
+    set onChange(onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void);
     listenerId?: number;
     resubOpts?: ResubOpts;
     isUnsubscribing: boolean;

package/lib/browser/accounts/webSocketProgramAccountSubscriber.js

@@ -2,6 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketProgramAccountSubscriber = void 0;
 class WebSocketProgramAccountSubscriber {
+    get onChange() {
+        if (!this._onChange) {
+            throw new Error('onChange callback function must be set');
+        }
+        return this._onChange;
+    }
+    set onChange(onChange) {
+        this._onChange = onChange;
+    }
     constructor(subscriptionName, accountDiscriminator, program, decodeBufferFn, options = {
         filters: [],
     }, resubOpts) {
@@ -14,7 +23,8 @@ class WebSocketProgramAccountSubscriber {
         this.program = program;
         this.decodeBuffer = decodeBufferFn;
         this.resubOpts = resubOpts;
-        if (((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) < 1000) {
+        if (((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) != null &&
+            this.resubOpts.resubTimeoutMs < 1000) {
             console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
         }
         this.options = options;
@@ -45,7 +55,7 @@ class WebSocketProgramAccountSubscriber {
     }
     setTimeout() {
         var _a;
-        if (!this.onChange) {
+        if (!this._onChange) {
             throw new Error('onChange callback function must be set');
         }
         this.timeoutId = setTimeout(async () => {
@@ -97,7 +107,7 @@ class WebSocketProgramAccountSubscriber {
         }
     }
     unsubscribe(onResub = false) {
-        if (!onResub) {
+        if (!onResub && this.resubOpts) {
             this.resubOpts.resubTimeoutMs = undefined;
         }
         this.isUnsubscribing = true;
@@ -114,6 +124,7 @@ class WebSocketProgramAccountSubscriber {
         }
         else {
             this.isUnsubscribing = false;
+            return Promise.resolve();
         }
     }
 }

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

@@ -69,7 +69,9 @@ export declare class WebSocketProgramAccountsSubscriberV2<T> implements ProgramA
     bufferAndSlotMap: Map<string, BufferAndSlot>;
     program: VelocityProgram;
     decodeBuffer: (accountName: string, ix: Buffer) => T;
-    onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
+    private _onChange?;
+    get onChange(): (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
+    set onChange(onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void);
     listenerId?: number;
     resubOpts: ResubOpts;
     isUnsubscribing: boolean;

package/lib/browser/accounts/webSocketProgramAccountSubscriberV2.js

@@ -67,6 +67,15 @@ const bs58_1 = __importDefault(require("bs58"));
  *   and processed concurrently.
  */
 class WebSocketProgramAccountsSubscriberV2 {
+    get onChange() {
+        if (!this._onChange) {
+            throw new Error('onChange callback function must be set');
+        }
+        return this._onChange;
+    }
+    set onChange(onChange) {
+        this._onChange = onChange;
+    }
     constructor(subscriptionName, accountDiscriminator, program, decodeBufferFn, options = {
         filters: [],
     }, resubOpts, accountsToMonitor // Optional list of accounts to poll
@@ -94,7 +103,8 @@ class WebSocketProgramAccountsSubscriberV2 {
             usePollingInsteadOfResub: true,
             logResubMessages: false,
         };
-        if (((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) < 1000) {
+        if (((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) !== undefined &&
+            this.resubOpts.resubTimeoutMs < 1000) {
             console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
         }
         this.options = options;
@@ -212,7 +222,7 @@ class WebSocketProgramAccountsSubscriberV2 {
     }
     setTimeout() {
         var _a;
-        if (!this.onChange) {
+        if (!this._onChange) {
             throw new Error('onChange callback function must be set');
         }
         this.timeoutId = setTimeout(async () => {
@@ -262,7 +272,9 @@ class WebSocketProgramAccountsSubscriberV2 {
         this.lastWsNotificationTime.set(accountIdString, Date.now());
         // If this account was being polled, stop polling it if the buffer has changed
         if (this.accountsCurrentlyPolling.has(accountIdString) &&
-            !(existingBufferAndSlot === null || existingBufferAndSlot === void 0 ? void 0 : existingBufferAndSlot.buffer.equals(newBuffer))) {
+            newBuffer &&
+            (!(existingBufferAndSlot === null || existingBufferAndSlot === void 0 ? void 0 : existingBufferAndSlot.buffer) ||
+                !newBuffer.equals(existingBufferAndSlot.buffer))) {
             this.accountsCurrentlyPolling.delete(accountIdString);
             // If no more accounts are being polled, stop batch polling
             if (this.accountsCurrentlyPolling.size === 0 &&

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

@@ -69,7 +69,9 @@ export declare class WebSocketProgramAccountsSubscriberV2<T> implements ProgramA
     bufferAndSlotMap: Map<string, BufferAndSlot>;
     program: VelocityProgram;
     decodeBuffer: (accountName: string, ix: Buffer) => T;
-    onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
+    private _onChange?;
+    get onChange(): (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
+    set onChange(onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void);
     listenerId?: number;
     resubOpts: ResubOpts;
     isUnsubscribing: boolean;

package/lib/browser/accounts/webSocketProgramAccountsSubscriberV2.js

@@ -67,11 +67,19 @@ const bs58_1 = __importDefault(require("bs58"));
  *   and processed concurrently.
  */
 class WebSocketProgramAccountsSubscriberV2 {
+    get onChange() {
+        if (!this._onChange) {
+            throw new Error('onChange callback function must be set');
+        }
+        return this._onChange;
+    }
+    set onChange(onChange) {
+        this._onChange = onChange;
+    }
     constructor(subscriptionName, accountDiscriminator, program, decodeBufferFn, options = {
         filters: [],
     }, resubOpts, accountsToMonitor // Optional list of accounts to poll
     ) {
-        var _a;
         this.bufferAndSlotMap = new Map();
         this.isUnsubscribing = false;
         this.receivingData = false;
@@ -94,7 +102,8 @@ class WebSocketProgramAccountsSubscriberV2 {
             usePollingInsteadOfResub: true,
             logResubMessages: false,
         };
-        if (((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) < 1000) {
+        if (this.resubOpts.resubTimeoutMs != null &&
+            this.resubOpts.resubTimeoutMs < 1000) {
             console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
         }
         this.options = options;
@@ -212,7 +221,7 @@ class WebSocketProgramAccountsSubscriberV2 {
     }
     setTimeout() {
         var _a;
-        if (!this.onChange) {
+        if (!this._onChange) {
             throw new Error('onChange callback function must be set');
         }
         this.timeoutId = setTimeout(async () => {
@@ -262,7 +271,8 @@ class WebSocketProgramAccountsSubscriberV2 {
         this.lastWsNotificationTime.set(accountIdString, Date.now());
         // If this account was being polled, stop polling it if the buffer has changed
         if (this.accountsCurrentlyPolling.has(accountIdString) &&
-            !(existingBufferAndSlot === null || existingBufferAndSlot === void 0 ? void 0 : existingBufferAndSlot.buffer.equals(newBuffer))) {
+            (!(existingBufferAndSlot === null || existingBufferAndSlot === void 0 ? void 0 : existingBufferAndSlot.buffer) ||
+                (newBuffer != null && !existingBufferAndSlot.buffer.equals(newBuffer)))) {
             this.accountsCurrentlyPolling.delete(accountIdString);
             // If no more accounts are being polled, stop batch polling
             if (this.accountsCurrentlyPolling.size === 0 &&

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

@@ -12,12 +12,14 @@ export declare class WebSocketUserAccountSubscriber implements UserAccountSubscr
     program: VelocityProgram;
     eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
     userAccountPublicKey: PublicKey;
-    userDataAccountSubscriber: AccountSubscriber<UserAccount>;
+    private _userDataAccountSubscriber?;
+    get userDataAccountSubscriber(): AccountSubscriber<UserAccount>;
+    set userDataAccountSubscriber(subscriber: AccountSubscriber<UserAccount>);
     constructor(program: VelocityProgram, userAccountPublicKey: PublicKey, resubOpts?: ResubOpts, commitment?: Commitment);
     subscribe(userAccount?: UserAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;
-    getUserAccountAndSlot(): DataAndSlot<UserAccount>;
+    getUserAccountAndSlot(): DataAndSlot<UserAccount> | undefined;
     updateData(userAccount: UserAccount, slot: number): void;
 }

package/lib/browser/accounts/webSocketUserAccountSubscriber.js

@@ -5,6 +5,15 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketUserAccountSubscriber {
+    get userDataAccountSubscriber() {
+        if (!this._userDataAccountSubscriber) {
+            throw new Error('userDataAccountSubscriber accessed before subscribe()');
+        }
+        return this._userDataAccountSubscriber;
+    }
+    set userDataAccountSubscriber(subscriber) {
+        this._userDataAccountSubscriber = subscriber;
+    }
     constructor(program, userAccountPublicKey, resubOpts, commitment) {
         this.isSubscribed = false;
         this.program = program;

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

@@ -12,11 +12,13 @@ export declare class WebSocketUserStatsAccountSubscriber implements UserStatsAcc
     program: VelocityProgram;
     eventEmitter: StrictEventEmitter<EventEmitter, UserStatsAccountEvents>;
     userStatsAccountPublicKey: PublicKey;
-    userStatsAccountSubscriber: AccountSubscriber<UserStatsAccount>;
+    private _userStatsAccountSubscriber?;
+    get userStatsAccountSubscriber(): AccountSubscriber<UserStatsAccount>;
+    set userStatsAccountSubscriber(subscriber: AccountSubscriber<UserStatsAccount>);
     constructor(program: VelocityProgram, userStatsAccountPublicKey: PublicKey, resubOpts?: ResubOpts, commitment?: Commitment);
     subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;
-    getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount>;
+    getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount> | undefined;
 }

package/lib/browser/accounts/webSocketUserStatsAccountSubsriber.js

@@ -5,6 +5,15 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketUserStatsAccountSubscriber {
+    get userStatsAccountSubscriber() {
+        if (!this._userStatsAccountSubscriber) {
+            throw new Error('userStatsAccountSubscriber accessed before subscribe()');
+        }
+        return this._userStatsAccountSubscriber;
+    }
+    set userStatsAccountSubscriber(subscriber) {
+        this._userStatsAccountSubscriber = subscriber;
+    }
     constructor(program, userStatsAccountPublicKey, resubOpts, commitment) {
         this.isSubscribed = false;
         this.program = program;

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

@@ -31,14 +31,14 @@ export declare class WebSocketVelocityClientAccountSubscriber implements Velocit
     spotOracleStringMap: Map<number, string>;
     oracleSubscribers: Map<string, AccountSubscriber<OraclePriceData>>;
     delistedMarketSetting: DelistedMarketSetting;
-    initialPerpMarketAccountData: Map<number, PerpMarketAccount>;
-    initialSpotMarketAccountData: Map<number, SpotMarketAccount>;
-    initialOraclePriceData: Map<string, OraclePriceData>;
+    initialPerpMarketAccountData?: Map<number, PerpMarketAccount>;
+    initialSpotMarketAccountData?: Map<number, SpotMarketAccount>;
+    initialOraclePriceData?: Map<string, OraclePriceData>;
     customPerpMarketAccountSubscriber?: new (accountName: string, program: VelocityProgram, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => AccountSubscriber<any>;
     customOracleAccountSubscriber?: new (accountName: string, program: VelocityProgram, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => AccountSubscriber<any>;
     protected isSubscribing: boolean;
-    protected subscriptionPromise: Promise<boolean>;
     protected subscriptionPromiseResolver: (val: boolean) => void;
+    protected subscriptionPromise: Promise<boolean>;
     constructor(program: VelocityProgram, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting, resubOpts?: ResubOpts, commitment?: Commitment, customPerpMarketAccountSubscriber?: new (accountName: string, program: VelocityProgram, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => WebSocketAccountSubscriberV2<any> | WebSocketAccountSubscriber<any>, customOracleAccountSubscriber?: new (accountName: string, program: VelocityProgram, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => WebSocketAccountSubscriberV2<any> | WebSocketAccountSubscriber<any>);
     subscribe(): Promise<boolean>;
     chunks: <T>(array: readonly T[], size: number) => T[][];
@@ -71,7 +71,3 @@ export declare class WebSocketVelocityClientAccountSubscriber implements Velocit
     getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
 }
-/** @deprecated Use `WebSocketVelocityClientAccountSubscriber` instead. `WebSocketDriftClientAccountSubscriber` will be removed in a future major. */
-export declare const WebSocketDriftClientAccountSubscriber: typeof WebSocketVelocityClientAccountSubscriber;
-/** @deprecated Use `WebSocketVelocityClientAccountSubscriber` instead. `WebSocketDriftClientAccountSubscriber` will be removed in a future major. */
-export type WebSocketDriftClientAccountSubscriber = WebSocketVelocityClientAccountSubscriber;

package/lib/browser/accounts/webSocketVelocityClientAccountSubscriber.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebSocketDriftClientAccountSubscriber = exports.WebSocketVelocityClientAccountSubscriber = void 0;
+exports.WebSocketVelocityClientAccountSubscriber = void 0;
 const types_1 = require("./types");
 const events_1 = require("events");
 const pda_1 = require("../addresses/pda");
@@ -42,6 +42,8 @@ class WebSocketVelocityClientAccountSubscriber {
         this.spotOracleStringMap = new Map();
         this.oracleSubscribers = new Map();
         this.isSubscribing = false;
+        this.subscriptionPromiseResolver = () => { };
+        this.subscriptionPromise = Promise.resolve(false);
         this.chunks = (array, size) => {
             return new Array(Math.ceil(array.length / size))
                 .fill(null)
@@ -135,11 +137,15 @@ class WebSocketVelocityClientAccountSubscriber {
         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]) {
+            const oracleAccountInfo = oracleAccountInfos[i];
+            if (!oracleAccountInfo) {
                 return result;
             }
             const oracleClient = this.oracleClientCache.get(oracleInfo.source, connection, this.program);
-            const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(oracleAccountInfos[i].data);
+            if (!oracleClient) {
+                return result;
+            }
+            const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(oracleAccountInfo.data);
             result.push([
                 (0, oracleId_1.getOracleId)(oracleInfo.publicKey, oracleInfo.source),
                 oraclePriceData,
@@ -157,10 +163,11 @@ class WebSocketVelocityClientAccountSubscriber {
         return true;
     }
     async subscribeToPerpMarketAccount(marketIndex) {
+        var _a;
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex);
         const AccountSubscriberClass = this.customPerpMarketAccountSubscriber || webSocketAccountSubscriber_1.WebSocketAccountSubscriber;
         const accountSubscriber = new AccountSubscriberClass('perpMarket', this.program, perpMarketPublicKey, undefined, this.resubOpts, this.commitment);
-        const initialPerpMarketData = this.initialPerpMarketAccountData.get(marketIndex);
+        const initialPerpMarketData = (_a = this.initialPerpMarketAccountData) === null || _a === void 0 ? void 0 : _a.get(marketIndex);
         if (initialPerpMarketData) {
             accountSubscriber.setData(initialPerpMarketData);
         }
@@ -177,9 +184,10 @@ class WebSocketVelocityClientAccountSubscriber {
         return true;
     }
     async subscribeToSpotMarketAccount(marketIndex) {
+        var _a;
         const marketPublicKey = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex);
         const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('spotMarket', this.program, marketPublicKey, undefined, this.resubOpts, this.commitment);
-        const initialSpotMarketData = this.initialSpotMarketAccountData.get(marketIndex);
+        const initialSpotMarketData = (_a = this.initialSpotMarketAccountData) === null || _a === void 0 ? void 0 : _a.get(marketIndex);
         if (initialSpotMarketData) {
             accountSubscriber.setData(initialSpotMarketData);
         }
@@ -198,13 +206,17 @@ class WebSocketVelocityClientAccountSubscriber {
         return true;
     }
     async subscribeToOracle(oracleInfo) {
+        var _a;
         const oracleId = (0, oracleId_1.getOracleId)(oracleInfo.publicKey, oracleInfo.source);
         const client = this.oracleClientCache.get(oracleInfo.source, this.program.provider.connection, this.program);
+        if (!client) {
+            return false;
+        }
         const AccountSubscriberClass = this.customOracleAccountSubscriber || webSocketAccountSubscriber_1.WebSocketAccountSubscriber;
         const accountSubscriber = new AccountSubscriberClass('oracle', this.program, oracleInfo.publicKey, (buffer) => {
             return client.getOraclePriceDataFromBuffer(buffer);
         }, this.resubOpts, this.commitment);
-        const initialOraclePriceData = this.initialOraclePriceData.get(oracleId);
+        const initialOraclePriceData = (_a = this.initialOraclePriceData) === null || _a === void 0 ? void 0 : _a.get(oracleId);
         if (initialOraclePriceData) {
             accountSubscriber.setData(initialOraclePriceData);
         }
@@ -229,16 +241,20 @@ class WebSocketVelocityClientAccountSubscriber {
         if (!this.isSubscribed) {
             return;
         }
+        if (!this.stateAccountSubscriber) {
+            return;
+        }
         const promises = [this.stateAccountSubscriber.fetch()]
             .concat(Array.from(this.perpMarketAccountSubscribers.values()).map((subscriber) => subscriber.fetch()))
             .concat(Array.from(this.spotMarketAccountSubscribers.values()).map((subscriber) => subscriber.fetch()));
         await Promise.all(promises);
     }
     async unsubscribe() {
+        var _a;
         if (!this.isSubscribed) {
             return;
         }
-        await this.stateAccountSubscriber.unsubscribe();
+        await ((_a = this.stateAccountSubscriber) === null || _a === void 0 ? void 0 : _a.unsubscribe());
         await this.unsubscribeFromMarketAccounts();
         await this.unsubscribeFromSpotMarketAccounts();
         await this.unsubscribeFromOracles();
@@ -279,12 +295,12 @@ class WebSocketVelocityClientAccountSubscriber {
             }
             const perpMarketAccount = perpMarket.data;
             const perpMarketIndex = perpMarketAccount.marketIndex;
-            const oracle = perpMarketAccount.amm.oracle;
-            const oracleId = (0, oracleId_1.getOracleId)(oracle, perpMarket.data.amm.oracleSource);
+            const oracle = perpMarketAccount.oracle;
+            const oracleId = (0, oracleId_1.getOracleId)(oracle, perpMarket.data.oracleSource);
             if (!this.oracleSubscribers.has(oracleId)) {
                 addOraclePromises.push(this.addOracle({
                     publicKey: oracle,
-                    source: perpMarket.data.amm.oracleSource,
+                    source: perpMarket.data.oracleSource,
                 }));
             }
             this.perpOracleMap.set(perpMarketIndex, oracle);
@@ -315,21 +331,21 @@ class WebSocketVelocityClientAccountSubscriber {
         await Promise.all(addOraclePromises);
     }
     async handleDelistedMarkets() {
+        var _a, _b;
         if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Subscribe) {
             return;
         }
         const { perpMarketIndexes, oracles } = (0, utils_1.findDelistedPerpMarketsAndOracles)(this.getMarketAccountsAndSlots(), this.getSpotMarketAccountsAndSlots());
         for (const perpMarketIndex of perpMarketIndexes) {
-            await this.perpMarketAccountSubscribers
-                .get(perpMarketIndex)
-                .unsubscribe();
+            await ((_a = this.perpMarketAccountSubscribers
+                .get(perpMarketIndex)) === null || _a === void 0 ? void 0 : _a.unsubscribe());
             if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Discard) {
                 this.perpMarketAccountSubscribers.delete(perpMarketIndex);
             }
         }
         for (const oracle of oracles) {
             const oracleId = (0, oracleId_1.getOracleId)(oracle.publicKey, oracle.source);
-            await this.oracleSubscribers.get(oracleId).unsubscribe();
+            await ((_b = this.oracleSubscribers.get(oracleId)) === null || _b === void 0 ? void 0 : _b.unsubscribe());
             if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Discard) {
                 this.oracleSubscribers.delete(oracleId);
             }
@@ -341,24 +357,36 @@ class WebSocketVelocityClientAccountSubscriber {
         }
     }
     getStateAccountAndSlot() {
+        var _a;
         this.assertIsSubscribed();
-        return this.stateAccountSubscriber.dataAndSlot;
+        const dataAndSlot = (_a = this.stateAccountSubscriber) === null || _a === void 0 ? void 0 : _a.dataAndSlot;
+        if (!dataAndSlot) {
+            throw new Error('State account data not available');
+        }
+        return dataAndSlot;
     }
     getMarketAccountAndSlot(marketIndex) {
+        var _a;
         this.assertIsSubscribed();
-        return this.perpMarketAccountSubscribers.get(marketIndex).dataAndSlot;
+        return (_a = this.perpMarketAccountSubscribers.get(marketIndex)) === null || _a === void 0 ? void 0 : _a.dataAndSlot;
     }
     getMarketAccountsAndSlots() {
-        return Array.from(this.perpMarketAccountSubscribers.values()).map((subscriber) => subscriber.dataAndSlot);
+        return Array.from(this.perpMarketAccountSubscribers.values())
+            .map((subscriber) => subscriber.dataAndSlot)
+            .filter((dataAndSlot) => dataAndSlot !== undefined);
     }
     getSpotMarketAccountAndSlot(marketIndex) {
+        var _a;
         this.assertIsSubscribed();
-        return this.spotMarketAccountSubscribers.get(marketIndex).dataAndSlot;
+        return (_a = this.spotMarketAccountSubscribers.get(marketIndex)) === null || _a === void 0 ? void 0 : _a.dataAndSlot;
     }
     getSpotMarketAccountsAndSlots() {
-        return Array.from(this.spotMarketAccountSubscribers.values()).map((subscriber) => subscriber.dataAndSlot);
+        return Array.from(this.spotMarketAccountSubscribers.values())
+            .map((subscriber) => subscriber.dataAndSlot)
+            .filter((dataAndSlot) => dataAndSlot !== undefined);
     }
     getOraclePriceDataAndSlot(oracleId) {
+        var _a;
         this.assertIsSubscribed();
         if (oracleId === ORACLE_DEFAULT_ID) {
             return {
@@ -366,7 +394,7 @@ class WebSocketVelocityClientAccountSubscriber {
                 slot: 0,
             };
         }
-        return this.oracleSubscribers.get(oracleId).dataAndSlot;
+        return (_a = this.oracleSubscribers.get(oracleId)) === null || _a === void 0 ? void 0 : _a.dataAndSlot;
     }
     getOraclePriceDataAndSlotForPerpMarket(marketIndex) {
         const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
@@ -375,8 +403,8 @@ class WebSocketVelocityClientAccountSubscriber {
         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
+        if (!oracle || !perpMarketAccount.data.oracle.equals(oracle)) {
+            // If the oracle has changed (or not yet cached), update the oracle map in background
             this.setPerpOracleMap();
         }
         return this.getOraclePriceDataAndSlot(oracleId);
@@ -388,13 +416,11 @@ class WebSocketVelocityClientAccountSubscriber {
         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
+        if (!oracle || !spotMarketAccount.data.oracle.equals(oracle)) {
+            // If the oracle has changed (or not yet cached), update the oracle map in background
             this.setSpotOracleMap();
         }
         return this.getOraclePriceDataAndSlot(oracleId);
     }
 }
 exports.WebSocketVelocityClientAccountSubscriber = WebSocketVelocityClientAccountSubscriber;
-/** @deprecated Use `WebSocketVelocityClientAccountSubscriber` instead. `WebSocketDriftClientAccountSubscriber` will be removed in a future major. */
-exports.WebSocketDriftClientAccountSubscriber = WebSocketVelocityClientAccountSubscriber;

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

@@ -23,9 +23,13 @@ export declare class WebSocketVelocityClientAccountSubscriberV2 implements Veloc
     skipInitialData: boolean;
     eventEmitter: StrictEventEmitter<EventEmitter, VelocityClientAccountEvents>;
     stateAccountSubscriber?: WebSocketAccountSubscriberV2<StateAccount>;
-    perpMarketAllAccountsSubscriber: WebSocketProgramAccountsSubscriberV2<PerpMarketAccount>;
+    private _perpMarketAllAccountsSubscriber?;
+    get perpMarketAllAccountsSubscriber(): WebSocketProgramAccountsSubscriberV2<PerpMarketAccount>;
+    set perpMarketAllAccountsSubscriber(subscriber: WebSocketProgramAccountsSubscriberV2<PerpMarketAccount>);
     perpMarketAccountLatestData: Map<number, DataAndSlot<PerpMarketAccount>>;
-    spotMarketAllAccountsSubscriber: WebSocketProgramAccountsSubscriberV2<SpotMarketAccount>;
+    private _spotMarketAllAccountsSubscriber?;
+    get spotMarketAllAccountsSubscriber(): WebSocketProgramAccountsSubscriberV2<SpotMarketAccount>;
+    set spotMarketAllAccountsSubscriber(subscriber: WebSocketProgramAccountsSubscriberV2<SpotMarketAccount>);
     spotMarketAccountLatestData: Map<number, DataAndSlot<SpotMarketAccount>>;
     perpOracleMap: Map<number, PublicKey>;
     perpOracleStringMap: Map<number, string>;
@@ -37,8 +41,8 @@ export declare class WebSocketVelocityClientAccountSubscriberV2 implements Veloc
     initialSpotMarketAccountData: Map<number, SpotMarketAccount>;
     initialOraclePriceData: Map<string, OraclePriceData>;
     protected isSubscribing: boolean;
+    private subscriptionPromiseResolver;
     protected subscriptionPromise: Promise<boolean>;
-    protected subscriptionPromiseResolver: (val: boolean) => void;
     private rpc;
     private rpcSubscriptions;
     constructor(program: VelocityProgram, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting, resubOpts?: ResubOpts, commitment?: Commitment, skipInitialData?: boolean);
@@ -85,7 +89,3 @@ export declare class WebSocketVelocityClientAccountSubscriberV2 implements Veloc
     getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
 }
-/** @deprecated Use `WebSocketVelocityClientAccountSubscriberV2` instead. `WebSocketDriftClientAccountSubscriberV2` will be removed in a future major. */
-export declare const WebSocketDriftClientAccountSubscriberV2: typeof WebSocketVelocityClientAccountSubscriberV2;
-/** @deprecated Use `WebSocketVelocityClientAccountSubscriberV2` instead. `WebSocketDriftClientAccountSubscriberV2` will be removed in a future major. */
-export type WebSocketDriftClientAccountSubscriberV2 = WebSocketVelocityClientAccountSubscriberV2;