@velocity-exchange/sdk 0.0.5 → 0.2.0

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>;
@@ -67,7 +73,3 @@ export declare class PollingVelocityClientAccountSubscriber implements VelocityC
     getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     updateAccountLoaderPollingFrequency(pollingFrequency: number): void;
 }
-/** @deprecated Use `PollingVelocityClientAccountSubscriber` instead. `PollingDriftClientAccountSubscriber` will be removed in a future major. */
-export declare const PollingDriftClientAccountSubscriber: typeof PollingVelocityClientAccountSubscriber;
-/** @deprecated Use `PollingVelocityClientAccountSubscriber` instead. `PollingDriftClientAccountSubscriber` will be removed in a future major. */
-export type PollingDriftClientAccountSubscriber = PollingVelocityClientAccountSubscriber;

package/lib/browser/accounts/pollingVelocityClientAccountSubscriber.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PollingDriftClientAccountSubscriber = exports.PollingVelocityClientAccountSubscriber = void 0;
+exports.PollingVelocityClientAccountSubscriber = void 0;
 const types_1 = require("./types");
 const events_1 = require("events");
 const types_2 = require("../types");
@@ -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;
@@ -300,12 +324,12 @@ class PollingVelocityClientAccountSubscriber {
         for (const perpMarket of perpMarkets) {
             const perpMarketAccount = perpMarket.data;
             const perpMarketIndex = perpMarketAccount.marketIndex;
-            const oracle = perpMarketAccount.amm.oracle;
-            const oracleId = (0, oracleId_1.getOracleId)(oracle, perpMarketAccount.amm.oracleSource);
+            const oracle = perpMarketAccount.oracle;
+            const oracleId = (0, oracleId_1.getOracleId)(oracle, perpMarketAccount.oracleSource);
             if (!this.oracles.has(oracleId)) {
                 oraclePromises.push(this.addOracle({
                     publicKey: oracle,
-                    source: perpMarketAccount.amm.oracleSource,
+                    source: perpMarketAccount.oracleSource,
                 }));
             }
             this.perpOracleMap.set(perpMarketIndex, oracle);
@@ -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,10 +425,10 @@ 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.amm.oracle.equals(oracle)) {
+        if (!perpMarketAccount.data.oracle.equals(oracle)) {
             // If the oracle has changed, we need to update the oracle map in background
             this.setPerpOracleMap();
         }
@@ -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)) {
@@ -416,5 +452,3 @@ class PollingVelocityClientAccountSubscriber {
     }
 }
 exports.PollingVelocityClientAccountSubscriber = PollingVelocityClientAccountSubscriber;
-/** @deprecated Use `PollingVelocityClientAccountSubscriber` instead. `PollingDriftClientAccountSubscriber` will be removed in a future major. */
-exports.PollingDriftClientAccountSubscriber = PollingVelocityClientAccountSubscriber;

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

@@ -8,8 +8,8 @@
  * market, oracle, and state accounts cached in memory. `User` uses a `UserAccountSubscriber`
  * for the individual User account. All subscribers implement the interfaces defined here.
  *
- * Implementations: `webSocketDriftClientAccountSubscriber.ts` (default),
- * `pollingDriftClientAccountSubscriber.ts`, `bulkAccountLoader.ts` (batched RPC).
+ * Implementations: `webSocketVelocityClientAccountSubscriber.ts` (default),
+ * `pollingVelocityClientAccountSubscriber.ts`, `bulkAccountLoader.ts` (batched RPC).
  */
 import { SpotMarketAccount, PerpMarketAccount, OracleSource, StateAccount, UserAccount, UserStatsAccount, InsuranceFundStake, ConstituentAccount } from '../types';
 import StrictEventEmitter from 'strict-event-emitter-types';
@@ -42,9 +42,6 @@ export interface VelocityClientAccountEvents {
     update: void;
     error: (e: Error) => void;
 }
