@velocity-exchange/sdk 0.0.5 → 0.2.0

package/lib/node/accounts/webSocketInsuranceFundStakeAccountSubscriber.js

@@ -5,6 +5,15 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketInsuranceFundStakeAccountSubscriber {
+    get insuranceFundStakeDataAccountSubscriber() {
+        if (!this._insuranceFundStakeDataAccountSubscriber) {
+            throw new Error('insuranceFundStakeDataAccountSubscriber accessed before subscribe()');
+        }
+        return this._insuranceFundStakeDataAccountSubscriber;
+    }
+    set insuranceFundStakeDataAccountSubscriber(subscriber) {
+        this._insuranceFundStakeDataAccountSubscriber = subscriber;
+    }
     constructor(program, insuranceFundStakeAccountPublicKey, resubTimeoutMs, commitment) {
         this.isSubscribed = false;
         this.program = program;

package/lib/node/accounts/webSocketProgramAccountSubscriber.d.ts

@@ -10,7 +10,9 @@ export declare class WebSocketProgramAccountSubscriber<T> implements ProgramAcco
     bufferAndSlotMap: Map<string, BufferAndSlot>;
     program: VelocityProgram;
     decodeBuffer: (accountName: string, ix: Buffer) => T;
-    onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
+    private _onChange?;
+    get onChange(): (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
+    set onChange(onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void);
     listenerId?: number;
     resubOpts?: ResubOpts;
     isUnsubscribing: boolean;

package/lib/node/accounts/webSocketProgramAccountSubscriber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webSocketProgramAccountSubscriber.d.ts","sourceRoot":"","sources":["../../../src/accounts/webSocketProgramAccountSubscriber.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAE7E,OAAO,EACN,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,YAAY,EACZ,SAAS,EACT,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C,qBAAa,iCAAiC,CAAC,CAAC,CAC/C,YAAW,wBAAwB,CAAC,CAAC,CAAC;IAEtC,gBAAgB,EAAE,MAAM,CAAC;IACzB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAa;IACzD,OAAO,EAAE,eAAe,CAAC;IACzB,YAAY,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,CAAC,CAAC;IACrD,QAAQ,EAAE,CACT,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,KACV,IAAI,CAAC;IACV,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,eAAe,UAAS;IACxB,SAAS,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAC1C,OAAO,EAAE;QAAE,OAAO,EAAE,YAAY,EAAE,CAAC;QAAC,UAAU,CAAC,EAAE,UAAU,CAAA;KAAE,CAAC;IAE9D,aAAa,UAAS;gBAGrB,gBAAgB,EAAE,MAAM,EACxB,oBAAoB,EAAE,MAAM,EAC5B,OAAO,EAAE,eAAe,EACxB,cAAc,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,CAAC,EACtD,OAAO,GAAE;QAAE,OAAO,EAAE,YAAY,EAAE,CAAC;QAAC,UAAU,CAAC,EAAE,UAAU,CAAA;KAE1D,EACD,SAAS,CAAC,EAAE,SAAS;IAgBhB,SAAS,CACd,QAAQ,EAAE,CACT,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,KACV,IAAI,GACP,OAAO,CAAC,IAAI,CAAC;IA8BhB,SAAS,CAAC,UAAU,IAAI,IAAI;IA0B5B,iBAAiB,CAChB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,gBAAgB,GAChC,IAAI;IAqCP,WAAW,CAAC,OAAO,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAoB3C"}
+{"version":3,"file":"webSocketProgramAccountSubscriber.d.ts","sourceRoot":"","sources":["../../../src/accounts/webSocketProgramAccountSubscriber.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAE7E,OAAO,EACN,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,YAAY,EACZ,SAAS,EACT,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C,qBAAa,iCAAiC,CAAC,CAAC,CAC/C,YAAW,wBAAwB,CAAC,CAAC,CAAC;IAEtC,gBAAgB,EAAE,MAAM,CAAC;IACzB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAa;IACzD,OAAO,EAAE,eAAe,CAAC;IACzB,YAAY,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,CAAC,CAAC;IACrD,OAAO,CAAC,SAAS,CAAC,CAKR;IACV,IAAI,QAAQ,IAAI,CACf,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,KACV,IAAI,CAKR;IACD,IAAI,QAAQ,CACX,QAAQ,EAAE,CACT,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,KACV,IAAI,EAGT;IACD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,eAAe,UAAS;IACxB,SAAS,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAC1C,OAAO,EAAE;QAAE,OAAO,EAAE,YAAY,EAAE,CAAC;QAAC,UAAU,CAAC,EAAE,UAAU,CAAA;KAAE,CAAC;IAE9D,aAAa,UAAS;gBAGrB,gBAAgB,EAAE,MAAM,EACxB,oBAAoB,EAAE,MAAM,EAC5B,OAAO,EAAE,eAAe,EACxB,cAAc,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,CAAC,EACtD,OAAO,GAAE;QAAE,OAAO,EAAE,YAAY,EAAE,CAAC;QAAC,UAAU,CAAC,EAAE,UAAU,CAAA;KAE1D,EACD,SAAS,CAAC,EAAE,SAAS;IAmBhB,SAAS,CACd,QAAQ,EAAE,CACT,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,KACV,IAAI,GACP,OAAO,CAAC,IAAI,CAAC;IA8BhB,SAAS,CAAC,UAAU,IAAI,IAAI;IA0B5B,iBAAiB,CAChB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,gBAAgB,GAChC,IAAI;IAqCP,WAAW,CAAC,OAAO,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAqB3C"}

package/lib/node/accounts/webSocketProgramAccountSubscriber.js

@@ -2,6 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketProgramAccountSubscriber = void 0;
 class WebSocketProgramAccountSubscriber {
+    get onChange() {
+        if (!this._onChange) {
+            throw new Error('onChange callback function must be set');
+        }
+        return this._onChange;
+    }
+    set onChange(onChange) {
+        this._onChange = onChange;
+    }
     constructor(subscriptionName, accountDiscriminator, program, decodeBufferFn, options = {
         filters: [],
     }, resubOpts) {
@@ -14,7 +23,8 @@ class WebSocketProgramAccountSubscriber {
         this.program = program;
         this.decodeBuffer = decodeBufferFn;
         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.options = options;
@@ -45,7 +55,7 @@ class WebSocketProgramAccountSubscriber {
     }
     setTimeout() {
         var _a;
-        if (!this.onChange) {
+        if (!this._onChange) {
             throw new Error('onChange callback function must be set');
         }
         this.timeoutId = setTimeout(async () => {
@@ -97,7 +107,7 @@ class WebSocketProgramAccountSubscriber {
         }
     }
     unsubscribe(onResub = false) {
-        if (!onResub) {
+        if (!onResub && this.resubOpts) {
             this.resubOpts.resubTimeoutMs = undefined;
         }
         this.isUnsubscribing = true;
@@ -114,6 +124,7 @@ class WebSocketProgramAccountSubscriber {
         }
         else {
             this.isUnsubscribing = false;
+            return Promise.resolve();
         }
     }
 }

package/lib/node/accounts/webSocketProgramAccountSubscriberV2.d.ts

@@ -69,7 +69,9 @@ export declare class WebSocketProgramAccountsSubscriberV2<T> implements ProgramA
     bufferAndSlotMap: Map<string, BufferAndSlot>;
     program: VelocityProgram;
     decodeBuffer: (accountName: string, ix: Buffer) => T;
-    onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
+    private _onChange?;
+    get onChange(): (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
+    set onChange(onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void);
     listenerId?: number;
     resubOpts: ResubOpts;
     isUnsubscribing: boolean;

package/lib/node/accounts/webSocketProgramAccountSubscriberV2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webSocketProgramAccountSubscriberV2.d.ts","sourceRoot":"","sources":["../../../src/accounts/webSocketProgramAccountSubscriberV2.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webSocketProgramAccountSubscriberV2.d.ts","sourceRoot":"","sources":["../../../src/accounts/webSocketProgramAccountSubscriberV2.ts"],"names":[],"mappings":"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"}

package/lib/node/accounts/webSocketProgramAccountSubscriberV2.js

@@ -67,6 +67,15 @@ const bs58_1 = __importDefault(require("bs58"));
  *   and processed concurrently.
  */
 class WebSocketProgramAccountsSubscriberV2 {
+    get onChange() {
+        if (!this._onChange) {
+            throw new Error('onChange callback function must be set');
+        }
+        return this._onChange;
+    }
+    set onChange(onChange) {
+        this._onChange = onChange;
+    }
     constructor(subscriptionName, accountDiscriminator, program, decodeBufferFn, options = {
         filters: [],
     }, resubOpts, accountsToMonitor // Optional list of accounts to poll
@@ -94,7 +103,8 @@ class WebSocketProgramAccountsSubscriberV2 {
             usePollingInsteadOfResub: true,
             logResubMessages: false,
         };
-        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) !== undefined &&
+            this.resubOpts.resubTimeoutMs < 1000) {
             console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
         }
         this.options = options;
@@ -212,7 +222,7 @@ class WebSocketProgramAccountsSubscriberV2 {
     }
     setTimeout() {
         var _a;
-        if (!this.onChange) {
+        if (!this._onChange) {
             throw new Error('onChange callback function must be set');
         }
         this.timeoutId = setTimeout(async () => {
@@ -262,7 +272,9 @@ class WebSocketProgramAccountsSubscriberV2 {
         this.lastWsNotificationTime.set(accountIdString, Date.now());
         // If this account was being polled, stop polling it if the buffer has changed
         if (this.accountsCurrentlyPolling.has(accountIdString) &&
-            !(existingBufferAndSlot === null || existingBufferAndSlot === void 0 ? void 0 : existingBufferAndSlot.buffer.equals(newBuffer))) {
+            newBuffer &&
+            (!(existingBufferAndSlot === null || existingBufferAndSlot === void 0 ? void 0 : existingBufferAndSlot.buffer) ||
+                !newBuffer.equals(existingBufferAndSlot.buffer))) {
             this.accountsCurrentlyPolling.delete(accountIdString);
             // If no more accounts are being polled, stop batch polling
             if (this.accountsCurrentlyPolling.size === 0 &&

package/lib/node/accounts/webSocketProgramAccountsSubscriberV2.d.ts

@@ -69,7 +69,9 @@ export declare class WebSocketProgramAccountsSubscriberV2<T> implements ProgramA
     bufferAndSlotMap: Map<string, BufferAndSlot>;
     program: VelocityProgram;
     decodeBuffer: (accountName: string, ix: Buffer) => T;
-    onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
+    private _onChange?;
+    get onChange(): (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
+    set onChange(onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void);
     listenerId?: number;
     resubOpts: ResubOpts;
     isUnsubscribing: boolean;

package/lib/node/accounts/webSocketProgramAccountsSubscriberV2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webSocketProgramAccountsSubscriberV2.d.ts","sourceRoot":"","sources":["../../../src/accounts/webSocketProgramAccountsSubscriberV2.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webSocketProgramAccountsSubscriberV2.d.ts","sourceRoot":"","sources":["../../../src/accounts/webSocketProgramAccountsSubscriberV2.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAE7E,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EACN,eAAe,EACf,gCAAgC,EAChC,gCAAgC,EAKhC,OAAO,EAEP,MAAM,MAAM,CAAC;AAqBd;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0DG;AAEH,qBAAa,oCAAoC,CAAC,CAAC,CAClD,YAAW,wBAAwB,CAAC,CAAC,CAAC;IAEtC,gBAAgB,EAAE,MAAM,CAAC;IACzB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAa;IACzD,OAAO,EAAE,eAAe,CAAC;IACzB,YAAY,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,CAAC,CAAC;IACrD,OAAO,CAAC,SAAS,CAAC,CAKR;IACV,IAAI,QAAQ,IAAI,CACf,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,KACV,IAAI,CAKR;IACD,IAAI,QAAQ,CACX,QAAQ,EAAE,CACT,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,KACV,IAAI,EAGT;IACD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,eAAe,UAAS;IACxB,SAAS,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAC1C,OAAO,EAAE;QAAE,OAAO,EAAE,YAAY,EAAE,CAAC;QAAC,UAAU,CAAC,EAAE,UAAU,CAAA;KAAE,CAAC;IAE9D,aAAa,UAAS;IAGtB,OAAO,CAAC,GAAG,CAA+C;IAC1D,OAAO,CAAC,gBAAgB,CAEF;IACtB,OAAO,CAAC,eAAe,CAAC,CAAkB;IAG1C,OAAO,CAAC,iBAAiB,CAA0B;IACnD,OAAO,CAAC,iBAAiB,CAAiB;IAC1C,OAAO,CAAC,eAAe,CACZ;IACX,OAAO,CAAC,sBAAsB,CAAkC;IAChE,OAAO,CAAC,wBAAwB,CAA0B;IAC1D,OAAO,CAAC,mBAAmB,CAAC,CAAgC;IAG5D,OAAO,CAAC,6BAA6B,CAAC,CAAgC;IACtE,OAAO,CAAC,wBAAwB,CAAe;IAG/C,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,qBAAqB,CAAC,CAAgC;IAC9D,OAAO,CAAC,yBAAyB,CAA0B;gBAG1D,gBAAgB,EAAE,MAAM,EACxB,oBAAoB,EAAE,MAAM,EAC5B,OAAO,EAAE,eAAe,EACxB,cAAc,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,CAAC,EACtD,OAAO,GAAE;QAAE,OAAO,EAAE,YAAY,EAAE,CAAC;QAAC,UAAU,CAAC,EAAE,UAAU,CAAA;KAE1D,EACD,SAAS,CAAC,EAAE,SAAS,EACrB,iBAAiB,CAAC,EAAE,SAAS,EAAE;YAuClB,sBAAsB;IAsC9B,SAAS,CACd,QAAQ,EAAE,CACT,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,KACV,IAAI,GACP,OAAO,CAAC,IAAI,CAAC;IAwFhB,SAAS,CAAC,UAAU,IAAI,IAAI;IAmC5B,iBAAiB,CAChB,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EACzB,SAAS,EAAE,OAAO,EAClB,WAAW,CAAC,EAAE,eAAe,GAC5B,CACG,gCAAgC,GAChC,gCAAgC,CAClC,CAAC,MAAM,CAAC,GACR,IAAI;IA4DP,OAAO,CAAC,0BAA0B;IAUlC,OAAO,CAAC,yBAAyB;IAmCjC,OAAO,CAAC,8BAA8B;IAyBtC,OAAO,CAAC,iBAAiB;YAiBX,eAAe;IA4B7B;;;OAGG;YACW,oCAAoC;IAuFlD;;;OAGG;YACW,yBAAyB;YAiGzB,kBAAkB;IAmGhC,OAAO,CAAC,oBAAoB;IAmC5B;;OAEG;YACW,oBAAoB;IAmBlC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAoB1B,WAAW,CAAC,OAAO,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB3C;;;;OAIG;IACH,mBAAmB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAW/C,wBAAwB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAsBpD;;;OAGG;IACH,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAQ5C,OAAO,CAAC,2BAA2B;CAanC"}

package/lib/node/accounts/webSocketProgramAccountsSubscriberV2.js

@@ -67,11 +67,19 @@ const bs58_1 = __importDefault(require("bs58"));
  *   and processed concurrently.
  */
 class WebSocketProgramAccountsSubscriberV2 {
+    get onChange() {
+        if (!this._onChange) {
+            throw new Error('onChange callback function must be set');
+        }
+        return this._onChange;
+    }
+    set onChange(onChange) {
+        this._onChange = onChange;
+    }
     constructor(subscriptionName, accountDiscriminator, program, decodeBufferFn, options = {
         filters: [],
     }, resubOpts, accountsToMonitor // Optional list of accounts to poll
     ) {
-        var _a;
         this.bufferAndSlotMap = new Map();
         this.isUnsubscribing = false;
         this.receivingData = false;
@@ -94,7 +102,8 @@ class WebSocketProgramAccountsSubscriberV2 {
             usePollingInsteadOfResub: true,
             logResubMessages: false,
         };
-        if (((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) < 1000) {
+        if (this.resubOpts.resubTimeoutMs != null &&
+            this.resubOpts.resubTimeoutMs < 1000) {
             console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
         }
         this.options = options;
@@ -212,7 +221,7 @@ class WebSocketProgramAccountsSubscriberV2 {
     }
     setTimeout() {
         var _a;
-        if (!this.onChange) {
+        if (!this._onChange) {
             throw new Error('onChange callback function must be set');
         }
         this.timeoutId = setTimeout(async () => {
@@ -262,7 +271,8 @@ class WebSocketProgramAccountsSubscriberV2 {
         this.lastWsNotificationTime.set(accountIdString, Date.now());
         // If this account was being polled, stop polling it if the buffer has changed
         if (this.accountsCurrentlyPolling.has(accountIdString) &&
-            !(existingBufferAndSlot === null || existingBufferAndSlot === void 0 ? void 0 : existingBufferAndSlot.buffer.equals(newBuffer))) {
+            (!(existingBufferAndSlot === null || existingBufferAndSlot === void 0 ? void 0 : existingBufferAndSlot.buffer) ||
+                (newBuffer != null && !existingBufferAndSlot.buffer.equals(newBuffer)))) {
             this.accountsCurrentlyPolling.delete(accountIdString);
             // If no more accounts are being polled, stop batch polling
             if (this.accountsCurrentlyPolling.size === 0 &&

package/lib/node/accounts/webSocketUserAccountSubscriber.d.ts

@@ -12,13 +12,15 @@ export declare class WebSocketUserAccountSubscriber implements UserAccountSubscr
     program: VelocityProgram;
     eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
     userAccountPublicKey: PublicKey;
-    userDataAccountSubscriber: AccountSubscriber<UserAccount>;
+    private _userDataAccountSubscriber?;
+    get userDataAccountSubscriber(): AccountSubscriber<UserAccount>;
+    set userDataAccountSubscriber(subscriber: AccountSubscriber<UserAccount>);
     constructor(program: VelocityProgram, userAccountPublicKey: PublicKey, resubOpts?: ResubOpts, commitment?: Commitment);
     subscribe(userAccount?: UserAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;
-    getUserAccountAndSlot(): DataAndSlot<UserAccount>;
+    getUserAccountAndSlot(): DataAndSlot<UserAccount> | undefined;
     updateData(userAccount: UserAccount, slot: number): void;
 }
 //# sourceMappingURL=webSocketUserAccountSubscriber.d.ts.map

package/lib/node/accounts/webSocketUserAccountSubscriber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webSocketUserAccountSubscriber.d.ts","sourceRoot":"","sources":["../../../src/accounts/webSocketUserAccountSubscriber.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,WAAW,EACX,iBAAiB,EAEjB,iBAAiB,EACjB,qBAAqB,EACrB,SAAS,EACT,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,qBAAa,8BAA+B,YAAW,qBAAqB;IAC3E,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,OAAO,EAAE,eAAe,CAAC;IACzB,YAAY,EAAE,kBAAkB,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;IAClE,oBAAoB,EAAE,SAAS,CAAC;IAEhC,yBAAyB,EAAE,iBAAiB,CAAC,WAAW,CAAC,CAAC;gBAGzD,OAAO,EAAE,eAAe,EACxB,oBAAoB,EAAE,SAAS,EAC/B,SAAS,CAAC,EAAE,SAAS,EACrB,UAAU,CAAC,EAAE,UAAU;IAUlB,SAAS,CAAC,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IA4BtD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAUlC,kBAAkB,IAAI,IAAI;IAQnB,qBAAqB,IAAI,WAAW,CAAC,WAAW,CAAC;IAKjD,UAAU,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM;CASxD"}
+{"version":3,"file":"webSocketUserAccountSubscriber.d.ts","sourceRoot":"","sources":["../../../src/accounts/webSocketUserAccountSubscriber.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,WAAW,EACX,iBAAiB,EAEjB,iBAAiB,EACjB,qBAAqB,EACrB,SAAS,EACT,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,qBAAa,8BAA+B,YAAW,qBAAqB;IAC3E,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,OAAO,EAAE,eAAe,CAAC;IACzB,YAAY,EAAE,kBAAkB,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;IAClE,oBAAoB,EAAE,SAAS,CAAC;IAEhC,OAAO,CAAC,0BAA0B,CAAC,CAAiC;IACpE,IAAI,yBAAyB,IAAI,iBAAiB,CAAC,WAAW,CAAC,CAK9D;IACD,IAAI,yBAAyB,CAAC,UAAU,EAAE,iBAAiB,CAAC,WAAW,CAAC,EAEvE;gBAGA,OAAO,EAAE,eAAe,EACxB,oBAAoB,EAAE,SAAS,EAC/B,SAAS,CAAC,EAAE,SAAS,EACrB,UAAU,CAAC,EAAE,UAAU;IAUlB,SAAS,CAAC,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IA4BtD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAUlC,kBAAkB,IAAI,IAAI;IAQnB,qBAAqB,IAAI,WAAW,CAAC,WAAW,CAAC,GAAG,SAAS;IAK7D,UAAU,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM;CASxD"}

package/lib/node/accounts/webSocketUserAccountSubscriber.js

@@ -5,6 +5,15 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketUserAccountSubscriber {
+    get userDataAccountSubscriber() {
+        if (!this._userDataAccountSubscriber) {
+            throw new Error('userDataAccountSubscriber accessed before subscribe()');
+        }
+        return this._userDataAccountSubscriber;
+    }
+    set userDataAccountSubscriber(subscriber) {
+        this._userDataAccountSubscriber = subscriber;
+    }
     constructor(program, userAccountPublicKey, resubOpts, commitment) {
         this.isSubscribed = false;
         this.program = program;

package/lib/node/accounts/webSocketUserStatsAccountSubsriber.d.ts

@@ -12,12 +12,14 @@ export declare class WebSocketUserStatsAccountSubscriber implements UserStatsAcc
     program: VelocityProgram;
     eventEmitter: StrictEventEmitter<EventEmitter, UserStatsAccountEvents>;
     userStatsAccountPublicKey: PublicKey;
-    userStatsAccountSubscriber: AccountSubscriber<UserStatsAccount>;
+    private _userStatsAccountSubscriber?;
+    get userStatsAccountSubscriber(): AccountSubscriber<UserStatsAccount>;
+    set userStatsAccountSubscriber(subscriber: AccountSubscriber<UserStatsAccount>);
     constructor(program: VelocityProgram, userStatsAccountPublicKey: PublicKey, resubOpts?: ResubOpts, commitment?: Commitment);
     subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;
-    getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount>;
+    getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount> | undefined;
 }
 //# sourceMappingURL=webSocketUserStatsAccountSubsriber.d.ts.map

package/lib/node/accounts/webSocketUserStatsAccountSubsriber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webSocketUserStatsAccountSubsriber.d.ts","sourceRoot":"","sources":["../../../src/accounts/webSocketUserStatsAccountSubsriber.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,WAAW,EACX,iBAAiB,EAEjB,0BAA0B,EAC1B,sBAAsB,EACtB,SAAS,EACT,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,qBAAa,mCACZ,YAAW,0BAA0B;IAErC,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,OAAO,EAAE,eAAe,CAAC;IACzB,YAAY,EAAE,kBAAkB,CAAC,YAAY,EAAE,sBAAsB,CAAC,CAAC;IACvE,yBAAyB,EAAE,SAAS,CAAC;IAErC,0BAA0B,EAAE,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;gBAG/D,OAAO,EAAE,eAAe,EACxB,yBAAyB,EAAE,SAAS,EACpC,SAAS,CAAC,EAAE,SAAS,EACrB,UAAU,CAAC,EAAE,UAAU;IAUlB,SAAS,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IA8BhE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAUlC,kBAAkB,IAAI,IAAI;IAQnB,0BAA0B,IAAI,WAAW,CAAC,gBAAgB,CAAC;CAIlE"}
+{"version":3,"file":"webSocketUserStatsAccountSubsriber.d.ts","sourceRoot":"","sources":["../../../src/accounts/webSocketUserStatsAccountSubsriber.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,WAAW,EACX,iBAAiB,EAEjB,0BAA0B,EAC1B,sBAAsB,EACtB,SAAS,EACT,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,qBAAa,mCACZ,YAAW,0BAA0B;IAErC,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,OAAO,EAAE,eAAe,CAAC;IACzB,YAAY,EAAE,kBAAkB,CAAC,YAAY,EAAE,sBAAsB,CAAC,CAAC;IACvE,yBAAyB,EAAE,SAAS,CAAC;IAErC,OAAO,CAAC,2BAA2B,CAAC,CAAsC;IAC1E,IAAI,0BAA0B,IAAI,iBAAiB,CAAC,gBAAgB,CAAC,CAKpE;IACD,IAAI,0BAA0B,CAC7B,UAAU,EAAE,iBAAiB,CAAC,gBAAgB,CAAC,EAG/C;gBAGA,OAAO,EAAE,eAAe,EACxB,yBAAyB,EAAE,SAAS,EACpC,SAAS,CAAC,EAAE,SAAS,EACrB,UAAU,CAAC,EAAE,UAAU;IAUlB,SAAS,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IA8BhE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAUlC,kBAAkB,IAAI,IAAI;IAQnB,0BAA0B,IAC9B,WAAW,CAAC,gBAAgB,CAAC,GAC7B,SAAS;CAIZ"}

package/lib/node/accounts/webSocketUserStatsAccountSubsriber.js

@@ -5,6 +5,15 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketUserStatsAccountSubscriber {
+    get userStatsAccountSubscriber() {
+        if (!this._userStatsAccountSubscriber) {
+            throw new Error('userStatsAccountSubscriber accessed before subscribe()');
+        }
+        return this._userStatsAccountSubscriber;
+    }
+    set userStatsAccountSubscriber(subscriber) {
+        this._userStatsAccountSubscriber = subscriber;
+    }
     constructor(program, userStatsAccountPublicKey, resubOpts, commitment) {
         this.isSubscribed = false;
         this.program = program;

package/lib/node/accounts/webSocketVelocityClientAccountSubscriber.d.ts

@@ -31,14 +31,14 @@ export declare class WebSocketVelocityClientAccountSubscriber implements Velocit
     spotOracleStringMap: Map<number, string>;
     oracleSubscribers: Map<string, AccountSubscriber<OraclePriceData>>;
     delistedMarketSetting: DelistedMarketSetting;
-    initialPerpMarketAccountData: Map<number, PerpMarketAccount>;
-    initialSpotMarketAccountData: Map<number, SpotMarketAccount>;
-    initialOraclePriceData: Map<string, OraclePriceData>;
+    initialPerpMarketAccountData?: Map<number, PerpMarketAccount>;
+    initialSpotMarketAccountData?: Map<number, SpotMarketAccount>;
+    initialOraclePriceData?: Map<string, OraclePriceData>;
     customPerpMarketAccountSubscriber?: new (accountName: string, program: VelocityProgram, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => AccountSubscriber<any>;
     customOracleAccountSubscriber?: new (accountName: string, program: VelocityProgram, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => AccountSubscriber<any>;
     protected isSubscribing: boolean;
-    protected subscriptionPromise: Promise<boolean>;
     protected subscriptionPromiseResolver: (val: boolean) => void;
+    protected subscriptionPromise: Promise<boolean>;
     constructor(program: VelocityProgram, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting, resubOpts?: ResubOpts, commitment?: Commitment, customPerpMarketAccountSubscriber?: new (accountName: string, program: VelocityProgram, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => WebSocketAccountSubscriberV2<any> | WebSocketAccountSubscriber<any>, customOracleAccountSubscriber?: new (accountName: string, program: VelocityProgram, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => WebSocketAccountSubscriberV2<any> | WebSocketAccountSubscriber<any>);
     subscribe(): Promise<boolean>;
     chunks: <T>(array: readonly T[], size: number) => T[][];
@@ -71,8 +71,4 @@ export declare class WebSocketVelocityClientAccountSubscriber implements Velocit
     getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
 }
-/** @deprecated Use `WebSocketVelocityClientAccountSubscriber` instead. `WebSocketDriftClientAccountSubscriber` will be removed in a future major. */
-export declare const WebSocketDriftClientAccountSubscriber: typeof WebSocketVelocityClientAccountSubscriber;
-/** @deprecated Use `WebSocketVelocityClientAccountSubscriber` instead. `WebSocketDriftClientAccountSubscriber` will be removed in a future major. */
-export type WebSocketDriftClientAccountSubscriber = WebSocketVelocityClientAccountSubscriber;
 //# sourceMappingURL=webSocketVelocityClientAccountSubscriber.d.ts.map

package/lib/node/accounts/webSocketVelocityClientAccountSubscriber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webSocketVelocityClientAccountSubscriber.d.ts","sourceRoot":"","sources":["../../../src/accounts/webSocketVelocityClientAccountSubscriber.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webSocketVelocityClientAccountSubscriber.d.ts","sourceRoot":"","sources":["../../../src/accounts/webSocketVelocityClientAccountSubscriber.ts"],"names":[],"mappings":"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"}

package/lib/node/accounts/webSocketVelocityClientAccountSubscriber.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebSocketDriftClientAccountSubscriber = exports.WebSocketVelocityClientAccountSubscriber = void 0;
+exports.WebSocketVelocityClientAccountSubscriber = void 0;
 const types_1 = require("./types");
 const events_1 = require("events");
 const pda_1 = require("../addresses/pda");
@@ -42,6 +42,8 @@ class WebSocketVelocityClientAccountSubscriber {
         this.spotOracleStringMap = new Map();
         this.oracleSubscribers = new Map();
         this.isSubscribing = false;
+        this.subscriptionPromiseResolver = () => { };
+        this.subscriptionPromise = Promise.resolve(false);
         this.chunks = (array, size) => {
             return new Array(Math.ceil(array.length / size))
                 .fill(null)
@@ -135,11 +137,15 @@ class WebSocketVelocityClientAccountSubscriber {
         const oracleAccountPubkeyChunks = this.chunks(this.oracleInfos.map((oracleInfo) => oracleInfo.publicKey), 75);
         const oracleAccountInfos = (await Promise.all(oracleAccountPubkeyChunks.map((oracleAccountPublicKeysChunk) => connection.getMultipleAccountsInfo(oracleAccountPublicKeysChunk)))).flat();
         this.initialOraclePriceData = new Map(this.oracleInfos.reduce((result, oracleInfo, i) => {
-            if (!oracleAccountInfos[i]) {
+            const oracleAccountInfo = oracleAccountInfos[i];
+            if (!oracleAccountInfo) {
                 return result;
             }
             const oracleClient = this.oracleClientCache.get(oracleInfo.source, connection, this.program);
-            const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(oracleAccountInfos[i].data);
+            if (!oracleClient) {
+                return result;
+            }
+            const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(oracleAccountInfo.data);
             result.push([
                 (0, oracleId_1.getOracleId)(oracleInfo.publicKey, oracleInfo.source),
                 oraclePriceData,
@@ -157,10 +163,11 @@ class WebSocketVelocityClientAccountSubscriber {
         return true;
     }
     async subscribeToPerpMarketAccount(marketIndex) {
+        var _a;
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex);
         const AccountSubscriberClass = this.customPerpMarketAccountSubscriber || webSocketAccountSubscriber_1.WebSocketAccountSubscriber;
         const accountSubscriber = new AccountSubscriberClass('perpMarket', this.program, perpMarketPublicKey, undefined, this.resubOpts, this.commitment);
-        const initialPerpMarketData = this.initialPerpMarketAccountData.get(marketIndex);
+        const initialPerpMarketData = (_a = this.initialPerpMarketAccountData) === null || _a === void 0 ? void 0 : _a.get(marketIndex);
         if (initialPerpMarketData) {
             accountSubscriber.setData(initialPerpMarketData);
         }
@@ -177,9 +184,10 @@ class WebSocketVelocityClientAccountSubscriber {
         return true;
     }
     async subscribeToSpotMarketAccount(marketIndex) {
+        var _a;
         const marketPublicKey = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex);
         const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('spotMarket', this.program, marketPublicKey, undefined, this.resubOpts, this.commitment);
-        const initialSpotMarketData = this.initialSpotMarketAccountData.get(marketIndex);
+        const initialSpotMarketData = (_a = this.initialSpotMarketAccountData) === null || _a === void 0 ? void 0 : _a.get(marketIndex);
         if (initialSpotMarketData) {
             accountSubscriber.setData(initialSpotMarketData);
         }
@@ -198,13 +206,17 @@ class WebSocketVelocityClientAccountSubscriber {
         return true;
     }
     async subscribeToOracle(oracleInfo) {
+        var _a;
         const oracleId = (0, oracleId_1.getOracleId)(oracleInfo.publicKey, oracleInfo.source);
         const client = this.oracleClientCache.get(oracleInfo.source, this.program.provider.connection, this.program);
+        if (!client) {
+            return false;
+        }
         const AccountSubscriberClass = this.customOracleAccountSubscriber || webSocketAccountSubscriber_1.WebSocketAccountSubscriber;
         const accountSubscriber = new AccountSubscriberClass('oracle', this.program, oracleInfo.publicKey, (buffer) => {
             return client.getOraclePriceDataFromBuffer(buffer);
         }, this.resubOpts, this.commitment);
-        const initialOraclePriceData = this.initialOraclePriceData.get(oracleId);
+        const initialOraclePriceData = (_a = this.initialOraclePriceData) === null || _a === void 0 ? void 0 : _a.get(oracleId);
         if (initialOraclePriceData) {
             accountSubscriber.setData(initialOraclePriceData);
         }
@@ -229,16 +241,20 @@ class WebSocketVelocityClientAccountSubscriber {
         if (!this.isSubscribed) {
             return;
         }
+        if (!this.stateAccountSubscriber) {
+            return;
+        }
         const promises = [this.stateAccountSubscriber.fetch()]
             .concat(Array.from(this.perpMarketAccountSubscribers.values()).map((subscriber) => subscriber.fetch()))
             .concat(Array.from(this.spotMarketAccountSubscribers.values()).map((subscriber) => subscriber.fetch()));
         await Promise.all(promises);
     }
     async unsubscribe() {
+        var _a;
         if (!this.isSubscribed) {
             return;
         }
-        await this.stateAccountSubscriber.unsubscribe();
+        await ((_a = this.stateAccountSubscriber) === null || _a === void 0 ? void 0 : _a.unsubscribe());
         await this.unsubscribeFromMarketAccounts();
         await this.unsubscribeFromSpotMarketAccounts();
         await this.unsubscribeFromOracles();
@@ -279,12 +295,12 @@ class WebSocketVelocityClientAccountSubscriber {
             }
             const perpMarketAccount = perpMarket.data;
             const perpMarketIndex = perpMarketAccount.marketIndex;
-            const oracle = perpMarketAccount.amm.oracle;
-            const oracleId = (0, oracleId_1.getOracleId)(oracle, perpMarket.data.amm.oracleSource);
+            const oracle = perpMarketAccount.oracle;
+            const oracleId = (0, oracleId_1.getOracleId)(oracle, perpMarket.data.oracleSource);
             if (!this.oracleSubscribers.has(oracleId)) {
                 addOraclePromises.push(this.addOracle({
                     publicKey: oracle,
-                    source: perpMarket.data.amm.oracleSource,
+                    source: perpMarket.data.oracleSource,
                 }));
             }
             this.perpOracleMap.set(perpMarketIndex, oracle);
@@ -315,21 +331,21 @@ class WebSocketVelocityClientAccountSubscriber {
         await Promise.all(addOraclePromises);
     }
     async handleDelistedMarkets() {
+        var _a, _b;
         if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Subscribe) {
             return;
         }
         const { perpMarketIndexes, oracles } = (0, utils_1.findDelistedPerpMarketsAndOracles)(this.getMarketAccountsAndSlots(), this.getSpotMarketAccountsAndSlots());
         for (const perpMarketIndex of perpMarketIndexes) {
-            await this.perpMarketAccountSubscribers
-                .get(perpMarketIndex)
-                .unsubscribe();
+            await ((_a = this.perpMarketAccountSubscribers
+                .get(perpMarketIndex)) === null || _a === void 0 ? void 0 : _a.unsubscribe());
             if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Discard) {
                 this.perpMarketAccountSubscribers.delete(perpMarketIndex);
             }
         }
         for (const oracle of oracles) {
             const oracleId = (0, oracleId_1.getOracleId)(oracle.publicKey, oracle.source);
-            await this.oracleSubscribers.get(oracleId).unsubscribe();
+            await ((_b = this.oracleSubscribers.get(oracleId)) === null || _b === void 0 ? void 0 : _b.unsubscribe());
             if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Discard) {
                 this.oracleSubscribers.delete(oracleId);
             }
@@ -341,24 +357,36 @@ class WebSocketVelocityClientAccountSubscriber {
         }
     }
     getStateAccountAndSlot() {
+        var _a;
         this.assertIsSubscribed();
-        return this.stateAccountSubscriber.dataAndSlot;
+        const dataAndSlot = (_a = this.stateAccountSubscriber) === null || _a === void 0 ? void 0 : _a.dataAndSlot;
+        if (!dataAndSlot) {
+            throw new Error('State account data not available');
+        }
+        return dataAndSlot;
     }
     getMarketAccountAndSlot(marketIndex) {
+        var _a;
         this.assertIsSubscribed();
-        return this.perpMarketAccountSubscribers.get(marketIndex).dataAndSlot;
+        return (_a = this.perpMarketAccountSubscribers.get(marketIndex)) === null || _a === void 0 ? void 0 : _a.dataAndSlot;
     }
     getMarketAccountsAndSlots() {
-        return Array.from(this.perpMarketAccountSubscribers.values()).map((subscriber) => subscriber.dataAndSlot);
+        return Array.from(this.perpMarketAccountSubscribers.values())
+            .map((subscriber) => subscriber.dataAndSlot)
+            .filter((dataAndSlot) => dataAndSlot !== undefined);
     }
     getSpotMarketAccountAndSlot(marketIndex) {
+        var _a;
         this.assertIsSubscribed();
-        return this.spotMarketAccountSubscribers.get(marketIndex).dataAndSlot;
+        return (_a = this.spotMarketAccountSubscribers.get(marketIndex)) === null || _a === void 0 ? void 0 : _a.dataAndSlot;
     }
     getSpotMarketAccountsAndSlots() {
-        return Array.from(this.spotMarketAccountSubscribers.values()).map((subscriber) => subscriber.dataAndSlot);
+        return Array.from(this.spotMarketAccountSubscribers.values())
+            .map((subscriber) => subscriber.dataAndSlot)
+            .filter((dataAndSlot) => dataAndSlot !== undefined);
     }
     getOraclePriceDataAndSlot(oracleId) {
+        var _a;
         this.assertIsSubscribed();
         if (oracleId === ORACLE_DEFAULT_ID) {
             return {
@@ -366,7 +394,7 @@ class WebSocketVelocityClientAccountSubscriber {
                 slot: 0,
             };
         }
-        return this.oracleSubscribers.get(oracleId).dataAndSlot;
+        return (_a = this.oracleSubscribers.get(oracleId)) === null || _a === void 0 ? void 0 : _a.dataAndSlot;
     }
     getOraclePriceDataAndSlotForPerpMarket(marketIndex) {
         const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
@@ -375,8 +403,8 @@ class WebSocketVelocityClientAccountSubscriber {
         if (!perpMarketAccount || !oracleId) {
             return undefined;
         }
-        if (!perpMarketAccount.data.amm.oracle.equals(oracle)) {
-            // If the oracle has changed, we need to update the oracle map in background
+        if (!oracle || !perpMarketAccount.data.oracle.equals(oracle)) {
+            // If the oracle has changed (or not yet cached), update the oracle map in background
             this.setPerpOracleMap();
         }
         return this.getOraclePriceDataAndSlot(oracleId);
@@ -388,13 +416,11 @@ class WebSocketVelocityClientAccountSubscriber {
         if (!spotMarketAccount || !oracleId) {
             return undefined;
         }
-        if (!spotMarketAccount.data.oracle.equals(oracle)) {
-            // If the oracle has changed, we need to update the oracle map in background
+        if (!oracle || !spotMarketAccount.data.oracle.equals(oracle)) {
+            // If the oracle has changed (or not yet cached), update the oracle map in background
             this.setSpotOracleMap();
         }
         return this.getOraclePriceDataAndSlot(oracleId);
     }
 }
 exports.WebSocketVelocityClientAccountSubscriber = WebSocketVelocityClientAccountSubscriber;
-/** @deprecated Use `WebSocketVelocityClientAccountSubscriber` instead. `WebSocketDriftClientAccountSubscriber` will be removed in a future major. */
-exports.WebSocketDriftClientAccountSubscriber = WebSocketVelocityClientAccountSubscriber;