@velocity-exchange/sdk 0.1.0 → 0.2.1

package/CHANGELOG.md

@@ -1,35 +1,7 @@
-# Changelog
+# @velocity-exchange/sdk
 
-## [0.1.0](https://github.com/drift-labs/protocol-v2-shadow/compare/sdk-v0.0.5...sdk-v0.1.0) (2026-06-11)
+## 0.2.1
 
+### Patch Changes
 
-### Features
-
-* add builder codes on non swift ([#68](https://github.com/drift-labs/protocol-v2-shadow/issues/68)) ([2df4034](https://github.com/drift-labs/protocol-v2-shadow/commit/2df4034b2162f0df060b21453a16566f9de24f4f))
-* add transfer deposit by delegate ([16386ca](https://github.com/drift-labs/protocol-v2-shadow/commit/16386cad98a2a48d9a8a249ff75c9ce646e9fcac))
-* decouple AMM from rest of codebase ([84aba6d](https://github.com/drift-labs/protocol-v2-shadow/commit/84aba6d0c17ef97069185d82b74671bde6619919))
-* rebrand drift to velocity ([9c330b1](https://github.com/drift-labs/protocol-v2-shadow/commit/9c330b17cda7170482cc8b75ad3d1b3c137a8d32))
-
-
-### Bug Fixes
-
-* resolve eslint unused-var and prettier formatting failures ([a3a1e3e](https://github.com/drift-labs/protocol-v2-shadow/commit/a3a1e3e1cbf68f35a7c39ea335927d0136c5bce1))
-
-
-### Refactors
-
-* gather vAMM and hedge into a single VLP module ([905edc3](https://github.com/drift-labs/protocol-v2-shadow/commit/905edc338b453a1ce0ebb4dd9a13be97c66aa66d))
-
-## [0.0.5](https://github.com/drift-labs/protocol-v2-shadow/compare/sdk-v0.0.4...sdk-v0.0.5) (2026-05-28)
-
-
-### Refactors
-
-* increase oracle_price_offset to i64 ([#51](https://github.com/drift-labs/protocol-v2-shadow/issues/51)) ([d04039a](https://github.com/drift-labs/protocol-v2-shadow/commit/d04039a22b2ff37d05afd8fe271b9913d66689e1))
-
-## [0.0.4](https://github.com/drift-labs/protocol-v2-shadow/compare/sdk-v0.0.3...sdk-v0.0.4) (2026-05-28)
-
-
-### Refactors
-
-* increase oracle_price_offset to i64 ([#51](https://github.com/drift-labs/protocol-v2-shadow/issues/51)) ([d04039a](https://github.com/drift-labs/protocol-v2-shadow/commit/d04039a22b2ff37d05afd8fe271b9913d66689e1))
+- [`4fd7462`](https://github.com/drift-labs/protocol-v2-shadow/commit/4fd7462bfa3c55e31e3457b1b65f519cf052a6fa) Thanks [@ChewingGlass](https://github.com/ChewingGlass)! - Testing new changelog based package publishing flow

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

@@ -14,14 +14,16 @@ export declare class BasicUserAccountSubscriber implements UserAccountSubscriber
     userAccountPublicKey: PublicKey;
     callbackId?: string;
     errorCallbackId?: string;
-    user: DataAndSlot<UserAccount>;
+    user?: DataAndSlot<UserAccount>;
     constructor(userAccountPublicKey: PublicKey, data?: UserAccount, slot?: number);
     subscribe(_userAccount?: UserAccount): Promise<boolean>;
     addToAccountLoader(): 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/basicUserAccountSubscriber.js

@@ -11,7 +11,9 @@ class BasicUserAccountSubscriber {
         this.isSubscribed = true;
         this.eventEmitter = new events_1.EventEmitter();
         this.userAccountPublicKey = userAccountPublicKey;
-        this.user = { data, slot };
+        // `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 ? { data, slot: slot !== null && slot !== void 0 ? slot : 0 } : undefined;
     }
     async subscribe(_userAccount) {
         return true;
@@ -27,8 +29,7 @@ class BasicUserAccountSubscriber {
         return this.user;
     }
     updateData(userAccount, slot) {
-        var _a;
-        if (!this.user || slot >= ((_a = this.user.slot) !== null && _a !== void 0 ? _a : 0)) {
+        if (!this.user || slot >= this.user.slot) {
             this.user = { data: userAccount, slot };
             this.eventEmitter.emit('userAccountUpdate', userAccount);
             this.eventEmitter.emit('update');

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

@@ -14,14 +14,16 @@ export declare class BasicUserStatsAccountSubscriber implements UserStatsAccount
     userStatsAccountPublicKey: PublicKey;
     callbackId?: string;
     errorCallbackId?: string;
-    userStats: DataAndSlot<UserStatsAccount>;
+    userStats?: DataAndSlot<UserStatsAccount>;
     constructor(userStatsAccountPublicKey: PublicKey, data?: UserStatsAccount, slot?: number);
     subscribe(_userStatsAccount?: UserStatsAccount): Promise<boolean>;
     addToAccountLoader(): 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;
     updateData(userStatsAccount: UserStatsAccount, slot: number): void;
 }

package/lib/browser/accounts/basicUserStatsAccountSubscriber.js

@@ -11,7 +11,9 @@ class BasicUserStatsAccountSubscriber {
         this.isSubscribed = true;
         this.eventEmitter = new events_1.EventEmitter();
         this.userStatsAccountPublicKey = userStatsAccountPublicKey;
-        this.userStats = { data, slot };
+        // `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 ? { data, slot: slot !== null && slot !== void 0 ? slot : 0 } : undefined;
     }
     async subscribe(_userStatsAccount) {
         return true;
@@ -27,8 +29,7 @@ class BasicUserStatsAccountSubscriber {
         return this.userStats;
     }
     updateData(userStatsAccount, slot) {
-        var _a;
-        if (!this.userStats || slot >= ((_a = this.userStats.slot) !== null && _a !== void 0 ? _a : 0)) {
+        if (!this.userStats || slot >= this.userStats.slot) {
             this.userStats = { data: userStatsAccount, slot };
             this.eventEmitter.emit('userStatsAccountUpdate', userStatsAccount);
             this.eventEmitter.emit('update');

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

@@ -13,21 +13,21 @@ export declare class BulkAccountLoader {
     pollingFrequency: number;
     accountsToLoad: Map<string, AccountToLoad>;
     bufferAndSlotMap: Map<string, BufferAndSlot>;
-    errorCallbacks: Map<string, (e: any) => void>;
+    errorCallbacks: Map<string, (e: Error) => void>;
     intervalId?: ReturnType<typeof setTimeout>;
     loadPromise?: Promise<void>;
-    loadPromiseResolver: () => void;
+    private loadPromiseResolver;
     lastTimeLoadingPromiseCleared: number;
     mostRecentSlot: number;
     constructor(connection: Connection, commitment: Commitment, pollingFrequency: number);
     addAccount(publicKey: PublicKey, callback: (buffer: Buffer, slot: number) => void): Promise<string>;
-    removeAccount(publicKey: PublicKey, callbackId: string): void;
+    removeAccount(publicKey: PublicKey, callbackId: string | undefined): void;
     addErrorCallbacks(callback: (error: Error) => void): string;
-    removeErrorCallbacks(callbackId: string): void;
+    removeErrorCallbacks(callbackId: string | undefined): void;
     chunks<T>(array: readonly T[], size: number): T[][];
     load(): Promise<void>;
     loadChunk(accountsToLoadChunks: AccountToLoad[][]): Promise<void>;
-    handleAccountCallbacks(accountToLoad: AccountToLoad, buffer: Buffer, slot: number): void;
+    handleAccountCallbacks(accountToLoad: AccountToLoad, buffer: Buffer | undefined, slot: number): void;
     getBufferAndSlot(publicKey: PublicKey): BufferAndSlot | undefined;
     getSlot(): number;
     startPolling(): void;

package/lib/browser/accounts/bulkAccountLoader.js

@@ -10,6 +10,7 @@ class BulkAccountLoader {
         this.accountsToLoad = new Map();
         this.bufferAndSlotMap = new Map();
         this.errorCallbacks = new Map();
+        this.loadPromiseResolver = () => { };
         this.lastTimeLoadingPromiseCleared = Date.now();
         this.mostRecentSlot = 0;
         this.connection = connection;
@@ -43,6 +44,9 @@ class BulkAccountLoader {
         return callbackId;
     }
     removeAccount(publicKey, callbackId) {
+        if (callbackId === undefined) {
+            return;
+        }
         const existingAccountToLoad = this.accountsToLoad.get(publicKey.toString());
         if (existingAccountToLoad) {
             existingAccountToLoad.callbacks.delete(callbackId);
@@ -61,6 +65,9 @@ class BulkAccountLoader {
         return callbackId;
     }
     removeErrorCallbacks(callbackId) {
+        if (callbackId === undefined) {
+            return;
+        }
         this.errorCallbacks.delete(callbackId);
     }
     chunks(array, size) {
@@ -92,8 +99,9 @@ class BulkAccountLoader {
         catch (e) {
             console.error(`Error in bulkAccountLoader.load()`);
             console.error(e);
+            const error = e instanceof Error ? e : new Error(String(e));
             for (const [_, callback] of this.errorCallbacks) {
-                callback(e);
+                callback(error);
             }
         }
         finally {
@@ -174,6 +182,9 @@ class BulkAccountLoader {
         });
     }
     handleAccountCallbacks(accountToLoad, buffer, slot) {
+        if (buffer === undefined) {
+            return;
+        }
         for (const [_, callback] of accountToLoad.callbacks) {
             try {
                 callback(buffer, slot);

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

@@ -7,7 +7,8 @@ import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
 import { Client } from '../isomorphic/grpc';
 export declare class grpcAccountSubscriber<T> extends WebSocketAccountSubscriber<T> {
     private client;
-    private stream;
+    private _stream?;
+    private get stream();
     private commitmentLevel;
     listenerId?: number;
     private constructor();

package/lib/browser/accounts/grpcAccountSubscriber.js

@@ -29,6 +29,12 @@ const Buffer = __importStar(require("buffer"));
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 const grpc_1 = require("../isomorphic/grpc");
 class grpcAccountSubscriber extends webSocketAccountSubscriber_1.WebSocketAccountSubscriber {
+    get stream() {
+        if (!this._stream) {
+            throw new Error('grpcAccountSubscriber: stream accessed before subscribe()');
+        }
+        return this._stream;
+    }
     constructor(client, commitmentLevel, accountName, program, accountPublicKey, decodeBuffer, resubOpts) {
         super(accountName, program, accountPublicKey, decodeBuffer, resubOpts);
         this.client = client;
@@ -53,7 +59,7 @@ class grpcAccountSubscriber extends webSocketAccountSubscriber_1.WebSocketAccoun
             await this.fetch();
         }
         // Subscribe with grpc
-        this.stream =
+        this._stream =
             (await this.client.subscribe());
         const request = {
             slots: {},
@@ -74,7 +80,7 @@ class grpcAccountSubscriber extends webSocketAccountSubscriber_1.WebSocketAccoun
         };
         this.stream.on('data', (chunk) => {
             var _a;
-            if (!chunk.account) {
+            if (!chunk.account || !chunk.account.account) {
                 return;
             }
             const slot = Number(chunk.account.slot);

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

@@ -6,7 +6,8 @@ import { Client } from '../isomorphic/grpc';
 import { DataAndSlot, GrpcConfigs, ResubOpts } from './types';
 export declare class grpcMultiAccountSubscriber<T, U = undefined> {
     private client;
-    private stream;
+    private _stream?;
+    private get stream();
     private commitmentLevel;
     private program;
     private accountName;
@@ -28,7 +29,7 @@ export declare class grpcMultiAccountSubscriber<T, U = undefined> {
     getAccountData(accountPubkey: string): DataAndSlot<T> | undefined;
     getAccountDataMap(): Map<string, DataAndSlot<T>>;
     fetch(): Promise<void>;
-    subscribe(accounts: PublicKey[], onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer, accountProps: U) => void): Promise<void>;
+    subscribe(accounts: PublicKey[], onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer, accountProps: U | undefined) => void): Promise<void>;
     addAccounts(accounts: PublicKey[]): Promise<void>;
     removeAccounts(accounts: PublicKey[]): Promise<void>;
     unsubscribe(): Promise<void>;

package/lib/browser/accounts/grpcMultiAccountSubscriber.js

@@ -44,6 +44,12 @@ function commitmentLevelToCommitment(commitmentLevel) {
     }
 }
 class grpcMultiAccountSubscriber {
+    get stream() {
+        if (!this._stream) {
+            throw new Error('grpcMultiAccountSubscriber: stream accessed before subscribe()');
+        }
+        return this._stream;
+    }
     constructor(client, commitmentLevel, accountName, program, decodeBuffer, resubOpts, onUnsubscribe, accountPropsMap) {
         this.isUnsubscribing = false;
         this.receivingData = false;
@@ -59,7 +65,9 @@ class grpcMultiAccountSubscriber {
         this.decodeBufferFn = decodeBuffer;
         this.resubOpts = resubOpts;
         this.onUnsubscribe = onUnsubscribe;
-        this.accountPropsMap = accountPropsMap;
+        if (accountPropsMap) {
+            this.accountPropsMap = accountPropsMap;
+        }
     }
     static async create(grpcConfigs, accountName, program, decodeBuffer, resubOpts, clientProp, onUnsubscribe, accountPropsMap) {
         var _a, _b;
@@ -72,7 +80,7 @@ class grpcMultiAccountSubscriber {
         return new grpcMultiAccountSubscriber(client, commitmentLevel, accountName, program, decodeBuffer, resubOpts, onUnsubscribe, accountPropsMap);
     }
     setAccountData(accountPubkey, data, slot) {
-        this.dataMap.set(accountPubkey, { data, slot });
+        this.dataMap.set(accountPubkey, { data, slot: slot !== null && slot !== void 0 ? slot : 0 });
     }
     getAccountData(accountPubkey) {
         return this.dataMap.get(accountPubkey);
@@ -146,7 +154,7 @@ class grpcMultiAccountSubscriber {
                 onChange(new web3_js_1.PublicKey(key), data, ctx, buffer, accountProps);
             });
         }
-        this.stream =
+        this._stream =
             (await this.client.subscribe());
         const request = {
             slots: {},
@@ -167,7 +175,7 @@ class grpcMultiAccountSubscriber {
         };
         this.stream.on('data', (chunk) => {
             var _a, _b;
-            if (!chunk.account) {
+            if (!chunk.account || !chunk.account.account) {
                 return;
             }
             const slot = Number(chunk.account.slot);
@@ -212,7 +220,7 @@ class grpcMultiAccountSubscriber {
             const handleDataBuffer = (context, buffer, accountProps) => {
                 const data = this.decodeBufferFn
                     ? this.decodeBufferFn(buffer, accountPubkey, accountProps)
-                    : this.program.account[this.accountName].coder.accounts.decode(this.capitalize(this.accountName), buffer);
+                    : this.program.coder.accounts.decode(this.capitalize(this.accountName), buffer);
                 const handler = this.onChangeMap.get(accountPubkey);
                 if (handler) {
                     handler(data, context, buffer, accountProps);

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

@@ -5,7 +5,8 @@ import { VelocityProgram } from '../config';
 import { grpcMultiAccountSubscriber } from './grpcMultiAccountSubscriber';
 export declare class grpcMultiUserAccountSubscriber {
     private program;
-    private multiSubscriber;
+    private _multiSubscriber?;
+    private get multiSubscriber();
     private userData;
     private listeners;
     private keyToPk;

package/lib/browser/accounts/grpcMultiUserAccountSubscriber.js

@@ -6,6 +6,12 @@ const events_1 = require("events");
 const web3_js_1 = require("@solana/web3.js");
 const grpcMultiAccountSubscriber_1 = require("./grpcMultiAccountSubscriber");
 class grpcMultiUserAccountSubscriber {
+    get multiSubscriber() {
+        if (!this._multiSubscriber) {
+            throw new Error('grpcMultiUserAccountSubscriber: multiSubscriber accessed before subscribe()');
+        }
+        return this._multiSubscriber;
+    }
     constructor(program, grpcConfigs, resubOpts, multiSubscriber) {
         this.userData = new Map();
         this.listeners = new Map();
@@ -26,13 +32,15 @@ class grpcMultiUserAccountSubscriber {
             }
         };
         this.program = program;
-        this.multiSubscriber = multiSubscriber;
+        if (multiSubscriber) {
+            this._multiSubscriber = multiSubscriber;
+        }
         this.grpcConfigs = grpcConfigs;
         this.resubOpts = resubOpts;
     }
     async subscribe() {
-        if (!this.multiSubscriber) {
-            this.multiSubscriber =
+        if (!this._multiSubscriber) {
+            this._multiSubscriber =
                 await grpcMultiAccountSubscriber_1.grpcMultiAccountSubscriber.create(this.grpcConfigs, 'user', this.program, undefined, this.resubOpts);
         }
         // Subscribe all per-user subscribers first
@@ -138,11 +146,7 @@ class grpcMultiUserAccountSubscriber {
                 isSubscribed = false;
             },
             getUserAccountAndSlot() {
-                const das = parent.userData.get(key);
-                if (!das) {
-                    throw new types_1.NotSubscribedError('Must subscribe before getting user account data');
-                }
-                return das;
+                return parent.userData.get(key);
             },
         };
         this.userAccountSubscribers.set(userAccountPublicKey.toBase58(), perUser);

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

@@ -6,7 +6,8 @@ import { VelocityProgram } from '../config';
 import { WebSocketProgramAccountSubscriber } from './webSocketProgramAccountSubscriber';
 export declare class grpcProgramAccountSubscriber<T> extends WebSocketProgramAccountSubscriber<T> {
     private client;
-    private stream;
+    private _stream?;
+    private get stream();
     private commitmentLevel;
     listenerId?: number;
     private constructor();

package/lib/browser/accounts/grpcProgramAccountSubscriber.js

@@ -29,6 +29,12 @@ const Buffer = __importStar(require("buffer"));
 const webSocketProgramAccountSubscriber_1 = require("./webSocketProgramAccountSubscriber");
 const grpc_1 = require("../isomorphic/grpc");
 class grpcProgramAccountSubscriber extends webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber {
+    get stream() {
+        if (!this._stream) {
+            throw new Error('grpcProgramAccountSubscriber: stream accessed before subscribe()');
+        }
+        return this._stream;
+    }
     constructor(client, commitmentLevel, subscriptionName, accountDiscriminator, program, decodeBufferFn, options = {
         filters: [],
     }, resubOpts) {
@@ -57,7 +63,7 @@ class grpcProgramAccountSubscriber extends webSocketProgramAccountSubscriber_1.W
         }
         this.onChange = onChange;
         // Subscribe with grpc
-        this.stream = await this.client.subscribe();
+        this._stream = await this.client.subscribe();
         const filters = this.options.filters.map((filter) => {
             return {
                 memcmp: {
@@ -85,7 +91,7 @@ class grpcProgramAccountSubscriber extends webSocketProgramAccountSubscriber_1.W
         };
         this.stream.on('data', (chunk) => {
             var _a;
-            if (!chunk.account) {
+            if (!chunk.account || !chunk.account.account) {
                 return;
             }
             const slot = Number(chunk.account.slot);

package/lib/browser/accounts/grpcVelocityClientAccountSubscriber.js

@@ -60,9 +60,13 @@ class grpcVelocityClientAccountSubscriber extends webSocketVelocityClientAccount
         return true;
     }
     async subscribeToSpotMarketAccount(marketIndex) {
+        var _a;
         const marketPublicKey = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex);
         const accountSubscriber = await grpcAccountSubscriber_1.grpcAccountSubscriber.create(this.grpcConfigs, 'spotMarket', this.program, marketPublicKey, undefined, this.resubOpts);
-        accountSubscriber.setData(this.initialSpotMarketAccountData.get(marketIndex));
+        const initialSpotMarketData = (_a = this.initialSpotMarketAccountData) === null || _a === void 0 ? void 0 : _a.get(marketIndex);
+        if (initialSpotMarketData) {
+            accountSubscriber.setData(initialSpotMarketData);
+        }
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('spotMarketAccountUpdate', data);
             this.eventEmitter.emit('update');
@@ -71,9 +75,13 @@ class grpcVelocityClientAccountSubscriber extends webSocketVelocityClientAccount
         return true;
     }
     async subscribeToPerpMarketAccount(marketIndex) {
+        var _a;
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex);
         const accountSubscriber = await grpcAccountSubscriber_1.grpcAccountSubscriber.create(this.grpcConfigs, 'perpMarket', this.program, perpMarketPublicKey, undefined, this.resubOpts);
-        accountSubscriber.setData(this.initialPerpMarketAccountData.get(marketIndex));
+        const initialPerpMarketData = (_a = this.initialPerpMarketAccountData) === null || _a === void 0 ? void 0 : _a.get(marketIndex);
+        if (initialPerpMarketData) {
+            accountSubscriber.setData(initialPerpMarketData);
+        }
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('perpMarketAccountUpdate', data);
             this.eventEmitter.emit('update');
@@ -82,12 +90,19 @@ class grpcVelocityClientAccountSubscriber extends webSocketVelocityClientAccount
         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 accountSubscriber = await grpcAccountSubscriber_1.grpcAccountSubscriber.create(this.grpcConfigs, 'oracle', this.program, oracleInfo.publicKey, (buffer) => {
             return client.getOraclePriceDataFromBuffer(buffer);
         }, this.resubOpts);
-        accountSubscriber.setData(this.initialOraclePriceData.get(oracleId));
+        const initialOraclePriceData = (_a = this.initialOraclePriceData) === null || _a === void 0 ? void 0 : _a.get(oracleId);
+        if (initialOraclePriceData) {
+            accountSubscriber.setData(initialOraclePriceData);
+        }
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('oraclePriceUpdate', oracleInfo.publicKey, oracleInfo.source, data);
             this.eventEmitter.emit('update');

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

@@ -34,8 +34,8 @@ export declare class grpcVelocityClientAccountSubscriberV2 implements VelocityCl
     stateAccountSubscriber?: AccountSubscriber<StateAccount>;
     oracleClientCache: OracleClientCache;
     private resubOpts?;
+    private subscriptionPromiseResolver;
     private subscriptionPromise;
-    protected subscriptionPromiseResolver: (val: boolean) => void;
     constructor(grpcConfigs: GrpcConfigs, program: VelocityProgram, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting, resubOpts?: ResubOpts);
     chunks: <T>(array: readonly T[], size: number) => T[][];
     setInitialData(): Promise<void>;

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