@drift-labs/sdk 2.37.1-beta.9 → 2.38.0

package/VERSION

@@ -1 +1 @@
-2.37.1-beta.9
+2.37.1-beta.13

package/lib/accounts/bulkAccountLoader.js

@@ -168,7 +168,18 @@ class BulkAccountLoader {
     }
     handleAccountCallbacks(accountToLoad, buffer, slot) {
         for (const [_, callback] of accountToLoad.callbacks) {
-            callback(buffer, slot);
+            try {
+                callback(buffer, slot);
+            }
+            catch (e) {
+                console.log('Bulk account load: error in account callback');
+                console.log('accounto to load', accountToLoad.publicKey.toString());
+                console.log('buffer', buffer.toString('base64'));
+                for (const callback of accountToLoad.callbacks.values()) {
+                    console.log('account to load cb', callback);
+                }
+                throw e;
+            }
         }
     }
     getBufferAndSlot(publicKey) {

package/lib/events/eventSubscriber.js

@@ -30,7 +30,7 @@ class EventSubscriber {
             this.logProvider = new webSocketLogProvider_1.WebSocketLogProvider(this.connection, this.address, this.options.commitment);
         }
         else {
-            this.logProvider = new pollingLogProvider_1.PollingLogProvider(this.connection, this.address, options.commitment, this.options.logProviderConfig.frequency);
+            this.logProvider = new pollingLogProvider_1.PollingLogProvider(this.connection, this.address, options.commitment, this.options.logProviderConfig.frequency, this.options.logProviderConfig.batchSize);
         }
     }
     async subscribe() {

package/lib/events/fetchLogs.d.ts

@@ -14,7 +14,7 @@ type FetchLogsResponse = {
     transactionLogs: Log[];
     mostRecentBlockTime: number | undefined;
 };
-export declare function fetchLogs(connection: Connection, address: PublicKey, finality: Finality, beforeTx?: TransactionSignature, untilTx?: TransactionSignature, limit?: number): Promise<FetchLogsResponse>;
+export declare function fetchLogs(connection: Connection, address: PublicKey, finality: Finality, beforeTx?: TransactionSignature, untilTx?: TransactionSignature, limit?: number, batchSize?: number): Promise<FetchLogsResponse>;
 export declare function fetchTransactionLogs(connection: Connection, signatures: TransactionSignature[], finality: Finality): Promise<Log[]>;
 export declare class LogParser {
     private program;

package/lib/events/fetchLogs.js

@@ -9,7 +9,7 @@ function mapTransactionResponseToLog(transaction) {
         logs: transaction.meta.logMessages,
     };
 }
-async function fetchLogs(connection, address, finality, beforeTx, untilTx, limit) {
+async function fetchLogs(connection, address, finality, beforeTx, untilTx, limit, batchSize = 25) {
     const signatures = await connection.getSignaturesForAddress(address, {
         before: beforeTx,
         until: untilTx,
@@ -20,7 +20,7 @@ async function fetchLogs(connection, address, finality, beforeTx, untilTx, limit
     if (filteredSignatures.length === 0) {
         return undefined;
     }
-    const chunkedSignatures = chunk(filteredSignatures, 100);
+    const chunkedSignatures = chunk(filteredSignatures, batchSize);
     const transactionLogs = (await Promise.all(chunkedSignatures.map(async (chunk) => {
         return await fetchTransactionLogs(connection, chunk.map((confirmedSignature) => confirmedSignature.signature), finality);
     }))).flat();

package/lib/events/pollingLogProvider.d.ts

@@ -4,12 +4,13 @@ export declare class PollingLogProvider implements LogProvider {
     private connection;
     private address;
     private frequency;
+    private batchSize?;
     private finality;
     private intervalId;
     private mostRecentSeenTx?;
     private mutex;
     private firstFetch;
-    constructor(connection: Connection, address: PublicKey, commitment: Commitment, frequency?: number);
+    constructor(connection: Connection, address: PublicKey, commitment: Commitment, frequency?: number, batchSize?: number);
     subscribe(callback: logProviderCallback, skipHistory?: boolean): boolean;
     isSubscribed(): boolean;
     unsubscribe(): Promise<boolean>;

package/lib/events/pollingLogProvider.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PollingLogProvider = void 0;
 const fetchLogs_1 = require("./fetchLogs");
 class PollingLogProvider {
-    constructor(connection, address, commitment, frequency = 15 * 1000) {
+    constructor(connection, address, commitment, frequency = 15 * 1000, batchSize) {
         this.connection = connection;
         this.address = address;
         this.frequency = frequency;
+        this.batchSize = batchSize;
         this.firstFetch = true;
         this.finality = commitment === 'finalized' ? 'finalized' : 'confirmed';
     }
@@ -22,7 +23,7 @@ class PollingLogProvider {
             try {
                 const response = await (0, fetchLogs_1.fetchLogs)(this.connection, this.address, this.finality, undefined, this.mostRecentSeenTx, 
                 // If skipping history, only fetch one log back, not the maximum amount available
-                skipHistory && this.firstFetch ? 1 : undefined);
+                skipHistory && this.firstFetch ? 1 : undefined, this.batchSize);
                 if (response === undefined) {
                     return;
                 }

package/lib/events/types.d.ts

@@ -57,5 +57,6 @@ export type WebSocketLogProviderConfig = {
 export type PollingLogProviderConfig = {
     type: 'polling';
     frequency: number;
+    batchSize?: number;
 };
 export type LogProviderConfig = WebSocketLogProviderConfig | PollingLogProviderConfig;

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.37.0",
+    "version": "2.38.0",
     "name": "drift",
     "instructions": [
         {

package/lib/user.d.ts

@@ -101,10 +101,10 @@ export declare class User {
     getPerpBuyingPower(marketIndex: number, collateralBuffer?: any): BN;
     getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex: number, freeCollateral: BN, baseAssetAmount: BN): BN;
     /**
-     * calculates Free Collateral = Total collateral - initial margin requirement
+     * calculates Free Collateral = Total collateral - margin requirement
      * @returns : Precision QUOTE_PRECISION
      */
-    getFreeCollateral(): BN;
+    getFreeCollateral(marginCategory?: MarginCategory): BN;
     /**
      * @returns The margin requirement of a certain type (Initial or Maintenance) in USDC. : QUOTE_PRECISION
      */

package/lib/user.js

@@ -414,13 +414,15 @@ class User {
         return freeCollateral.mul(numericConstants_1.MARGIN_PRECISION).div(new _1.BN(marginRatio));
     }
     /**
-     * calculates Free Collateral = Total collateral - initial margin requirement
+     * calculates Free Collateral = Total collateral - margin requirement
      * @returns : Precision QUOTE_PRECISION
      */
-    getFreeCollateral() {
-        const totalCollateral = this.getTotalCollateral('Initial', true);
-        const initialMarginRequirement = this.getInitialMarginRequirement();
-        const freeCollateral = totalCollateral.sub(initialMarginRequirement);
+    getFreeCollateral(marginCategory = 'Initial') {
+        const totalCollateral = this.getTotalCollateral(marginCategory, true);
+        const marginRequirement = marginCategory === 'Initial'
+            ? this.getInitialMarginRequirement()
+            : this.getMaintenanceMarginRequirement();
+        const freeCollateral = totalCollateral.sub(marginRequirement);
         return freeCollateral.gte(numericConstants_1.ZERO) ? freeCollateral : numericConstants_1.ZERO;
     }
     /**
@@ -686,15 +688,8 @@ class User {
             health = 0;
         }
         else {
-            const healthP1 = Math.max(0, (1 - maintenanceMarginReq.toNumber() / totalCollateral.toNumber()) *
-                100) + 1;
-            health = Math.min(1, Math.log(healthP1) / Math.log(100)) * 100;
-            if (health > 1) {
-                health = Math.round(health);
-            }
-            else {
-                health = Math.round(health * 100) / 100;
-            }
+            health = Math.round(Math.min(100, Math.max(0, (1 - maintenanceMarginReq.toNumber() / totalCollateral.toNumber()) *
+                100)));
         }
         return health;
     }
@@ -759,12 +754,7 @@ class User {
      */
     getPerpMarketLiabilityValue(marketIndex, marginCategory, liquidationBuffer, includeOpenOrders, strict = false) {
         const perpPosition = this.getPerpPosition(marketIndex);
-        if (!perpPosition) {
-            return numericConstants_1.ZERO;
-        }
-        else {
-            return this.calculateWeightedPerpPositionValue(perpPosition, marginCategory, liquidationBuffer, includeOpenOrders, strict);
-        }
+        return this.calculateWeightedPerpPositionValue(perpPosition, marginCategory, liquidationBuffer, includeOpenOrders, strict);
     }
     /**
      * calculates sum of position value across all positions in margin system
@@ -1817,7 +1807,7 @@ class User {
             healthComponents.perpPnl.push({
                 marketIndex: perpMarket.marketIndex,
                 size: positionUnrealizedPnl,
-                value: wegithedPnlValue,
+                value: pnlValue,
                 weight: pnlWeight,
                 weightedValue: wegithedPnlValue,
             });
@@ -1858,7 +1848,7 @@ class User {
                 healthComponents.deposits.push({
                     marketIndex: spotMarketAccount.marketIndex,
                     size: worstCaseTokenAmount,
-                    value: weightedValue,
+                    value: baseAssetValue,
                     weight: weight,
                     weightedValue: weightedValue,
                 });
@@ -1892,7 +1882,7 @@ class User {
                 healthComponents.deposits.push({
                     marketIndex: spotMarketAccount.marketIndex,
                     size: netQuoteValue,
-                    value: weightedValue,
+                    value: baseAssetValue,
                     weight: weight,
                     weightedValue: weightedValue,
                 });

package/package.json

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

package/src/accounts/bulkAccountLoader.ts

@@ -229,7 +229,17 @@ export class BulkAccountLoader {
 		slot: number
 	): void {
 		for (const [_, callback] of accountToLoad.callbacks) {
-			callback(buffer, slot);
+			try {
+				callback(buffer, slot);
+			} catch (e) {
+				console.log('Bulk account load: error in account callback');
+				console.log('accounto to load', accountToLoad.publicKey.toString());
+				console.log('buffer', buffer.toString('base64'));
+				for (const callback of accountToLoad.callbacks.values()) {
+					console.log('account to load cb', callback);
+				}
+				throw e;
+			}
 		}
 	}
 

package/src/events/eventSubscriber.ts

@@ -63,7 +63,8 @@ export class EventSubscriber {
 				this.connection,
 				this.address,
 				options.commitment,
-				this.options.logProviderConfig.frequency
+				this.options.logProviderConfig.frequency,
+				this.options.logProviderConfig.batchSize
 			);
 		}
 	}

package/src/events/fetchLogs.ts

@@ -36,7 +36,8 @@ export async function fetchLogs(
 	finality: Finality,
 	beforeTx?: TransactionSignature,
 	untilTx?: TransactionSignature,
-	limit?: number
+	limit?: number,
+	batchSize = 25
 ): Promise<FetchLogsResponse> {
 	const signatures = await connection.getSignaturesForAddress(
 		address,
@@ -60,7 +61,7 @@ export async function fetchLogs(
 		return undefined;
 	}
 
-	const chunkedSignatures = chunk(filteredSignatures, 100);
+	const chunkedSignatures = chunk(filteredSignatures, batchSize);
 
 	const transactionLogs = (
 		await Promise.all(

package/src/events/pollingLogProvider.ts

@@ -19,7 +19,8 @@ export class PollingLogProvider implements LogProvider {
 		private connection: Connection,
 		private address: PublicKey,
 		commitment: Commitment,
-		private frequency = 15 * 1000
+		private frequency = 15 * 1000,
+		private batchSize?: number
 	) {
 		this.finality = commitment === 'finalized' ? 'finalized' : 'confirmed';
 	}
@@ -46,7 +47,8 @@ export class PollingLogProvider implements LogProvider {
 					undefined,
 					this.mostRecentSeenTx,
 					// If skipping history, only fetch one log back, not the maximum amount available
-					skipHistory && this.firstFetch ? 1 : undefined
+					skipHistory && this.firstFetch ? 1 : undefined,
+					this.batchSize
 				);
 
 				if (response === undefined) {

package/src/events/types.ts

@@ -137,6 +137,7 @@ export type WebSocketLogProviderConfig = {
 export type PollingLogProviderConfig = {
 	type: 'polling';
 	frequency: number;
+	batchSize?: number;
 };
 
 export type LogProviderConfig =

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.37.0",
+  "version": "2.38.0",
   "name": "drift",
   "instructions": [
     {

package/src/user.ts

@@ -636,13 +636,16 @@ export class User {
 	}
 
 	/**
-	 * calculates Free Collateral = Total collateral - initial margin requirement
+	 * calculates Free Collateral = Total collateral - margin requirement
 	 * @returns : Precision QUOTE_PRECISION
 	 */
-	public getFreeCollateral(): BN {
-		const totalCollateral = this.getTotalCollateral('Initial', true);
-		const initialMarginRequirement = this.getInitialMarginRequirement();
-		const freeCollateral = totalCollateral.sub(initialMarginRequirement);
+	public getFreeCollateral(marginCategory: MarginCategory = 'Initial'): BN {
+		const totalCollateral = this.getTotalCollateral(marginCategory, true);
+		const marginRequirement =
+			marginCategory === 'Initial'
+				? this.getInitialMarginRequirement()
+				: this.getMaintenanceMarginRequirement();
+		const freeCollateral = totalCollateral.sub(marginRequirement);
 		return freeCollateral.gte(ZERO) ? freeCollateral : ZERO;
 	}
 
@@ -1222,19 +1225,16 @@ export class User {
 		} else if (totalCollateral.lte(ZERO)) {
 			health = 0;
 		} else {
-			const healthP1 =
-				Math.max(
-					0,
-					(1 - maintenanceMarginReq.toNumber() / totalCollateral.toNumber()) *
-						100
-				) + 1;
-
-			health = Math.min(1, Math.log(healthP1) / Math.log(100)) * 100;
-			if (health > 1) {
-				health = Math.round(health);
-			} else {
-				health = Math.round(health * 100) / 100;
-			}
+			health = Math.round(
+				Math.min(
+					100,
+					Math.max(
+						0,
+						(1 - maintenanceMarginReq.toNumber() / totalCollateral.toNumber()) *
+							100
+					)
+				)
+			);
 		}
 
 		return health;
@@ -1359,17 +1359,13 @@ export class User {
 		strict = false
 	): BN {
 		const perpPosition = this.getPerpPosition(marketIndex);
-		if (!perpPosition) {
-			return ZERO;
-		} else {
-			return this.calculateWeightedPerpPositionValue(
-				perpPosition,
-				marginCategory,
-				liquidationBuffer,
-				includeOpenOrders,
-				strict
-			);
-		}
+		return this.calculateWeightedPerpPositionValue(
+			perpPosition,
+			marginCategory,
+			liquidationBuffer,
+			includeOpenOrders,
+			strict
+		);
 	}
 
 	/**
@@ -3271,7 +3267,7 @@ export class User {
 			healthComponents.perpPnl.push({
 				marketIndex: perpMarket.marketIndex,
 				size: positionUnrealizedPnl,
-				value: wegithedPnlValue,
+				value: pnlValue,
 				weight: pnlWeight,
 				weightedValue: wegithedPnlValue,
 			});
@@ -3347,7 +3343,7 @@ export class User {
 				healthComponents.deposits.push({
 					marketIndex: spotMarketAccount.marketIndex,
 					size: worstCaseTokenAmount,
-					value: weightedValue,
+					value: baseAssetValue,
 					weight: weight,
 					weightedValue: weightedValue,
 				});
@@ -3398,7 +3394,7 @@ export class User {
 				healthComponents.deposits.push({
 					marketIndex: spotMarketAccount.marketIndex,
 					size: netQuoteValue,
-					value: weightedValue,
+					value: baseAssetValue,
 					weight: weight,
 					weightedValue: weightedValue,
 				});