@drift-labs/sdk 2.42.0-beta.9 → 2.43.0-beta.1

package/lib/user.js

@@ -670,9 +670,7 @@ class User {
      * @returns : number (value from [0, 100])
      */
     getHealth() {
-        const userAccount = this.getUserAccount();
-        if ((0, types_1.isVariant)(userAccount.status, 'beingLiquidated') ||
-            (0, types_1.isVariant)(userAccount.status, 'bankrupt')) {
+        if (this.isBeingLiquidated()) {
             return 0;
         }
         const totalCollateral = this.getTotalCollateral('Maintenance');
@@ -1004,13 +1002,12 @@ class User {
         };
     }
     isBeingLiquidated() {
-        return (0, types_1.isOneOfVariant)(this.getUserAccount().status, [
-            'beingLiquidated',
-            'bankrupt',
-        ]);
+        return ((this.getUserAccount().status &
+            (types_1.UserStatus.BEING_LIQUIDATED | types_1.UserStatus.BANKRUPT)) >
+            0);
     }
     isBankrupt() {
-        return (0, types_1.isVariant)(this.getUserAccount().status, 'bankrupt');
+        return (this.getUserAccount().status & types_1.UserStatus.BANKRUPT) > 0;
     }
     /**
      * Checks if any user position cumulative funding differs from respective market cumulative funding
@@ -1335,7 +1332,7 @@ class User {
         const outContributionInitial = this.calculateSpotPositionFreeCollateralContribution(outSpotPosition, outStrictOraclePrice);
         const { totalAssetValue: outTotalAssetValueInitial, totalLiabilityValue: outTotalLiabilityValueInitial, } = this.calculateSpotPositionLeverageContribution(outSpotPosition, outStrictOraclePrice);
         const initialContribution = inContributionInitial.add(outContributionInitial);
-        const { perpLiabilityValue, perpPnl, spotAssetValue, spotLiabilityValue } = this.getLeverageComponents(undefined, 'Initial');
+        const { perpLiabilityValue, perpPnl, spotAssetValue, spotLiabilityValue } = this.getLeverageComponents();
         if (!calculateSwap) {
             calculateSwap = (inSwap) => {
                 return inSwap
@@ -1490,7 +1487,7 @@ class User {
             this.getEmptySpotPosition(outMarketIndex);
         const { totalAssetValue: inTotalAssetValueInitial, totalLiabilityValue: inTotalLiabilityValueInitial, } = this.calculateSpotPositionLeverageContribution(inSpotPosition, inStrictOraclePrice);
         const { totalAssetValue: outTotalAssetValueInitial, totalLiabilityValue: outTotalLiabilityValueInitial, } = this.calculateSpotPositionLeverageContribution(outSpotPosition, outStrictOraclePrice);
-        const { perpLiabilityValue, perpPnl, spotAssetValue, spotLiabilityValue } = this.getLeverageComponents(undefined, 'Initial');
+        const { perpLiabilityValue, perpPnl, spotAssetValue, spotLiabilityValue } = this.getLeverageComponents();
         const inPositionAfter = this.cloneAndUpdateSpotPosition(inSpotPosition, inAmount.abs().neg(), inMarket);
         const outPositionAfter = this.cloneAndUpdateSpotPosition(outSpotPosition, outAmount.abs(), outMarket);
         const { totalAssetValue: inTotalAssetValueAfter, totalLiabilityValue: inTotalLiabilityValueAfter, } = this.calculateSpotPositionLeverageContribution(inPositionAfter, inStrictOraclePrice);
@@ -1741,11 +1738,20 @@ class User {
             depositAmount,
         };
     }
-    canMakeIdle(slot, slotsBeforeIdle) {
+    canMakeIdle(slot) {
         const userAccount = this.getUserAccount();
         if (userAccount.idle) {
             return false;
         }
+        const { totalAssetValue, totalLiabilityValue } = this.getSpotMarketAssetAndLiabilityValue();
+        const equity = totalAssetValue.sub(totalLiabilityValue);
+        let slotsBeforeIdle;
+        if (equity.lt(numericConstants_1.QUOTE_PRECISION)) {
+            slotsBeforeIdle = new _1.BN(9000); // 1 hour
+        }
+        else {
+            slotsBeforeIdle = new _1.BN(1512000); // 1 week
+        }
         const userLastActiveSlot = userAccount.lastActiveSlot;
         const slotsSinceLastActive = slot.sub(userLastActiveSlot);
         if (slotsSinceLastActive.lt(slotsBeforeIdle)) {

package/package.json

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

package/src/accounts/bulkAccountLoader.ts

@@ -19,7 +19,7 @@ export class BulkAccountLoader {
 	accountsToLoad = new Map<string, AccountToLoad>();
 	bufferAndSlotMap = new Map<string, BufferAndSlot>();
 	errorCallbacks = new Map<string, (e) => void>();
-	intervalId?: NodeJS.Timer;
+	intervalId?: ReturnType<typeof setTimeout>;
 	// to handle clients spamming load
 	loadPromise?: Promise<void>;
 	loadPromiseResolver: () => void;

package/src/config.ts

@@ -26,6 +26,7 @@ type DriftConfig = {
 	PERP_MARKETS: PerpMarketConfig[];
 	SPOT_MARKETS: SpotMarketConfig[];
 	MARKET_LOOKUP_TABLE: string;
+	SERUM_LOOKUP_TABLE?: string;
 };
 
 export type DriftEnv = 'devnet' | 'mainnet-beta';
@@ -60,6 +61,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 		PERP_MARKETS: MainnetPerpMarkets,
 		SPOT_MARKETS: MainnetSpotMarkets,
 		MARKET_LOOKUP_TABLE: 'D9cnvzswDikQDf53k4HpQ3KJ9y1Fv3HGGDFYMXnK5T6c',
+		SERUM_LOOKUP_TABLE: 'GPZkp76cJtNL2mphCvT6FXkJCVPpouidnacckR6rzKDN',
 	},
 };
 

package/src/constants/perpMarkets.ts

@@ -161,7 +161,27 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 		baseAssetSymbol: 'HNT',
 		marketIndex: 14,
 		oracle: new PublicKey('6Eg8YdfFJQF2HHonzPUBSCCmyUEhrStg9VBLK957sBe6'),
-		launchTs: 16922949550000,
+		launchTs: 1692294955000,
+		oracleSource: OracleSource.PYTH,
+	},
+	{
+		fullName: 'INJ',
+		category: ['L1', 'Exchange'],
+		symbol: 'INJ-PERP',
+		baseAssetSymbol: 'INJ',
+		marketIndex: 15,
+		oracle: new PublicKey('44uRsNnT35kjkscSu59MxRr9CfkLZWf6gny8bWqUbVxE'),
+		launchTs: 1698074659000,
+		oracleSource: OracleSource.PYTH,
+	},
+	{
+		fullName: 'LINK',
+		category: ['Oracle'],
+		symbol: 'LINK-PERP',
+		baseAssetSymbol: 'LINK',
+		marketIndex: 16,
+		oracle: new PublicKey('9sGidS4qUXS2WvHZFhzw4df1jNd5TvUGZXZVsSjXo7UF'),
+		launchTs: 1698074659000,
 		oracleSource: OracleSource.PYTH,
 	},
 ];
@@ -314,7 +334,27 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		baseAssetSymbol: 'HNT',
 		marketIndex: 14,
 		oracle: new PublicKey('7moA1i5vQUpfDwSpK6Pw9s56ahB7WFGidtbL2ujWrVvm'),
-		launchTs: 16922949550000,
+		launchTs: 1692294955000,
+		oracleSource: OracleSource.PYTH,
+	},
+	{
+		fullName: 'INJ',
+		category: ['L1', 'Exchange'],
+		symbol: 'INJ-PERP',
+		baseAssetSymbol: 'INJ',
+		marketIndex: 15,
+		oracle: new PublicKey('9EdtbaivHQYA4Nh3XzGR6DwRaoorqXYnmpfsnFhvwuVj'),
+		launchTs: 1698074659000,
+		oracleSource: OracleSource.PYTH,
+	},
+	{
+		fullName: 'LINK',
+		category: ['Oracle'],
+		symbol: 'LINK-PERP',
+		baseAssetSymbol: 'LINK',
+		marketIndex: 16,
+		oracle: new PublicKey('ALdkqQDMfHNg77oCNskfX751kHys4KE7SFuZzuKaN536'),
+		launchTs: 1698074659000,
 		oracleSource: OracleSource.PYTH,
 	},
 ];

package/src/constants/spotMarkets.ts

@@ -135,7 +135,7 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		mint: new PublicKey('J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn'),
 		precision: new BN(10).pow(NINE),
 		precisionExp: NINE,
-		serumMarket: new PublicKey('JAmhJbmBzLp2aTp9mNJodPsTcpCJsmq5jpr6CuCbWHvR'),
+		serumMarket: new PublicKey('DkbVbMhFxswS32xnn1K2UY4aoBugXooBTxdzkWWDWRkH'),
 	},
 ];
 

package/src/driftClient.ts

@@ -875,21 +875,48 @@ export class DriftClient {
 	}
 
 	public async updateUserCustomMarginRatio(
+		updates: { marginRatio: number; subAccountId: number }[]
+	): Promise<TransactionSignature> {
+		const ixs = await Promise.all(
+			updates.map(async ({ marginRatio, subAccountId }) => {
+				const ix = await this.getUpdateUserCustomMarginRatioIx(
+					marginRatio,
+					subAccountId
+				);
+				return ix;
+			})
+		);
+
+		const tx = await this.buildTransaction(ixs, this.txParams);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
+	}
+
+	public async getUpdateUserCustomMarginRatioIx(
 		marginRatio: number,
 		subAccountId = 0
-	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updateUserCustomMarginRatio(
+	): Promise<TransactionInstruction> {
+		const userAccountPublicKey = getUserAccountPublicKeySync(
+			this.program.programId,
+			this.wallet.publicKey,
+			subAccountId
+		);
+
+		await this.addUser(subAccountId, this.wallet.publicKey);
+
+		const ix = this.program.instruction.updateUserCustomMarginRatio(
 			subAccountId,
 			marginRatio,
 			{
 				accounts: {
-					user: await this.getUserAccountPublicKey(),
+					user: userAccountPublicKey,
 					authority: this.wallet.publicKey,
 				},
 			}
 		);
-		const { txSig } = await this.sendTransaction(tx, [], this.opts);
-		return txSig;
+
+		return ix;
 	}
 
 	public async getUpdateUserMarginTradingEnabledIx(
@@ -930,31 +957,18 @@ export class DriftClient {
 	}
 
 	public async updateUserMarginTradingEnabled(
-		marginTradingEnabled: boolean,
-		subAccountId = 0
+		updates: { marginTradingEnabled: boolean; subAccountId: number }[]
 	): Promise<TransactionSignature> {
-		const userAccountPublicKey = getUserAccountPublicKeySync(
-			this.program.programId,
-			this.wallet.publicKey,
-			subAccountId
+		const ixs = await Promise.all(
+			updates.map(async ({ marginTradingEnabled, subAccountId }) => {
+				return await this.getUpdateUserMarginTradingEnabledIx(
+					marginTradingEnabled,
+					subAccountId
+				);
+			})
 		);
 
-		await this.addUser(subAccountId, this.wallet.publicKey);
-		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts: [this.getUserAccount(subAccountId)],
-		});
-
-		const tx = await this.program.transaction.updateUserMarginTradingEnabled(
-			subAccountId,
-			marginTradingEnabled,
-			{
-				accounts: {
-					user: userAccountPublicKey,
-					authority: this.wallet.publicKey,
-				},
-				remainingAccounts,
-			}
-		);
+		const tx = await this.buildTransaction(ixs, this.txParams);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;

package/src/events/fetchLogs.ts

@@ -150,6 +150,9 @@ export class LogParser {
 
 	public parseEventsFromLogs(event: Log): WrappedEvents {
 		const records: WrappedEvents = [];
+
+		if (!event.logs) return records;
+
 		// @ts-ignore
 		const eventGenerator = this.program._events._eventParser.parseLogs(
 			event.logs,

package/src/events/pollingLogProvider.ts

@@ -10,7 +10,7 @@ import { fetchLogs } from './fetchLogs';
 
 export class PollingLogProvider implements LogProvider {
 	private finality: Finality;
-	private intervalId: NodeJS.Timer;
+	private intervalId: ReturnType<typeof setTimeout>;
 	private mostRecentSeenTx?: TransactionSignature;
 	private mutex: number;
 	private firstFetch = true;