@drift-labs/sdk 2.10.0-beta.2 → 2.10.0-beta.3

package/lib/accounts/bulkAccountLoader.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Commitment, Connection, PublicKey } from '@solana/web3.js';
 import { BufferAndSlot } from './types';
-declare type AccountToLoad = {
+type AccountToLoad = {
     publicKey: PublicKey;
     callbacks: Map<string, (buffer: Buffer, slot: number) => void>;
 };

package/lib/accounts/types.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { SpotMarketAccount, PerpMarketAccount, OracleSource, StateAccount, UserAccount, UserStatsAccount } from '../types';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
@@ -78,23 +79,23 @@ export interface OracleAccountSubscriber {
     unsubscribe(): Promise<void>;
     getOraclePriceData(): DataAndSlot<OraclePriceData>;
 }
-export declare type AccountToPoll = {
+export type AccountToPoll = {
     key: string;
     publicKey: PublicKey;
     eventType: string;
     callbackId?: string;
     mapKey?: number;
 };
-export declare type OraclesToPoll = {
+export type OraclesToPoll = {
     publicKey: PublicKey;
     source: OracleSource;
     callbackId?: string;
 };
-export declare type BufferAndSlot = {
+export type BufferAndSlot = {
     slot: number;
     buffer: Buffer | undefined;
 };
-export declare type DataAndSlot<T> = {
+export type DataAndSlot<T> = {
     data: T;
     slot: number;
 };

package/lib/config.d.ts

@@ -1,7 +1,7 @@
 import { PerpMarketConfig } from './constants/perpMarkets';
 import { SpotMarketConfig } from './constants/spotMarkets';
 import { OracleInfo } from './oracles/types';
-declare type DriftConfig = {
+type DriftConfig = {
     ENV: DriftEnv;
     PYTH_ORACLE_MAPPING_ADDRESS: string;
     DRIFT_PROGRAM_ID: string;
@@ -11,7 +11,7 @@ declare type DriftConfig = {
     PERP_MARKETS: PerpMarketConfig[];
     SPOT_MARKETS: SpotMarketConfig[];
 };
-export declare type DriftEnv = 'devnet' | 'mainnet-beta';
+export type DriftEnv = 'devnet' | 'mainnet-beta';
 export declare const configs: {
     [key in DriftEnv]: DriftConfig;
 };

package/lib/constants/perpMarkets.d.ts

@@ -1,7 +1,7 @@
 import { OracleSource } from '../';
 import { DriftEnv } from '../';
 import { PublicKey } from '@solana/web3.js';
-export declare type PerpMarketConfig = {
+export type PerpMarketConfig = {
     fullName?: string;
     category?: string[];
     symbol: string;

package/lib/constants/spotMarkets.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="bn.js" />
 import { PublicKey } from '@solana/web3.js';
 import { BN, DriftEnv, OracleSource } from '../';
-export declare type SpotMarketConfig = {
+export type SpotMarketConfig = {
     symbol: string;
     marketIndex: number;
     oracle: PublicKey;

package/lib/dlob/DLOB.d.ts

@@ -4,7 +4,7 @@ import { MarketType, BN, DriftClient, Order, SpotMarketAccount, PerpMarketAccoun
 import { PublicKey } from '@solana/web3.js';
 import { DLOBNode, DLOBNodeType, TriggerOrderNode } from '..';
 import { DLOBOrders } from './DLOBOrders';
-export declare type MarketNodeLists = {
+export type MarketNodeLists = {
     limit: {
         ask: NodeList<'limit'>;
         bid: NodeList<'limit'>;
@@ -22,12 +22,12 @@ export declare type MarketNodeLists = {
         below: NodeList<'trigger'>;
     };
 };
-declare type OrderBookCallback = () => void;
-export declare type NodeToFill = {
+type OrderBookCallback = () => void;
+export type NodeToFill = {
     node: DLOBNode;
     makerNode?: DLOBNode;
 };
-export declare type NodeToTrigger = {
+export type NodeToTrigger = {
     node: TriggerOrderNode;
 };
 export declare class DLOB {

package/lib/dlob/DLOBNode.d.ts

@@ -42,11 +42,11 @@ export declare class TriggerOrderNode extends OrderNode {
     previous?: TriggerOrderNode;
     getSortValue(order: Order): BN;
 }
-export declare type DLOBNodeMap = {
+export type DLOBNodeMap = {
     limit: LimitOrderNode;
     floatingLimit: FloatingLimitOrderNode;
     market: MarketOrderNode;
     trigger: TriggerOrderNode;
 };
-export declare type DLOBNodeType = 'limit' | 'floatingLimit' | 'market' | ('trigger' & keyof DLOBNodeMap);
+export type DLOBNodeType = 'limit' | 'floatingLimit' | 'market' | ('trigger' & keyof DLOBNodeMap);
 export declare function createNode<T extends DLOBNodeType>(nodeType: T, order: Order, userAccount: PublicKey): DLOBNodeMap[T];

package/lib/dlob/DLOBOrders.d.ts

@@ -2,11 +2,11 @@
 import { PublicKey } from '@solana/web3.js';
 import { Idl } from '@project-serum/anchor';
 import { Order } from '../types';
-export declare type DLOBOrder = {
+export type DLOBOrder = {
     user: PublicKey;
     order: Order;
 };
-export declare type DLOBOrders = DLOBOrder[];
+export type DLOBOrders = DLOBOrder[];
 export declare class DLOBOrdersCoder {
     private idl;
     constructor(idl: Idl);

package/lib/dlob/NodeList.d.ts

@@ -2,7 +2,7 @@
 import { BN, MarketTypeStr, Order } from '..';
 import { PublicKey } from '@solana/web3.js';
 import { DLOBNode, DLOBNodeMap } from './DLOBNode';
-export declare type SortDirection = 'asc' | 'desc';
+export type SortDirection = 'asc' | 'desc';
 export declare function getOrderSignature(orderId: number, userAccount: PublicKey): string;
 export interface DLOBNodeGenerator {
     getGenerator(): Generator<DLOBNode>;

package/lib/driftClient.d.ts

@@ -14,7 +14,7 @@ import { DriftClientConfig } from './driftClientConfig';
 import { User } from './user';
 import { UserSubscriptionConfig } from './userConfig';
 import { UserStats } from './userStats';
-declare type RemainingAccountParams = {
+type RemainingAccountParams = {
     userAccounts: UserAccount[];
     writablePerpMarketIndexes?: number[];
     writableSpotMarketIndexes?: number[];

package/lib/driftClient.js

@@ -53,6 +53,12 @@ const spotPosition_1 = require("./math/spotPosition");
  * This class is the main way to interact with Drift Protocol. It allows you to subscribe to the various accounts where the Market's state is stored, as well as: opening positions, liquidating, settling funding, depositing & withdrawing, and more.
  */
 class DriftClient {
+    get isSubscribed() {
+        return this._isSubscribed && this.accountSubscriber.isSubscribed;
+    }
+    set isSubscribed(val) {
+        this._isSubscribed = val;
+    }
     constructor(config) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         this.users = new Map();
@@ -106,12 +112,6 @@ class DriftClient {
         this.eventEmitter = this.accountSubscriber.eventEmitter;
         this.txSender = new retryTxSender_1.RetryTxSender(this.provider, (_f = config.txSenderConfig) === null || _f === void 0 ? void 0 : _f.timeout, (_g = config.txSenderConfig) === null || _g === void 0 ? void 0 : _g.retrySleep, (_h = config.txSenderConfig) === null || _h === void 0 ? void 0 : _h.additionalConnections);
     }
-    get isSubscribed() {
-        return this._isSubscribed && this.accountSubscriber.isSubscribed;
-    }
-    set isSubscribed(val) {
-        this._isSubscribed = val;
-    }
     createUsers(subAccountIds, accountSubscriptionConfig) {
         for (const subAccountId of subAccountIds) {
             const user = this.createUser(subAccountId, accountSubscriptionConfig);

package/lib/driftClientConfig.d.ts

@@ -3,7 +3,7 @@ import { IWallet } from './types';
 import { OracleInfo } from './oracles/types';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { DriftEnv } from './config';
-export declare type DriftClientConfig = {
+export type DriftClientConfig = {
     connection: Connection;
     wallet: IWallet;
     programID: PublicKey;
@@ -19,13 +19,13 @@ export declare type DriftClientConfig = {
     userStats?: boolean;
     authority?: PublicKey;
 };
-declare type DriftClientSubscriptionConfig = {
+export type DriftClientSubscriptionConfig = {
     type: 'websocket';
 } | {
     type: 'polling';
     accountLoader: BulkAccountLoader;
 };
-declare type TxSenderConfig = {
+type TxSenderConfig = {
     type: 'retry';
     timeout?: number;
     retrySleep?: number;

package/lib/events/fetchLogs.d.ts

@@ -1,12 +1,12 @@
 import { Program } from '@project-serum/anchor';
 import { Connection, Finality, PublicKey, TransactionResponse, TransactionSignature } from '@solana/web3.js';
 import { WrappedEvents } from './types';
-declare type Log = {
+type Log = {
     txSig: TransactionSignature;
     slot: number;
     logs: string[];
 };
-declare type FetchLogsResponse = {
+type FetchLogsResponse = {
     earliestTx: string;
     mostRecentTx: string;
     earliestSlot: number;

package/lib/events/types.d.ts

@@ -1,6 +1,6 @@
 import { Commitment, TransactionSignature } from '@solana/web3.js';
 import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderActionRecord, OrderRecord, SettlePnlRecord, LPRecord, InsuranceFundRecord, SpotInterestRecord, InsuranceFundStakeRecord, CurveRecord } from '../index';
-export declare type EventSubscriptionOptions = {
+export type EventSubscriptionOptions = {
     eventTypes?: EventType[];
     maxEventsPerType?: number;
     orderBy?: EventSubscriptionOrderBy;
@@ -11,17 +11,17 @@ export declare type EventSubscriptionOptions = {
     untilTx?: TransactionSignature;
 };
 export declare const DefaultEventSubscriptionOptions: EventSubscriptionOptions;
-export declare type EventSubscriptionOrderBy = 'blockchain' | 'client';
-export declare type EventSubscriptionOrderDirection = 'asc' | 'desc';
-export declare type Event<T> = T & {
+export type EventSubscriptionOrderBy = 'blockchain' | 'client';
+export type EventSubscriptionOrderDirection = 'asc' | 'desc';
+export type Event<T> = T & {
     txSig: TransactionSignature;
     slot: number;
 };
-export declare type WrappedEvent<Type extends EventType> = EventMap[Type] & {
+export type WrappedEvent<Type extends EventType> = EventMap[Type] & {
     eventType: Type;
 };
-export declare type WrappedEvents = WrappedEvent<EventType>[];
-export declare type EventMap = {
+export type WrappedEvents = WrappedEvent<EventType>[];
+export type EventMap = {
     DepositRecord: Event<DepositRecord>;
     FundingPaymentRecord: Event<FundingPaymentRecord>;
     LiquidationRecord: Event<LiquidationRecord>;
@@ -36,22 +36,22 @@ export declare type EventMap = {
     InsuranceFundStakeRecord: Event<InsuranceFundStakeRecord>;
     CurveRecord: Event<CurveRecord>;
 };
-export declare type EventType = keyof EventMap;
+export type EventType = keyof EventMap;
 export interface EventSubscriberEvents {
     newEvent: (event: WrappedEvent<EventType>) => void;
 }
-export declare type SortFn = (currentRecord: EventMap[EventType], newRecord: EventMap[EventType]) => 'less than' | 'greater than';
-export declare type logProviderCallback = (txSig: TransactionSignature, slot: number, logs: string[], mostRecentBlockTime: number | undefined) => void;
+export type SortFn = (currentRecord: EventMap[EventType], newRecord: EventMap[EventType]) => 'less than' | 'greater than';
+export type logProviderCallback = (txSig: TransactionSignature, slot: number, logs: string[], mostRecentBlockTime: number | undefined) => void;
 export interface LogProvider {
     isSubscribed(): boolean;
     subscribe(callback: logProviderCallback, skipHistory?: boolean): boolean;
     unsubscribe(): Promise<boolean>;
 }
-export declare type WebSocketLogProviderConfig = {
+export type WebSocketLogProviderConfig = {
     type: 'websocket';
 };
-export declare type PollingLogProviderConfig = {
+export type PollingLogProviderConfig = {
     type: 'polling';
     frequency: number;
 };
-export declare type LogProviderConfig = WebSocketLogProviderConfig | PollingLogProviderConfig;
+export type LogProviderConfig = WebSocketLogProviderConfig | PollingLogProviderConfig;

package/lib/factory/bigNum.js

@@ -5,15 +5,15 @@ const anchor_1 = require("@project-serum/anchor");
 const assert_1 = require("../assert/assert");
 const numericConstants_1 = require("./../constants/numericConstants");
 class BigNum {
+    static setLocale(locale) {
+        BigNum.delim = (1.1).toLocaleString(locale).slice(1, 2) || '.';
+        BigNum.spacer = (1000).toLocaleString(locale).slice(1, 2) || ',';
+    }
     constructor(val, precisionVal = new anchor_1.BN(0)) {
         this.toString = (base, length) => this.val.toString(base, length);
         this.val = new anchor_1.BN(val);
         this.precision = new anchor_1.BN(precisionVal);
     }
-    static setLocale(locale) {
-        BigNum.delim = (1.1).toLocaleString(locale).slice(1, 2) || '.';
-        BigNum.spacer = (1000).toLocaleString(locale).slice(1, 2) || ',';
-    }
     bigNumFromParam(bn) {
         return anchor_1.BN.isBN(bn) ? BigNum.from(bn) : bn;
     }

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.10.0-beta.2",
+    "version": "2.10.0-beta.3",
     "name": "drift",
     "instructions": [
         {

package/lib/math/amm.d.ts

@@ -22,7 +22,7 @@ export declare function calculateBidAskPrice(amm: AMM, oraclePriceData: OraclePr
  * @returns price : Precision PRICE_PRECISION
  */
 export declare function calculatePrice(baseAssetReserves: BN, quoteAssetReserves: BN, pegMultiplier: BN): BN;
-export declare type AssetType = 'quote' | 'base';
+export type AssetType = 'quote' | 'base';
 /**
  * Calculates what the amm reserves would be after swapping a quote or base asset amount.
  *

package/lib/math/trade.d.ts

@@ -3,7 +3,7 @@ import { PerpMarketAccount, PositionDirection } from '../types';
 import { BN } from '@project-serum/anchor';
 import { AssetType } from './amm';
 import { OraclePriceData } from '../oracles/types';
-export declare type PriceImpactUnit = 'entryPrice' | 'maxPrice' | 'priceDelta' | 'priceDeltaAsNumber' | 'pctAvg' | 'pctMax' | 'quoteAssetAmount' | 'quoteAssetAmountPeg' | 'acquiredBaseAssetAmount' | 'acquiredQuoteAssetAmount' | 'all';
+export type PriceImpactUnit = 'entryPrice' | 'maxPrice' | 'priceDelta' | 'priceDeltaAsNumber' | 'pctAvg' | 'pctMax' | 'quoteAssetAmount' | 'quoteAssetAmountPeg' | 'acquiredBaseAssetAmount' | 'acquiredQuoteAssetAmount' | 'all';
 /**
  * Calculates avg/max slippage (price impact) for candidate trade
  * @param direction

package/lib/oracles/types.d.ts

@@ -3,7 +3,7 @@
 import { BN } from '@project-serum/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { OracleSource } from '../types';
-export declare type OraclePriceData = {
+export type OraclePriceData = {
     price: BN;
     slot: BN;
     confidence: BN;
@@ -11,7 +11,7 @@ export declare type OraclePriceData = {
     twap?: BN;
     twapConfidence?: BN;
 };
-export declare type OracleInfo = {
+export type OracleInfo = {
     publicKey: PublicKey;
     source: OracleSource;
 };

package/lib/serum/types.d.ts

@@ -1,6 +1,6 @@
 import { Connection, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
-export declare type SerumMarketSubscriberConfig = {
+export type SerumMarketSubscriberConfig = {
     connection: Connection;
     programId: PublicKey;
     marketAddress: PublicKey;

package/lib/slot/SlotSubscriber.d.ts

@@ -2,7 +2,7 @@
 import { Connection } from '@solana/web3.js';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types/types/src';
-declare type SlotSubscriberConfig = {};
+type SlotSubscriberConfig = {};
 export interface SlotSubscriberEvents {
     newSlot: (newSlot: number) => void;
 }

package/lib/tx/retryTxSender.d.ts

@@ -2,7 +2,7 @@
 import { TxSender, TxSigAndSlot } from './types';
 import { Commitment, ConfirmOptions, RpcResponseAndContext, Signer, SignatureResult, Transaction, TransactionSignature, Connection } from '@solana/web3.js';
 import { AnchorProvider } from '@project-serum/anchor';
-declare type ResolveReference = {
+type ResolveReference = {
     resolve?: () => void;
 };
 export declare class RetryTxSender implements TxSender {

package/lib/tx/types.d.ts

@@ -1,6 +1,6 @@
 import { Provider } from '@project-serum/anchor';
 import { ConfirmOptions, Signer, Transaction, TransactionSignature } from '@solana/web3.js';
-export declare type TxSigAndSlot = {
+export type TxSigAndSlot = {
     txSig: TransactionSignature;
     slot: number;
 };

package/lib/types.d.ts

@@ -317,8 +317,8 @@ export declare enum TradeSide {
     Buy = 1,
     Sell = 2
 }
-export declare type CandleResolution = '1' | '5' | '15' | '60' | '240' | 'D' | 'W' | 'M';
-export declare type NewUserRecord = {
+export type CandleResolution = '1' | '5' | '15' | '60' | '240' | 'D' | 'W' | 'M';
+export type NewUserRecord = {
     ts: BN;
     userAuthority: PublicKey;
     user: PublicKey;
@@ -326,7 +326,7 @@ export declare type NewUserRecord = {
     name: number[];
     referrer: PublicKey;
 };
-export declare type DepositRecord = {
+export type DepositRecord = {
     ts: BN;
     userAuthority: PublicKey;
     user: PublicKey;
@@ -347,7 +347,7 @@ export declare type DepositRecord = {
     explanation: DepositExplanation;
     transferUser?: PublicKey;
 };
-export declare type SpotInterestRecord = {
+export type SpotInterestRecord = {
     ts: BN;
     marketIndex: number;
     depositBalance: BN;
@@ -358,7 +358,7 @@ export declare type SpotInterestRecord = {
     optimalBorrowRate: number;
     maxBorrowRate: number;
 };
-export declare type CurveRecord = {
+export type CurveRecord = {
     ts: BN;
     recordId: BN;
     marketIndex: number;
@@ -406,7 +406,7 @@ export declare type InsuranceFundStakeRecord = {
     userIfSharesAfter: BN;
     totalIfSharesAfter: BN;
 };
-export declare type LPRecord = {
+export type LPRecord = {
     ts: BN;
     user: PublicKey;
     action: LPAction;
@@ -427,7 +427,7 @@ export declare class LPAction {
         settleLiquidity: {};
     };
 }
-export declare type FundingRateRecord = {
+export type FundingRateRecord = {
     ts: BN;
     recordId: BN;
     marketIndex: number;
@@ -442,7 +442,7 @@ export declare type FundingRateRecord = {
     baseAssetAmountWithAmm: BN;
     baseAssetAmountWithUnsettledLp: BN;
 };
-export declare type FundingPaymentRecord = {
+export type FundingPaymentRecord = {
     ts: BN;
     userAuthority: PublicKey;
     user: PublicKey;
@@ -453,7 +453,7 @@ export declare type FundingPaymentRecord = {
     ammCumulativeFundingLong: BN;
     ammCumulativeFundingShort: BN;
 };
-export declare type LiquidationRecord = {
+export type LiquidationRecord = {
     ts: BN;
     user: PublicKey;
     liquidator: PublicKey;
@@ -491,7 +491,7 @@ export declare class LiquidationType {
         liquidateSpot: {};
     };
 }
-export declare type LiquidatePerpRecord = {
+export type LiquidatePerpRecord = {
     marketIndex: number;
     oraclePrice: BN;
     baseAssetAmount: BN;
@@ -503,7 +503,7 @@ export declare type LiquidatePerpRecord = {
     liquidatorFee: BN;
     ifFee: BN;
 };
-export declare type LiquidateSpotRecord = {
+export type LiquidateSpotRecord = {
     assetMarketIndex: number;
     assetPrice: BN;
     assetTransfer: BN;
@@ -512,7 +512,7 @@ export declare type LiquidateSpotRecord = {
     liabilityTransfer: BN;
     ifFee: BN;
 };
-export declare type LiquidateBorrowForPerpPnlRecord = {
+export type LiquidateBorrowForPerpPnlRecord = {
     perpMarketIndex: number;
     marketOraclePrice: BN;
     pnlTransfer: BN;
@@ -520,7 +520,7 @@ export declare type LiquidateBorrowForPerpPnlRecord = {
     liabilityPrice: BN;
     liabilityTransfer: BN;
 };
-export declare type LiquidatePerpPnlForDepositRecord = {
+export type LiquidatePerpPnlForDepositRecord = {
     perpMarketIndex: number;
     marketOraclePrice: BN;
     pnlTransfer: BN;
@@ -528,7 +528,7 @@ export declare type LiquidatePerpPnlForDepositRecord = {
     assetPrice: BN;
     assetTransfer: BN;
 };
-export declare type PerpBankruptcyRecord = {
+export type PerpBankruptcyRecord = {
     marketIndex: number;
     pnl: BN;
     ifPayment: BN;
@@ -536,13 +536,13 @@ export declare type PerpBankruptcyRecord = {
     clawbackUserPayment: BN | null;
     cumulativeFundingRateDelta: BN;
 };
-export declare type SpotBankruptcyRecord = {
+export type SpotBankruptcyRecord = {
     marketIndex: number;
     borrowAmount: BN;
     cumulativeDepositInterestDelta: BN;
     ifPayment: BN;
 };
-export declare type SettlePnlRecord = {
+export type SettlePnlRecord = {
     ts: BN;
     user: PublicKey;
     marketIndex: number;
@@ -553,12 +553,12 @@ export declare type SettlePnlRecord = {
     settlePrice: BN;
     explanation: SettlePnlExplanation;
 };
-export declare type OrderRecord = {
+export type OrderRecord = {
     ts: BN;
     user: PublicKey;
     order: Order;
 };
-export declare type OrderActionRecord = {
+export type OrderActionRecord = {
     ts: BN;
     action: OrderAction;
     actionExplanation: OrderActionExplanation;
@@ -588,7 +588,7 @@ export declare type OrderActionRecord = {
     makerOrderCumulativeQuoteAssetAmountFilled: BN | null;
     oraclePrice: BN;
 };
-export declare type StateAccount = {
+export type StateAccount = {
     admin: PublicKey;
     exchangeStatus: ExchangeStatus;
     whitelistMint: PublicKey;
@@ -612,7 +612,7 @@ export declare type StateAccount = {
     initialPctToLiquidate: number;
     liquidationDuration: number;
 };
-export declare type PerpMarketAccount = {
+export type PerpMarketAccount = {
     status: MarketStatus;
     contractType: ContractType;
     contractTier: ContractTier;
@@ -645,7 +645,7 @@ export declare type PerpMarketAccount = {
         quoteMaxInsurance: BN;
     };
 };
-export declare type HistoricalOracleData = {
+export type HistoricalOracleData = {
     lastOraclePrice: BN;
     lastOracleDelay: BN;
     lastOracleConf: BN;
@@ -653,14 +653,14 @@ export declare type HistoricalOracleData = {
     lastOraclePriceTwap5Min: BN;
     lastOraclePriceTwapTs: BN;
 };
-export declare type HistoricalIndexData = {
+export type HistoricalIndexData = {
     lastIndexBidPrice: BN;
     lastIndexAskPrice: BN;
     lastIndexPriceTwap: BN;
     lastIndexPriceTwap5Min: BN;
     lastIndexPriceTwapTs: BN;
 };
-export declare type SpotMarketAccount = {
+export type SpotMarketAccount = {
     status: MarketStatus;
     assetTier: AssetTier;
     marketIndex: number;
@@ -715,11 +715,11 @@ export declare type SpotMarketAccount = {
     totalSpotFee: BN;
     ordersEnabled: boolean;
 };
-export declare type PoolBalance = {
+export type PoolBalance = {
     scaledBalance: BN;
     marketIndex: number;
 };
-export declare type AMM = {
+export type AMM = {
     baseAssetReserve: BN;
     sqrtK: BN;
     cumulativeFundingRate: BN;
@@ -797,7 +797,7 @@ export declare type AMM = {
     askBaseAssetReserve: BN;
     askQuoteAssetReserve: BN;
 };
-export declare type PerpPosition = {
+export type PerpPosition = {
     baseAssetAmount: BN;
     lastCumulativeFundingRate: BN;
     marketIndex: number;
@@ -813,7 +813,7 @@ export declare type PerpPosition = {
     lastBaseAssetAmountPerLp: BN;
     lastQuoteAssetAmountPerLp: BN;
 };
-export declare type UserStatsAccount = {
+export type UserStatsAccount = {
     numberOfSubAccounts: number;
     numberOfSubAccountsCreated: number;
     makerVolume30D: BN;
@@ -835,7 +835,7 @@ export declare type UserStatsAccount = {
     authority: PublicKey;
     ifStakedQuoteAssetAmount: BN;
 };
-export declare type UserAccount = {
+export type UserAccount = {
     authority: PublicKey;
     delegate: PublicKey;
     name: number[];
@@ -857,7 +857,7 @@ export declare type UserAccount = {
     liquidationStartSlot: BN;
     isMarginTradingEnabled: boolean;
 };
-export declare type SpotPosition = {
+export type SpotPosition = {
     marketIndex: number;
     balanceType: SpotBalanceType;
     scaledBalance: BN;
@@ -866,7 +866,7 @@ export declare type SpotPosition = {
     openAsks: BN;
     cumulativeDeposits: BN;
 };
-export declare type Order = {
+export type Order = {
     status: OrderStatus;
     orderType: OrderType;
     marketType: MarketType;
@@ -892,7 +892,7 @@ export declare type Order = {
     auctionEndPrice: BN;
     maxTs: BN;
 };
-export declare type OrderParams = {
+export type OrderParams = {
     orderType: OrderType;
     marketType: MarketType;
     userOrderId: number;
@@ -912,29 +912,29 @@ export declare type OrderParams = {
     auctionStartPrice: BN | null;
     auctionEndPrice: BN | null;
 };
-export declare type NecessaryOrderParams = {
+export type NecessaryOrderParams = {
     orderType: OrderType;
     marketIndex: number;
     baseAssetAmount: BN;
     direction: PositionDirection;
 };
-export declare type OptionalOrderParams = {
+export type OptionalOrderParams = {
     [Property in keyof OrderParams]?: OrderParams[Property];
 } & NecessaryOrderParams;
 export declare const DefaultOrderParams: OrderParams;
-export declare type MakerInfo = {
+export type MakerInfo = {
     maker: PublicKey;
     makerStats: PublicKey;
     makerUserAccount: UserAccount;
     order: Order;
 };
-export declare type TakerInfo = {
+export type TakerInfo = {
     taker: PublicKey;
     takerStats: PublicKey;
     takerUserAccount: UserAccount;
     order: Order;
 };
-export declare type ReferrerInfo = {
+export type ReferrerInfo = {
     referrer: PublicKey;
     referrerStats: PublicKey;
 };
@@ -943,7 +943,7 @@ export interface IWallet {
     signAllTransactions(txs: Transaction[]): Promise<Transaction[]>;
     publicKey: PublicKey;
 }
-export declare type FeeStructure = {
+export type FeeStructure = {
     feeTiers: FeeTier[];
     makerRebateNumerator: BN;
     makerRebateDenominator: BN;
@@ -951,7 +951,7 @@ export declare type FeeStructure = {
     flatFillerFee: BN;
     referrerRewardEpochUpperBound: BN;
 };
-export declare type FeeTier = {
+export type FeeTier = {
     feeNumerator: number;
     feeDenominator: number;
     makerRebateNumerator: number;
@@ -961,12 +961,12 @@ export declare type FeeTier = {
     refereeFeeNumerator: number;
     refereeFeeDenominator: number;
 };
-export declare type OrderFillerRewardStructure = {
+export type OrderFillerRewardStructure = {
     rewardNumerator: BN;
     rewardDenominator: BN;
     timeBasedRewardLowerBound: BN;
 };
-export declare type OracleGuardRails = {
+export type OracleGuardRails = {
     priceDivergence: {
         markOracleDivergenceNumerator: BN;
         markOracleDivergenceDenominator: BN;
@@ -978,8 +978,8 @@ export declare type OracleGuardRails = {
         tooVolatileRatio: BN;
     };
 };
-export declare type MarginCategory = 'Initial' | 'Maintenance';
-export declare type InsuranceFundStake = {
+export type MarginCategory = 'Initial' | 'Maintenance';
+export type InsuranceFundStake = {
     marketIndex: number;
     authority: PublicKey;
     ifShares: BN;
@@ -988,7 +988,7 @@ export declare type InsuranceFundStake = {
     lastWithdrawRequestValue: BN;
     lastWithdrawRequestTs: BN;
 };
-export declare type SerumV3FulfillmentConfigAccount = {
+export type SerumV3FulfillmentConfigAccount = {
     fulfillmentType: SpotFulfillmentType;
     status: SpotFulfillmentStatus;
     pubkey: PublicKey;

package/lib/user.js

@@ -12,6 +12,12 @@ const pollingUserAccountSubscriber_1 = require("./accounts/pollingUserAccountSub
 const webSocketUserAccountSubscriber_1 = require("./accounts/webSocketUserAccountSubscriber");
 const spotPosition_1 = require("./math/spotPosition");
 class User {
+    get isSubscribed() {
+        return this._isSubscribed && this.accountSubscriber.isSubscribed;
+    }
+    set isSubscribed(val) {
+        this._isSubscribed = val;
+    }
     constructor(config) {
         var _a;
         this._isSubscribed = false;
@@ -25,12 +31,6 @@ class User {
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
     }
-    get isSubscribed() {
-        return this._isSubscribed && this.accountSubscriber.isSubscribed;
-    }
-    set isSubscribed(val) {
-        this._isSubscribed = val;
-    }
     /**
      * Subscribe to User state accounts
      * @returns SusbcriptionSuccess result

package/lib/userConfig.d.ts

@@ -1,12 +1,12 @@
 import { DriftClient } from './driftClient';
 import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
-export declare type UserConfig = {
+export type UserConfig = {
     accountSubscription?: UserSubscriptionConfig;
     driftClient: DriftClient;
     userAccountPublicKey: PublicKey;
 };
-export declare type UserSubscriptionConfig = {
+export type UserSubscriptionConfig = {
     type: 'websocket';
 } | {
     type: 'polling';

package/lib/userMap/userMap.js

@@ -26,6 +26,9 @@ class UserMap {
         if (this.accountSubscription.type === 'polling') {
             await (0, __1.bulkPollingUserSubscribe)(userArray, this.accountSubscription.accountLoader);
         }
+        else {
+            await Promise.all(userArray.map((user) => user.subscribe()));
+        }
         for (const user of userArray) {
             this.userMap.set(user.getUserAccountPublicKey().toString(), user);
         }

package/lib/userMap/userStatsMap.js

@@ -30,6 +30,9 @@ class UserStatsMap {
         if (this.accountSubscription.type === 'polling') {
             await (0, __1.bulkPollingUserStatsSubscribe)(userStatArray, this.accountSubscription.accountLoader);
         }
+        else {
+            await Promise.all(userStatArray.map((userStat) => userStat.subscribe()));
+        }
         for (const userStat of userStatArray) {
             this.userStatsMap.set(userStat.getAccount().authority.toString(), userStat);
         }

package/lib/userStatsConfig.d.ts

@@ -1,12 +1,12 @@
 import { DriftClient } from './driftClient';
 import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
-export declare type UserStatsConfig = {
+export type UserStatsConfig = {
     accountSubscription?: UserStatsSubscriptionConfig;
     driftClient: DriftClient;
     userStatsAccountPublicKey: PublicKey;
 };
-export declare type UserStatsSubscriptionConfig = {
+export type UserStatsSubscriptionConfig = {
     type: 'websocket';
 } | {
     type: 'polling';

package/package.json

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

package/src/driftClientConfig.ts

@@ -21,7 +21,7 @@ export type DriftClientConfig = {
 	authority?: PublicKey; // explicitly pass an authority if signer is delegate
 };
 
-type DriftClientSubscriptionConfig =
+export type DriftClientSubscriptionConfig =
 	| {
 			type: 'websocket';
 	  }

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.10.0-beta.2",
+  "version": "2.10.0-beta.3",
   "name": "drift",
   "instructions": [
     {

package/src/userMap/userMap.ts

@@ -65,6 +65,8 @@ export class UserMap implements UserMapInterface {
 				userArray,
 				this.accountSubscription.accountLoader
 			);
+		} else {
+			await Promise.all(userArray.map((user) => user.subscribe()));
 		}
 
 		for (const user of userArray) {

package/src/userMap/userStatsMap.ts

@@ -65,6 +65,8 @@ export class UserStatsMap {
 				userStatArray,
 				this.accountSubscription.accountLoader
 			);
+		} else {
+			await Promise.all(userStatArray.map((userStat) => userStat.subscribe()));
 		}
 
 		for (const userStat of userStatArray) {

package/src/assert/assert.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assert = void 0;
-function assert(condition, error) {
-    if (!condition) {
-        throw new Error(error || 'Unspecified AssertionError');
-    }
-}
-exports.assert = assert;

package/src/examples/makeTradeExample.js

@@ -1,157 +0,0 @@
-'use strict';
-var __awaiter =
-	(this && this.__awaiter) ||
-	function (thisArg, _arguments, P, generator) {
-		function adopt(value) {
-			return value instanceof P
-				? value
-				: new P(function (resolve) {
-						resolve(value);
-				  });
-		}
-		return new (P || (P = Promise))(function (resolve, reject) {
-			function fulfilled(value) {
-				try {
-					step(generator.next(value));
-				} catch (e) {
-					reject(e);
-				}
-			}
-			function rejected(value) {
-				try {
-					step(generator['throw'](value));
-				} catch (e) {
-					reject(e);
-				}
-			}
-			function step(result) {
-				result.done
-					? resolve(result.value)
-					: adopt(result.value).then(fulfilled, rejected);
-			}
-			step((generator = generator.apply(thisArg, _arguments || [])).next());
-		});
-	};
-Object.defineProperty(exports, '__esModule', { value: true });
-exports.getTokenAddress = void 0;
-const anchor_1 = require('@project-serum/anchor');
-const __1 = require('..');
-const spl_token_1 = require('@solana/spl-token');
-const web3_js_1 = require('@solana/web3.js');
-const __2 = require('..');
-const banks_1 = require('../constants/spotMarkets');
-const getTokenAddress = (mintAddress, userPubKey) => {
-	return spl_token_1.Token.getAssociatedTokenAddress(
-		new web3_js_1.PublicKey(`ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL`),
-		spl_token_1.TOKEN_PROGRAM_ID,
-		new web3_js_1.PublicKey(mintAddress),
-		new web3_js_1.PublicKey(userPubKey)
-	);
-};
-exports.getTokenAddress = getTokenAddress;
-const main = () =>
-	__awaiter(void 0, void 0, void 0, function* () {
-		// Initialize Drift SDK
-		const sdkConfig = __2.initialize({ env: 'devnet' });
-		// Set up the Wallet and Provider
-		const privateKey = process.env.BOT_PRIVATE_KEY; // stored as an array string
-		const keypair = web3_js_1.Keypair.fromSecretKey(
-			Uint8Array.from(JSON.parse(privateKey))
-		);
-		const wallet = new __1.Wallet(keypair);
-		// Set up the Connection
-		const rpcAddress = process.env.RPC_ADDRESS; // can use: https://api.devnet.solana.com for devnet; https://api.mainnet-beta.solana.com for mainnet;
-		const connection = new web3_js_1.Connection(rpcAddress);
-		// Set up the Provider
-		const provider = new anchor_1.AnchorProvider(
-			connection,
-			wallet,
-			anchor_1.AnchorProvider.defaultOptions()
-		);
-		// Check SOL Balance
-		const lamportsBalance = yield connection.getBalance(wallet.publicKey);
-		console.log('SOL balance:', lamportsBalance / Math.pow(10, 9));
-		// Misc. other things to set up
-		const usdcTokenAddress = yield exports.getTokenAddress(
-			sdkConfig.USDC_MINT_ADDRESS,
-			wallet.publicKey.toString()
-		);
-		// Set up the Drift Clearing House
-		const clearingHousePublicKey = new web3_js_1.PublicKey(
-			sdkConfig.DRIFT_PROGRAM_ID
-		);
-		const clearingHouse = new __2.ClearingHouse({
-			connection,
-			wallet: provider.wallet,
-			programID: clearingHousePublicKey,
-		});
-		yield clearingHouse.subscribe();
-		// Set up Clearing House user client
-		const user = new __2.ClearingHouseUser({
-			clearingHouse,
-			userAccountPublicKey: yield clearingHouse.getUserAccountPublicKey(),
-		});
-		//// Check if clearing house account exists for the current wallet
-		const userAccountExists = yield user.exists();
-		if (!userAccountExists) {
-			//// Create a Clearing House account by Depositing some USDC ($10,000 in this case)
-			const depositAmount = new anchor_1.BN(10000).mul(__2.QUOTE_PRECISION);
-			yield clearingHouse.initializeUserAccountAndDepositCollateral(
-				depositAmount,
-				yield exports.getTokenAddress(
-					usdcTokenAddress.toString(),
-					wallet.publicKey.toString()
-				),
-				banks_1.SpotMarkets['devnet'][0].marketIndex
-			);
-		}
-		yield user.subscribe();
-		// Get current price
-		const solMarketInfo = sdkConfig.PERP_MARKETS.find(
-			(market) => market.baseAssetSymbol === 'SOL'
-		);
-		const currentMarketPrice = __2.calculateMarkPrice(
-			clearingHouse.getMarketAccount(solMarketInfo.marketIndex),
-			undefined
-		);
-		const formattedPrice = __2.convertToNumber(
-			currentMarketPrice,
-			__2.PRICE_PRECISION
-		);
-		console.log(`Current Market Price is $${formattedPrice}`);
-		// Estimate the slippage for a $5000 LONG trade
-		const solMarketAccount = clearingHouse.getMarketAccount(
-			solMarketInfo.marketIndex
-		);
-		const longAmount = new anchor_1.BN(5000).mul(__2.QUOTE_PRECISION);
-		const slippage = __2.convertToNumber(
-			__2.calculateTradeSlippage(
-				__2.PositionDirection.LONG,
-				longAmount,
-				solMarketAccount,
-				'quote',
-				undefined
-			)[0],
-			__2.PRICE_PRECISION
-		);
-		console.log(
-			`Slippage for a $5000 LONG on the SOL market would be $${slippage}`
-		);
-		// Make a $5000 LONG trade
-		yield clearingHouse.openPosition(
-			__2.PositionDirection.LONG,
-			longAmount,
-			solMarketInfo.marketIndex
-		);
-		console.log(`LONGED $5000 SOL`);
-		// Reduce the position by $2000
-		const reduceAmount = new anchor_1.BN(2000).mul(__2.QUOTE_PRECISION);
-		yield clearingHouse.openPosition(
-			__2.PositionDirection.SHORT,
-			reduceAmount,
-			solMarketInfo.marketIndex
-		);
-		// Close the rest of the position
-		yield clearingHouse.closePosition(solMarketInfo.marketIndex);
-	});
-main();

package/src/token/index.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseTokenAccount = void 0;
-const spl_token_1 = require("@solana/spl-token");
-const web3_js_1 = require("@solana/web3.js");
-function parseTokenAccount(data) {
-    const accountInfo = spl_token_1.AccountLayout.decode(data);
-    accountInfo.mint = new web3_js_1.PublicKey(accountInfo.mint);
-    accountInfo.owner = new web3_js_1.PublicKey(accountInfo.owner);
-    accountInfo.amount = spl_token_1.u64.fromBuffer(accountInfo.amount);
-    if (accountInfo.delegateOption === 0) {
-        accountInfo.delegate = null;
-        // eslint-disable-next-line new-cap
-        accountInfo.delegatedAmount = new spl_token_1.u64(0);
-    }
-    else {
-        accountInfo.delegate = new web3_js_1.PublicKey(accountInfo.delegate);
-        accountInfo.delegatedAmount = spl_token_1.u64.fromBuffer(accountInfo.delegatedAmount);
-    }
-    accountInfo.isInitialized = accountInfo.state !== 0;
-    accountInfo.isFrozen = accountInfo.state === 2;
-    if (accountInfo.isNativeOption === 1) {
-        accountInfo.rentExemptReserve = spl_token_1.u64.fromBuffer(accountInfo.isNative);
-        accountInfo.isNative = true;
-    }
-    else {
-        accountInfo.rentExemptReserve = null;
-        accountInfo.isNative = false;
-    }
-    if (accountInfo.closeAuthorityOption === 0) {
-        accountInfo.closeAuthority = null;
-    }
-    else {
-        accountInfo.closeAuthority = new web3_js_1.PublicKey(accountInfo.closeAuthority);
-    }
-    return accountInfo;
-}
-exports.parseTokenAccount = parseTokenAccount;

package/src/tx/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/src/tx/utils.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.wrapInTx = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const COMPUTE_UNITS_DEFAULT = 200000;
-function wrapInTx(instruction, computeUnits = 600000 // TODO, requires less code change
-) {
-    const tx = new web3_js_1.Transaction();
-    if (computeUnits != COMPUTE_UNITS_DEFAULT) {
-        tx.add(web3_js_1.ComputeBudgetProgram.requestUnits({
-            units: computeUnits,
-            additionalFee: 0,
-        }));
-    }
-    return tx.add(instruction);
-}
-exports.wrapInTx = wrapInTx;

package/src/util/computeUnits.js

@@ -1,27 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.findComputeUnitConsumption = void 0;
-function findComputeUnitConsumption(programId, connection, txSignature, commitment = 'confirmed') {
-    return __awaiter(this, void 0, void 0, function* () {
-        const tx = yield connection.getTransaction(txSignature, { commitment });
-        const computeUnits = [];
-        const regex = new RegExp(`Program ${programId.toString()} consumed ([0-9]{0,6}) of ([0-9]{0,7}) compute units`);
-        tx.meta.logMessages.forEach((logMessage) => {
-            const match = logMessage.match(regex);
-            if (match && match[1]) {
-                computeUnits.push(match[1]);
-            }
-        });
-        return computeUnits;
-    });
-}
-exports.findComputeUnitConsumption = findComputeUnitConsumption;

package/src/util/getTokenAddress.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTokenAddress = void 0;
-const spl_token_1 = require("@solana/spl-token");
-const web3_js_1 = require("@solana/web3.js");
-const getTokenAddress = (mintAddress, userPubKey) => {
-    return spl_token_1.Token.getAssociatedTokenAddress(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, spl_token_1.TOKEN_PROGRAM_ID, new web3_js_1.PublicKey(mintAddress), new web3_js_1.PublicKey(userPubKey));
-};
-exports.getTokenAddress = getTokenAddress;

package/src/util/promiseTimeout.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.promiseTimeout = void 0;
-function promiseTimeout(promise, timeoutMs) {
-    let timeoutId;
-    const timeoutPromise = new Promise((resolve) => {
-        timeoutId = setTimeout(() => resolve(null), timeoutMs);
-    });
-    return Promise.race([promise, timeoutPromise]).then((result) => {
-        clearTimeout(timeoutId);
-        return result;
-    });
-}
-exports.promiseTimeout = promiseTimeout;

package/src/util/tps.js

@@ -1,27 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.estimateTps = void 0;
-function estimateTps(programId, connection, failed) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let signatures = yield connection.getSignaturesForAddress(programId, undefined, 'finalized');
-        if (failed) {
-            signatures = signatures.filter((signature) => signature.err);
-        }
-        const numberOfSignatures = signatures.length;
-        if (numberOfSignatures === 0) {
-            return 0;
-        }
-        return (numberOfSignatures /
-            (signatures[0].blockTime - signatures[numberOfSignatures - 1].blockTime));
-    });
-}
-exports.estimateTps = estimateTps;