@drift-labs/sdk-browser 2.107.0-beta.14 → 2.107.0-beta.16

package/VERSION

@@ -1 +1 @@
-2.107.0-beta.14
+2.107.0-beta.16

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

@@ -35,6 +35,7 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     protected subscriptionPromiseResolver: (val: boolean) => void;
     constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting, resubOpts?: ResubOpts, commitment?: Commitment);
     subscribe(): Promise<boolean>;
+    chunks: <T>(array: readonly T[], size: number) => T[][];
     setInitialData(): Promise<void>;
     removeInitialData(): void;
     subscribeToPerpMarketAccounts(): Promise<boolean>;

package/lib/browser/accounts/webSocketDriftClientAccountSubscriber.js

@@ -24,6 +24,12 @@ class WebSocketDriftClientAccountSubscriber {
         this.spotOracleStringMap = new Map();
         this.oracleSubscribers = new Map();
         this.isSubscribing = false;
+        this.chunks = (array, size) => {
+            return new Array(Math.ceil(array.length / size))
+                .fill(null)
+                .map((_, index) => index * size)
+                .map((begin) => array.slice(begin, begin + size));
+        };
         this.isSubscribed = false;
         this.program = program;
         this.eventEmitter = new events_1.EventEmitter();
@@ -86,7 +92,8 @@ class WebSocketDriftClientAccountSubscriber {
         const connection = this.program.provider.connection;
         if (!this.initialPerpMarketAccountData) {
             const perpMarketPublicKeys = this.perpMarketIndexes.map((marketIndex) => (0, pda_1.getPerpMarketPublicKeySync)(this.program.programId, marketIndex));
-            const perpMarketAccountInfos = await connection.getMultipleAccountsInfo(perpMarketPublicKeys);
+            const perpMarketPublicKeysChunks = this.chunks(perpMarketPublicKeys, 75);
+            const perpMarketAccountInfos = (await Promise.all(perpMarketPublicKeysChunks.map((perpMarketPublicKeysChunk) => connection.getMultipleAccountsInfo(perpMarketPublicKeysChunk)))).flat();
             this.initialPerpMarketAccountData = new Map(perpMarketAccountInfos
                 .filter((accountInfo) => !!accountInfo)
                 .map((accountInfo) => {
@@ -96,7 +103,8 @@ class WebSocketDriftClientAccountSubscriber {
         }
         if (!this.initialSpotMarketAccountData) {
             const spotMarketPublicKeys = this.spotMarketIndexes.map((marketIndex) => (0, pda_1.getSpotMarketPublicKeySync)(this.program.programId, marketIndex));
-            const spotMarketAccountInfos = await connection.getMultipleAccountsInfo(spotMarketPublicKeys);
+            const spotMarketPublicKeysChunks = this.chunks(spotMarketPublicKeys, 75);
+            const spotMarketAccountInfos = (await Promise.all(spotMarketPublicKeysChunks.map((spotMarketPublicKeysChunk) => connection.getMultipleAccountsInfo(spotMarketPublicKeysChunk)))).flat();
             this.initialSpotMarketAccountData = new Map(spotMarketAccountInfos
                 .filter((accountInfo) => !!accountInfo)
                 .map((accountInfo) => {
@@ -104,7 +112,8 @@ class WebSocketDriftClientAccountSubscriber {
                 return [spotMarket.marketIndex, spotMarket];
             }));
         }
-        const oracleAccountInfos = await connection.getMultipleAccountsInfo(this.oracleInfos.map((oracleInfo) => oracleInfo.publicKey));
+        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]) {
                 return result;

package/lib/browser/driftClient.js

@@ -3188,16 +3188,18 @@ class DriftClient {
     encodeSwiftOrderParamsMessage(orderParamsMessage) {
         const anchorIxName = 'global' + ':' + 'swiftOrderMessageParams';
         const prefix = Buffer.from((0, sha256_1.hash)(anchorIxName).slice(0, 8));
-        return Buffer.concat([
+        const buf = Buffer.concat([
             prefix,
             this.program.coder.types.encode('SwiftOrderParamsMessage', orderParamsMessage),
         ]);
+        return buf;
     }
     /*
      * Decode swift taker order params from borsh buffer
      */
     decodeSwiftOrderParamsMessage(encodedMessage) {
-        return this.program.coder.types.decode('SwiftOrderParamsMessage', encodedMessage);
+        return this.program.coder.types.decode('SwiftOrderParamsMessage', encodedMessage.slice(8) // assumes discriminator
+        );
     }
     signMessage(message, keypair = this.wallet.payer) {
         return Buffer.from(tweetnacl_1.default.sign.detached(message, keypair.secretKey));

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

@@ -35,6 +35,7 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     protected subscriptionPromiseResolver: (val: boolean) => void;
     constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting, resubOpts?: ResubOpts, commitment?: Commitment);
     subscribe(): Promise<boolean>;
+    chunks: <T>(array: readonly T[], size: number) => T[][];
     setInitialData(): Promise<void>;
     removeInitialData(): void;
     subscribeToPerpMarketAccounts(): Promise<boolean>;

package/lib/node/accounts/webSocketDriftClientAccountSubscriber.js

@@ -24,6 +24,12 @@ class WebSocketDriftClientAccountSubscriber {
         this.spotOracleStringMap = new Map();
         this.oracleSubscribers = new Map();
         this.isSubscribing = false;
+        this.chunks = (array, size) => {
+            return new Array(Math.ceil(array.length / size))
+                .fill(null)
+                .map((_, index) => index * size)
+                .map((begin) => array.slice(begin, begin + size));
+        };
         this.isSubscribed = false;
         this.program = program;
         this.eventEmitter = new events_1.EventEmitter();
@@ -86,7 +92,8 @@ class WebSocketDriftClientAccountSubscriber {
         const connection = this.program.provider.connection;
         if (!this.initialPerpMarketAccountData) {
             const perpMarketPublicKeys = this.perpMarketIndexes.map((marketIndex) => (0, pda_1.getPerpMarketPublicKeySync)(this.program.programId, marketIndex));
-            const perpMarketAccountInfos = await connection.getMultipleAccountsInfo(perpMarketPublicKeys);
+            const perpMarketPublicKeysChunks = this.chunks(perpMarketPublicKeys, 75);
+            const perpMarketAccountInfos = (await Promise.all(perpMarketPublicKeysChunks.map((perpMarketPublicKeysChunk) => connection.getMultipleAccountsInfo(perpMarketPublicKeysChunk)))).flat();
             this.initialPerpMarketAccountData = new Map(perpMarketAccountInfos
                 .filter((accountInfo) => !!accountInfo)
                 .map((accountInfo) => {
@@ -96,7 +103,8 @@ class WebSocketDriftClientAccountSubscriber {
         }
         if (!this.initialSpotMarketAccountData) {
             const spotMarketPublicKeys = this.spotMarketIndexes.map((marketIndex) => (0, pda_1.getSpotMarketPublicKeySync)(this.program.programId, marketIndex));
-            const spotMarketAccountInfos = await connection.getMultipleAccountsInfo(spotMarketPublicKeys);
+            const spotMarketPublicKeysChunks = this.chunks(spotMarketPublicKeys, 75);
+            const spotMarketAccountInfos = (await Promise.all(spotMarketPublicKeysChunks.map((spotMarketPublicKeysChunk) => connection.getMultipleAccountsInfo(spotMarketPublicKeysChunk)))).flat();
             this.initialSpotMarketAccountData = new Map(spotMarketAccountInfos
                 .filter((accountInfo) => !!accountInfo)
                 .map((accountInfo) => {
@@ -104,7 +112,8 @@ class WebSocketDriftClientAccountSubscriber {
                 return [spotMarket.marketIndex, spotMarket];
             }));
         }
-        const oracleAccountInfos = await connection.getMultipleAccountsInfo(this.oracleInfos.map((oracleInfo) => oracleInfo.publicKey));
+        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]) {
                 return result;

package/lib/node/driftClient.js

@@ -3188,16 +3188,18 @@ class DriftClient {
     encodeSwiftOrderParamsMessage(orderParamsMessage) {
         const anchorIxName = 'global' + ':' + 'swiftOrderMessageParams';
         const prefix = Buffer.from((0, sha256_1.hash)(anchorIxName).slice(0, 8));
-        return Buffer.concat([
+        const buf = Buffer.concat([
             prefix,
             this.program.coder.types.encode('SwiftOrderParamsMessage', orderParamsMessage),
         ]);
+        return buf;
     }
     /*
      * Decode swift taker order params from borsh buffer
      */
     decodeSwiftOrderParamsMessage(encodedMessage) {
-        return this.program.coder.types.decode('SwiftOrderParamsMessage', encodedMessage);
+        return this.program.coder.types.decode('SwiftOrderParamsMessage', encodedMessage.slice(8) // assumes discriminator
+        );
     }
     signMessage(message, keypair = this.wallet.payer) {
         return Buffer.from(tweetnacl_1.default.sign.detached(message, keypair.secretKey));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drift-labs/sdk-browser",
-  "version": "2.107.0-beta.14",
+  "version": "2.107.0-beta.16",
   "main": "lib/node/index.js",
   "types": "lib/node/index.d.ts",
   "browser": "./lib/browser/index.js",

package/src/accounts/webSocketDriftClientAccountSubscriber.ts

@@ -176,6 +176,13 @@ export class WebSocketDriftClientAccountSubscriber
 		return true;
 	}
 
+	chunks = <T>(array: readonly T[], size: number): T[][] => {
+		return new Array(Math.ceil(array.length / size))
+			.fill(null)
+			.map((_, index) => index * size)
+			.map((begin) => array.slice(begin, begin + size));
+	};
+
 	async setInitialData(): Promise<void> {
 		const connection = this.program.provider.connection;
 
@@ -183,9 +190,14 @@ export class WebSocketDriftClientAccountSubscriber
 			const perpMarketPublicKeys = this.perpMarketIndexes.map((marketIndex) =>
 				getPerpMarketPublicKeySync(this.program.programId, marketIndex)
 			);
-			const perpMarketAccountInfos = await connection.getMultipleAccountsInfo(
-				perpMarketPublicKeys
-			);
+			const perpMarketPublicKeysChunks = this.chunks(perpMarketPublicKeys, 75);
+			const perpMarketAccountInfos = (
+				await Promise.all(
+					perpMarketPublicKeysChunks.map((perpMarketPublicKeysChunk) =>
+						connection.getMultipleAccountsInfo(perpMarketPublicKeysChunk)
+					)
+				)
+			).flat();
 			this.initialPerpMarketAccountData = new Map(
 				perpMarketAccountInfos
 					.filter((accountInfo) => !!accountInfo)
@@ -203,9 +215,14 @@ export class WebSocketDriftClientAccountSubscriber
 			const spotMarketPublicKeys = this.spotMarketIndexes.map((marketIndex) =>
 				getSpotMarketPublicKeySync(this.program.programId, marketIndex)
 			);
-			const spotMarketAccountInfos = await connection.getMultipleAccountsInfo(
-				spotMarketPublicKeys
-			);
+			const spotMarketPublicKeysChunks = this.chunks(spotMarketPublicKeys, 75);
+			const spotMarketAccountInfos = (
+				await Promise.all(
+					spotMarketPublicKeysChunks.map((spotMarketPublicKeysChunk) =>
+						connection.getMultipleAccountsInfo(spotMarketPublicKeysChunk)
+					)
+				)
+			).flat();
 			this.initialSpotMarketAccountData = new Map(
 				spotMarketAccountInfos
 					.filter((accountInfo) => !!accountInfo)
@@ -219,9 +236,17 @@ export class WebSocketDriftClientAccountSubscriber
 			);
 		}
 
-		const oracleAccountInfos = await connection.getMultipleAccountsInfo(
-			this.oracleInfos.map((oracleInfo) => oracleInfo.publicKey)
+		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]) {

package/src/driftClient.ts

@@ -5885,13 +5885,14 @@ export class DriftClient {
 	): Buffer {
 		const anchorIxName = 'global' + ':' + 'swiftOrderMessageParams';
 		const prefix = Buffer.from(hash(anchorIxName).slice(0, 8));
-		return Buffer.concat([
+		const buf = Buffer.concat([
 			prefix,
 			this.program.coder.types.encode(
 				'SwiftOrderParamsMessage',
 				orderParamsMessage
 			),
 		]);
+		return buf;
 	}
 
 	/*
@@ -5902,7 +5903,7 @@ export class DriftClient {
 	): SwiftOrderParamsMessage {
 		return this.program.coder.types.decode(
 			'SwiftOrderParamsMessage',
-			encodedMessage
+			encodedMessage.slice(8) // assumes discriminator
 		);
 	}