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

package/VERSION

@@ -1 +1 @@
-2.37.1-beta.4
+2.37.1-beta.5

package/lib/constants/perpMarkets.js

@@ -144,6 +144,16 @@ exports.DevnetPerpMarkets = [
         launchTs: 1689270550000,
         oracleSource: __1.OracleSource.PYTH,
     },
+    {
+        fullName: 'HNT',
+        category: ['IoT'],
+        symbol: 'HNT-PERP',
+        baseAssetSymbol: 'HNT',
+        marketIndex: 14,
+        oracle: new web3_js_1.PublicKey('6Eg8YdfFJQF2HHonzPUBSCCmyUEhrStg9VBLK957sBe6'),
+        launchTs: 16922949550000,
+        oracleSource: __1.OracleSource.PYTH,
+    },
 ];
 exports.MainnetPerpMarkets = [
     {
@@ -286,6 +296,16 @@ exports.MainnetPerpMarkets = [
         launchTs: 1689270550000,
         oracleSource: __1.OracleSource.PYTH,
     },
+    {
+        fullName: 'HNT',
+        category: ['IoT'],
+        symbol: 'HNT-PERP',
+        baseAssetSymbol: 'HNT',
+        marketIndex: 14,
+        oracle: new web3_js_1.PublicKey('7moA1i5vQUpfDwSpK6Pw9s56ahB7WFGidtbL2ujWrVvm'),
+        launchTs: 16922949550000,
+        oracleSource: __1.OracleSource.PYTH,
+    },
 ];
 exports.PerpMarkets = {
     devnet: exports.DevnetPerpMarkets,

package/lib/events/eventSubscriber.js

@@ -101,7 +101,7 @@ class EventSubscriber {
         const records = [];
         // @ts-ignore
         const events = (0, parse_1.parseLogs)(this.program, slot, logs);
-        let _runningEventIndex = 0;
+        let runningEventIndex = 0;
         for (const event of events) {
             // @ts-ignore
             const expectRecordType = this.eventListMap.has(event.name);
@@ -109,10 +109,10 @@ class EventSubscriber {
                 event.data.txSig = txSig;
                 event.data.slot = slot;
                 event.data.eventType = event.name;
-                //event.data.txSigIndex = _runningEventIndex;
+                event.data.txSigIndex = runningEventIndex;
                 records.push(event.data);
             }
-            _runningEventIndex++;
+            runningEventIndex++;
         }
         return records;
     }

package/lib/events/fetchLogs.js

@@ -83,14 +83,14 @@ class LogParser {
         const records = [];
         // @ts-ignore
         const eventGenerator = this.program._events._eventParser.parseLogs(event.logs, false);
-        let _runningEventIndex = 0;
+        let runningEventIndex = 0;
         for (const eventLog of eventGenerator) {
             eventLog.data.txSig = event.txSig;
             eventLog.data.slot = event.slot;
             eventLog.data.eventType = eventLog.name;
-            //eventLog.data.txSigIndex = _runningEventIndex;
+            eventLog.data.txSigIndex = runningEventIndex;
             records.push(eventLog.data);
-            _runningEventIndex++;
+            runningEventIndex++;
         }
         return records;
     }

package/lib/events/types.d.ts

@@ -17,6 +17,7 @@ export type EventSubscriptionOrderDirection = 'asc' | 'desc';
 export type Event<T> = T & {
     txSig: TransactionSignature;
     slot: number;
+    txSigIndex: number;
 };
 export type WrappedEvent<Type extends EventType> = EventMap[Type] & {
     eventType: Type;

package/lib/user.js

@@ -1606,12 +1606,15 @@ class User {
         if (canBypass) {
             withdrawLimit = _1.BN.max(withdrawLimit, userDepositAmount);
         }
-        const amountWithdrawable = freeCollateral
-            .mul(numericConstants_1.MARGIN_PRECISION)
-            .div(new _1.BN(spotMarket.initialAssetWeight))
-            .mul(numericConstants_1.PRICE_PRECISION)
-            .div(oracleData.price)
-            .mul(precisionIncrease);
+        const assetWeight = (0, spotBalance_1.calculateAssetWeight)(userDepositAmount, spotMarket, 'Initial');
+        const amountWithdrawable = assetWeight.eq(numericConstants_1.ZERO)
+            ? userDepositAmount
+            : freeCollateral
+                .mul(numericConstants_1.MARGIN_PRECISION)
+                .div(assetWeight)
+                .mul(numericConstants_1.PRICE_PRECISION)
+                .div(oracleData.price)
+                .mul(precisionIncrease);
         const maxWithdrawValue = _1.BN.min(_1.BN.min(amountWithdrawable, userDepositAmount), withdrawLimit.abs());
         if (reduceOnly) {
             return _1.BN.max(maxWithdrawValue, numericConstants_1.ZERO);

package/package.json

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

package/src/constants/perpMarkets.ts

@@ -154,6 +154,16 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1689270550000,
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'HNT',
+		category: ['IoT'],
+		symbol: 'HNT-PERP',
+		baseAssetSymbol: 'HNT',
+		marketIndex: 14,
+		oracle: new PublicKey('6Eg8YdfFJQF2HHonzPUBSCCmyUEhrStg9VBLK957sBe6'),
+		launchTs: 16922949550000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const MainnetPerpMarkets: PerpMarketConfig[] = [
@@ -297,6 +307,16 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1689270550000,
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'HNT',
+		category: ['IoT'],
+		symbol: 'HNT-PERP',
+		baseAssetSymbol: 'HNT',
+		marketIndex: 14,
+		oracle: new PublicKey('7moA1i5vQUpfDwSpK6Pw9s56ahB7WFGidtbL2ujWrVvm'),
+		launchTs: 16922949550000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {

package/src/events/eventSubscriber.ts

@@ -168,7 +168,7 @@ export class EventSubscriber {
 		const records = [];
 		// @ts-ignore
 		const events = parseLogs(this.program, slot, logs);
-		let _runningEventIndex = 0;
+		let runningEventIndex = 0;
 		for (const event of events) {
 			// @ts-ignore
 			const expectRecordType = this.eventListMap.has(event.name);
@@ -176,10 +176,10 @@ export class EventSubscriber {
 				event.data.txSig = txSig;
 				event.data.slot = slot;
 				event.data.eventType = event.name;
-				//event.data.txSigIndex = _runningEventIndex;
+				event.data.txSigIndex = runningEventIndex;
 				records.push(event.data);
 			}
-			_runningEventIndex++;
+			runningEventIndex++;
 		}
 		return records;
 	}

package/src/events/fetchLogs.ts

@@ -155,14 +155,14 @@ export class LogParser {
 			event.logs,
 			false
 		);
-		let _runningEventIndex = 0;
+		let runningEventIndex = 0;
 		for (const eventLog of eventGenerator) {
 			eventLog.data.txSig = event.txSig;
 			eventLog.data.slot = event.slot;
 			eventLog.data.eventType = eventLog.name;
-			//eventLog.data.txSigIndex = _runningEventIndex;
+			eventLog.data.txSigIndex = runningEventIndex;
 			records.push(eventLog.data);
-			_runningEventIndex++;
+			runningEventIndex++;
 		}
 		return records;
 	}

package/src/events/types.ts

@@ -64,7 +64,7 @@ export type EventSubscriptionOrderDirection = 'asc' | 'desc';
 export type Event<T> = T & {
 	txSig: TransactionSignature;
 	slot: number;
-	//txSigIndex: number; // Unique index for each event inside a tx
+	txSigIndex: number; // Unique index for each event inside a tx
 };
 
 export type WrappedEvent<Type extends EventType> = EventMap[Type] & {

package/src/user.ts

@@ -2937,12 +2937,20 @@ export class User {
 			withdrawLimit = BN.max(withdrawLimit, userDepositAmount);
 		}
 
-		const amountWithdrawable = freeCollateral
-			.mul(MARGIN_PRECISION)
-			.div(new BN(spotMarket.initialAssetWeight))
-			.mul(PRICE_PRECISION)
-			.div(oracleData.price)
-			.mul(precisionIncrease);
+		const assetWeight = calculateAssetWeight(
+			userDepositAmount,
+			spotMarket,
+			'Initial'
+		);
+
+		const amountWithdrawable = assetWeight.eq(ZERO)
+			? userDepositAmount
+			: freeCollateral
+					.mul(MARGIN_PRECISION)
+					.div(assetWeight)
+					.mul(PRICE_PRECISION)
+					.div(oracleData.price)
+					.mul(precisionIncrease);
 
 		const maxWithdrawValue = BN.min(
 			BN.min(amountWithdrawable, userDepositAmount),