@velocity-exchange/sdk 0.1.0 → 0.2.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.2.0](https://github.com/drift-labs/protocol-v2-shadow/compare/sdk-v0.1.0...sdk-v0.2.0) (2026-06-18)
+
+
+### Features
+
+* better fee collection and distribution architecture ([1999fbe](https://github.com/drift-labs/protocol-v2-shadow/commit/1999fbef3fcb81878dc56f510f06e28588cd1c40))
+* funding bias spread multiplier ([d7eb00c](https://github.com/drift-labs/protocol-v2-shadow/commit/d7eb00caa82b351f515b65dc4a7315a969059d91))
+* withdraw guard threshold to have a notional limit ([be33e8e](https://github.com/drift-labs/protocol-v2-shadow/commit/be33e8ed48cc319846d0896e435ed61050fc6a86))
+
+
+### Refactors
+
+* enable strict mode in SDK and fix initial strict errors ([#74](https://github.com/drift-labs/protocol-v2-shadow/issues/74)) ([5e045d8](https://github.com/drift-labs/protocol-v2-shadow/commit/5e045d8a7ca3a599420d3583975ddaab610a780e))
+* fix remaining strict errors and enable strict mode in SDK ([#78](https://github.com/drift-labs/protocol-v2-shadow/issues/78)) ([1fb7c07](https://github.com/drift-labs/protocol-v2-shadow/commit/1fb7c07ad95b696ecd09605358d86df3ef5d1102))
+
 ## [0.1.0](https://github.com/drift-labs/protocol-v2-shadow/compare/sdk-v0.0.5...sdk-v0.1.0) (2026-06-11)
 
 

package/bun.lock

@@ -19,6 +19,7 @@
         "gill": "0.10.2",
         "nanoid": "3.3.4",
         "node-cache": "5.1.2",
+        "node-fetch": "2.6.11",
         "solana-bankrun": "0.4.0",
         "strict-event-emitter-types": "2.0.0",
         "tweetnacl": "1.0.3",
@@ -35,6 +36,7 @@
         "@types/chai": "4.3.20",
         "@types/jest": "28.1.8",
         "@types/mocha": "9.1.1",
+        "@types/node-fetch": "2.6.11",
         "@typescript-eslint/eslint-plugin": "6.21.0",
         "@typescript-eslint/parser": "6.21.0",
         "chai": "4.5.0",
@@ -386,6 +388,8 @@
 
     "@types/node": ["@types/node@22.13.8", "", { "dependencies": { "undici-types": "~6.20.0" } }, "sha512-G3EfaZS+iOGYWLLRCEAXdWK9my08oHNZ+FHluRiggIYJPOXzhOiDgpVCUHaUvyIC5/fj7C/p637jdzC666AOKQ=="],
 
+    "@types/node-fetch": ["@types/node-fetch@2.6.11", "", { "dependencies": { "@types/node": "*", "form-data": "^4.0.0" } }, "sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g=="],
+
     "@types/protobufjs": ["@types/protobufjs@6.0.0", "", { "dependencies": { "protobufjs": "*" } }, "sha512-A27RDExpAf3rdDjIrHKiJK6x8kqqJ4CmoChwtipfhVAn1p7+wviQFFP7dppn8FslSbHtQeVPvi8wNKkDjSYjHw=="],
 
     "@types/semver": ["@types/semver@7.7.0", "", {}, "sha512-k107IF4+Xr7UHjwDc7Cfd6PRQfbdkiRabXGRjo07b4WyPahFBZCZ1sE+BNxYIJPPg73UkfOsVOLwqVc/6ETrIA=="],
@@ -472,6 +476,8 @@
 
     "ast-module-types": ["ast-module-types@6.0.1", "", {}, "sha512-WHw67kLXYbZuHTmcdbIrVArCq5wxo6NEuj3hiYAWr8mwJeC+C2mMCIBIWCiDoCye/OF/xelc+teJ1ERoWmnEIA=="],
 
+    "asynckit": ["asynckit@0.4.0", "", {}, "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="],
+
     "available-typed-arrays": ["available-typed-arrays@1.0.7", "", { "dependencies": { "possible-typed-array-names": "^1.0.0" } }, "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ=="],
 
     "balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="],
@@ -556,6 +562,8 @@
 
     "color-name": ["color-name@1.1.4", "", {}, "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="],
 
+    "combined-stream": ["combined-stream@1.0.8", "", { "dependencies": { "delayed-stream": "~1.0.0" } }, "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="],
+
     "commander": ["commander@7.2.0", "", {}, "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="],
 
     "commondir": ["commondir@1.0.1", "", {}, "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="],
@@ -598,6 +606,8 @@
 
     "delay": ["delay@5.0.0", "", {}, "sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw=="],
 
+    "delayed-stream": ["delayed-stream@1.0.0", "", {}, "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="],
+
     "dependency-tree": ["dependency-tree@11.2.0", "", { "dependencies": { "commander": "^12.1.0", "filing-cabinet": "^5.0.3", "precinct": "^12.2.0", "typescript": "^5.8.3" }, "bin": { "dependency-tree": "bin/cli.js" } }, "sha512-+C1H3mXhcvMCeu5i2Jpg9dc0N29TWTuT6vJD7mHLAfVmAbo9zW8NlkvQ1tYd3PDMab0IRQM0ccoyX68EZtx9xw=="],
 
     "des.js": ["des.js@1.1.0", "", { "dependencies": { "inherits": "^2.0.1", "minimalistic-assert": "^1.0.0" } }, "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg=="],
@@ -650,6 +660,8 @@
 
     "es-object-atoms": ["es-object-atoms@1.1.1", "", { "dependencies": { "es-errors": "^1.3.0" } }, "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA=="],
 
+    "es-set-tostringtag": ["es-set-tostringtag@2.1.0", "", { "dependencies": { "es-errors": "^1.3.0", "get-intrinsic": "^1.2.6", "has-tostringtag": "^1.0.2", "hasown": "^2.0.2" } }, "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA=="],
+
     "es6-promise": ["es6-promise@4.2.8", "", {}, "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="],
 
     "es6-promisify": ["es6-promisify@5.0.0", "", { "dependencies": { "es6-promise": "^4.0.3" } }, "sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ=="],
@@ -728,6 +740,8 @@
 
     "for-each": ["for-each@0.3.5", "", { "dependencies": { "is-callable": "^1.2.7" } }, "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg=="],
 
+    "form-data": ["form-data@4.0.5", "", { "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", "hasown": "^2.0.2", "mime-types": "^2.1.12" } }, "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w=="],
+
     "fs.realpath": ["fs.realpath@1.0.0", "", {}, "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="],
 
     "fsevents": ["fsevents@2.3.3", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="],
@@ -926,6 +940,10 @@
 
     "miller-rabin": ["miller-rabin@4.0.1", "", { "dependencies": { "bn.js": "^4.0.0", "brorand": "^1.0.1" }, "bin": { "miller-rabin": "bin/miller-rabin" } }, "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA=="],
 
+    "mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="],
+
+    "mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],
+
     "mimic-fn": ["mimic-fn@2.1.0", "", {}, "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="],
 
     "minimalistic-assert": ["minimalistic-assert@1.0.1", "", {}, "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="],
@@ -954,7 +972,7 @@
 
     "node-cache": ["node-cache@5.1.2", "", { "dependencies": { "clone": "2.x" } }, "sha512-t1QzWwnk4sjLWaQAS8CHgOJ+RAfmHpxFWmc36IWTiWHQfs0w5JDMBS1b1ZxQteo0vVVuWJvIUKHDkkeK7vIGCg=="],
 
-    "node-fetch": ["node-fetch@2.7.0", "", { "dependencies": { "whatwg-url": "^5.0.0" }, "peerDependencies": { "encoding": "^0.1.0" }, "optionalPeers": ["encoding"] }, "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="],
+    "node-fetch": ["node-fetch@2.6.11", "", { "dependencies": { "whatwg-url": "^5.0.0" }, "peerDependencies": { "encoding": "^0.1.0" }, "optionalPeers": ["encoding"] }, "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w=="],
 
     "node-gyp-build": ["node-gyp-build@4.8.4", "", { "bin": { "node-gyp-build": "bin.js", "node-gyp-build-optional": "optional.js", "node-gyp-build-test": "build-test.js" } }, "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ=="],
 
@@ -1422,6 +1440,8 @@
 
     "@solana/web3.js/bn.js": ["bn.js@5.2.1", "", {}, "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="],
 
+    "@solana/web3.js/node-fetch": ["node-fetch@2.7.0", "", { "dependencies": { "whatwg-url": "^5.0.0" }, "peerDependencies": { "encoding": "^0.1.0" }, "optionalPeers": ["encoding"] }, "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="],
+
     "@solana/web3.js/superstruct": ["superstruct@2.0.2", "", {}, "sha512-uV+TFRZdXsqXTL2pRvujROjdZQ4RAlBUS5BTh9IGm+jTqQntYThciG/qu57Gs69yjnVUSqdxF9YLmSnpupBW9A=="],
 
     "@typescript-eslint/project-service/@typescript-eslint/types": ["@typescript-eslint/types@8.38.0", "", {}, "sha512-wzkUfX3plUqij4YwWaJyqhiPE5UCRVlFpKn1oCRn2O1bJ592XxWJj8ROQ3JD5MYXLORW84063z3tZTb/cs4Tyw=="],
@@ -1440,6 +1460,8 @@
 
     "create-ecdh/bn.js": ["bn.js@4.12.2", "", {}, "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw=="],
 
+    "cross-fetch/node-fetch": ["node-fetch@2.7.0", "", { "dependencies": { "whatwg-url": "^5.0.0" }, "peerDependencies": { "encoding": "^0.1.0" }, "optionalPeers": ["encoding"] }, "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="],
+
     "defaults/clone": ["clone@1.0.4", "", {}, "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg=="],
 
     "dependency-tree/commander": ["commander@12.1.0", "", {}, "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA=="],

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