@velocity-exchange/sdk 0.1.0 → 0.2.1

package/lib/browser/accounts/oneShotUserAccountSubscriber.js

@@ -14,8 +14,9 @@ class OneShotUserAccountSubscriber extends basicUserAccountSubscriber_1.BasicUse
         this.commitment = commitment !== null && commitment !== void 0 ? commitment : 'confirmed';
     }
     async subscribe(userAccount) {
+        var _a, _b;
         if (userAccount) {
-            this.user = { data: userAccount, slot: this.user.slot };
+            this.user = { data: userAccount, slot: (_b = (_a = this.user) === null || _a === void 0 ? void 0 : _a.slot) !== null && _b !== void 0 ? _b : 0 };
             return true;
         }
         await this.fetchIfUnloaded();
@@ -25,7 +26,7 @@ class OneShotUserAccountSubscriber extends basicUserAccountSubscriber_1.BasicUse
         return true;
     }
     async fetchIfUnloaded() {
-        if (this.user.data === undefined) {
+        if (!this.user) {
             await this.fetch();
         }
     }
@@ -41,7 +42,7 @@ class OneShotUserAccountSubscriber extends basicUserAccountSubscriber_1.BasicUse
             }
         }
         catch (e) {
-            console.error(`OneShotUserAccountSubscriber.fetch() UserAccount does not exist: ${e.message}`);
+            console.error(`OneShotUserAccountSubscriber.fetch() UserAccount does not exist: ${e instanceof Error ? e.message : String(e)}`);
         }
     }
 }

package/lib/browser/accounts/oneShotUserStatsAccountSubscriber.js

@@ -14,8 +14,12 @@ class OneShotUserStatsAccountSubscriber extends basicUserStatsAccountSubscriber_
         this.commitment = commitment !== null && commitment !== void 0 ? commitment : 'confirmed';
     }
     async subscribe(userStatsAccount) {
+        var _a, _b;
         if (userStatsAccount) {
-            this.userStats = { data: userStatsAccount, slot: this.userStats.slot };
+            this.userStats = {
+                data: userStatsAccount,
+                slot: (_b = (_a = this.userStats) === null || _a === void 0 ? void 0 : _a.slot) !== null && _b !== void 0 ? _b : 0,
+            };
             return true;
         }
         await this.fetchIfUnloaded();
@@ -25,7 +29,7 @@ class OneShotUserStatsAccountSubscriber extends basicUserStatsAccountSubscriber_
         return true;
     }
     async fetchIfUnloaded() {
-        if (this.userStats.data === undefined) {
+        if (!this.userStats) {
             await this.fetch();
         }
     }
@@ -41,7 +45,7 @@ class OneShotUserStatsAccountSubscriber extends basicUserStatsAccountSubscriber_
             }
         }
         catch (e) {
-            console.error(`OneShotUserStatsAccountSubscriber.fetch() UserStatsAccount does not exist: ${e.message}`);
+            console.error(`OneShotUserStatsAccountSubscriber.fetch() UserStatsAccount does not exist: ${e instanceof Error ? e.message : String(e)}`);
         }
     }
 }

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

@@ -20,10 +20,12 @@ export declare class PollingInsuranceFundStakeAccountSubscriber implements Insur
     addToAccountLoader(): Promise<void>;
     fetchIfUnloaded(): Promise<void>;
     fetch(): Promise<void>;
-    doesAccountExist(): boolean;
+    doesAccountExist(): this is {
+        insuranceFundStakeAccountAndSlot: DataAndSlot<InsuranceFundStake>;
+    };
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;
-    getInsuranceFundStakeAccountAndSlot(): DataAndSlot<InsuranceFundStake>;
+    getInsuranceFundStakeAccountAndSlot(): DataAndSlot<InsuranceFundStake> | undefined;
     didSubscriptionSucceed(): boolean;
     updateData(insuranceFundStake: InsuranceFundStake, slot: number): void;
 }

package/lib/browser/accounts/pollingInsuranceFundStakeAccountSubscriber.js

