@drift-labs/sdk 2.37.1-beta.10 → 2.37.1-beta.12

package/VERSION

@@ -1 +1 @@
-2.37.1-beta.10
+2.37.1-beta.12

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.37.1-beta.10",
+	"version": "2.37.1-beta.12",
 	"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/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
+		);
 	}
 
 	/**