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

package/lib/{admin.js → adminClient.js}

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Admin = void 0;
+exports.AdminClient = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const types_1 = require("./types");
 const userName_1 = require("./userName");
@@ -32,24 +32,24 @@ const anchor = __importStar(require("@project-serum/anchor"));
 const pda_1 = require("./addresses/pda");
 const utils_1 = require("./math/utils");
 const spl_token_1 = require("@solana/spl-token");
-const clearingHouse_1 = require("./clearingHouse");
+const driftClient_1 = require("./driftClient");
 const numericConstants_1 = require("./constants/numericConstants");
 const trade_1 = require("./math/trade");
 const amm_1 = require("./math/amm");
-class Admin extends clearingHouse_1.ClearingHouse {
+class AdminClient extends driftClient_1.DriftClient {
     async initialize(usdcMint, _adminControlsPrices) {
         const stateAccountRPCResponse = await this.connection.getParsedAccountInfo(await this.getStatePublicKey());
         if (stateAccountRPCResponse.value !== null) {
             throw new Error('Clearing house already initialized');
         }
-        const [clearingHouseStatePublicKey] = await (0, pda_1.getClearingHouseStateAccountPublicKeyAndNonce)(this.program.programId);
+        const [driftStatePublicKey] = await (0, pda_1.getDriftStateAccountPublicKeyAndNonce)(this.program.programId);
         const initializeTx = await this.program.transaction.initialize({
             accounts: {
                 admin: this.wallet.publicKey,
-                state: clearingHouseStatePublicKey,
+                state: driftStatePublicKey,
                 quoteAssetMint: usdcMint,
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                clearingHouseSigner: this.getSignerPublicKey(),
+                driftSigner: this.getSignerPublicKey(),
                 systemProgram: anchor.web3.SystemProgram.programId,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
@@ -57,19 +57,20 @@ class Admin extends clearingHouse_1.ClearingHouse {
         const { txSig: initializeTxSig } = await this.txSender.send(initializeTx, [], this.opts);
         return [initializeTxSig];
     }
-    async initializeSpotMarket(mint, optimalUtilization, optimalRate, maxRate, oracle, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor = 0, liquidationFee = 0, activeStatus = true) {
+    async initializeSpotMarket(mint, optimalUtilization, optimalRate, maxRate, oracle, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor = 0, liquidatorFee = 0, activeStatus = true, name = userName_1.DEFAULT_MARKET_NAME) {
         const spotMarketIndex = this.getStateAccount().numberOfSpotMarkets;
         const spotMarket = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex);
         const spotMarketVault = await (0, pda_1.getSpotMarketVaultPublicKey)(this.program.programId, spotMarketIndex);
         const insuranceFundVault = await (0, pda_1.getInsuranceFundVaultPublicKey)(this.program.programId, spotMarketIndex);
-        const initializeTx = await this.program.transaction.initializeSpotMarket(optimalUtilization, optimalRate, maxRate, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor, liquidationFee, activeStatus, {
+        const nameBuffer = (0, userName_1.encodeName)(name);
+        const initializeTx = await this.program.transaction.initializeSpotMarket(optimalUtilization, optimalRate, maxRate, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor, liquidatorFee, activeStatus, nameBuffer, {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket,
                 spotMarketVault,
                 insuranceFundVault,
-                clearingHouseSigner: this.getSignerPublicKey(),
+                driftSigner: this.getSignerPublicKey(),
                 spotMarketMint: mint,
                 oracle,
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
@@ -94,7 +95,7 @@ class Admin extends clearingHouse_1.ClearingHouse {
                 state: await this.getStatePublicKey(),
                 baseSpotMarket: this.getSpotMarketAccount(marketIndex).pubkey,
                 quoteSpotMarket: this.getQuoteSpotMarketAccount().pubkey,
-                clearingHouseSigner: this.getSignerPublicKey(),
+                driftSigner: this.getSignerPublicKey(),
                 serumProgram,
                 serumMarket,
                 serumOpenOrders,
@@ -104,10 +105,10 @@ class Admin extends clearingHouse_1.ClearingHouse {
             },
         });
     }
-    async initializePerpMarket(priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, oracleSource = types_1.OracleSource.PYTH, marginRatioInitial = 2000, marginRatioMaintenance = 500, liquidationFee = 0, activeStatus = true, name = userName_1.DEFAULT_MARKET_NAME) {
+    async initializePerpMarket(priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, oracleSource = types_1.OracleSource.PYTH, marginRatioInitial = 2000, marginRatioMaintenance = 500, liquidatorFee = 0, activeStatus = true, name = userName_1.DEFAULT_MARKET_NAME) {
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, this.getStateAccount().numberOfMarkets);
         const nameBuffer = (0, userName_1.encodeName)(name);
-        const initializeMarketTx = await this.program.transaction.initializePerpMarket(baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, oracleSource, marginRatioInitial, marginRatioMaintenance, liquidationFee, activeStatus, nameBuffer, {
+        const initializeMarketTx = await this.program.transaction.initializePerpMarket(baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, oracleSource, marginRatioInitial, marginRatioMaintenance, liquidatorFee, activeStatus, nameBuffer, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 admin: this.wallet.publicKey,
@@ -215,7 +216,7 @@ class Admin extends clearingHouse_1.ClearingHouse {
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
                 sourceVault,
-                clearingHouseSigner: this.getSignerPublicKey(),
+                driftSigner: this.getSignerPublicKey(),
                 quoteSpotMarket: spotMarket.pubkey,
                 spotMarketVault: spotMarket.vault,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -250,6 +251,15 @@ class Admin extends clearingHouse_1.ClearingHouse {
             },
         });
     }
+    async updatePerpMarketImfFactor(perpMarketIndex, imfFactor, unrealizedPnlImfFactor) {
+        return await this.program.rpc.updatePerpMarketImfFactor(imfFactor, unrealizedPnlImfFactor, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
+            },
+        });
+    }
     async updatePerpMarketBaseSpread(perpMarketIndex, baseSpread) {
         return await this.program.rpc.updatePerpMarketBaseSpread(baseSpread, {
             accounts: {
@@ -278,6 +288,16 @@ class Admin extends clearingHouse_1.ClearingHouse {
             },
         });
     }
+    async updateSpotMarketName(spotMarketIndex, name) {
+        const nameBuffer = (0, userName_1.encodeName)(name);
+        return await this.program.rpc.updateSpotMarketName(nameBuffer, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+            },
+        });
+    }
     async updatePerpMarketMaxSpread(perpMarketIndex, maxSpread) {
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
         return await this.program.rpc.updatePerpMarketMaxSpread(maxSpread, {
@@ -401,6 +421,24 @@ class Admin extends clearingHouse_1.ClearingHouse {
             },
         });
     }
+    async updateSpotMarketStepSizeAndTickSize(spotMarketIndex, stepSize, tickSize) {
+        return await this.program.rpc.updateSpotMarketStepSizeAndTickSize(stepSize, tickSize, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+            },
+        });
+    }
+    async updateSpotMarketMinOrderSize(spotMarketIndex, orderSize) {
+        return await this.program.rpc.updateSpotMarketMinOrderSize(orderSize, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+            },
+        });
+    }
     async updatePerpMarketExpiry(perpMarketIndex, expiryTs) {
         return await this.program.rpc.updatePerpMarketExpiry(expiryTs, {
             accounts: {
@@ -454,6 +492,15 @@ class Admin extends clearingHouse_1.ClearingHouse {
             },
         });
     }
+    async updateSpotMarketBorrowRate(spotMarketIndex, optimalUtilization, optimalBorrowRate, optimalMaxRate) {
+        return await this.program.rpc.updateSpotMarketBorrowRate(optimalUtilization, optimalBorrowRate, optimalMaxRate, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+            },
+        });
+    }
     async updateSpotMarketAssetTier(spotMarketIndex, assetTier) {
         return await this.program.rpc.updateSpotMarketAssetTier(assetTier, {
             accounts: {
@@ -519,7 +566,7 @@ class Admin extends clearingHouse_1.ClearingHouse {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: this.getPerpMarketAccount(perpMarketIndex).pubkey,
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
     }
@@ -532,6 +579,15 @@ class Admin extends clearingHouse_1.ClearingHouse {
             },
         });
     }
+    async updatePerpMarketUnrealizedAssetWeight(perpMarketIndex, unrealizedInitialAssetWeight, unrealizedMaintenanceAssetWeight) {
+        return await this.program.rpc.updatePerpMarketUnrealizedAssetWeight(unrealizedInitialAssetWeight, unrealizedMaintenanceAssetWeight, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
+            },
+        });
+    }
     async updatePerpMarketMaxImbalances(perpMarketIndex, unrealizedMaxImbalance, maxRevenueWithdrawPerPeriod, quoteMaxInsurance) {
         return await this.program.rpc.updatePerpMarketMaxImbalances(unrealizedMaxImbalance, maxRevenueWithdrawPerPeriod, quoteMaxInsurance, {
             accounts: {
@@ -559,5 +615,23 @@ class Admin extends clearingHouse_1.ClearingHouse {
             },
         });
     }
+    async updatePerpMarketLiquidationFee(perpMarketIndex, liquidatorFee, ifLiquidationFee) {
+        return await this.program.rpc.updatePerpMarketLiquidationFee(liquidatorFee, ifLiquidationFee, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
+            },
+        });
+    }
+    async updateSpotMarketLiquidationFee(spotMarketIndex, liquidatorFee, ifLiquidationFee) {
+        return await this.program.rpc.updateSpotMarketLiquidationFee(liquidatorFee, ifLiquidationFee, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+            },
+        });
+    }
 }
