@drift-labs/sdk 2.10.0-beta.4 → 2.10.0-beta.5

package/lib/accounts/bulkAccountLoader.d.ts

@@ -24,7 +24,7 @@ export declare class BulkAccountLoader {
     removeErrorCallbacks(callbackId: string): void;
     chunks<T>(array: readonly T[], size: number): T[][];
     load(): Promise<void>;
-    loadChunk(accountsToLoad: AccountToLoad[]): Promise<void>;
+    loadChunk(accountsToLoadChunks: AccountToLoad[][]): Promise<void>;
     handleAccountCallbacks(accountToLoad: AccountToLoad, buffer: Buffer, slot: number): void;
     getBufferAndSlot(publicKey: PublicKey): BufferAndSlot | undefined;
     startPolling(): void;

package/lib/accounts/bulkAccountLoader.js

@@ -80,7 +80,7 @@ class BulkAccountLoader {
         });
         this.lastTimeLoadingPromiseCleared = Date.now();
         try {
-            const chunks = this.chunks(Array.from(this.accountsToLoad.values()), GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE);
+            const chunks = this.chunks(this.chunks(Array.from(this.accountsToLoad.values()), GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE), 10);
             await Promise.all(chunks.map((chunk) => {
                 return this.loadChunk(chunk);
             }));
@@ -97,56 +97,67 @@ class BulkAccountLoader {
             this.loadPromise = undefined;
         }
     }
