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

package/lib/accounts/bulkAccountLoader.d.ts

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

package/lib/accounts/types.d.ts

@@ -1,5 +1,4 @@
 /// <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';
@@ -11,6 +10,7 @@ export interface AccountSubscriber<T> {
     subscribe(onChange: (data: T) => void): Promise<void>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
+    setData(userAccount: T): void;
 }
 export declare class NotSubscribedError extends Error {
     name: string;
@@ -48,7 +48,7 @@ export interface UserAccountEvents {
 export interface UserAccountSubscriber {
     eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
     isSubscribed: boolean;
-    subscribe(): Promise<boolean>;
+    subscribe(userAccount?: UserAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
     getUserAccountAndSlot(): DataAndSlot<UserAccount>;
@@ -79,23 +79,23 @@ export interface OracleAccountSubscriber {
     unsubscribe(): Promise<void>;
     getOraclePriceData(): DataAndSlot<OraclePriceData>;
 }
-export type AccountToPoll = {
+export declare type AccountToPoll = {
     key: string;
     publicKey: PublicKey;
     eventType: string;
     callbackId?: string;
     mapKey?: number;
 };
-export type OraclesToPoll = {
+export declare type OraclesToPoll = {
     publicKey: PublicKey;
     source: OracleSource;
     callbackId?: string;
 };
-export type BufferAndSlot = {
+export declare type BufferAndSlot = {
     slot: number;
     buffer: Buffer | undefined;
 };
-export type DataAndSlot<T> = {
+export declare type DataAndSlot<T> = {
     data: T;
     slot: number;
 };
@@ -107,7 +107,7 @@ export interface UserStatsAccountEvents {
 export interface UserStatsAccountSubscriber {
     eventEmitter: StrictEventEmitter<EventEmitter, UserStatsAccountEvents>;
     isSubscribed: boolean;
-    subscribe(): Promise<boolean>;
+    subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
     getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount>;

package/lib/accounts/webSocketAccountSubscriber.d.ts

@@ -13,6 +13,7 @@ export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<
     listenerId?: number;
     constructor(accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => T);
     subscribe(onChange: (data: T) => void): Promise<void>;
+    setData(data: T): void;
     fetch(): Promise<void>;
     handleRpcResponse(context: Context, accountInfo?: AccountInfo<Buffer>): void;
     decodeBuffer(buffer: Buffer): T;

package/lib/accounts/webSocketAccountSubscriber.js

@@ -14,11 +14,22 @@ class WebSocketAccountSubscriber {
             return;
         }
         this.onChange = onChange;
-        await this.fetch();
+        if (!this.dataAndSlot) {
+            await this.fetch();
+        }
         this.listenerId = this.program.provider.connection.onAccountChange(this.accountPublicKey, (accountInfo, context) => {
             this.handleRpcResponse(context, accountInfo);
         }, this.program.provider.opts.commitment);
     }
+    setData(data) {
+        if (this.dataAndSlot) {
+            return;
+        }
+        this.dataAndSlot = {
+            data,
+            slot: undefined,
+        };
+    }
     async fetch() {
         const rpcResponse = await this.program.provider.connection.getAccountInfoAndContext(this.accountPublicKey, this.program.provider.opts.commitment);
         this.handleRpcResponse(rpcResponse.context, rpcResponse === null || rpcResponse === void 0 ? void 0 : rpcResponse.value);

package/lib/accounts/webSocketUserAccountSubscriber.d.ts

@@ -12,7 +12,7 @@ export declare class WebSocketUserAccountSubscriber implements UserAccountSubscr
     userAccountPublicKey: PublicKey;
     userDataAccountSubscriber: AccountSubscriber<UserAccount>;
     constructor(program: Program, userAccountPublicKey: PublicKey);
-    subscribe(): Promise<boolean>;
+    subscribe(userAccount?: UserAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;

package/lib/accounts/webSocketUserAccountSubscriber.js

@@ -11,11 +11,14 @@ class WebSocketUserAccountSubscriber {
         this.userAccountPublicKey = userAccountPublicKey;
         this.eventEmitter = new events_1.EventEmitter();
     }
-    async subscribe() {
+    async subscribe(userAccount) {
         if (this.isSubscribed) {
             return true;
         }
         this.userDataAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('user', this.program, this.userAccountPublicKey);
+        if (userAccount) {
+            this.userDataAccountSubscriber.setData(userAccount);
+        }
         await this.userDataAccountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('userAccountUpdate', data);
             this.eventEmitter.emit('update');

package/lib/accounts/webSocketUserStatsAccountSubsriber.d.ts

@@ -12,7 +12,7 @@ export declare class WebSocketUserStatsAccountSubscriber implements UserStatsAcc
     userStatsAccountPublicKey: PublicKey;
     userStatsAccountSubscriber: AccountSubscriber<UserStatsAccount>;
     constructor(program: Program, userStatsAccountPublicKey: PublicKey);
-    subscribe(): Promise<boolean>;
+    subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;

package/lib/accounts/webSocketUserStatsAccountSubsriber.js

@@ -11,11 +11,14 @@ class WebSocketUserStatsAccountSubscriber {
         this.userStatsAccountPublicKey = userStatsAccountPublicKey;
         this.eventEmitter = new events_1.EventEmitter();
     }
-    async subscribe() {
+    async subscribe(userStatsAccount) {
         if (this.isSubscribed) {
             return true;
         }
         this.userStatsAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('userStats', this.program, this.userStatsAccountPublicKey);
+        if (userStatsAccount) {
+            this.userStatsAccountSubscriber.setData(userStatsAccount);
+        }
         await this.userStatsAccountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('userStatsAccountUpdate', data);
             this.eventEmitter.emit('update');

package/lib/config.d.ts

@@ -1,7 +1,7 @@
 import { PerpMarketConfig } from './constants/perpMarkets';
 import { SpotMarketConfig } from './constants/spotMarkets';
 import { OracleInfo } from './oracles/types';
-type DriftConfig = {
+declare type DriftConfig = {
     ENV: DriftEnv;
     PYTH_ORACLE_MAPPING_ADDRESS: string;
     DRIFT_PROGRAM_ID: string;
@@ -11,7 +11,7 @@ type DriftConfig = {
     PERP_MARKETS: PerpMarketConfig[];
     SPOT_MARKETS: SpotMarketConfig[];
 };
-export type DriftEnv = 'devnet' | 'mainnet-beta';
+export declare 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 type PerpMarketConfig = {
+export declare 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 type SpotMarketConfig = {
+export declare 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 type MarketNodeLists = {
+export declare type MarketNodeLists = {
     limit: {
         ask: NodeList<'limit'>;
         bid: NodeList<'limit'>;
@@ -22,12 +22,12 @@ export type MarketNodeLists = {
         below: NodeList<'trigger'>;
     };
 };
-type OrderBookCallback = () => void;
-export type NodeToFill = {
+declare type OrderBookCallback = () => void;
+export declare type NodeToFill = {
     node: DLOBNode;
     makerNode?: DLOBNode;
 };
-export type NodeToTrigger = {
+export declare 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 type DLOBNodeMap = {
+export declare type DLOBNodeMap = {
     limit: LimitOrderNode;
     floatingLimit: FloatingLimitOrderNode;
     market: MarketOrderNode;
     trigger: TriggerOrderNode;
 };
-export type DLOBNodeType = 'limit' | 'floatingLimit' | 'market' | ('trigger' & keyof DLOBNodeMap);
+export declare 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 type DLOBOrder = {
+export declare type DLOBOrder = {
     user: PublicKey;
     order: Order;
 };
-export type DLOBOrders = DLOBOrder[];
+export declare 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 type SortDirection = 'asc' | 'desc';
+export declare 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';
-type RemainingAccountParams = {
+declare type RemainingAccountParams = {
     userAccounts: UserAccount[];
     writablePerpMarketIndexes?: number[];
     writableSpotMarketIndexes?: number[];

package/lib/driftClient.js

@@ -53,12 +53,6 @@ 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();
@@ -112,6 +106,12 @@ 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 type DriftClientConfig = {
+export declare type DriftClientConfig = {
     connection: Connection;
     wallet: IWallet;
     programID: PublicKey;
@@ -19,13 +19,13 @@ export type DriftClientConfig = {
     userStats?: boolean;
     authority?: PublicKey;
 };
-export type DriftClientSubscriptionConfig = {
+export declare type DriftClientSubscriptionConfig = {
     type: 'websocket';
 } | {
     type: 'polling';
     accountLoader: BulkAccountLoader;
 };
-type TxSenderConfig = {
+declare 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';
-type Log = {
+declare type Log = {
     txSig: TransactionSignature;
     slot: number;
     logs: string[];
 };
-type FetchLogsResponse = {
+declare 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 type EventSubscriptionOptions = {
+export declare type EventSubscriptionOptions = {
     eventTypes?: EventType[];
     maxEventsPerType?: number;
     orderBy?: EventSubscriptionOrderBy;
@@ -11,17 +11,17 @@ export type EventSubscriptionOptions = {
     untilTx?: TransactionSignature;
 };
 export declare const DefaultEventSubscriptionOptions: EventSubscriptionOptions;
-export type EventSubscriptionOrderBy = 'blockchain' | 'client';
-export type EventSubscriptionOrderDirection = 'asc' | 'desc';
-export type Event<T> = T & {
+export declare type EventSubscriptionOrderBy = 'blockchain' | 'client';
+export declare type EventSubscriptionOrderDirection = 'asc' | 'desc';
+export declare type Event<T> = T & {
     txSig: TransactionSignature;
     slot: number;
 };
-export type WrappedEvent<Type extends EventType> = EventMap[Type] & {
+export declare type WrappedEvent<Type extends EventType> = EventMap[Type] & {
     eventType: Type;
 };
-export type WrappedEvents = WrappedEvent<EventType>[];
-export type EventMap = {
+export declare type WrappedEvents = WrappedEvent<EventType>[];
+export declare type EventMap = {
     DepositRecord: Event<DepositRecord>;
     FundingPaymentRecord: Event<FundingPaymentRecord>;
     LiquidationRecord: Event<LiquidationRecord>;
@@ -36,22 +36,22 @@ export type EventMap = {
     InsuranceFundStakeRecord: Event<InsuranceFundStakeRecord>;
     CurveRecord: Event<CurveRecord>;
 };
-export type EventType = keyof EventMap;
+export declare type EventType = keyof EventMap;
 export interface EventSubscriberEvents {
     newEvent: (event: WrappedEvent<EventType>) => 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 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 interface LogProvider {
     isSubscribed(): boolean;
     subscribe(callback: logProviderCallback, skipHistory?: boolean): boolean;
     unsubscribe(): Promise<boolean>;
 }
-export type WebSocketLogProviderConfig = {
+export declare type WebSocketLogProviderConfig = {
     type: 'websocket';
 };
-export type PollingLogProviderConfig = {
+export declare type PollingLogProviderConfig = {
     type: 'polling';
     frequency: number;
 };
-export type LogProviderConfig = WebSocketLogProviderConfig | PollingLogProviderConfig;
+export declare 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.3",
+    "version": "2.10.0-beta.4",
     "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 type AssetType = 'quote' | 'base';
+export declare 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 type PriceImpactUnit = 'entryPrice' | 'maxPrice' | 'priceDelta' | 'priceDeltaAsNumber' | 'pctAvg' | 'pctMax' | 'quoteAssetAmount' | 'quoteAssetAmountPeg' | 'acquiredBaseAssetAmount' | 'acquiredQuoteAssetAmount' | 'all';
+export declare 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 type OraclePriceData = {
+export declare type OraclePriceData = {
     price: BN;
     slot: BN;
     confidence: BN;
@@ -11,7 +11,7 @@ export type OraclePriceData = {
     twap?: BN;
     twapConfidence?: BN;
 };
-export type OracleInfo = {
+export declare 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 type SerumMarketSubscriberConfig = {
+export declare 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';
-type SlotSubscriberConfig = {};
+declare 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';
-type ResolveReference = {
+declare 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 type TxSigAndSlot = {
+export declare type TxSigAndSlot = {
     txSig: TransactionSignature;
     slot: number;
 };