-exports.Admin = Admin;
+exports.AdminClient = AdminClient;

package/lib/config.js

@@ -7,7 +7,7 @@ exports.configs = {
     devnet: {
         ENV: 'devnet',
         PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-        CLEARING_HOUSE_PROGRAM_ID: 'jAEeKs9twxAJmXZHqS2p459xW7FMDjoyvuqthRo9qGS',
+        CLEARING_HOUSE_PROGRAM_ID: 'H4G1xzAoqSW8n1Edmeowqsgc895tSNCeDPafYjv4Md7i',
         USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
         SERUM_V3: 'DESVgJVGajEgKGXhb6XmqDHGz3VjdgP7rEVESBgxmroY',
         V2_ALPHA_TICKET_MINT_ADDRESS: 'DeEiGWfCMP9psnLGkxGrBBMEAW5Jv8bBGMN8DCtFRCyB',

package/lib/constants/numericConstants.d.ts

@@ -15,6 +15,9 @@ export declare const TEN_THOUSAND: BN;
 export declare const BN_MAX: BN;
 export declare const TEN_MILLION: BN;
 export declare const MAX_LEVERAGE: BN;
+export declare const PERCENTAGE_PRECISION_EXP: BN;
+export declare const PERCENTAGE_PRECISION: BN;
+export declare const CONCENTRATION_PRECISION: BN;
 export declare const QUOTE_PRECISION_EXP: BN;
 export declare const FUNDING_RATE_BUFFER_PRECISION_EXP: BN;
 export declare const PRICE_PRECISION_EXP: BN;

package/lib/constants/numericConstants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LAMPORTS_PRECISION = exports.QUOTE_SPOT_MARKET_INDEX = exports.ONE_YEAR = exports.BID_ASK_SPREAD_PRECISION = exports.MARGIN_PRECISION = exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.PRICE_DIV_PEG = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION_EXP = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_RATE_BUFFER_PRECISION = exports.FUNDING_RATE_PRECISION = exports.PRICE_PRECISION = exports.QUOTE_PRECISION = exports.LIQUIDATION_FEE_PRECISION = exports.SPOT_MARKET_IMF_PRECISION = exports.SPOT_MARKET_IMF_PRECISION_EXP = exports.SPOT_MARKET_BALANCE_PRECISION = exports.SPOT_MARKET_BALANCE_PRECISION_EXP = exports.SPOT_MARKET_WEIGHT_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION_EXP = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP = exports.SPOT_MARKET_RATE_PRECISION = exports.SPOT_MARKET_RATE_PRECISION_EXP = exports.AMM_RESERVE_PRECISION_EXP = exports.PEG_PRECISION_EXP = exports.FUNDING_RATE_PRECISION_EXP = exports.PRICE_PRECISION_EXP = exports.FUNDING_RATE_BUFFER_PRECISION_EXP = exports.QUOTE_PRECISION_EXP = exports.MAX_LEVERAGE = exports.TEN_MILLION = exports.BN_MAX = exports.TEN_THOUSAND = exports.TEN = exports.NINE = exports.EIGHT = exports.SEVEN = exports.SIX = exports.FIVE = exports.FOUR = exports.THREE = exports.TWO = exports.ONE = exports.ZERO = void 0;
-exports.LAMPORTS_EXP = void 0;
+exports.BID_ASK_SPREAD_PRECISION = exports.MARGIN_PRECISION = exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.PRICE_DIV_PEG = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION_EXP = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_RATE_BUFFER_PRECISION = exports.FUNDING_RATE_PRECISION = exports.PRICE_PRECISION = exports.QUOTE_PRECISION = exports.LIQUIDATION_FEE_PRECISION = exports.SPOT_MARKET_IMF_PRECISION = exports.SPOT_MARKET_IMF_PRECISION_EXP = exports.SPOT_MARKET_BALANCE_PRECISION = exports.SPOT_MARKET_BALANCE_PRECISION_EXP = exports.SPOT_MARKET_WEIGHT_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION_EXP = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP = exports.SPOT_MARKET_RATE_PRECISION = exports.SPOT_MARKET_RATE_PRECISION_EXP = exports.AMM_RESERVE_PRECISION_EXP = exports.PEG_PRECISION_EXP = exports.FUNDING_RATE_PRECISION_EXP = exports.PRICE_PRECISION_EXP = exports.FUNDING_RATE_BUFFER_PRECISION_EXP = exports.QUOTE_PRECISION_EXP = exports.CONCENTRATION_PRECISION = exports.PERCENTAGE_PRECISION = exports.PERCENTAGE_PRECISION_EXP = exports.MAX_LEVERAGE = exports.TEN_MILLION = exports.BN_MAX = exports.TEN_THOUSAND = exports.TEN = exports.NINE = exports.EIGHT = exports.SEVEN = exports.SIX = exports.FIVE = exports.FOUR = exports.THREE = exports.TWO = exports.ONE = exports.ZERO = void 0;
+exports.LAMPORTS_EXP = exports.LAMPORTS_PRECISION = exports.QUOTE_SPOT_MARKET_INDEX = exports.ONE_YEAR = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const __1 = require("../");
 exports.ZERO = new __1.BN(0);
@@ -19,6 +19,9 @@ exports.TEN_THOUSAND = new __1.BN(10000);
 exports.BN_MAX = new __1.BN(Number.MAX_SAFE_INTEGER);
 exports.TEN_MILLION = exports.TEN_THOUSAND.mul(exports.TEN_THOUSAND);
 exports.MAX_LEVERAGE = new __1.BN(5);
+exports.PERCENTAGE_PRECISION_EXP = new __1.BN(6);
+exports.PERCENTAGE_PRECISION = new __1.BN(10).pow(exports.PERCENTAGE_PRECISION_EXP);
+exports.CONCENTRATION_PRECISION = exports.PERCENTAGE_PRECISION;
 exports.QUOTE_PRECISION_EXP = new __1.BN(6);
 exports.FUNDING_RATE_BUFFER_PRECISION_EXP = new __1.BN(3);
 exports.PRICE_PRECISION_EXP = new __1.BN(6);

package/lib/dlob/DLOB.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="bn.js" />
 import { NodeList } from './NodeList';
-import { MarketType, BN, ClearingHouse, Order, SpotMarketAccount, PerpMarketAccount, OraclePriceData, SlotSubscriber, UserMapInterface, MarketTypeStr, StateAccount } from '..';
+import { MarketType, BN, DriftClient, Order, SpotMarketAccount, PerpMarketAccount, OraclePriceData, SlotSubscriber, UserMapInterface, MarketTypeStr, StateAccount } from '..';
 import { PublicKey } from '@solana/web3.js';
 import { DLOBNode, TriggerOrderNode } from '..';
 export declare type MarketNodeLists = {
@@ -77,6 +77,6 @@ export declare class DLOB {
     getBestAsk(marketIndex: number, fallbackAsk: BN | undefined, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): BN;
     getBestBid(marketIndex: number, fallbackBid: BN | undefined, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): BN;
     findNodesToTrigger(marketIndex: number, slot: number, oraclePrice: BN, marketType: MarketType): NodeToTrigger[];
-    printTopOfOrderLists(sdkConfig: any, clearingHouse: ClearingHouse, slotSubscriber: SlotSubscriber, marketIndex: number, marketType: MarketType): void;
+    printTopOfOrderLists(sdkConfig: any, driftClient: DriftClient, slotSubscriber: SlotSubscriber, marketIndex: number, marketType: MarketType): void;
 }
 export {};

package/lib/dlob/DLOB.js

@@ -649,11 +649,11 @@ class DLOB {
         }
         return nodesToTrigger;
     }
-    printTopOfOrderLists(sdkConfig, clearingHouse, slotSubscriber, marketIndex, marketType) {
+    printTopOfOrderLists(sdkConfig, driftClient, slotSubscriber, marketIndex, marketType) {
         if ((0, __1.isVariant)(marketType, 'perp')) {
-            const market = clearingHouse.getPerpMarketAccount(marketIndex);
+            const market = driftClient.getPerpMarketAccount(marketIndex);
             const slot = slotSubscriber.getSlot();
-            const oraclePriceData = clearingHouse.getOracleDataForPerpMarket(marketIndex);
+            const oraclePriceData = driftClient.getOracleDataForPerpMarket(marketIndex);
             const fallbackAsk = (0, __1.calculateAskPrice)(market, oraclePriceData);
             const fallbackBid = (0, __1.calculateBidPrice)(market, oraclePriceData);
             const bestAsk = this.getBestAsk(marketIndex, fallbackAsk, slot, marketType, oraclePriceData);
@@ -674,7 +674,7 @@ class DLOB {
         }
         else if ((0, __1.isVariant)(marketType, 'spot')) {
             const slot = slotSubscriber.getSlot();
-            const oraclePriceData = clearingHouse.getOracleDataForPerpMarket(marketIndex);
+            const oraclePriceData = driftClient.getOracleDataForPerpMarket(marketIndex);
             const bestAsk = this.getBestAsk(marketIndex, undefined, slot, marketType, oraclePriceData);
             const bestBid = this.getBestBid(marketIndex, undefined, slot, marketType, oraclePriceData);
             const mid = bestAsk.add(bestBid).div(new __1.BN(2));

package/lib/{clearingHouse.d.ts → driftClient.d.ts}

@@ -7,13 +7,13 @@ import { Connection, PublicKey, TransactionSignature, ConfirmOptions, Transactio
 import { TokenFaucet } from './tokenFaucet';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
-import { ClearingHouseAccountSubscriber, ClearingHouseAccountEvents, DataAndSlot } from './accounts/types';
+import { DriftClientAccountSubscriber, DriftClientAccountEvents, DataAndSlot } from './accounts/types';
 import { TxSender } from './tx/types';
 import { OraclePriceData } from './oracles/types';
-import { ClearingHouseConfig } from './clearingHouseConfig';
-import { ClearingHouseUser } from './clearingHouseUser';
-import { ClearingHouseUserAccountSubscriptionConfig } from './clearingHouseUserConfig';
-import { ClearingHouseUserStats } from './clearingHouseUserStats';
+import { DriftClientConfig } from './driftClientConfig';
+import { User } from './user';
+import { UserSubscriptionConfig } from './userConfig';
+import { UserStats } from './userStats';
 declare type RemainingAccountParams = {
     userAccounts: UserAccount[];
     writablePerpMarketIndexes?: number[];
@@ -23,21 +23,21 @@ declare type RemainingAccountParams = {
     useMarketLastSlotCache?: boolean;
 };
 /**
- * # ClearingHouse
+ * # DriftClient
  * 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.
  */
-export declare class ClearingHouse {
+export declare class DriftClient {
     connection: Connection;
     wallet: IWallet;
     program: Program;
     provider: AnchorProvider;
     opts?: ConfirmOptions;
-    users: Map<number, ClearingHouseUser>;
-    userStats?: ClearingHouseUserStats;
+    users: Map<number, User>;
+    userStats?: UserStats;
     activeSubAccountId: number;
-    userAccountSubscriptionConfig: ClearingHouseUserAccountSubscriptionConfig;
-    accountSubscriber: ClearingHouseAccountSubscriber;
-    eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
+    userAccountSubscriptionConfig: UserSubscriptionConfig;
+    accountSubscriber: DriftClientAccountSubscriber;
+    eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
     _isSubscribed: boolean;
     txSender: TxSender;
     perpMarketLastSlotCache: Map<number, number>;
@@ -45,9 +45,9 @@ export declare class ClearingHouse {
     authority: PublicKey;
     get isSubscribed(): boolean;
     set isSubscribed(val: boolean);
-    constructor(config: ClearingHouseConfig);
-    createUsers(subAccountIds: number[], accountSubscriptionConfig: ClearingHouseUserAccountSubscriptionConfig): void;
-    createUser(subAccountId: number, accountSubscriptionConfig: ClearingHouseUserAccountSubscriptionConfig): ClearingHouseUser;
+    constructor(config: DriftClientConfig);
+    createUsers(subAccountIds: number[], accountSubscriptionConfig: UserSubscriptionConfig): void;
+    createUser(subAccountId: number, accountSubscriptionConfig: UserSubscriptionConfig): User;
     subscribe(): Promise<boolean>;
     subscribeUsers(): Promise<boolean>[];
     /**
@@ -69,7 +69,7 @@ export declare class ClearingHouse {
     getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
     getSerumV3FulfillmentConfig(serumMarket: PublicKey): Promise<SerumV3FulfillmentConfigAccount>;
     /**
-     * Update the wallet to use for clearing house transactions and linked user account
+     * Update the wallet to use for drift transactions and linked user account
      * @param newWallet
      * @param subAccountIds
      * @param activeSubAccountId
@@ -85,9 +85,9 @@ export declare class ClearingHouse {
     updateUserDelegate(delegate: PublicKey, subAccountId?: number): Promise<TransactionSignature>;
     getUserAccountsForDelegate(delegate: PublicKey): Promise<UserAccount[]>;
     deleteUser(subAccountId?: number): Promise<TransactionSignature>;
-    getUser(subAccountId?: number): ClearingHouseUser;
-    getUsers(): ClearingHouseUser[];
-    getUserStats(): ClearingHouseUserStats;
+    getUser(subAccountId?: number): User;
+    getUsers(): User[];
+    getUserStats(): UserStats;
     userStatsAccountPublicKey: PublicKey;
     getUserStatsAccountPublicKey(): PublicKey;
     getUserAccountPublicKey(): Promise<PublicKey>;
@@ -168,6 +168,7 @@ export declare class ClearingHouse {
     getPlaceSpotOrderIx(orderParams: OptionalOrderParams): Promise<TransactionInstruction>;
     fillSpotOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Order, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionSignature>;
     getFillSpotOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order?: Order, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
+    addSpotFulfillmentAccounts(marketIndex: number, remainingAccounts: AccountMeta[], fulfillmentConfig?: SerumV3FulfillmentConfigAccount): void;
     addSerumRemainingAccounts(marketIndex: number, remainingAccounts: AccountMeta[], fulfillmentConfig: SerumV3FulfillmentConfigAccount): void;
     triggerOrder(userAccountPublicKey: PublicKey, user: UserAccount, order: Order): Promise<TransactionSignature>;
     getTriggerOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order: Order): Promise<TransactionInstruction>;
@@ -216,7 +217,7 @@ export declare class ClearingHouse {
     getUpdateFundingRateIx(perpMarketIndex: number, oracle: PublicKey): Promise<TransactionInstruction>;
     settleFundingPayment(userAccountPublicKey: PublicKey): Promise<TransactionSignature>;
     getSettleFundingPaymentIx(userAccountPublicKey: PublicKey): Promise<TransactionInstruction>;
-    triggerEvent(eventName: keyof ClearingHouseAccountEvents, data?: any): void;
+    triggerEvent(eventName: keyof DriftClientAccountEvents, data?: any): void;
     getOracleDataForPerpMarket(marketIndex: number): OraclePriceData;
     getOracleDataForSpotMarket(marketIndex: number): OraclePriceData;
     initializeInsuranceFundStake(marketIndex: number): Promise<TransactionSignature>;