@@ -18,7 +18,7 @@ class PollingInsuranceFundStakeAccountSubscriber {
         if (insuranceFundStake) {
             this.insuranceFundStakeAccountAndSlot = {
                 data: insuranceFundStake,
-                slot: undefined,
+                slot: 0,
             };
         }
         await this.addToAccountLoader();
@@ -50,7 +50,7 @@ class PollingInsuranceFundStakeAccountSubscriber {
         });
     }
     async fetchIfUnloaded() {
-        if (this.insuranceFundStakeAccountAndSlot === undefined) {
+        if (!this.doesAccountExist()) {
             await this.fetch();
         }
     }
@@ -67,7 +67,7 @@ class PollingInsuranceFundStakeAccountSubscriber {
             }
         }
         catch (e) {
-            console.log(`PollingInsuranceFundStakeAccountSubscriber.fetch() InsuranceFundStake does not exist: ${e.message}`);
+            console.log(`PollingInsuranceFundStakeAccountSubscriber.fetch() InsuranceFundStake does not exist: ${e instanceof Error ? e.message : String(e)}`);
         }
     }
     doesAccountExist() {

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

@@ -5,10 +5,8 @@ import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './bulkAccountLoader';
 import { OracleClient, OraclePriceData } from '../oracles/types';
-import { VelocityProgram } from '../config';
 export declare class PollingOracleAccountSubscriber implements OracleAccountSubscriber {
     isSubscribed: boolean;
-    program: VelocityProgram;
     eventEmitter: StrictEventEmitter<EventEmitter, OracleEvents>;
     publicKey: PublicKey;
     accountLoader: BulkAccountLoader;

package/lib/browser/accounts/pollingOracleAccountSubscriber.js

@@ -46,7 +46,14 @@ class PollingOracleAccountSubscriber {
     }
     async fetch() {
         await this.accountLoader.load();
-        const { buffer, slot } = this.accountLoader.getBufferAndSlot(this.publicKey);
+        const bufferAndSlot = this.accountLoader.getBufferAndSlot(this.publicKey);
+        if (!bufferAndSlot) {
+            return;
+        }
+        const { buffer, slot } = bufferAndSlot;
+        if (!buffer) {
+            return;
+        }
         this.oraclePriceData = {
             data: await this.oracleClient.getOraclePriceDataFromBuffer(buffer),
             slot,
@@ -56,10 +63,14 @@ class PollingOracleAccountSubscriber {
         if (!this.isSubscribed) {
             return;
         }
-        this.accountLoader.removeAccount(this.publicKey, this.callbackId);
-        this.callbackId = undefined;
-        this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
-        this.errorCallbackId = undefined;
+        if (this.callbackId) {
+            this.accountLoader.removeAccount(this.publicKey, this.callbackId);
+            this.callbackId = undefined;
+        }
+        if (this.errorCallbackId) {
+            this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
+            this.errorCallbackId = undefined;
+        }
         this.isSubscribed = false;
     }
     assertIsSubscribed() {

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

@@ -5,10 +5,8 @@ import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './bulkAccountLoader';
 import { Account } from '@solana/spl-token';
-import { VelocityProgram } from '../config';
 export declare class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
     isSubscribed: boolean;
-    program: VelocityProgram;
     eventEmitter: StrictEventEmitter<EventEmitter, TokenAccountEvents>;
     publicKey: PublicKey;
     accountLoader: BulkAccountLoader;

package/lib/browser/accounts/pollingTokenAccountSubscriber.js

@@ -46,7 +46,14 @@ class PollingTokenAccountSubscriber {
     }
     async fetch() {
         await this.accountLoader.load();
-        const { buffer, slot } = this.accountLoader.getBufferAndSlot(this.publicKey);
+        const bufferAndSlot = this.accountLoader.getBufferAndSlot(this.publicKey);
+        if (!bufferAndSlot) {
+            return;
+        }
+        const { buffer, slot } = bufferAndSlot;
+        if (!buffer) {
+            return;
+        }
         this.tokenAccountAndSlot = {
             data: (0, token_1.parseTokenAccount)(buffer, this.publicKey),
             slot,
@@ -56,10 +63,14 @@ class PollingTokenAccountSubscriber {
         if (!this.isSubscribed) {
             return;
         }
-        this.accountLoader.removeAccount(this.publicKey, this.callbackId);
-        this.callbackId = undefined;
-        this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
-        this.errorCallbackId = undefined;
+        if (this.callbackId) {
+            this.accountLoader.removeAccount(this.publicKey, this.callbackId);
+            this.callbackId = undefined;
+        }
+        if (this.errorCallbackId) {
+            this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
+            this.errorCallbackId = undefined;
+        }
         this.isSubscribed = false;
     }
     assertIsSubscribed() {

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

@@ -1,4 +1,6 @@
 /// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import { DataAndSlot, UserAccountEvents, UserAccountSubscriber } from './types';
 import { Connection } from '../bankrun/bankrunConnection';
 import StrictEventEmitter from 'strict-event-emitter-types';
@@ -14,16 +16,18 @@ export declare class PollingUserAccountSubscriber implements UserAccountSubscrib
     accountLoader: BulkAccountLoader;
     callbackId?: string;
     errorCallbackId?: string;
-    decode: (name: any, buffer: any) => UserAccount;
+    decode: (name: string, buffer: Buffer) => UserAccount;
     user?: DataAndSlot<UserAccount>;
-    constructor(connection: Connection, userAccountPublicKey: PublicKey, accountLoader: BulkAccountLoader, decode: (name: any, buffer: any) => UserAccount);
+    constructor(connection: Connection, userAccountPublicKey: PublicKey, accountLoader: BulkAccountLoader, decode: (name: string, buffer: Buffer) => UserAccount);
     subscribe(userAccount?: UserAccount): Promise<boolean>;
     addToAccountLoader(): Promise<void>;
     fetchIfUnloaded(): Promise<void>;
     fetch(): Promise<void>;
-    doesAccountExist(): boolean;
+    doesAccountExist(): this is {
+        user: DataAndSlot<UserAccount>;
+    };
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;
-    getUserAccountAndSlot(): DataAndSlot<UserAccount>;
+    getUserAccountAndSlot(): DataAndSlot<UserAccount> | undefined;
     updateData(userAccount: UserAccount, slot: number): void;
 }

package/lib/browser/accounts/pollingUserAccountSubscriber.js

@@ -17,7 +17,9 @@ class PollingUserAccountSubscriber {
             return true;
         }
         if (userAccount) {
-            this.user = { data: userAccount, slot: undefined };
+            // `slot: 0` keeps {data, slot} atomic: a seeded account always carries a
+            // slot (0 = oldest-possible sentinel, overwritten by the first real fetch).
+            this.user = { data: userAccount, slot: 0 };
         }
         await this.addToAccountLoader();
         await this.fetchIfUnloaded();
@@ -48,7 +50,7 @@ class PollingUserAccountSubscriber {
         });
     }
     async fetchIfUnloaded() {
-        if (this.user === undefined) {
+        if (!this.doesAccountExist()) {
             await this.fetch();
         }
     }
@@ -56,7 +58,8 @@ class PollingUserAccountSubscriber {
         var _a, _b;
         try {
             const dataAndContext = await this.connection.getAccountInfoAndContext(this.userAccountPublicKey, this.accountLoader.commitment);
-            if (dataAndContext.context.slot > ((_b = (_a = this.user) === null || _a === void 0 ? void 0 : _a.slot) !== null && _b !== void 0 ? _b : 0)) {
+            if (dataAndContext.value !== null &&
+                dataAndContext.context.slot > ((_b = (_a = this.user) === null || _a === void 0 ? void 0 : _a.slot) !== null && _b !== void 0 ? _b : 0)) {
                 this.user = {
                     data: this.decode('user', dataAndContext.value.data),
                     slot: dataAndContext.context.slot,
@@ -64,7 +67,8 @@ class PollingUserAccountSubscriber {
             }
         }
         catch (e) {
-            console.log(`PollingUserAccountSubscriber.fetch() UserAccount does not exist: ${e.message}-${e.stack}`);
+            const err = e instanceof Error ? e : new Error(String(e));
+            console.log(`PollingUserAccountSubscriber.fetch() UserAccount does not exist: ${err.message}-${err.stack}`);
         }
     }
     doesAccountExist() {
@@ -74,10 +78,14 @@ class PollingUserAccountSubscriber {
         if (!this.isSubscribed) {
             return;
         }
-        this.accountLoader.removeAccount(this.userAccountPublicKey, this.callbackId);
-        this.callbackId = undefined;
-        this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
-        this.errorCallbackId = undefined;
+        if (this.callbackId) {
+            this.accountLoader.removeAccount(this.userAccountPublicKey, this.callbackId);
+            this.callbackId = undefined;
+        }
+        if (this.errorCallbackId) {
+            this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
+            this.errorCallbackId = undefined;
+        }
         this.isSubscribed = false;
     }
     assertIsSubscribed() {
@@ -86,9 +94,7 @@ class PollingUserAccountSubscriber {
         }
     }
     getUserAccountAndSlot() {
-        if (!this.doesAccountExist()) {
-            throw new types_1.NotSubscribedError('You must call `subscribe` or `fetch` before using this function');
-        }
+        this.assertIsSubscribed();
         return this.user;
     }
     updateData(userAccount, slot) {

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

@@ -20,8 +20,10 @@ export declare class PollingUserStatsAccountSubscriber implements UserStatsAccou
     addToAccountLoader(): Promise<void>;
     fetchIfUnloaded(): Promise<void>;
     fetch(): Promise<void>;
-    doesAccountExist(): boolean;
+    doesAccountExist(): this is {
+        userStats: DataAndSlot<UserStatsAccount>;
+    };
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;
-    getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount>;
+    getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount> | undefined;
 }

package/lib/browser/accounts/pollingUserStatsAccountSubscriber.js

@@ -16,7 +16,9 @@ class PollingUserStatsAccountSubscriber {
             return true;
         }
         if (userStatsAccount) {
-            this.userStats = { data: userStatsAccount, slot: undefined };
+            // `slot: 0` keeps {data, slot} atomic: a seeded account always carries a
+            // slot (0 = oldest-possible sentinel, overwritten by the first real fetch).
+            this.userStats = { data: userStatsAccount, slot: 0 };
         }
         await this.addToAccountLoader();
         await this.fetchIfUnloaded();
@@ -47,7 +49,7 @@ class PollingUserStatsAccountSubscriber {
         });
     }
     async fetchIfUnloaded() {
-        if (this.userStats === undefined) {
+        if (!this.doesAccountExist()) {
             await this.fetch();
         }
     }
@@ -63,7 +65,7 @@ class PollingUserStatsAccountSubscriber {
             }
         }
         catch (e) {
-            console.log(`PollingUserStatsAccountSubscriber.fetch() UserStatsAccount does not exist: ${e.message}`);
+            console.log(`PollingUserStatsAccountSubscriber.fetch() UserStatsAccount does not exist: ${e instanceof Error ? e.message : String(e)}`);
         }
     }
     doesAccountExist() {
@@ -85,9 +87,7 @@ class PollingUserStatsAccountSubscriber {
         }
     }
     getUserStatsAccountAndSlot() {
-        if (!this.doesAccountExist()) {
-            throw new types_1.NotSubscribedError('You must call `subscribe` or `fetch` before using this function');
-        }
+        this.assertIsSubscribed();
         return this.userStats;
     }
 }

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

@@ -32,8 +32,8 @@ export declare class PollingVelocityClientAccountSubscriber implements VelocityC
     user?: DataAndSlot<UserAccount>;
     delistedMarketSetting: DelistedMarketSetting;
     private isSubscribing;
-    private subscriptionPromise;
     private subscriptionPromiseResolver;
+    private subscriptionPromise;
     constructor(program: VelocityProgram, accountLoader: BulkAccountLoader, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting);
     subscribe(): Promise<boolean>;
     updateAccountsToPoll(): Promise<void>;
@@ -44,6 +44,12 @@ export declare class PollingVelocityClientAccountSubscriber implements VelocityC
     updateOraclesToPoll(): boolean;
     addOracleToPoll(oracleInfo: OracleInfo): boolean;
     addToAccountLoader(): Promise<void>;
+    /**
+     * Routes a freshly-decoded account into the correct container based on
+     * its poll key. Replaces dynamic `this[key]` indexing with explicit,
+     * type-checked dispatch.
+     */
+    private storeDecodedAccount;
     addAccountToAccountLoader(accountToPoll: AccountToPoll): Promise<void>;
     addOracleToAccountLoader(oracleToPoll: OraclesToPoll): Promise<void>;
     fetch(): Promise<void>;

package/lib/browser/accounts/pollingVelocityClientAccountSubscriber.js

@@ -25,6 +25,10 @@ class PollingVelocityClientAccountSubscriber {
         this.spotOracleStringMap = new Map();
         this.oracles = new Map();
         this.isSubscribing = false;
+        this.subscriptionPromiseResolver = () => { };
+        this.subscriptionPromise = new Promise((res) => {
+            this.subscriptionPromiseResolver = res;
+        });
         this.isSubscribed = false;
         this.program = program;
         this.eventEmitter = new events_1.EventEmitter();
@@ -148,21 +152,39 @@ class PollingVelocityClientAccountSubscriber {
             this.eventEmitter.emit('error', error);
         });
     }
+    /**
+     * Routes a freshly-decoded account into the correct container based on
+     * its poll key. Replaces dynamic `this[key]` indexing with explicit,
+     * type-checked dispatch.
+     */
+    storeDecodedAccount(accountToPoll, account, slot) {
+        const dataAndSlot = { data: account, slot };
+        switch (accountToPoll.key) {
+            case 'perpMarket':
+                if (accountToPoll.mapKey !== undefined) {
+                    this.perpMarket.set(accountToPoll.mapKey, dataAndSlot);
+                }
+                break;
+            case 'spotMarket':
+                if (accountToPoll.mapKey !== undefined) {
+                    this.spotMarket.set(accountToPoll.mapKey, dataAndSlot);
+                }
+                break;
+            case 'state':
+                this.state = dataAndSlot;
+                break;
+            default: {
+                const _exhaustive = accountToPoll.key;
+                throw new Error(`Unhandled account poll key: ${String(_exhaustive)}`);
+            }
+        }
+    }
     async addAccountToAccountLoader(accountToPoll) {
         accountToPoll.callbackId = await this.accountLoader.addAccount(accountToPoll.publicKey, (buffer, slot) => {
             if (!buffer)
                 return;
             const account = this.program.coder.accounts.decodeUnchecked(accountToPoll.key, buffer);
-            const dataAndSlot = {
-                data: account,
-                slot,
-            };
-            if (accountToPoll.mapKey != undefined) {
-                this[accountToPoll.key].set(accountToPoll.mapKey, dataAndSlot);
-            }
-            else {
-                this[accountToPoll.key] = dataAndSlot;
-            }
+            this.storeDecodedAccount(accountToPoll, account, slot);
             // @ts-ignore
             this.eventEmitter.emit(accountToPoll.eventType, account);
             this.eventEmitter.emit('update');
@@ -177,6 +199,8 @@ class PollingVelocityClientAccountSubscriber {
         oracleToPoll.callbackId = await this.accountLoader.addAccount(oracleToPoll.publicKey, (buffer, slot) => {
             if (!buffer)
                 return;
+            if (!oracleClient)
+                return;
             const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(buffer);
             const dataAndSlot = {
                 data: oraclePriceData,
@@ -197,18 +221,7 @@ class PollingVelocityClientAccountSubscriber {
             const { buffer, slot } = bufferAndSlot;
             if (buffer) {
                 const account = this.program.coder.accounts.decodeUnchecked(accountToPoll.key, buffer);
-                if (accountToPoll.mapKey != undefined) {
-                    this[accountToPoll.key].set(accountToPoll.mapKey, {
-                        data: account,
-                        slot,
-                    });
-                }
-                else {
-                    this[accountToPoll.key] = {
-                        data: account,
-                        slot,
-                    };
-                }
+                this.storeDecodedAccount(accountToPoll, account, slot);
             }
         }
         for (const [_, oracleToPoll] of this.oraclesToPoll) {
@@ -219,6 +232,9 @@ class PollingVelocityClientAccountSubscriber {
             const { buffer, slot } = bufferAndSlot;
             if (buffer) {
                 const oracleClient = this.oracleClientCache.get(oracleToPoll.source, this.program.provider.connection, this.program);
+                if (!oracleClient) {
+                    continue;
+                }
                 const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(buffer);
                 this.oracles.set((0, oracleId_1.getOracleId)(oracleToPoll.publicKey, oracleToPoll.source), {
                     data: oraclePriceData,
@@ -252,6 +268,9 @@ class PollingVelocityClientAccountSubscriber {
         }
         await this.addSpotMarketAccountToPoll(marketIndex);
         const accountToPoll = this.accountsToPoll.get(marketPublicKey.toString());
+        if (!accountToPoll) {
+            return false;
+        }
         await this.addAccountToAccountLoader(accountToPoll);
         this.setSpotOracleMap();
         return true;
@@ -263,6 +282,9 @@ class PollingVelocityClientAccountSubscriber {
         }
         await this.addPerpMarketAccountToPoll(marketIndex);
         const accountToPoll = this.accountsToPoll.get(marketPublicKey.toString());
+        if (!accountToPoll) {
+            return false;
+        }
         await this.addAccountToAccountLoader(accountToPoll);
         await this.setPerpOracleMap();
         return true;
@@ -278,7 +300,9 @@ class PollingVelocityClientAccountSubscriber {
         if (!this.oraclesToPoll.has(oracleId)) {
             this.addOracleToPoll(oracleInfo);
             const oracleToPoll = this.oraclesToPoll.get(oracleId);
-            await this.addOracleToAccountLoader(oracleToPoll);
+            if (oracleToPoll) {
+                await this.addOracleToAccountLoader(oracleToPoll);
+            }
         }
         await this.pauseForOracleToBeAdded(3, oracleInfo.publicKey.toBase58());
         return true;
@@ -338,8 +362,16 @@ class PollingVelocityClientAccountSubscriber {
         }
         const { perpMarketIndexes, oracles } = (0, utils_1.findDelistedPerpMarketsAndOracles)(this.getMarketAccountsAndSlots(), this.getSpotMarketAccountsAndSlots());
         for (const perpMarketIndex of perpMarketIndexes) {
-            const perpMarketPubkey = this.perpMarket.get(perpMarketIndex).data.pubkey;
-            const callbackId = this.accountsToPoll.get(perpMarketPubkey.toBase58()).callbackId;
+            const perpMarketData = this.perpMarket.get(perpMarketIndex);
+            if (!perpMarketData) {
+                throw new Error(`PollingVelocityClientAccountSubscriber: delisted perp market ${perpMarketIndex} not found in perpMarket map`);
+            }
+            const perpMarketPubkey = perpMarketData.data.pubkey;
+            const accountToPoll = this.accountsToPoll.get(perpMarketPubkey.toBase58());
+            if (!accountToPoll) {
+                throw new Error(`PollingVelocityClientAccountSubscriber: delisted perp market ${perpMarketIndex} not found in accountsToPoll map`);
+            }
+            const callbackId = accountToPoll.callbackId;
             this.accountLoader.removeAccount(perpMarketPubkey, callbackId);
             if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Discard) {
                 this.perpMarket.delete(perpMarketIndex);
@@ -347,7 +379,11 @@ class PollingVelocityClientAccountSubscriber {
         }
         for (const oracle of oracles) {
             const oracleId = (0, oracleId_1.getOracleId)(oracle.publicKey, oracle.source);
-            const callbackId = this.oraclesToPoll.get(oracleId).callbackId;
+            const oracleToPoll = this.oraclesToPoll.get(oracleId);
+            if (!oracleToPoll) {
+                throw new Error(`PollingVelocityClientAccountSubscriber: delisted oracle ${oracleId} not found in oraclesToPoll map`);
+            }
+            const callbackId = oracleToPoll.callbackId;
             this.accountLoader.removeAccount(oracle.publicKey, callbackId);
             if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Discard) {
                 this.oracles.delete(oracleId);
@@ -389,7 +425,7 @@ class PollingVelocityClientAccountSubscriber {
         const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
         const oracle = this.perpOracleMap.get(marketIndex);
         const oracleId = this.perpOracleStringMap.get(marketIndex);
-        if (!perpMarketAccount || !oracle) {
+        if (!perpMarketAccount || !oracle || !oracleId) {
             return undefined;
         }
         if (!perpMarketAccount.data.oracle.equals(oracle)) {
@@ -402,7 +438,7 @@ class PollingVelocityClientAccountSubscriber {
         const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
         const oracle = this.spotOracleMap.get(marketIndex);
         const oracleId = this.spotOracleStringMap.get(marketIndex);
-        if (!spotMarketAccount || !oracle) {
+        if (!spotMarketAccount || !oracle || !oracleId) {
             return undefined;
         }
         if (!spotMarketAccount.data.oracle.equals(oracle)) {

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

@@ -85,7 +85,7 @@ export interface UserAccountSubscriber {
     fetch(): Promise<void>;
     updateData(userAccount: UserAccount, slot: number): void;
     unsubscribe(): Promise<void>;
-    getUserAccountAndSlot(): DataAndSlot<UserAccount>;
+    getUserAccountAndSlot(): DataAndSlot<UserAccount> | undefined;
 }
 export interface TokenAccountEvents {
     tokenAccountUpdate: (payload: Account) => void;
@@ -106,7 +106,7 @@ export interface InsuranceFundStakeAccountSubscriber {
     subscribe(): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
-    getInsuranceFundStakeAccountAndSlot(): DataAndSlot<InsuranceFundStake>;
+    getInsuranceFundStakeAccountAndSlot(): DataAndSlot<InsuranceFundStake> | undefined;
 }
 export interface InsuranceFundStakeAccountEvents {
     insuranceFundStakeAccountUpdate: (payload: InsuranceFundStake) => void;
@@ -127,7 +127,7 @@ export interface OracleAccountSubscriber {
     getOraclePriceData(): DataAndSlot<OraclePriceData>;
 }
 export type AccountToPoll = {
-    key: string;
+    key: 'state' | 'perpMarket' | 'spotMarket';
     publicKey: PublicKey;
     eventType: string;
     callbackId?: string;
@@ -163,7 +163,7 @@ export interface UserStatsAccountSubscriber {
     subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
-    getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount>;
+    getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount> | undefined;
 }
 type BaseGrpcConfigs = {
     endpoint: string;

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

@@ -2,6 +2,7 @@ import { DataAndSlot } from './types';
 import { PerpMarketAccount, SpotMarketAccount } from '../types';
 import { OracleInfo } from '../oracles/types';
 export declare function capitalize(value: string): string;
+export declare function assertDataAndSlot<T>(dataAndSlot: DataAndSlot<T> | undefined, message: string): DataAndSlot<T>;
 export declare function findDelistedPerpMarketsAndOracles(perpMarkets: DataAndSlot<PerpMarketAccount>[], spotMarkets: DataAndSlot<SpotMarketAccount>[]): {
     perpMarketIndexes: number[];
     oracles: OracleInfo[];

package/lib/browser/accounts/utils.js

@@ -1,12 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findDelistedPerpMarketsAndOracles = exports.capitalize = void 0;
+exports.findDelistedPerpMarketsAndOracles = exports.assertDataAndSlot = exports.capitalize = void 0;
 const types_1 = require("../types");
 const oracleId_1 = require("../oracles/oracleId");
 function capitalize(value) {
     return value[0].toUpperCase() + value.slice(1);
 }
 exports.capitalize = capitalize;
+function assertDataAndSlot(dataAndSlot, message) {
+    if (!dataAndSlot) {
+        throw new Error(message);
+    }
+    return dataAndSlot;
+}
+exports.assertDataAndSlot = assertDataAndSlot;
 function findDelistedPerpMarketsAndOracles(perpMarkets, spotMarkets) {
     const delistedPerpMarketIndexes = [];
     const delistedOracles = [];

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

@@ -10,8 +10,10 @@ export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<
     logAccountName: string;
     program: VelocityProgram;
     accountPublicKey: PublicKey;
-    decodeBufferFn: (buffer: Buffer) => T;
-    onChange: (data: T) => void;
+    decodeBufferFn?: (buffer: Buffer) => T;
+    private _onChange?;
+    get onChange(): (data: T) => void;
+    set onChange(onChange: (data: T) => void);
     listenerId?: number;
     resubOpts?: ResubOpts;
     commitment?: Commitment;