@drift-labs/sdk 0.2.0-master.37 → 0.2.0-master.39

package/lib/index.d.ts

@@ -8,23 +8,23 @@ export * from './oracles/switchboardClient';
 export * from './types';
 export * from './constants/perpMarkets';
 export * from './accounts/fetch';
-export * from './accounts/webSocketClearingHouseAccountSubscriber';
+export * from './accounts/webSocketDriftClientAccountSubscriber';
 export * from './accounts/bulkAccountLoader';
 export * from './accounts/bulkUserSubscription';
 export * from './accounts/bulkUserStatsSubscription';
-export * from './accounts/pollingClearingHouseAccountSubscriber';
-export * from './accounts/pollingOracleSubscriber';
+export * from './accounts/pollingDriftClientAccountSubscriber';
+export * from './accounts/pollingOracleAccountSubscriber';
 export * from './accounts/pollingTokenAccountSubscriber';
 export * from './accounts/pollingUserAccountSubscriber';
 export * from './accounts/pollingUserStatsAccountSubscriber';
 export * from './accounts/types';
 export * from './addresses/pda';
-export * from './admin';
-export * from './clearingHouseUser';
-export * from './clearingHouseUserConfig';
-export * from './clearingHouseUserStats';
-export * from './clearingHouseUserStatsConfig';
-export * from './clearingHouse';
+export * from './adminClient';
+export * from './user';
+export * from './userConfig';
+export * from './userStats';
+export * from './userStatsConfig';
+export * from './driftClient';
 export * from './factory/oracleClient';
 export * from './factory/bigNum';
 export * from './events/types';
@@ -59,7 +59,7 @@ export * from './util/tps';
 export * from './util/promiseTimeout';
 export * from './math/spotBalance';
 export * from './constants/spotMarkets';
-export * from './clearingHouseConfig';
+export * from './driftClientConfig';
 export * from './dlob/DLOB';
 export * from './dlob/DLOBNode';
 export * from './dlob/NodeList';

package/lib/index.js

