@velocity-exchange/sdk 0.1.0 → 0.2.0

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[][];

package/lib/browser/accounts/webSocketVelocityClientAccountSubscriber.js

@@ -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();
@@ -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.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,8 +416,8 @@ 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);

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);

package/lib/browser/accounts/webSocketVelocityClientAccountSubscriberV2.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketVelocityClientAccountSubscriberV2 = void 0;
 const types_1 = require("./types");
+const utils_1 = require("./utils");
 const types_2 = require("../types");
 const events_1 = require("events");
 const pda_1 = require("../addresses/pda");
@@ -10,7 +11,7 @@ const gill_1 = require("gill");
 const oracleClientCache_1 = require("../oracles/oracleClientCache");
 const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
 const config_1 = require("../config");
-const utils_1 = require("./utils");
+const utils_2 = require("./utils");
 const oracleId_1 = require("../oracles/oracleId");
 const types_3 = require("../types");
 const memcmp_1 = require("../memcmp");
@@ -18,6 +19,24 @@ const webSocketProgramAccountsSubscriberV2_1 = require("./webSocketProgramAccoun
 const webSocketAccountSubscriberV2_1 = require("./webSocketAccountSubscriberV2");
 const ORACLE_DEFAULT_ID = (0, oracleId_1.getOracleId)(web3_js_1.PublicKey.default, types_3.OracleSource.QUOTE_ASSET);
 class WebSocketVelocityClientAccountSubscriberV2 {
+    get perpMarketAllAccountsSubscriber() {
+        if (!this._perpMarketAllAccountsSubscriber) {
+            throw new Error('perpMarketAllAccountsSubscriber accessed before subscribe()');
+        }
+        return this._perpMarketAllAccountsSubscriber;
+    }
+    set perpMarketAllAccountsSubscriber(subscriber) {
+        this._perpMarketAllAccountsSubscriber = subscriber;
+    }
+    get spotMarketAllAccountsSubscriber() {
+        if (!this._spotMarketAllAccountsSubscriber) {
+            throw new Error('spotMarketAllAccountsSubscriber accessed before subscribe()');
+        }
+        return this._spotMarketAllAccountsSubscriber;
+    }
+    set spotMarketAllAccountsSubscriber(subscriber) {
+        this._spotMarketAllAccountsSubscriber = subscriber;
+    }
     constructor(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, delistedMarketSetting, resubOpts, commitment, skipInitialData) {
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
         this.skipInitialData = true;
@@ -28,7 +47,12 @@ class WebSocketVelocityClientAccountSubscriberV2 {
         this.spotOracleMap = new Map();
         this.spotOracleStringMap = new Map();
         this.oracleSubscribers = new Map();
+        this.initialPerpMarketAccountData = new Map();
+        this.initialSpotMarketAccountData = new Map();
+        this.initialOraclePriceData = new Map();
         this.isSubscribing = false;
+        this.subscriptionPromiseResolver = () => { };
+        this.subscriptionPromise = Promise.resolve(false);
         this.chunks = (array, size) => {
             const result = [];
             for (let i = 0; i < array.length; i += size) {
@@ -177,9 +201,7 @@ class WebSocketVelocityClientAccountSubscriberV2 {
             this.isSubscribed = true;
             this.isSubscribing = false;
             // Before calling subscriptionPromiseResolver, check if it's defined
-            if (this.subscriptionPromiseResolver) {
-                this.subscriptionPromiseResolver(true);
-            }
+            this.subscriptionPromiseResolver(true);
             return true;
         }
         catch (error) {
@@ -223,11 +245,15 @@ class WebSocketVelocityClientAccountSubscriberV2 {
         const oracleAccountPubkeyChunks = this.chunks(this.oracleInfos.map((oracleInfo) => oracleInfo.publicKey), 100);
         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,
@@ -265,6 +291,9 @@ class WebSocketVelocityClientAccountSubscriberV2 {
         try {
             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 accountSubscriber = new webSocketAccountSubscriberV2_1.WebSocketAccountSubscriberV2('oracle', this.program, oracleInfo.publicKey, (buffer) => {
                 return client.getOraclePriceDataFromBuffer(buffer);
             }, this.resubOpts, this.commitment, this.rpcSubscriptions, this.rpc);
@@ -369,11 +398,12 @@ class WebSocketVelocityClientAccountSubscriberV2 {
         if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Subscribe) {
             return;
         }
-        const { oracles } = (0, utils_1.findDelistedPerpMarketsAndOracles)(this.getMarketAccountsAndSlots(), this.getSpotMarketAccountsAndSlots());
+        const { oracles } = (0, utils_2.findDelistedPerpMarketsAndOracles)(this.getMarketAccountsAndSlots(), this.getSpotMarketAccountsAndSlots());
         for (const oracle of oracles) {
             const oracleId = (0, oracleId_1.getOracleId)(oracle.publicKey, oracle.source);
-            if (this.oracleSubscribers.has(oracleId)) {
-                await this.oracleSubscribers.get(oracleId).unsubscribe();
+            const subscriber = this.oracleSubscribers.get(oracleId);
+            if (subscriber) {
+                await subscriber.unsubscribe();
                 if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Discard) {
                     this.oracleSubscribers.delete(oracleId);
                 }
@@ -386,8 +416,9 @@ class WebSocketVelocityClientAccountSubscriberV2 {
         }
     }
     getStateAccountAndSlot() {
+        var _a;
         this.assertIsSubscribed();
-        return this.stateAccountSubscriber.dataAndSlot;
+        return (0, utils_1.assertDataAndSlot)((_a = this.stateAccountSubscriber) === null || _a === void 0 ? void 0 : _a.dataAndSlot, 'State account data not available');
     }
     getMarketAccountAndSlot(marketIndex) {
         this.assertIsSubscribed();
@@ -421,8 +452,8 @@ class WebSocketVelocityClientAccountSubscriberV2 {
         if (!perpMarketAccount || !oracleId) {
             return undefined;
         }
-        if (!perpMarketAccount.data.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);
@@ -434,8 +465,8 @@ class WebSocketVelocityClientAccountSubscriberV2 {
         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);

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

@@ -18,5 +18,5 @@ export declare class WebSocketProgramUserAccountSubscriber implements UserAccoun
     fetch(): Promise<void>;
     updateData(userAccount: UserAccount, slot: number): void;
     unsubscribe(): Promise<void>;
-    getUserAccountAndSlot(): DataAndSlot<UserAccount>;
+    getUserAccountAndSlot(): DataAndSlot<UserAccount> | undefined;
 }

package/lib/browser/accounts/websocketProgramUserAccountSubscriber.js

@@ -45,9 +45,6 @@ class WebSocketProgramUserAccountSubscriber {
         this.isSubscribed = false;
     }
     getUserAccountAndSlot() {
-        if (!this.userAccountAndSlot) {
-            throw new types_1.NotSubscribedError('Must subscribe before getting user account data');
-        }
         return this.userAccountAndSlot;
     }
 }

package/lib/browser/addresses/marketAddresses.js

@@ -5,8 +5,9 @@ const pda_1 = require("./pda");
 const CACHE = new Map();
 async function getMarketAddress(programId, marketIndex) {
     const cacheKey = `${programId.toString()}-${marketIndex.toString()}`;
-    if (CACHE.has(cacheKey)) {
-        return CACHE.get(cacheKey);
+    const cached = CACHE.get(cacheKey);
+    if (cached !== undefined) {
+        return cached;
     }
     const publicKey = await (0, pda_1.getPerpMarketPublicKey)(programId, marketIndex);
     CACHE.set(cacheKey, publicKey);

package/lib/browser/addresses/pda.d.ts

@@ -23,11 +23,9 @@ export declare function getInsuranceFundVaultPublicKey(programId: PublicKey, mar
 export declare function getInsuranceFundStakeAccountPublicKey(programId: PublicKey, authority: PublicKey, marketIndex: number): PublicKey;
 export declare function getVelocitySignerPublicKey(programId: PublicKey): PublicKey;
 export declare function getReferrerNamePublicKeySync(programId: PublicKey, nameBuffer: number[]): PublicKey;
-export declare function getProtocolIfSharesTransferConfigPublicKey(programId: PublicKey): PublicKey;
 export declare function getPrelaunchOraclePublicKey(programId: PublicKey, marketIndex: number): PublicKey;
 export declare function getPythLazerOraclePublicKey(progarmId: PublicKey, feedId: number): PublicKey;
 export declare function getTokenProgramForSpotMarket(spotMarketAccount: SpotMarketAccount): PublicKey;
-export declare function getIfRebalanceConfigPublicKey(programId: PublicKey, inMarketIndex: number, outMarketIndex: number): PublicKey;
 export declare function getRevenueShareAccountPublicKey(programId: PublicKey, authority: PublicKey): PublicKey;
 export declare function getRevenueShareEscrowAccountPublicKey(programId: PublicKey, authority: PublicKey): PublicKey;
 export declare function getLpPoolPublicKey(programId: PublicKey, lpPoolId: number): PublicKey;

package/lib/browser/addresses/pda.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLpPoolTokenTokenAccountPublicKey = exports.getConstituentCorrelationsPublicKey = exports.getAmmCachePublicKey = exports.getConstituentVaultPublicKey = exports.getConstituentPublicKey = exports.getConstituentTargetBasePublicKey = exports.getAmmConstituentMappingPublicKey = exports.getLpPoolTokenVaultPublicKey = exports.getLpPoolPublicKey = exports.getRevenueShareEscrowAccountPublicKey = exports.getRevenueShareAccountPublicKey = exports.getIfRebalanceConfigPublicKey = exports.getTokenProgramForSpotMarket = exports.getPythLazerOraclePublicKey = exports.getPrelaunchOraclePublicKey = exports.getProtocolIfSharesTransferConfigPublicKey = exports.getReferrerNamePublicKeySync = exports.getVelocitySignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKeySync = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKeySync = exports.getPerpMarketPublicKey = exports.getSignedMsgWsDelegatesAccountPublicKey = exports.getSignedMsgUserAccountPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getVelocityStateAccountPublicKey = exports.getVelocityStateAccountPublicKeyAndNonce = void 0;
+exports.getLpPoolTokenTokenAccountPublicKey = exports.getConstituentCorrelationsPublicKey = exports.getAmmCachePublicKey = exports.getConstituentVaultPublicKey = exports.getConstituentPublicKey = exports.getConstituentTargetBasePublicKey = exports.getAmmConstituentMappingPublicKey = exports.getLpPoolTokenVaultPublicKey = exports.getLpPoolPublicKey = exports.getRevenueShareEscrowAccountPublicKey = exports.getRevenueShareAccountPublicKey = exports.getTokenProgramForSpotMarket = exports.getPythLazerOraclePublicKey = exports.getPrelaunchOraclePublicKey = exports.getReferrerNamePublicKeySync = exports.getVelocitySignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKeySync = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKeySync = exports.getPerpMarketPublicKey = exports.getSignedMsgWsDelegatesAccountPublicKey = exports.getSignedMsgUserAccountPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getVelocityStateAccountPublicKey = exports.getVelocityStateAccountPublicKeyAndNonce = void 0;
 /**
  * PDA derivation helpers for all Velocity protocol accounts.
  * Covers: User, UserStats, PerpMarket, SpotMarket, InsuranceFundStake,
@@ -32,7 +32,6 @@ exports.getLpPoolTokenTokenAccountPublicKey = exports.getConstituentCorrelations
  */
 const web3_js_1 = require("@solana/web3.js");
 const anchor = __importStar(require("../isomorphic/anchor"));
-const anchor_1 = require("../isomorphic/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const types_1 = require("../types");
 async function getVelocityStateAccountPublicKeyAndNonce(programId) {
@@ -145,10 +144,6 @@ function getReferrerNamePublicKeySync(programId, nameBuffer) {
     ], programId)[0];
 }
 exports.getReferrerNamePublicKeySync = getReferrerNamePublicKeySync;
-function getProtocolIfSharesTransferConfigPublicKey(programId) {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from(anchor.utils.bytes.utf8.encode('if_shares_transfer_config'))], programId)[0];
-}
-exports.getProtocolIfSharesTransferConfigPublicKey = getProtocolIfSharesTransferConfigPublicKey;
 function getPrelaunchOraclePublicKey(programId, marketIndex) {
     return web3_js_1.PublicKey.findProgramAddressSync([
         Buffer.from(anchor.utils.bytes.utf8.encode('prelaunch_oracle')),
@@ -174,14 +169,6 @@ function getTokenProgramForSpotMarket(spotMarketAccount) {
     return spl_token_1.TOKEN_PROGRAM_ID;
 }
 exports.getTokenProgramForSpotMarket = getTokenProgramForSpotMarket;
-function getIfRebalanceConfigPublicKey(programId, inMarketIndex, outMarketIndex) {
-    return web3_js_1.PublicKey.findProgramAddressSync([
-        Buffer.from(anchor.utils.bytes.utf8.encode('if_rebalance_config')),
-        new anchor_1.BN(inMarketIndex).toArrayLike(Buffer, 'le', 2),
-        new anchor_1.BN(outMarketIndex).toArrayLike(Buffer, 'le', 2),
-    ], programId)[0];
-}
-exports.getIfRebalanceConfigPublicKey = getIfRebalanceConfigPublicKey;
 function getRevenueShareAccountPublicKey(programId, authority) {
     return web3_js_1.PublicKey.findProgramAddressSync([
         Buffer.from(anchor.utils.bytes.utf8.encode('REV_SHARE')),