@drift-labs/sdk 2.42.0-beta.8 → 2.43.0-beta.0

package/lib/math/spotBalance.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { SpotMarketAccount, SpotBalanceType, MarginCategory } from '../types';
 import { BN } from '@coral-xyz/anchor';
 import { OraclePriceData } from '../oracles/types';
@@ -50,7 +51,7 @@ export declare function getTokenValue(tokenAmount: BN, spotDecimals: number, ora
 export declare function calculateAssetWeight(balanceAmount: BN, oraclePrice: BN, spotMarket: SpotMarketAccount, marginCategory: MarginCategory): BN;
 export declare function calculateScaledInitialAssetWeight(spotMarket: SpotMarketAccount, oraclePrice: BN): BN;
 export declare function calculateLiabilityWeight(size: BN, spotMarket: SpotMarketAccount, marginCategory: MarginCategory): BN;
-export declare function calculateUtilization(bank: SpotMarketAccount, delta?: any): BN;
+export declare function calculateUtilization(bank: SpotMarketAccount, delta?: BN): BN;
 /**
  * calculates max borrow amount where rate would stay below targetBorrowRate
  * @param spotMarketAccount
@@ -61,7 +62,7 @@ export declare function calculateSpotMarketBorrowCapacity(spotMarketAccount: Spo
     totalCapacity: BN;
     remainingCapacity: BN;
 };
-export declare function calculateInterestRate(bank: SpotMarketAccount, delta?: any): BN;
+export declare function calculateInterestRate(bank: SpotMarketAccount, delta?: BN): BN;
 export declare function calculateDepositRate(bank: SpotMarketAccount): BN;
 export declare function calculateBorrowRate(bank: SpotMarketAccount): BN;
 export declare function calculateInterestAccumulated(bank: SpotMarketAccount, now: BN): {

package/lib/math/spotMarket.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { BN } from '@coral-xyz/anchor';
 import { MarginCategory, SpotBalanceType, SpotMarketAccount } from '../types';
 export declare function castNumberToSpotPrecision(value: number | BN, spotMarket: SpotMarketAccount): BN;

package/lib/math/spotPosition.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { MarginCategory, SpotMarketAccount, SpotPosition } from '../types';
 import { BN } from '@coral-xyz/anchor';
 import { StrictOraclePrice } from '../oracles/strictOraclePrice';

package/lib/math/superStake.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { AddressLookupTableAccount, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import { JupiterClient } from '../jupiter/jupiterClient';
 import { DriftClient } from '../driftClient';

package/lib/math/trade.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { PerpMarketAccount, PositionDirection, SpotMarketAccount } from '../types';
 import { BN } from '@coral-xyz/anchor';
 import { AssetType } from './amm';

package/lib/math/utils.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { BN } from '../';
 export declare function clampBN(x: BN, min: BN, max: BN): BN;
 export declare const squareRootBN: (n: BN) => BN;

package/lib/oracles/pythClient.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 /// <reference types="node" />
 import { Connection, PublicKey } from '@solana/web3.js';
 import { OracleClient, OraclePriceData } from './types';
@@ -6,7 +7,7 @@ export declare class PythClient implements OracleClient {
     private connection;
     private multiple;
     private stableCoin;
-    constructor(connection: Connection, multiple?: any, stableCoin?: boolean);
+    constructor(connection: Connection, multiple?: BN, stableCoin?: boolean);
     getOraclePriceData(pricePublicKey: PublicKey): Promise<OraclePriceData>;
     getOraclePriceDataFromBuffer(buffer: Buffer): OraclePriceData;
 }

package/lib/oracles/strictOraclePrice.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { BN } from '@coral-xyz/anchor';
 export declare class StrictOraclePrice {
     current: BN;

package/lib/oracles/types.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 /// <reference types="node" />
 import { BN } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';

package/lib/orderParams.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { OptionalOrderParams, OrderParams, OrderTriggerCondition } from './types';
 import { BN } from '@coral-xyz/anchor';
 export declare function getLimitOrderParams(params: Omit<OptionalOrderParams, 'orderType'> & {

package/lib/orderSubscriber/PollingSubscription.d.ts

@@ -1,9 +1,8 @@
-/// <reference types="node" />
 import { OrderSubscriber } from './OrderSubscriber';
 export declare class PollingSubscription {
     private orderSubscriber;
     private frequency;
-    intervalId?: NodeJS.Timer;
+    intervalId?: ReturnType<typeof setTimeout>;
     constructor({ orderSubscriber, frequency, }: {
         orderSubscriber: OrderSubscriber;
         frequency: number;

package/lib/phoenix/phoenixSubscriber.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { Connection, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
 import { Client, Market } from '@ellipsis-labs/phoenix-sdk';

package/lib/priorityFee/priorityFeeSubscriber.d.ts

@@ -1,11 +1,10 @@
-/// <reference types="node" />
 import { Connection, PublicKey } from '@solana/web3.js';
 export declare class PriorityFeeSubscriber {
     connection: Connection;
     frequencyMs: number;
     addresses: PublicKey[];
     slotsToCheck: number;
-    intervalId?: NodeJS.Timer;
+    intervalId?: ReturnType<typeof setTimeout>;
     latestPriorityFee: number;
     avgPriorityFee: number;
     maxPriorityFee: number;

package/lib/serum/serumSubscriber.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { Connection, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
 import { Market, Orderbook } from '@project-serum/serum';

package/lib/tokenFaucet.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import * as anchor from '@coral-xyz/anchor';
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { Account } from '@solana/spl-token';

package/lib/types.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { PublicKey, Transaction, VersionedTransaction } from '@solana/web3.js';
 import { BN } from '.';
 export declare enum ExchangeStatus {
@@ -40,19 +41,10 @@ export declare class MarketStatus {
         delisted: {};
     };
 }
-export declare class UserStatus {
-    static readonly ACTIVE: {
-        active: {};
-    };
-    static readonly BEING_LIQUIDATED: {
-        beingLiquidated: {};
-    };
-    static readonly BANKRUPT: {
-        bankrupt: {};
-    };
-    static readonly REDUCE_ONLY: {
-        reduceOnly: {};
-    };
+export declare enum UserStatus {
+    BEING_LIQUIDATED = 1,
+    BANKRUPT = 2,
+    REDUCE_ONLY = 4
 }
 export declare class ContractType {
     static readonly PERPETUAL: {
@@ -881,7 +873,7 @@ export type UserAccount = {
     spotPositions: SpotPosition[];
     perpPositions: PerpPosition[];
     orders: Order[];
-    status: UserStatus;
+    status: number;
     nextLiquidationId: number;
     nextOrderId: number;
     maxMarginRatio: number;

package/lib/types.js

@@ -27,13 +27,12 @@ MarketStatus.WITHDRAW_PAUSED = { withdrawPaused: {} };
 MarketStatus.REDUCE_ONLY = { reduceOnly: {} };
 MarketStatus.SETTLEMENT = { settlement: {} };
 MarketStatus.DELISTED = { delisted: {} };
-class UserStatus {
-}
-exports.UserStatus = UserStatus;
-UserStatus.ACTIVE = { active: {} };
-UserStatus.BEING_LIQUIDATED = { beingLiquidated: {} };
-UserStatus.BANKRUPT = { bankrupt: {} };
-UserStatus.REDUCE_ONLY = { reduceOnly: {} };
+var UserStatus;
+(function (UserStatus) {
+    UserStatus[UserStatus["BEING_LIQUIDATED"] = 1] = "BEING_LIQUIDATED";
+    UserStatus[UserStatus["BANKRUPT"] = 2] = "BANKRUPT";
+    UserStatus[UserStatus["REDUCE_ONLY"] = 4] = "REDUCE_ONLY";
+})(UserStatus = exports.UserStatus || (exports.UserStatus = {}));
 class ContractType {
 }
 exports.ContractType = ContractType;

package/lib/user.d.ts

@@ -1,11 +1,12 @@
 /// <reference types="node" />
+/// <reference types="bn.js" />
 import { PublicKey } from '@solana/web3.js';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { DriftClient } from './driftClient';
-import { MarginCategory, Order, UserAccount, PerpPosition, SpotPosition, PerpMarketAccount, HealthComponents } from './types';
-import { UserAccountSubscriber, UserAccountEvents, DataAndSlot } from './accounts/types';
-import { PositionDirection, BN, SpotMarketAccount, MarketType } from '.';
+import { HealthComponents, MarginCategory, Order, PerpMarketAccount, PerpPosition, SpotPosition, UserAccount } from './types';
+import { DataAndSlot, UserAccountEvents, UserAccountSubscriber } from './accounts/types';
+import { BN, MarketType, PositionDirection, SpotMarketAccount } from '.';
 import { OraclePriceData } from './oracles/types';
 import { UserConfig } from './userConfig';
 import { StrictOraclePrice } from './oracles/strictOraclePrice';
@@ -99,7 +100,7 @@ export declare class User {
      * calculates Buying Power = free collateral / initial margin ratio
      * @returns : Precision QUOTE_PRECISION
      */
-    getPerpBuyingPower(marketIndex: number, collateralBuffer?: any): BN;
+    getPerpBuyingPower(marketIndex: number, collateralBuffer?: BN): BN;
     getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex: number, freeCollateral: BN, baseAssetAmount: BN): BN;
     /**
      * calculates Free Collateral = Total collateral - margin requirement
@@ -365,7 +366,7 @@ export declare class User {
         depositAmount: BN;
         maxDepositAmount: BN;
     };
-    canMakeIdle(slot: BN, slotsBeforeIdle: BN): boolean;
+    canMakeIdle(slot: BN): boolean;
     getSafestTiers(): {
         perpTier: number;
         spotTier: number;

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.8",
+	"version": "2.43.0-beta.0",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -45,6 +45,7 @@
 	},
 	"devDependencies": {
 		"@types/big.js": "^6.2.0",
+		"@types/bn.js": "^5.1.3",
 		"@types/chai": "^4.3.1",
 		"@types/jest": "^28.1.3",
 		"@types/mocha": "^9.1.1",

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/dlob/DLOB.ts

@@ -73,6 +73,14 @@ export type MarketNodeLists = {
 
 type OrderBookCallback = () => void;
 
+/**
+ *  Receives a DLOBNode and is expected to return true if the node should
+ *  be taken into account when generating, or false otherwise.
+ *
+ * Currently used in getRestingLimitBids and getRestingLimitAsks.
+ */
+export type DLOBFilterFcn = (node: DLOBNode) => boolean;
+
 export type NodeToFill = {
 	node: DLOBNode;
 	makerNodes: DLOBNode[];
@@ -1065,7 +1073,8 @@ export class DLOB {
 			currentDLOBNode: DLOBNode,
 			slot: number,
 			oraclePriceData: OraclePriceData
-		) => boolean
+		) => boolean,
+		filterFcn?: DLOBFilterFcn
 	): Generator<DLOBNode> {
 		const generators = generatorList.map((generator) => {
 			return {
@@ -1102,6 +1111,11 @@ export class DLOB {
 					continue;
 				}
 
+				if (filterFcn && filterFcn(bestGenerator.next.value)) {
+					bestGenerator.next = bestGenerator.generator.next();
+					continue;
+				}
+
 				yield bestGenerator.next.value;
 				bestGenerator.next = bestGenerator.generator.next();
 			} else {
@@ -1114,7 +1128,8 @@ export class DLOB {
 		marketIndex: number,
 		slot: number,
 		marketType: MarketType,
-		oraclePriceData: OraclePriceData
+		oraclePriceData: OraclePriceData,
+		filterFcn?: DLOBFilterFcn
 	): Generator<DLOBNode> {
 		if (isVariant(marketType, 'spot') && !oraclePriceData) {
 			throw new Error('Must provide OraclePriceData to get spot asks');
@@ -1142,46 +1157,17 @@ export class DLOB {
 				return bestNode
 					.getPrice(oraclePriceData, slot)
 					.lt(currentNode.getPrice(oraclePriceData, slot));
-			}
+			},
+			filterFcn
 		);
 	}
 
-	/**
-	 * Filters the limit asks that are resting and do not cross fallback bid
-	 * Taking orders can only fill against orders that meet this criteria
-	 *
-	 * @returns
-	 */
-	*getMakerLimitAsks(
-		marketIndex: number,
-		slot: number,
-		marketType: MarketType,
-		oraclePriceData: OraclePriceData,
-		fallbackBid?: BN
-	): Generator<DLOBNode> {
-		const isPerpMarket = isVariant(marketType, 'perp');
-		for (const node of this.getRestingLimitAsks(
-			marketIndex,
-			slot,
-			marketType,
-			oraclePriceData
-		)) {
-			if (
-				isPerpMarket &&
-				fallbackBid &&
-				node.getPrice(oraclePriceData, slot).lte(fallbackBid)
-			) {
-				continue;
-			}
-			yield node;
-		}
-	}
-
 	*getRestingLimitBids(
 		marketIndex: number,
 		slot: number,
 		marketType: MarketType,
-		oraclePriceData: OraclePriceData
+		oraclePriceData: OraclePriceData,
+		filterFcn?: DLOBFilterFcn
 	): Generator<DLOBNode> {
 		if (isVariant(marketType, 'spot') && !oraclePriceData) {
 			throw new Error('Must provide OraclePriceData to get spot bids');
@@ -1209,41 +1195,11 @@ export class DLOB {
 				return bestNode
 					.getPrice(oraclePriceData, slot)
 					.gt(currentNode.getPrice(oraclePriceData, slot));
-			}
+			},
+			filterFcn
 		);
 	}
 
-	/**
-	 * Filters the limit bids that are post only, have been place for sufficiently long or are below the fallback ask
-	 * Market orders can only fill against orders that meet this criteria
-	 *
-	 * @returns
-	 */
-	*getMakerLimitBids(
-		marketIndex: number,
-		slot: number,
-		marketType: MarketType,
-		oraclePriceData: OraclePriceData,
-		fallbackAsk?: BN
-	): Generator<DLOBNode> {
-		const isPerpMarket = isVariant(marketType, 'perp');
-		for (const node of this.getRestingLimitBids(
-			marketIndex,
-			slot,
-			marketType,
-			oraclePriceData
-		)) {
-			if (
-				isPerpMarket &&
-				fallbackAsk &&
-				node.getPrice(oraclePriceData, slot).gte(fallbackAsk)
-			) {
-				continue;
-			}
-			yield node;
-		}
-	}
-
 	*getAsks(
 		marketIndex: number,
 		fallbackAsk: BN | undefined,

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;