@@ -31,23 +31,23 @@ __exportStar(require("./oracles/switchboardClient"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./constants/perpMarkets"), exports);
 __exportStar(require("./accounts/fetch"), exports);
-__exportStar(require("./accounts/webSocketClearingHouseAccountSubscriber"), exports);
+__exportStar(require("./accounts/webSocketDriftClientAccountSubscriber"), exports);
 __exportStar(require("./accounts/bulkAccountLoader"), exports);
 __exportStar(require("./accounts/bulkUserSubscription"), exports);
 __exportStar(require("./accounts/bulkUserStatsSubscription"), exports);
-__exportStar(require("./accounts/pollingClearingHouseAccountSubscriber"), exports);
-__exportStar(require("./accounts/pollingOracleSubscriber"), exports);
+__exportStar(require("./accounts/pollingDriftClientAccountSubscriber"), exports);
+__exportStar(require("./accounts/pollingOracleAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingTokenAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingUserAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingUserStatsAccountSubscriber"), exports);
 __exportStar(require("./accounts/types"), exports);
 __exportStar(require("./addresses/pda"), exports);
-__exportStar(require("./admin"), exports);
-__exportStar(require("./clearingHouseUser"), exports);
-__exportStar(require("./clearingHouseUserConfig"), exports);
-__exportStar(require("./clearingHouseUserStats"), exports);
-__exportStar(require("./clearingHouseUserStatsConfig"), exports);
-__exportStar(require("./clearingHouse"), exports);
+__exportStar(require("./adminClient"), exports);
+__exportStar(require("./user"), exports);
+__exportStar(require("./userConfig"), exports);
+__exportStar(require("./userStats"), exports);
+__exportStar(require("./userStatsConfig"), exports);
+__exportStar(require("./driftClient"), exports);
 __exportStar(require("./factory/oracleClient"), exports);
 __exportStar(require("./factory/bigNum"), exports);
 __exportStar(require("./events/types"), exports);
@@ -82,7 +82,7 @@ __exportStar(require("./util/tps"), exports);
 __exportStar(require("./util/promiseTimeout"), exports);
 __exportStar(require("./math/spotBalance"), exports);
 __exportStar(require("./constants/spotMarkets"), exports);
-__exportStar(require("./clearingHouseConfig"), exports);
+__exportStar(require("./driftClientConfig"), exports);
 __exportStar(require("./dlob/DLOB"), exports);
 __exportStar(require("./dlob/DLOBNode"), exports);
 __exportStar(require("./dlob/NodeList"), exports);

package/lib/math/orders.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="bn.js" />
-import { ClearingHouseUser } from '../clearingHouseUser';
+import { User } from '../user';
 import { PerpMarketAccount, Order } from '../types';
 import { BN } from '@project-serum/anchor';
 import { OraclePriceData } from '../oracles/types';
-export declare function isOrderRiskIncreasing(user: ClearingHouseUser, order: Order): boolean;
-export declare function isOrderRiskIncreasingInSameDirection(user: ClearingHouseUser, order: Order): boolean;
-export declare function isOrderReduceOnly(user: ClearingHouseUser, order: Order): boolean;
+export declare function isOrderRiskIncreasing(user: User, order: Order): boolean;
+export declare function isOrderRiskIncreasingInSameDirection(user: User, order: Order): boolean;
+export declare function isOrderReduceOnly(user: User, order: Order): boolean;
 export declare function standardizeBaseAssetAmount(baseAssetAmount: BN, stepSize: BN): BN;
 export declare function getLimitPrice(order: Order, oraclePriceData: OraclePriceData, slot: number): BN;
 export declare function getOptionalLimitPrice(order: Order, oraclePriceData: OraclePriceData, slot: number): BN | undefined;

package/lib/math/orders.js

@@ -10,7 +10,7 @@ function isOrderRiskIncreasing(user, order) {
     if ((0, types_1.isVariant)(order.status, 'init')) {
         return false;
     }
-    const position = user.getUserPosition(order.marketIndex) ||
+    const position = user.getPerpPosition(order.marketIndex) ||
         user.getEmptyPosition(order.marketIndex);
     // if no position exists, it's risk increasing
     if (position.baseAssetAmount.eq(numericConstants_1.ZERO)) {
@@ -37,7 +37,7 @@ function isOrderRiskIncreasingInSameDirection(user, order) {
     if ((0, types_1.isVariant)(order.status, 'init')) {
         return false;
     }
-    const position = user.getUserPosition(order.marketIndex) ||
+    const position = user.getPerpPosition(order.marketIndex) ||
         user.getEmptyPosition(order.marketIndex);
     // if no position exists, it's risk increasing
     if (position.baseAssetAmount.eq(numericConstants_1.ZERO)) {
@@ -59,7 +59,7 @@ function isOrderReduceOnly(user, order) {
     if ((0, types_1.isVariant)(order.status, 'init')) {
         return false;
     }
-    const position = user.getUserPosition(order.marketIndex) ||
+    const position = user.getPerpPosition(order.marketIndex) ||
         user.getEmptyPosition(order.marketIndex);
     // if position is long and order is long
     if (position.baseAssetAmount.gte(numericConstants_1.ZERO) &&

package/lib/serum/serumFulfillmentConfigMap.d.ts

@@ -1,10 +1,10 @@
 import { PublicKey } from '@solana/web3.js';
 import { SerumV3FulfillmentConfigAccount } from '../types';
-import { ClearingHouse } from '../clearingHouse';
+import { DriftClient } from '../driftClient';
 export declare class SerumFulfillmentConfigMap {
-    clearingHouse: ClearingHouse;
+    driftClient: DriftClient;
     map: Map<number, SerumV3FulfillmentConfigAccount>;
-    constructor(clearingHouse: ClearingHouse);
+    constructor(driftClient: DriftClient);
     add(marketIndex: number, serumMarketAddress: PublicKey): Promise<void>;
     get(marketIndex: number): SerumV3FulfillmentConfigAccount;
 }

package/lib/serum/serumFulfillmentConfigMap.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SerumFulfillmentConfigMap = void 0;
 class SerumFulfillmentConfigMap {
-    constructor(clearingHouse) {
+    constructor(driftClient) {
         this.map = new Map();
-        this.clearingHouse = clearingHouse;
+        this.driftClient = driftClient;
     }
     async add(marketIndex, serumMarketAddress) {
-        const account = await this.clearingHouse.getSerumV3FulfillmentConfig(serumMarketAddress);
+        const account = await this.driftClient.getSerumV3FulfillmentConfig(serumMarketAddress);
         this.map.set(marketIndex, account);
     }
     get(marketIndex) {

package/lib/types.d.ts

@@ -71,9 +71,12 @@ export declare class ContractTier {
     static readonly C: {
         c: {};
     };
-    static readonly Speculative: {
+    static readonly SPECULATIVE: {
         speculative: {};
     };
+    static readonly ISOLATED: {
+        isolated: {};
+    };
 }
 export declare class AssetTier {
     static readonly COLLATERAL: {
@@ -270,6 +273,7 @@ export declare type DepositRecord = {
     marketWithdrawBalance: BN;
     marketCumulativeDepositInterest: BN;
     marketCumulativeBorrowInterest: BN;
+    depositRecordId: BN;
     transferUser?: PublicKey;
 };
 export declare type SpotInterestRecord = {
@@ -436,6 +440,9 @@ export declare type LiquidatePerpPnlForDepositRecord = {
 export declare type PerpBankruptcyRecord = {
     marketIndex: number;
     pnl: BN;
+    ifPayment: BN;
+    clawbackUser: PublicKey | null;
+    clawbackUserPayment: BN | null;
     cumulativeFundingRateDelta: BN;
 };
 export declare type SpotBankruptcyRecord = {
@@ -511,6 +518,7 @@ export declare type StateAccount = {
 export declare type PerpMarketAccount = {
     status: MarketStatus;
     contractType: ContractType;
+    contractTier: ContractTier;
     expiryTs: BN;
     expiryPrice: BN;
     marketIndex: number;
@@ -522,6 +530,8 @@ export declare type PerpMarketAccount = {
     marginRatioInitial: number;
     marginRatioMaintenance: number;
     nextFillRecordId: BN;
+    nextFundingRateRecordId: BN;
+    nextCurveRecordId: BN;
     pnlPool: PoolBalance;
     liquidatorFee: number;
     ifLiquidationFee: number;
@@ -598,11 +608,13 @@ export declare type SpotMarketAccount = {
     depositTokenTwap: BN;
     borrowTokenTwap: BN;
     utilizationTwap: BN;
+    nextDepositRecordId: BN;
     orderStepSize: BN;
     orderTickSize: BN;
     nextFillRecordId: BN;
     spotFeePool: PoolBalance;
     totalSpotFee: BN;
+    ordersEnabled: boolean;
 };
 export declare type PoolBalance = {
     scaledBalance: BN;
@@ -617,6 +629,7 @@ export declare type AMM = {
     lastMarkPriceTwap: BN;
     lastMarkPriceTwap5min: BN;
     lastMarkPriceTwapTs: BN;
+    lastTradeTs: BN;
     oracle: PublicKey;
     oracleSource: OracleSource;
     historicalOracleData: HistoricalOracleData;
@@ -627,7 +640,10 @@ export declare type AMM = {
     pegMultiplier: BN;
     cumulativeFundingRateLong: BN;
     cumulativeFundingRateShort: BN;
-    cumulativeFundingRateLp: BN;
+    last24hAvgFundingRate: BN;
+    lastFundingRateShort: BN;
+    lastFundingRateLong: BN;
+    totalLiquidationFee: BN;
     totalFeeMinusDistributions: BN;
     totalFeeWithdrawn: BN;
     totalFee: BN;
@@ -644,11 +660,13 @@ export declare type AMM = {
     baseAssetAmountShort: BN;
     quoteAssetAmount: BN;
     terminalQuoteAssetReserve: BN;
+    concentrationCoef: BN;
     feePool: PoolBalance;
     totalExchangeFee: BN;
     totalMmFee: BN;
     netRevenueSinceLastFunding: BN;
     lastUpdateSlot: BN;
+    lastOracleNormalisedPrice: BN;
     lastOracleValid: boolean;
     lastBidPriceTwap: BN;
     lastAskPriceTwap: BN;
@@ -658,9 +676,26 @@ export declare type AMM = {
     baseAssetAmountPerLp: BN;
     quoteAssetAmountPerLp: BN;
     ammJitIntensity: number;
+    maxOpenInterest: BN;
     maxBaseAssetReserve: BN;
     minBaseAssetReserve: BN;
     cumulativeSocialLoss: BN;
+    quoteBreakEvenAmountLong: BN;
+    quoteBreakEvenAmountShort: BN;
+    quoteEntryAmountLong: BN;
+    quoteEntryAmountShort: BN;
+    markStd: BN;
+    longIntensityCount: number;
+    longIntensityVolume: BN;
+    shortIntensityCount: number;
+    shortIntensityVolume: BN;
+    volume24h: BN;
+    minOrderSize: BN;
+    maxPositionSize: BN;
+    bidBaseAssetReserve: BN;
+    bidQuoteAssetReserve: BN;
+    askBaseAssetReserve: BN;
+    askQuoteAssetReserve: BN;
 };
 export declare type PerpPosition = {
     baseAssetAmount: BN;
@@ -717,6 +752,7 @@ export declare type UserAccount = {
     settledPerpPnl: BN;
     totalDeposits: BN;
     totalWithdraws: BN;
+    cumulativePerpFunding: BN;
 };
 export declare type SpotPosition = {
     marketIndex: number;

package/lib/types.js

@@ -36,7 +36,8 @@ exports.ContractTier = ContractTier;
 ContractTier.A = { a: {} };
 ContractTier.B = { b: {} };
 ContractTier.C = { c: {} };
-ContractTier.Speculative = { speculative: {} };
+ContractTier.SPECULATIVE = { speculative: {} };
+ContractTier.ISOLATED = { isolated: {} };
 class AssetTier {
 }
 exports.AssetTier = AssetTier;

package/lib/{clearingHouseUser.d.ts → user.d.ts}

@@ -3,23 +3,23 @@
 import { PublicKey } from '@solana/web3.js';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
-import { ClearingHouse } from './clearingHouse';
-import { MarginCategory, Order, UserAccount, PerpPosition } from './types';
+import { DriftClient } from './driftClient';
+import { MarginCategory, Order, UserAccount, PerpPosition, SpotPosition } from './types';
 import { UserAccountSubscriber, UserAccountEvents, DataAndSlot } from './accounts/types';
 import { PositionDirection, BN, SpotMarketAccount } from '.';
 import { OraclePriceData } from './oracles/types';
-import { ClearingHouseUserConfig } from './clearingHouseUserConfig';
-export declare class ClearingHouseUser {
-    clearingHouse: ClearingHouse;
+import { UserConfig } from './userConfig';
+export declare class User {
+    driftClient: DriftClient;
     userAccountPublicKey: PublicKey;
     accountSubscriber: UserAccountSubscriber;
     _isSubscribed: boolean;
     eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
     get isSubscribed(): boolean;
     set isSubscribed(val: boolean);
-    constructor(config: ClearingHouseUserConfig);
+    constructor(config: UserConfig);
     /**
-     * Subscribe to ClearingHouseUser state accounts
+     * Subscribe to User state accounts
      * @returns SusbcriptionSuccess result
      */
     subscribe(): Promise<boolean>;
@@ -31,11 +31,17 @@ export declare class ClearingHouseUser {
     getUserAccount(): UserAccount;
     getUserAccountAndSlot(): DataAndSlot<UserAccount> | undefined;
     /**
-     * Gets the user's current position for a given market. If the user has no position returns undefined
+     * Gets the user's current position for a given perp market. If the user has no position returns undefined
      * @param marketIndex
-     * @returns userPosition
+     * @returns userPerpPosition
      */
-    getUserPosition(marketIndex: number): PerpPosition | undefined;
+    getPerpPosition(marketIndex: number): PerpPosition | undefined;
+    /**
+     * Gets the user's current position for a given spot market. If the user has no position returns undefined
+     * @param marketIndex
+     * @returns userSpotPosition
+     */
+    getSpotPosition(marketIndex: number): SpotPosition | undefined;
     getEmptyPosition(marketIndex: number): PerpPosition;
     getClonedPosition(position: PerpPosition): PerpPosition;
     /**