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

package/README.md

@@ -89,8 +89,8 @@ import { Token, TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { Connection, Keypair, PublicKey } from '@solana/web3.js';
 import {
 	calculateReservePrice,
-	ClearingHouse,
-	ClearingHouseUser,
+	DriftClient,
+	User,
 	initialize,
 	Markets,
 	PositionDirection,
@@ -141,19 +141,19 @@ const main = async () => {
 		wallet.publicKey.toString()
 	);
 
-	// Set up the Drift Clearing House
-	const clearingHousePublicKey = new PublicKey(
+	// Set up the Drift Client
+	const driftClientPublicKey = new PublicKey(
 		sdkConfig.CLEARING_HOUSE_PROGRAM_ID
 	);
-	const clearingHouse = ClearingHouse.from(
+	const driftClient = DriftClient.from(
 		connection,
 		provider.wallet,
-		clearingHousePublicKey
+		driftClientPublicKey
 	);
-	await clearingHouse.subscribe();
+	await driftClient.subscribe();
 
 	// Set up Clearing House user client
-	const user = ClearingHouseUser.from(clearingHouse, wallet.publicKey);
+	const user = User.from(driftClient, wallet.publicKey);
 
 	//// Check if clearing house account exists for the current wallet
 	const userAccountExists = await user.exists();
@@ -161,7 +161,7 @@ const main = async () => {
 	if (!userAccountExists) {
 		//// Create a Clearing House account by Depositing some USDC ($10,000 in this case)
 		const depositAmount = new BN(10000).mul(QUOTE_PRECISION);
-		await clearingHouse.initializeUserAccountAndDepositCollateral(
+		await driftClient.initializeUserAccountAndDepositCollateral(
 			depositAmount,
 			await getTokenAddress(
 				usdcTokenAddress.toString(),
@@ -178,7 +178,7 @@ const main = async () => {
 	);
 
 	const currentMarketPrice = calculateReservePrice(
-		clearingHouse.getMarket(solMarketInfo.marketIndex)
+		driftClient.getMarket(solMarketInfo.marketIndex)
 	);
 
 	const formattedPrice = convertToNumber(currentMarketPrice, PRICE_PRECISION);
@@ -186,7 +186,7 @@ const main = async () => {
 	console.log(`Current Market Price is $${formattedPrice}`);
 
 	// Estimate the slippage for a $5000 LONG trade
-	const solMarketAccount = clearingHouse.getMarket(solMarketInfo.marketIndex);
+	const solMarketAccount = driftClient.getMarket(solMarketInfo.marketIndex);
 
 	const slippage = convertToNumber(
 		calculateTradeSlippage(
@@ -202,7 +202,7 @@ const main = async () => {
 	);
 
 	// Make a $5000 LONG trade
-	await clearingHouse.openPosition(
+	await driftClient.openPosition(
 		PositionDirection.LONG,
 		new BN(5000).mul(QUOTE_PRECISION),
 		solMarketInfo.marketIndex
@@ -210,14 +210,14 @@ const main = async () => {
 	console.log(`LONGED $5000 worth of SOL`);
 
 	// Reduce the position by $2000
-	await clearingHouse.openPosition(
+	await driftClient.openPosition(
 		PositionDirection.SHORT,
 		new BN(2000).mul(QUOTE_PRECISION),
 		solMarketInfo.marketIndex
 	);
 
 	// Close the rest of the position
-	await clearingHouse.closePosition(solMarketInfo.marketIndex);
+	await driftClient.closePosition(solMarketInfo.marketIndex);
 };
 
 main();

package/lib/accounts/bulkUserStatsSubscription.d.ts

@@ -1,7 +1,7 @@
-import { ClearingHouseUserStats } from '../clearingHouseUserStats';
+import { UserStats } from '../userStats';
 import { BulkAccountLoader } from './bulkAccountLoader';
 /**
  * @param userStats
  * @param accountLoader
  */
-export declare function bulkPollingUserStatsSubscribe(userStats: ClearingHouseUserStats[], accountLoader: BulkAccountLoader): Promise<void>;
+export declare function bulkPollingUserStatsSubscribe(userStats: UserStats[], accountLoader: BulkAccountLoader): Promise<void>;

package/lib/accounts/bulkUserSubscription.d.ts

@@ -1,7 +1,7 @@
-import { ClearingHouseUser } from '../clearingHouseUser';
+import { User } from '../user';
 import { BulkAccountLoader } from './bulkAccountLoader';
 /**
  * @param users
  * @param accountLoader
  */
-export declare function bulkPollingUserSubscribe(users: ClearingHouseUser[], accountLoader: BulkAccountLoader): Promise<void>;
+export declare function bulkPollingUserSubscribe(users: User[], accountLoader: BulkAccountLoader): Promise<void>;

package/lib/accounts/{pollingClearingHouseAccountSubscriber.d.ts → pollingDriftClientAccountSubscriber.d.ts}

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { DataAndSlot, AccountToPoll, ClearingHouseAccountEvents, ClearingHouseAccountSubscriber, OraclesToPoll } from './types';
+import { DataAndSlot, AccountToPoll, DriftClientAccountEvents, DriftClientAccountSubscriber, OraclesToPoll } from './types';
 import { Program } from '@project-serum/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
@@ -8,14 +8,14 @@ import { BulkAccountLoader } from './bulkAccountLoader';
 import { PublicKey } from '@solana/web3.js';
 import { OracleInfo, OraclePriceData } from '../oracles/types';
 import { OracleClientCache } from '../oracles/oracleClientCache';
-export declare class PollingClearingHouseAccountSubscriber implements ClearingHouseAccountSubscriber {
+export declare class PollingDriftClientAccountSubscriber implements DriftClientAccountSubscriber {
     isSubscribed: boolean;
     program: Program;
     perpMarketIndexes: number[];
     spotMarketIndexes: number[];
     oracleInfos: OracleInfo[];
     oracleClientCache: OracleClientCache;
-    eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
+    eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
     accountLoader: BulkAccountLoader;
     accountsToPoll: Map<string, AccountToPoll>;
     oraclesToPoll: Map<string, OraclesToPoll>;
@@ -37,7 +37,6 @@ export declare class PollingClearingHouseAccountSubscriber implements ClearingHo
     addSpotMarketAccountToPoll(marketIndex: number): Promise<boolean>;
     updateOraclesToPoll(): boolean;
     addOracleToPoll(oracleInfo: OracleInfo): boolean;
-    getClearingHouseAccounts(): Promise<ClearingHouseAccounts>;
     addToAccountLoader(): Promise<void>;
     addAccountToAccountLoader(accountToPoll: AccountToPoll): void;
     addOracleToAccountLoader(oracleToPoll: OraclesToPoll): void;
@@ -55,7 +54,3 @@ export declare class PollingClearingHouseAccountSubscriber implements ClearingHo
     getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
     getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
 }
-declare type ClearingHouseAccounts = {
-    state: PublicKey;
-};
-export {};

package/lib/accounts/{pollingClearingHouseAccountSubscriber.js → pollingDriftClientAccountSubscriber.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PollingClearingHouseAccountSubscriber = void 0;
+exports.PollingDriftClientAccountSubscriber = void 0;
 const types_1 = require("./types");
 const events_1 = require("events");
 const pda_1 = require("../addresses/pda");
@@ -8,7 +8,7 @@ const utils_1 = require("./utils");
 const web3_js_1 = require("@solana/web3.js");
 const oracleClientCache_1 = require("../oracles/oracleClientCache");
 const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
-class PollingClearingHouseAccountSubscriber {
+class PollingDriftClientAccountSubscriber {
     constructor(program, accountLoader, perpMarketIndexes, spotMarketIndexes, oracleInfos) {
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
         this.accountsToPoll = new Map();
@@ -58,10 +58,10 @@ class PollingClearingHouseAccountSubscriber {
         if (this.accountsToPoll.size > 0) {
             return;
         }
-        const accounts = await this.getClearingHouseAccounts();
-        this.accountsToPoll.set(accounts.state.toString(), {
+        const statePublicKey = await (0, pda_1.getDriftStateAccountPublicKey)(this.program.programId);
+        this.accountsToPoll.set(statePublicKey.toString(), {
             key: 'state',
-            publicKey: accounts.state,
+            publicKey: statePublicKey,
             eventType: 'stateAccountUpdate',
         });
         await this.updatePerpMarketAccountsToPoll();
@@ -114,13 +114,6 @@ class PollingClearingHouseAccountSubscriber {
         });
         return true;
     }
-    async getClearingHouseAccounts() {
-        const statePublicKey = await (0, pda_1.getClearingHouseStateAccountPublicKey)(this.program.programId);
-        const accounts = {
-            state: statePublicKey,
-        };
-        return accounts;
-    }
     async addToAccountLoader() {
         for (const [_, accountToPoll] of this.accountsToPoll) {
             this.addAccountToAccountLoader(accountToPoll);
@@ -276,4 +269,4 @@ class PollingClearingHouseAccountSubscriber {
         return this.oracles.get(oraclePublicKey.toString());
     }
 }
-exports.PollingClearingHouseAccountSubscriber = PollingClearingHouseAccountSubscriber;
+exports.PollingDriftClientAccountSubscriber = PollingDriftClientAccountSubscriber;

package/lib/accounts/{pollingOracleSubscriber.d.ts → pollingOracleAccountSubscriber.d.ts}

@@ -1,12 +1,12 @@
 /// <reference types="node" />
-import { DataAndSlot, OracleEvents, OracleSubscriber } from './types';
+import { DataAndSlot, OracleEvents, OracleAccountSubscriber } from './types';
 import { Program } from '@project-serum/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './bulkAccountLoader';
 import { OracleClient, OraclePriceData } from '../oracles/types';
-export declare class PollingOracleSubscriber implements OracleSubscriber {
+export declare class PollingOracleAccountSubscriber implements OracleAccountSubscriber {
     isSubscribed: boolean;
     program: Program;
     eventEmitter: StrictEventEmitter<EventEmitter, OracleEvents>;

package/lib/accounts/{pollingOracleSubscriber.js → pollingOracleAccountSubscriber.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PollingOracleSubscriber = void 0;
+exports.PollingOracleAccountSubscriber = void 0;
 const types_1 = require("./types");
 const events_1 = require("events");
-class PollingOracleSubscriber {
+class PollingOracleAccountSubscriber {
     constructor(publicKey, oracleClient, accountLoader) {
         this.isSubscribed = false;
         this.publicKey = publicKey;
@@ -75,4 +75,4 @@ class PollingOracleSubscriber {
         return !!this.oraclePriceData;
     }
 }
-exports.PollingOracleSubscriber = PollingOracleSubscriber;
+exports.PollingOracleAccountSubscriber = PollingOracleAccountSubscriber;

package/lib/accounts/types.d.ts

@@ -15,7 +15,7 @@ export interface AccountSubscriber<T> {
 export declare class NotSubscribedError extends Error {
     name: string;
 }
-export interface ClearingHouseAccountEvents {
+export interface DriftClientAccountEvents {
     stateAccountUpdate: (payload: StateAccount) => void;
     perpMarketAccountUpdate: (payload: PerpMarketAccount) => void;
     spotMarketAccountUpdate: (payload: SpotMarketAccount) => void;
@@ -24,8 +24,8 @@ export interface ClearingHouseAccountEvents {
     update: void;
     error: (e: Error) => void;
 }
-export interface ClearingHouseAccountSubscriber {
-    eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
+export interface DriftClientAccountSubscriber {
+    eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
     isSubscribed: boolean;
     subscribe(): Promise<boolean>;
     fetch(): Promise<void>;
@@ -71,7 +71,7 @@ export interface OracleEvents {
     update: void;
     error: (e: Error) => void;
 }
-export interface OracleSubscriber {
+export interface OracleAccountSubscriber {
     eventEmitter: StrictEventEmitter<EventEmitter, OracleEvents>;
     isSubscribed: boolean;
     subscribe(): Promise<boolean>;

package/lib/accounts/{webSocketClearingHouseAccountSubscriber.d.ts → webSocketDriftClientAccountSubscriber.d.ts}

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { ClearingHouseAccountSubscriber, ClearingHouseAccountEvents, DataAndSlot } from './types';
+import { DriftClientAccountSubscriber, DriftClientAccountEvents, DataAndSlot } from './types';
 import { AccountSubscriber } from './types';
 import { SpotMarketAccount, PerpMarketAccount, StateAccount } from '../types';
 import { Program } from '@project-serum/anchor';
@@ -8,14 +8,14 @@ import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
 import { OracleInfo, OraclePriceData } from '../oracles/types';
 import { OracleClientCache } from '../oracles/oracleClientCache';
-export declare class WebSocketClearingHouseAccountSubscriber implements ClearingHouseAccountSubscriber {
+export declare class WebSocketDriftClientAccountSubscriber implements DriftClientAccountSubscriber {
     isSubscribed: boolean;
     program: Program;
     perpMarketIndexes: number[];
     spotMarketIndexes: number[];
     oracleInfos: OracleInfo[];
     oracleClientCache: OracleClientCache;
-    eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
+    eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
     stateAccountSubscriber?: AccountSubscriber<StateAccount>;
     perpMarketAccountSubscribers: Map<number, AccountSubscriber<PerpMarketAccount>>;
     spotMarketAccountSubscribers: Map<number, AccountSubscriber<SpotMarketAccount>>;

package/lib/accounts/{webSocketClearingHouseAccountSubscriber.js → webSocketDriftClientAccountSubscriber.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebSocketClearingHouseAccountSubscriber = void 0;
+exports.WebSocketDriftClientAccountSubscriber = void 0;
 const types_1 = require("./types");
 const events_1 = require("events");
 const pda_1 = require("../addresses/pda");
@@ -8,7 +8,7 @@ const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 const web3_js_1 = require("@solana/web3.js");
 const oracleClientCache_1 = require("../oracles/oracleClientCache");
 const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
-class WebSocketClearingHouseAccountSubscriber {
+class WebSocketDriftClientAccountSubscriber {
     constructor(program, perpMarketIndexes, spotMarketIndexes, oracleInfos) {
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
         this.perpMarketAccountSubscribers = new Map();
@@ -33,7 +33,7 @@ class WebSocketClearingHouseAccountSubscriber {
         this.subscriptionPromise = new Promise((res) => {
             this.subscriptionPromiseResolver = res;
         });
-        const statePublicKey = await (0, pda_1.getClearingHouseStateAccountPublicKey)(this.program.programId);
+        const statePublicKey = await (0, pda_1.getDriftStateAccountPublicKey)(this.program.programId);
         // create and activate main state account subscription
         this.stateAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('state', this.program, statePublicKey);
         await this.stateAccountSubscriber.subscribe((data) => {
@@ -193,4 +193,4 @@ class WebSocketClearingHouseAccountSubscriber {
         return this.oracleSubscribers.get(oraclePublicKey.toString()).dataAndSlot;
     }
 }
-exports.WebSocketClearingHouseAccountSubscriber = WebSocketClearingHouseAccountSubscriber;
+exports.WebSocketDriftClientAccountSubscriber = WebSocketDriftClientAccountSubscriber;

package/lib/addresses/pda.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="bn.js" />
 import { PublicKey } from '@solana/web3.js';
 import { BN } from '@project-serum/anchor';
-export declare function getClearingHouseStateAccountPublicKeyAndNonce(programId: PublicKey): Promise<[PublicKey, number]>;
-export declare function getClearingHouseStateAccountPublicKey(programId: PublicKey): Promise<PublicKey>;
+export declare function getDriftStateAccountPublicKeyAndNonce(programId: PublicKey): Promise<[PublicKey, number]>;
+export declare function getDriftStateAccountPublicKey(programId: PublicKey): Promise<PublicKey>;
 export declare function getUserAccountPublicKeyAndNonce(programId: PublicKey, authority: PublicKey, subAccountId?: number): Promise<[PublicKey, number]>;
 export declare function getUserAccountPublicKey(programId: PublicKey, authority: PublicKey, subAccountId?: number): Promise<PublicKey>;
 export declare function getUserAccountPublicKeySync(programId: PublicKey, authority: PublicKey, subAccountId?: number): PublicKey;
@@ -12,7 +12,7 @@ export declare function getSpotMarketPublicKey(programId: PublicKey, marketIndex
 export declare function getSpotMarketVaultPublicKey(programId: PublicKey, marketIndex: number): Promise<PublicKey>;
 export declare function getInsuranceFundVaultPublicKey(programId: PublicKey, marketIndex: number): Promise<PublicKey>;
 export declare function getInsuranceFundStakeAccountPublicKey(programId: PublicKey, authority: PublicKey, marketIndex: number): PublicKey;
-export declare function getClearingHouseSignerPublicKey(programId: PublicKey): PublicKey;
+export declare function getDriftSignerPublicKey(programId: PublicKey): PublicKey;
 export declare function getSerumOpenOrdersPublicKey(programId: PublicKey, market: PublicKey): PublicKey;
 export declare function getSerumSignerPublicKey(programId: PublicKey, market: PublicKey, nonce: BN): PublicKey;
 export declare function getSerumFulfillmentConfigPublicKey(programId: PublicKey, market: PublicKey): PublicKey;

package/lib/addresses/pda.js

@@ -23,17 +23,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getClearingHouseSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getClearingHouseStateAccountPublicKey = exports.getClearingHouseStateAccountPublicKeyAndNonce = void 0;
+exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const anchor = __importStar(require("@project-serum/anchor"));
-async function getClearingHouseStateAccountPublicKeyAndNonce(programId) {
-    return web3_js_1.PublicKey.findProgramAddress([Buffer.from(anchor.utils.bytes.utf8.encode('clearing_house'))], programId);
+async function getDriftStateAccountPublicKeyAndNonce(programId) {
+    return web3_js_1.PublicKey.findProgramAddress([Buffer.from(anchor.utils.bytes.utf8.encode('drift_state'))], programId);
 }
-exports.getClearingHouseStateAccountPublicKeyAndNonce = getClearingHouseStateAccountPublicKeyAndNonce;
-async function getClearingHouseStateAccountPublicKey(programId) {
-    return (await getClearingHouseStateAccountPublicKeyAndNonce(programId))[0];
+exports.getDriftStateAccountPublicKeyAndNonce = getDriftStateAccountPublicKeyAndNonce;
+async function getDriftStateAccountPublicKey(programId) {
+    return (await getDriftStateAccountPublicKeyAndNonce(programId))[0];
 }
-exports.getClearingHouseStateAccountPublicKey = getClearingHouseStateAccountPublicKey;
+exports.getDriftStateAccountPublicKey = getDriftStateAccountPublicKey;
 async function getUserAccountPublicKeyAndNonce(programId, authority, subAccountId = 0) {
     return web3_js_1.PublicKey.findProgramAddress([
         Buffer.from(anchor.utils.bytes.utf8.encode('user')),
@@ -97,10 +97,10 @@ function getInsuranceFundStakeAccountPublicKey(programId, authority, marketIndex
     ], programId)[0];
 }
 exports.getInsuranceFundStakeAccountPublicKey = getInsuranceFundStakeAccountPublicKey;
-function getClearingHouseSignerPublicKey(programId) {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from(anchor.utils.bytes.utf8.encode('clearing_house_signer'))], programId)[0];
+function getDriftSignerPublicKey(programId) {
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from(anchor.utils.bytes.utf8.encode('drift_signer'))], programId)[0];
 }
-exports.getClearingHouseSignerPublicKey = getClearingHouseSignerPublicKey;
+exports.getDriftSignerPublicKey = getDriftSignerPublicKey;
 function getSerumOpenOrdersPublicKey(programId, market) {
     return web3_js_1.PublicKey.findProgramAddressSync([
         Buffer.from(anchor.utils.bytes.utf8.encode('serum_open_orders')),

package/lib/{admin.d.ts → adminClient.d.ts}

@@ -2,12 +2,12 @@
 import { PublicKey, TransactionSignature } from '@solana/web3.js';
 import { FeeStructure, OracleGuardRails, OracleSource, ExchangeStatus, MarketStatus, ContractTier, AssetTier } from './types';
 import { BN } from '@project-serum/anchor';
-import { ClearingHouse } from './clearingHouse';
-export declare class Admin extends ClearingHouse {
+import { DriftClient } from './driftClient';
+export declare class AdminClient extends DriftClient {
     initialize(usdcMint: PublicKey, _adminControlsPrices: boolean): Promise<[TransactionSignature]>;
-    initializeSpotMarket(mint: PublicKey, optimalUtilization: number, optimalRate: number, maxRate: number, oracle: PublicKey, oracleSource: OracleSource, initialAssetWeight: number, maintenanceAssetWeight: number, initialLiabilityWeight: number, maintenanceLiabilityWeight: number, imfFactor?: number, liquidationFee?: number, activeStatus?: boolean): Promise<TransactionSignature>;
+    initializeSpotMarket(mint: PublicKey, optimalUtilization: number, optimalRate: number, maxRate: number, oracle: PublicKey, oracleSource: OracleSource, initialAssetWeight: number, maintenanceAssetWeight: number, initialLiabilityWeight: number, maintenanceLiabilityWeight: number, imfFactor?: number, liquidatorFee?: number, activeStatus?: boolean, name?: string): Promise<TransactionSignature>;
     initializeSerumFulfillmentConfig(marketIndex: number, serumMarket: PublicKey, serumProgram: PublicKey): Promise<TransactionSignature>;
-    initializePerpMarket(priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, oracleSource?: OracleSource, marginRatioInitial?: number, marginRatioMaintenance?: number, liquidationFee?: number, activeStatus?: boolean, name?: string): Promise<TransactionSignature>;
+    initializePerpMarket(priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, oracleSource?: OracleSource, marginRatioInitial?: number, marginRatioMaintenance?: number, liquidatorFee?: number, activeStatus?: boolean, name?: string): Promise<TransactionSignature>;
     moveAmmPrice(perpMarketIndex: number, baseAssetReserve: BN, quoteAssetReserve: BN, sqrtK?: BN): Promise<TransactionSignature>;
     updateK(perpMarketIndex: number, sqrtK: BN): Promise<TransactionSignature>;
     updatePerpMarketConcentrationScale(perpMarketIndex: number, concentrationScale: BN): Promise<TransactionSignature>;
@@ -19,9 +19,11 @@ export declare class Admin extends ClearingHouse {
     updateAdmin(admin: PublicKey): Promise<TransactionSignature>;
     updatePerpMarketCurveUpdateIntensity(perpMarketIndex: number, curveUpdateIntensity: number): Promise<TransactionSignature>;
     updatePerpMarketMarginRatio(perpMarketIndex: number, marginRatioInitial: number, marginRatioMaintenance: number): Promise<TransactionSignature>;
+    updatePerpMarketImfFactor(perpMarketIndex: number, imfFactor: number, unrealizedPnlImfFactor: number): Promise<TransactionSignature>;
     updatePerpMarketBaseSpread(perpMarketIndex: number, baseSpread: number): Promise<TransactionSignature>;
     updateAmmJitIntensity(perpMarketIndex: number, ammJitIntensity: number): Promise<TransactionSignature>;
     updatePerpMarketName(perpMarketIndex: number, name: string): Promise<TransactionSignature>;
+    updateSpotMarketName(spotMarketIndex: number, name: string): Promise<TransactionSignature>;
     updatePerpMarketMaxSpread(perpMarketIndex: number, maxSpread: number): Promise<TransactionSignature>;
     updatePerpFeeStructure(feeStructure: FeeStructure): Promise<TransactionSignature>;
     updateSpotFeeStructure(feeStructure: FeeStructure): Promise<TransactionSignature>;
@@ -54,7 +56,10 @@ export declare class Admin extends ClearingHouse {
     updateSpotAuctionDuration(defaultAuctionDuration: number): Promise<TransactionSignature>;
     updatePerpMarketMaxFillReserveFraction(perpMarketIndex: number, maxBaseAssetAmountRatio: number): Promise<TransactionSignature>;
     updateMaxSlippageRatio(perpMarketIndex: number, maxSlippageRatio: number): Promise<TransactionSignature>;
+    updatePerpMarketUnrealizedAssetWeight(perpMarketIndex: number, unrealizedInitialAssetWeight: number, unrealizedMaintenanceAssetWeight: number): Promise<TransactionSignature>;
     updatePerpMarketMaxImbalances(perpMarketIndex: number, unrealizedMaxImbalance: BN, maxRevenueWithdrawPerPeriod: BN, quoteMaxInsurance: BN): Promise<TransactionSignature>;
     updatePerpMarketMaxOpenInterest(perpMarketIndex: number, maxOpenInterest: BN): Promise<TransactionSignature>;
     updateSerumVault(srmVault: PublicKey): Promise<TransactionSignature>;
+    updatePerpMarketLiquidationFee(perpMarketIndex: number, liquidatorFee: number, ifLiquidationFee: number): Promise<TransactionSignature>;
+    updateSpotMarketLiquidationFee(spotMarketIndex: number, liquidatorFee: number, ifLiquidationFee: number): Promise<TransactionSignature>;
 }

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, {
@@ -546,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),
             },
         });
     }
@@ -559,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: {
@@ -586,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;