-    async loadChunk(accountsToLoad) {
-        if (accountsToLoad.length === 0) {
+    async loadChunk(accountsToLoadChunks) {
+        if (accountsToLoadChunks.length === 0) {
             return;
         }
-        const args = [
-            accountsToLoad.map((accountToLoad) => {
-                return accountToLoad.publicKey.toBase58();
-            }),
-            { commitment: this.commitment },
-        ];
-        const rpcResponse = await (0, promiseTimeout_1.promiseTimeout)(
+        const requests = new Array();
+        for (const accountsToLoadChunk of accountsToLoadChunks) {
+            const args = [
+                accountsToLoadChunk.map((accountToLoad) => {
+                    return accountToLoad.publicKey.toBase58();
+                }),
+                { commitment: this.commitment },
+            ];
+            requests.push({
+                methodName: 'getMultipleAccounts',
+                args,
+            });
+        }
+        const rpcResponses = await (0, promiseTimeout_1.promiseTimeout)(
         // @ts-ignore
-        this.connection._rpcRequest('getMultipleAccounts', args), 10 * 1000 // 30 second timeout
+        this.connection._rpcBatchRequest(requests), 10 * 1000 // 30 second timeout
         );
-        if (rpcResponse === null) {
+        if (rpcResponses === null) {
             this.log('request to rpc timed out');
             return;
         }
-        const newSlot = rpcResponse.result.context.slot;
-        if (newSlot > this.mostRecentSlot) {
-            this.mostRecentSlot = newSlot;
-        }
-        for (const i in accountsToLoad) {
-            const accountToLoad = accountsToLoad[i];
-            const key = accountToLoad.publicKey.toString();
-            const oldRPCResponse = this.bufferAndSlotMap.get(key);
-            let newBuffer = undefined;
-            if (rpcResponse.result.value[i]) {
-                const raw = rpcResponse.result.value[i].data[0];
-                const dataType = rpcResponse.result.value[i].data[1];
-                newBuffer = Buffer.from(raw, dataType);
+        for (const i in rpcResponses) {
+            const rpcResponse = rpcResponses[i];
+            const newSlot = rpcResponse.result.context.slot;
+            if (newSlot > this.mostRecentSlot) {
+                this.mostRecentSlot = newSlot;
             }
-            if (!oldRPCResponse) {
-                this.bufferAndSlotMap.set(key, {
-                    slot: newSlot,
-                    buffer: newBuffer,
-                });
-                this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
-                continue;
-            }
-            if (newSlot <= oldRPCResponse.slot) {
-                continue;
-            }
-            const oldBuffer = oldRPCResponse.buffer;
-            if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
-                this.bufferAndSlotMap.set(key, {
-                    slot: newSlot,
-                    buffer: newBuffer,
-                });
-                this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
+            const accountsToLoad = accountsToLoadChunks[i];
+            for (const j in accountsToLoad) {
+                const accountToLoad = accountsToLoad[j];
+                const key = accountToLoad.publicKey.toString();
+                const oldRPCResponse = this.bufferAndSlotMap.get(key);
+                let newBuffer = undefined;
+                if (rpcResponse.result.value[j]) {
+                    const raw = rpcResponse.result.value[j].data[0];
+                    const dataType = rpcResponse.result.value[j].data[1];
+                    newBuffer = Buffer.from(raw, dataType);
+                }
+                if (!oldRPCResponse) {
+                    this.bufferAndSlotMap.set(key, {
+                        slot: newSlot,
+                        buffer: newBuffer,
+                    });
+                    this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
+                    continue;
+                }
+                if (newSlot <= oldRPCResponse.slot) {
+                    continue;
+                }
+                const oldBuffer = oldRPCResponse.buffer;
+                if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
+                    this.bufferAndSlotMap.set(key, {
+                        slot: newSlot,
+                        buffer: newBuffer,
+                    });
+                    this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
+                }
             }
         }
     }

package/lib/idl/drift.json

@@ -8553,6 +8553,11 @@
             "code": 6222,
             "name": "InvalidMaker",
             "msg": "Invalid Maker"
+        },
+        {
+            "code": 6223,
+            "name": "FailedUnwrap",
+            "msg": "Failed Unwrap"
         }
     ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.10.0-beta.4",
+	"version": "2.10.0-beta.5",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/accounts/bulkAccountLoader.ts

@@ -117,8 +117,11 @@ export class BulkAccountLoader {
 
 		try {
 			const chunks = this.chunks(
-				Array.from(this.accountsToLoad.values()),
-				GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE
+				this.chunks(
+					Array.from(this.accountsToLoad.values()),
+					GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE
+				),
+				10
 			);
 
 			await Promise.all(
@@ -138,67 +141,79 @@ export class BulkAccountLoader {
 		}
 	}
 
-	async loadChunk(accountsToLoad: AccountToLoad[]): Promise<void> {
-		if (accountsToLoad.length === 0) {
+	async loadChunk(accountsToLoadChunks: AccountToLoad[][]): Promise<void> {
+		if (accountsToLoadChunks.length === 0) {
 			return;
 		}
 
-		const args = [
-			accountsToLoad.map((accountToLoad) => {
-				return accountToLoad.publicKey.toBase58();
-			}),
-			{ commitment: this.commitment },
-		];
+		const requests = new Array<{ methodName: string; args: any }>();
+		for (const accountsToLoadChunk of accountsToLoadChunks) {
+			const args = [
+				accountsToLoadChunk.map((accountToLoad) => {
+					return accountToLoad.publicKey.toBase58();
+				}),
+				{ commitment: this.commitment },
+			];
+
+			requests.push({
+				methodName: 'getMultipleAccounts',
+				args,
+			});
+		}
 
-		const rpcResponse: any | null = await promiseTimeout(
+		const rpcResponses: any | null = await promiseTimeout(
 			// @ts-ignore
-			this.connection._rpcRequest('getMultipleAccounts', args),
+			this.connection._rpcBatchRequest(requests),
 			10 * 1000 // 30 second timeout
 		);
 
-		if (rpcResponse === null) {
+		if (rpcResponses === null) {
 			this.log('request to rpc timed out');
 			return;
 		}
 
-		const newSlot = rpcResponse.result.context.slot;
-
-		if (newSlot > this.mostRecentSlot) {
-			this.mostRecentSlot = newSlot;
-		}
-
-		for (const i in accountsToLoad) {
-			const accountToLoad = accountsToLoad[i];
-			const key = accountToLoad.publicKey.toString();
-			const oldRPCResponse = this.bufferAndSlotMap.get(key);
-
-			let newBuffer: Buffer | undefined = undefined;
-			if (rpcResponse.result.value[i]) {
-				const raw: string = rpcResponse.result.value[i].data[0];
-				const dataType = rpcResponse.result.value[i].data[1];
-				newBuffer = Buffer.from(raw, dataType);
-			}
-
-			if (!oldRPCResponse) {
-				this.bufferAndSlotMap.set(key, {
-					slot: newSlot,
-					buffer: newBuffer,
-				});
-				this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
-				continue;
-			}
+		for (const i in rpcResponses) {
+			const rpcResponse = rpcResponses[i];
+			const newSlot = rpcResponse.result.context.slot;
 
-			if (newSlot <= oldRPCResponse.slot) {
-				continue;
+			if (newSlot > this.mostRecentSlot) {
+				this.mostRecentSlot = newSlot;
 			}
 
-			const oldBuffer = oldRPCResponse.buffer;
-			if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
-				this.bufferAndSlotMap.set(key, {
-					slot: newSlot,
-					buffer: newBuffer,
-				});
-				this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
+			const accountsToLoad = accountsToLoadChunks[i];
+			for (const j in accountsToLoad) {
+				const accountToLoad = accountsToLoad[j];
+				const key = accountToLoad.publicKey.toString();
+				const oldRPCResponse = this.bufferAndSlotMap.get(key);
+
+				let newBuffer: Buffer | undefined = undefined;
+				if (rpcResponse.result.value[j]) {
+					const raw: string = rpcResponse.result.value[j].data[0];
+					const dataType = rpcResponse.result.value[j].data[1];
+					newBuffer = Buffer.from(raw, dataType);
+				}
+
+				if (!oldRPCResponse) {
+					this.bufferAndSlotMap.set(key, {
+						slot: newSlot,
+						buffer: newBuffer,
+					});
+					this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
+					continue;
+				}
+
+				if (newSlot <= oldRPCResponse.slot) {
+					continue;
+				}
+
+				const oldBuffer = oldRPCResponse.buffer;
+				if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
+					this.bufferAndSlotMap.set(key, {
+						slot: newSlot,
+						buffer: newBuffer,
+					});
+					this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
+				}
 			}
 		}
 	}

package/src/idl/drift.json

@@ -8553,6 +8553,11 @@
       "code": 6222,
       "name": "InvalidMaker",
       "msg": "Invalid Maker"
+    },
+    {
+      "code": 6223,
+      "name": "FailedUnwrap",
+      "msg": "Failed Unwrap"
     }
   ]
 }