-/** @deprecated Use `VelocityClientAccountEvents` instead. `DriftClientAccountEvents` will be removed in a future major. */
-export interface DriftClientAccountEvents extends VelocityClientAccountEvents {
-}
 export interface VelocityClientAccountSubscriber {
     eventEmitter: StrictEventEmitter<EventEmitter, VelocityClientAccountEvents>;
     isSubscribed: boolean;
@@ -66,9 +63,6 @@ export interface VelocityClientAccountSubscriber {
     getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     updateAccountLoaderPollingFrequency?: (pollingFrequency: number) => void;
 }
-/** @deprecated Use `VelocityClientAccountSubscriber` instead. `DriftClientAccountSubscriber` will be removed in a future major. */
-export interface DriftClientAccountSubscriber extends VelocityClientAccountSubscriber {
-}
 export declare enum DelistedMarketSetting {
     Unsubscribe = 0,
     Subscribe = 1,
@@ -91,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;
@@ -112,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;
@@ -133,7 +127,7 @@ export interface OracleAccountSubscriber {
     getOraclePriceData(): DataAndSlot<OraclePriceData>;
 }
 export type AccountToPoll = {
-    key: string;
+    key: 'state' | 'perpMarket' | 'spotMarket';
     publicKey: PublicKey;
     eventType: string;
     callbackId?: string;
@@ -169,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 = [];
@@ -17,8 +24,8 @@ function findDelistedPerpMarketsAndOracles(perpMarkets, spotMarkets) {
         if ((0, types_1.isVariant)(perpMarket.data.status, 'delisted')) {
             delistedPerpMarketIndexes.push(perpMarket.data.marketIndex);
             delistedOracles.push({
-                publicKey: perpMarket.data.amm.oracle,
-                source: perpMarket.data.amm.oracleSource,
+                publicKey: perpMarket.data.oracle,
+                source: perpMarket.data.oracleSource,
             });
         }
     }

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;

package/lib/browser/accounts/webSocketAccountSubscriber.js

@@ -2,6 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketAccountSubscriber = void 0;
 class WebSocketAccountSubscriber {
+    get onChange() {
+        if (!this._onChange) {
+            throw new Error('onChange callback function must be set');
+        }
+        return this._onChange;
+    }
+    set onChange(onChange) {
+        this._onChange = onChange;
+    }
     constructor(accountName, program, accountPublicKey, decodeBuffer, resubOpts, commitment) {
         var _a;
         this.isUnsubscribing = false;
@@ -11,7 +20,8 @@ class WebSocketAccountSubscriber {
         this.accountPublicKey = accountPublicKey;
         this.decodeBufferFn = decodeBuffer;
         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.logAccountName}`);
         }
         this.receivingData = false;
@@ -54,12 +64,12 @@ class WebSocketAccountSubscriber {
         }
         this.dataAndSlot = {
             data,
-            slot,
+            slot: newSlot,
         };
     }
     setTimeout() {
         var _a;
-        if (!this.onChange) {
+        if (!this._onChange) {
             throw new Error('onChange callback function must be set');
         }
         this.timeoutId = setTimeout(async () => {
@@ -90,8 +100,9 @@ class WebSocketAccountSubscriber {
         }, (_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs);
     }
     async fetch() {
+        var _a;
         const rpcResponse = await this.program.provider.connection.getAccountInfoAndContext(this.accountPublicKey, this.program.provider.opts.commitment);
-        this.handleRpcResponse(rpcResponse.context, rpcResponse === null || rpcResponse === void 0 ? void 0 : rpcResponse.value);
+        this.handleRpcResponse(rpcResponse.context, (_a = rpcResponse === null || rpcResponse === void 0 ? void 0 : rpcResponse.value) !== null && _a !== void 0 ? _a : undefined);
     }
     handleRpcResponse(context, accountInfo) {
         const newSlot = context.slot;
@@ -136,7 +147,7 @@ class WebSocketAccountSubscriber {
             return this.decodeBufferFn(buffer);
         }
         else {
-            return this.program.account[this.accountName].coder.accounts.decode(this.accountName, buffer);
+            return this.program.coder.accounts.decode(this.accountName, buffer);
         }
     }
     unsubscribe(onResub = false) {
@@ -164,6 +175,7 @@ class WebSocketAccountSubscriber {
         }
         else {
             this.isUnsubscribing = false;
+            return Promise.resolve();
         }
     }
 }

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

@@ -59,8 +59,10 @@ export declare class WebSocketAccountSubscriberV2<T> implements AccountSubscribe
     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;

package/lib/browser/accounts/webSocketAccountSubscriberV2.js

@@ -56,6 +56,15 @@ const bs58_1 = __importDefault(require("bs58"));
  *   program provider’s RPC endpoint. Handles base58/base64 encoded data.
  */
 class WebSocketAccountSubscriberV2 {
+    get onChange() {
+        if (!this._onChange) {
+            throw new Error('onChange callback function must be set');
+        }
+        return this._onChange;
+    }
+    set onChange(onChange) {
+        this._onChange = onChange;
+    }
     /**
      * Create a single-account WebSocket subscriber with optional polling fallback.
      *
@@ -70,6 +79,7 @@ class WebSocketAccountSubscriberV2 {
      * @param rpc Optional override/injection for testing.
      */
     constructor(accountName, program, accountPublicKey, decodeBuffer, resubOpts, commitment, rpcSubscriptions, rpc) {
+        var _a;
         this.isUnsubscribing = false;
         this.accountName = accountName;
         this.logAccountName = `${accountName}-${accountPublicKey.toBase58()}-ws-acct-subscriber-v2`;
@@ -81,11 +91,12 @@ class WebSocketAccountSubscriberV2 {
             usePollingInsteadOfResub: true,
             logResubMessages: false,
         };
-        if (this.resubOpts.resubTimeoutMs < 1000) {
+        if (this.resubOpts.resubTimeoutMs != null &&
+            this.resubOpts.resubTimeoutMs < 1000) {
             console.log(`resubTimeoutMs should be at least 1000ms to avoid spamming resub ${this.logAccountName}`);
         }
         this.receivingData = false;
-        if (['recent', 'single', 'singleGossip', 'root', 'max'].includes(this.program.provider.opts.commitment)) {
+        if (['recent', 'single', 'singleGossip', 'root', 'max'].includes((_a = this.program.provider.opts.commitment) !== null && _a !== void 0 ? _a : '')) {
             console.warn(`using commitment ${this.program.provider.opts.commitment} that is not supported by gill, this may cause issues`);
         }
         this.commitment =
@@ -185,7 +196,7 @@ class WebSocketAccountSubscriberV2 {
         }
         this.dataAndSlot = {
             data,
-            slot,
+            slot: newSlot,
         };
     }
     setTimeout() {
@@ -194,7 +205,7 @@ class WebSocketAccountSubscriberV2 {
          * `resubOpts.resubTimeoutMs` and `receivingData` is true, trigger either
          * a polling loop or a resubscribe depending on options.
          */
-        if (!this.onChange) {
+        if (!this._onChange) {
             throw new Error('onChange callback function must be set');
         }
         this.timeoutId = setTimeout(async () => {
@@ -305,7 +316,7 @@ class WebSocketAccountSubscriberV2 {
             slot: Number(rpcResponse.context.slot),
         };
         const accountInfo = rpcResponse.value;
-        this.handleRpcResponse({ slot: BigInt(context.slot) }, accountInfo);
+        this.handleRpcResponse({ slot: BigInt(context.slot) }, accountInfo !== null && accountInfo !== void 0 ? accountInfo : undefined);
     }
     handleRpcResponse(context, accountInfo) {
         const newSlot = context.slot;
@@ -365,7 +376,7 @@ class WebSocketAccountSubscriberV2 {
             return this.decodeBufferFn(buffer);
         }
         else {
-            return this.program.account[this.accountName].coder.accounts.decode((0, utils_1.capitalize)(this.accountName), buffer);
+            return this.program.coder.accounts.decode((0, utils_1.capitalize)(this.accountName), buffer);
         }
     }
     unsubscribe(onResub = false) {

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

@@ -12,12 +12,14 @@ export declare class WebSocketInsuranceFundStakeAccountSubscriber implements Ins
     program: VelocityProgram;
     eventEmitter: StrictEventEmitter<EventEmitter, InsuranceFundStakeAccountEvents>;
     insuranceFundStakeAccountPublicKey: PublicKey;
-    insuranceFundStakeDataAccountSubscriber: AccountSubscriber<InsuranceFundStake>;
+    private _insuranceFundStakeDataAccountSubscriber?;
+    get insuranceFundStakeDataAccountSubscriber(): AccountSubscriber<InsuranceFundStake>;
+    set insuranceFundStakeDataAccountSubscriber(subscriber: AccountSubscriber<InsuranceFundStake>);
     constructor(program: VelocityProgram, insuranceFundStakeAccountPublicKey: PublicKey, resubTimeoutMs?: number, commitment?: Commitment);
     subscribe(insuranceFundStakeAccount?: InsuranceFundStake): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;
-    getInsuranceFundStakeAccountAndSlot(): DataAndSlot<InsuranceFundStake>;
+    getInsuranceFundStakeAccountAndSlot(): DataAndSlot<InsuranceFundStake> | undefined;
     updateData(insuranceFundStake: InsuranceFundStake, slot: number): void;
 }