@velocity-exchange/sdk 0.1.0 → 0.2.0

package/lib/browser/accounts/grpcVelocityClientAccountSubscriberV2.js

@@ -21,6 +21,8 @@ class grpcVelocityClientAccountSubscriberV2 {
         this.spotOracleStringMap = new Map();
         this.oracleIdToOracleDataMap = new Map();
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
+        this.subscriptionPromiseResolver = () => { };
+        this.subscriptionPromise = Promise.resolve(false);
         this.chunks = (array, size) => {
             return new Array(Math.ceil(array.length / size))
                 .fill(null)
@@ -75,11 +77,15 @@ class grpcVelocityClientAccountSubscriberV2 {
         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,
@@ -187,11 +193,19 @@ class grpcVelocityClientAccountSubscriberV2 {
     }
     getMarketAccountAndSlot(marketIndex) {
         var _a;
-        return (_a = this.perpMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountData(this.perpMarketIndexToAccountPubkeyMap.get(marketIndex));
+        const accountPubkey = this.perpMarketIndexToAccountPubkeyMap.get(marketIndex);
+        if (!accountPubkey) {
+            return undefined;
+        }
+        return (_a = this.perpMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountData(accountPubkey);
     }
     getSpotMarketAccountAndSlot(marketIndex) {
         var _a;
-        return (_a = this.spotMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountData(this.spotMarketIndexToAccountPubkeyMap.get(marketIndex));
+        const accountPubkey = this.spotMarketIndexToAccountPubkeyMap.get(marketIndex);
+        if (!accountPubkey) {
+            return undefined;
+        }
+        return (_a = this.spotMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountData(accountPubkey);
     }
     getOraclePriceDataAndSlot(oracleId) {
         this.assertIsSubscribed();
@@ -206,8 +220,8 @@ class grpcVelocityClientAccountSubscriberV2 {
         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);
@@ -219,16 +233,16 @@ class grpcVelocityClientAccountSubscriberV2 {
         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);
     }
     async setPerpOracleMap() {
-        var _a, _c;
+        var _a, _c, _d;
         const perpMarketsMap = (_a = this.perpMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountDataMap();
-        const perpMarkets = Array.from(perpMarketsMap.values());
+        const perpMarkets = Array.from((_c = perpMarketsMap === null || perpMarketsMap === void 0 ? void 0 : perpMarketsMap.values()) !== null && _c !== void 0 ? _c : []);
         const addOraclePromises = [];
         for (const perpMarket of perpMarkets) {
             if (!perpMarket || !perpMarket.data) {
@@ -238,7 +252,7 @@ class grpcVelocityClientAccountSubscriberV2 {
             const perpMarketIndex = perpMarketAccount.marketIndex;
             const oracle = perpMarketAccount.oracle;
             const oracleId = (0, oracleId_1.getOracleId)(oracle, perpMarket.data.oracleSource);
-            if (!((_c = this.oracleMultiSubscriber) === null || _c === void 0 ? void 0 : _c.getAccountDataMap().has(oracleId))) {
+            if (!((_d = this.oracleMultiSubscriber) === null || _d === void 0 ? void 0 : _d.getAccountDataMap().has(oracleId))) {
                 addOraclePromises.push(this.addOracle({
                     publicKey: oracle,
                     source: perpMarket.data.oracleSource,
@@ -250,9 +264,9 @@ class grpcVelocityClientAccountSubscriberV2 {
         await Promise.all(addOraclePromises);
     }
     async setSpotOracleMap() {
-        var _a, _c;
+        var _a, _c, _d;
         const spotMarketsMap = (_a = this.spotMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountDataMap();
-        const spotMarkets = Array.from(spotMarketsMap.values());
+        const spotMarkets = Array.from((_c = spotMarketsMap === null || spotMarketsMap === void 0 ? void 0 : spotMarketsMap.values()) !== null && _c !== void 0 ? _c : []);
         const addOraclePromises = [];
         for (const spotMarket of spotMarkets) {
             if (!spotMarket || !spotMarket.data) {
@@ -262,7 +276,7 @@ class grpcVelocityClientAccountSubscriberV2 {
             const spotMarketIndex = spotMarketAccount.marketIndex;
             const oracle = spotMarketAccount.oracle;
             const oracleId = (0, oracleId_1.getOracleId)(oracle, spotMarketAccount.oracleSource);
-            if (!((_c = this.oracleMultiSubscriber) === null || _c === void 0 ? void 0 : _c.getAccountDataMap().has(oracleId))) {
+            if (!((_d = this.oracleMultiSubscriber) === null || _d === void 0 ? void 0 : _d.getAccountDataMap().has(oracleId))) {
                 addOraclePromises.push(this.addOracle({
                     publicKey: oracle,
                     source: spotMarketAccount.oracleSource,
@@ -361,7 +375,13 @@ class grpcVelocityClientAccountSubscriberV2 {
             if (!pubkey) {
                 throw new Error('Oracle pubkey missing in decode');
             }
+            if (!accountProps) {
+                throw new Error('Oracle accountProps missing in decode');
+            }
             const client = this.oracleClientCache.get(accountProps.source, this.program.provider.connection, this.program);
+            if (!client) {
+                throw new Error('Oracle client missing in decode');
+            }
             const price = client.getOraclePriceDataFromBuffer(buffer);
             return price;
         }, this.resubOpts, undefined, async () => {
@@ -385,6 +405,9 @@ class grpcVelocityClientAccountSubscriberV2 {
             });
         }
         await this.oracleMultiSubscriber.subscribe(oraclePubkeys, (accountId, data, context, _b, accountProps) => {
+            if (accountProps === undefined) {
+                return;
+            }
             const oracleId = (0, oracleId_1.getOracleId)(accountId, accountProps.source);
             this.oracleIdToOracleDataMap.set(oracleId, {
                 data,
@@ -396,7 +419,7 @@ class grpcVelocityClientAccountSubscriberV2 {
         return true;
     }
     async handleDelistedMarkets() {
-        var _a, _c;
+        var _a, _c, _d, _e;
         if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Subscribe) {
             return;
         }
@@ -412,11 +435,11 @@ class grpcVelocityClientAccountSubscriberV2 {
         const oraclePubkeysToRemove = oracles.map((oracle) => oracle.publicKey);
         // Remove accounts in batches - perp markets
         if (perpMarketPubkeysToRemove.length > 0) {
-            await this.perpMarketsSubscriber.removeAccounts(perpMarketPubkeysToRemove);
+            await ((_d = this.perpMarketsSubscriber) === null || _d === void 0 ? void 0 : _d.removeAccounts(perpMarketPubkeysToRemove));
         }
         // Remove accounts in batches - oracles
         if (oraclePubkeysToRemove.length > 0) {
-            await this.oracleMultiSubscriber.removeAccounts(oraclePubkeysToRemove);
+            await ((_e = this.oracleMultiSubscriber) === null || _e === void 0 ? void 0 : _e.removeAccounts(oraclePubkeysToRemove));
         }
     }
     removeInitialData() {

package/lib/browser/accounts/laserProgramAccountSubscriber.js

@@ -94,6 +94,9 @@ class LaserstreamProgramAccountSubscriber extends webSocketProgramAccountSubscri
                 if (update.account) {
                     const slot = Number(update.account.slot);
                     const acc = update.account.account;
+                    if (!acc) {
+                        return;
+                    }
                     const accountInfo = {
                         owner: new web3_js_1.PublicKey(acc.owner),
                         lamports: Number(acc.lamports),

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