@drift-labs/sdk 0.1.18-orders.3 → 0.1.18-orders.7

package/src/clearingHouse.ts

@@ -414,6 +414,20 @@ export class ClearingHouse {
 		return this.userOrdersAccountPublicKey;
 	}
 
+	userOrdersExist?: boolean;
+	async userOrdersAccountExists(): Promise<boolean> {
+		if (this.userOrdersExist) {
+			return this.userOrdersExist;
+		}
+		const userOrdersAccountRPCResponse =
+			await this.connection.getParsedAccountInfo(
+				await this.getUserOrdersAccountPublicKey()
+			);
+
+		this.userOrdersExist = userOrdersAccountRPCResponse.value !== null;
+		return this.userOrdersExist;
+	}
+
 	public async depositCollateral(
 		amount: BN,
 		collateralAccountPublicKey: PublicKey,
@@ -668,6 +682,27 @@ export class ClearingHouse {
 		);
 	}
 
+	public async initializeUserOrdersThenPlaceOrder(
+		orderParams: OrderParams,
+		discountToken?: PublicKey,
+		referrer?: PublicKey
+	): Promise<TransactionSignature> {
+		const instructions: anchor.web3.TransactionInstruction[] = [];
+		const userOrdersAccountExists = await this.userOrdersAccountExists();
+		if (!userOrdersAccountExists) {
+			instructions.push(await this.getInitializeUserOrdersInstruction());
+		}
+		instructions.push(
+			await this.getPlaceOrderIx(orderParams, discountToken, referrer)
+		);
+		const tx = new Transaction();
+		for (const instruction of instructions) {
+			tx.add(instruction);
+		}
+
+		return await this.txSender.send(tx, [], this.opts);
+	}
+
 	public async placeOrder(
 		orderParams: OrderParams,
 		discountToken?: PublicKey,
@@ -872,6 +907,27 @@ export class ClearingHouse {
 		});
 	}
 
+	public async initializeUserOrdersThenPlaceAndFillOrder(
+		orderParams: OrderParams,
+		discountToken?: PublicKey,
+		referrer?: PublicKey
+	): Promise<TransactionSignature> {
+		const instructions: anchor.web3.TransactionInstruction[] = [];
+		const userOrdersAccountExists = await this.userOrdersAccountExists();
+		if (!userOrdersAccountExists) {
+			instructions.push(await this.getInitializeUserOrdersInstruction());
+		}
+		instructions.push(
+			await this.getPlaceAndFillOrderIx(orderParams, discountToken, referrer)
+		);
+		const tx = new Transaction();
+		for (const instruction of instructions) {
+			tx.add(instruction);
+		}
+
+		return await this.txSender.send(tx, [], this.opts);
+	}
+
 	public async placeAndFillOrder(
 		orderParams: OrderParams,
 		discountToken?: PublicKey,

package/src/clearingHouseUser.ts

@@ -1,5 +1,4 @@
 import { PublicKey } from '@solana/web3.js';
-import BN from 'bn.js';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { ClearingHouse } from './clearingHouse';
@@ -33,6 +32,7 @@ import {
 	getUserOrdersAccountPublicKey,
 	calculateNewStateAfterOrder,
 	calculateTradeSlippage,
+	BN,
 } from '.';
 import { getUserAccountPublicKey } from './addresses';
 import {
@@ -120,7 +120,7 @@ export class ClearingHouseUser {
 		return this.accountSubscriber.getUserPositionsAccount();
 	}
 
-	public getUserOrdersAccount(): UserOrdersAccount {
+	public getUserOrdersAccount(): UserOrdersAccount | undefined {
 		return this.accountSubscriber.getUserOrdersAccount();
 	}
 
@@ -155,6 +155,16 @@ export class ClearingHouseUser {
 		);
 	}
 
+	/**
+	 * @param userOrderId
+	 * @returns Order
+	 */
+	public getOrderByUserOrderId(userOrderId: number): Order | undefined {
+		return this.getUserOrdersAccount().orders.find(
+			(order) => order.userOrderId === userOrderId
+		);
+	}
+
 	public async getUserAccountPublicKey(): Promise<PublicKey> {
 		if (this.userAccountPublicKey) {
 			return this.userAccountPublicKey;

package/src/config.ts

@@ -11,7 +11,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 	devnet: {
 		ENV: 'devnet',
 		PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-		CLEARING_HOUSE_PROGRAM_ID: '8mKouB1uzsoMAhAu4qAXCiu8KAfwH7nonpuYfTM21Xg2',
+		CLEARING_HOUSE_PROGRAM_ID: '3PfbDmWxR6e2rJ2brhSv7KJyUrHbSCu63d3FHqdLhxUJ',
 		USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
 	},
 	'mainnet-beta': {

package/src/constants/markets.ts

@@ -1,4 +1,4 @@
-import BN from 'bn.js';
+import { BN } from '../';
 
 type Market = {
 	symbol: string;
@@ -98,6 +98,14 @@ export const Markets: Market[] = [
 		mainnetPythOracle: 'HqFyq1wh1xKvL7KDqqT7NJeSPdAqsDqnmBisUC2XdXAX',
 		launchTs: 1643686767000,
 	},
+	{
+		symbol: 'FTT-PERP',
+		baseAssetSymbol: 'FTT',
+		marketIndex: new BN(11),
+		devnetPythOracle: '6vivTRs5ZPeeXbjo7dfburfaYDWoXjBtdtuYgQRuGfu',
+		mainnetPythOracle: '8JPJJkmDScpcNmBRKGZuPuG2GYAveQgP3t5gFuMymwvF',
+		launchTs: 1644382122000,
+	},
 	// {
 	// 	symbol: 'mSOL-PERP',
 	// 	baseAssetSymbol: 'mSOL',

package/src/constants/numericConstants.ts

@@ -1,7 +1,8 @@
-import BN from 'bn.js';
+import { BN } from '../';
 
 export const ZERO = new BN(0);
 export const ONE = new BN(1);
+export const TWO = new BN(2);
 export const TEN_THOUSAND = new BN(10000);
 export const BN_MAX = new BN(Number.MAX_SAFE_INTEGER);
 
@@ -15,6 +16,7 @@ export const FUNDING_PAYMENT_PRECISION = new BN(10000);
 export const PEG_PRECISION = new BN(1000);
 
 export const AMM_RESERVE_PRECISION = new BN(10 ** 13);
+export const BASE_PRECISION = AMM_RESERVE_PRECISION;
 export const AMM_TO_QUOTE_PRECISION_RATIO =
 	AMM_RESERVE_PRECISION.div(QUOTE_PRECISION); // 10^7
 export const PRICE_TO_QUOTE_PRECISION =

package/src/examples/makeTradeExample.ts

@@ -95,7 +95,10 @@ const main = async () => {
 		clearingHouse.getMarket(solMarketInfo.marketIndex)
 	);
 
-	const formattedPrice = convertToNumber(currentMarketPrice, QUOTE_PRECISION);
+	const formattedPrice = convertToNumber(
+		currentMarketPrice,
+		MARK_PRICE_PRECISION
+	);
 
 	console.log(`Current Market Price is $${formattedPrice}`);
 

package/src/idl/clearing_house.json

@@ -572,7 +572,7 @@
         },
         {
           "name": "markets",
-          "isMut": true,
+          "isMut": false,
           "isSigner": false
         },
         {
@@ -628,7 +628,7 @@
         },
         {
           "name": "markets",
-          "isMut": true,
+          "isMut": false,
           "isSigner": false
         },
         {
@@ -3547,6 +3547,10 @@
             "name": "price",
             "type": "u128"
           },
+          {
+            "name": "userBaseAssetAmount",
+            "type": "i128"
+          },
           {
             "name": "quoteAssetAmount",
             "type": "u128"
@@ -3734,10 +3738,10 @@
             "name": "Limit"
           },
           {
-            "name": "Stop"
+            "name": "TriggerMarket"
           },
           {
-            "name": "StopLimit"
+            "name": "TriggerLimit"
           }
         ]
       }

package/src/math/conversion.ts

@@ -1,4 +1,4 @@
-import BN from 'bn.js';
+import { BN } from '../';
 import {
 	MARK_PRICE_PRECISION,
 	PEG_PRECISION,

package/src/math/insuranceFund.ts

@@ -1,5 +1,5 @@
 import { MarketsAccount, StateAccount } from '../types';
-import BN from 'bn.js';
+import { BN } from '../';
 import { Connection } from '@solana/web3.js';
 
 /**

package/src/math/orders.ts

@@ -1,6 +1,6 @@
 import { ClearingHouseUser } from '../clearingHouseUser';
 import { isVariant, Order } from '../types';
-import { ZERO } from '../constants/numericConstants';
+import { ZERO, TWO } from '../constants/numericConstants';
 
 export function isOrderRiskIncreasing(
 	user: ClearingHouseUser,
@@ -32,8 +32,13 @@ export function isOrderRiskIncreasing(
 		return true;
 	}
 
+	const baseAssetAmountToFill = order.baseAssetAmount.sub(
+		order.baseAssetAmountFilled
+	);
 	// if order will flip position
-	if (position.baseAssetAmount.abs().gt(order.baseAssetAmountFilled)) {
+	if (baseAssetAmountToFill.gt(position.baseAssetAmount.abs().mul(TWO))) {
 		return true;
 	}
+
+	return false;
 }

package/src/math/position.ts

@@ -1,4 +1,4 @@
-import BN from 'bn.js';
+import { BN } from '../';
 import {
 	AMM_RESERVE_PRECISION,
 	AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO,

package/src/math/utils.ts

@@ -1,4 +1,4 @@
-import BN from 'bn.js';
+import { BN } from '../';
 
 export const squareRootBN = (n, closeness = new BN(1)) => {
 	// Assuming the sqrt of n as n only

package/src/mockUSDCFaucet.ts

@@ -17,7 +17,7 @@ import {
 	TransactionInstruction,
 	TransactionSignature,
 } from '@solana/web3.js';
-import BN from 'bn.js';
+import { BN } from '.';
 import mockUSDCFaucetIDL from './idl/mock_usdc_faucet.json';
 import { IWallet } from './types';
 

package/src/orderParams.ts

@@ -41,7 +41,7 @@ export function getLimitOrderParams(
 	};
 }
 
-export function getStopOrderParams(
+export function getTriggerMarketOrderParams(
 	marketIndex: BN,
 	direction: PositionDirection,
 	baseAssetAmount: BN,
@@ -53,7 +53,7 @@ export function getStopOrderParams(
 	userOrderId = 0
 ): OrderParams {
 	return {
-		orderType: OrderType.STOP,
+		orderType: OrderType.TRIGGER_MARKET,
 		userOrderId,
 		marketIndex,
 		direction,
@@ -76,7 +76,7 @@ export function getStopOrderParams(
 	};
 }
 
-export function getStopLimitOrderParams(
+export function getTriggerLimitOrderParams(
 	marketIndex: BN,
 	direction: PositionDirection,
 	baseAssetAmount: BN,
@@ -89,7 +89,7 @@ export function getStopLimitOrderParams(
 	userOrderId = 0
 ): OrderParams {
 	return {
-		orderType: OrderType.STOP_LIMIT,
+		orderType: OrderType.TRIGGER_LIMIT,
 		userOrderId,
 		marketIndex,
 		direction,

package/src/orders.ts

@@ -6,7 +6,7 @@ import {
 	UserAccount,
 	UserPosition,
 } from './types';
-import BN from 'bn.js';
+import { BN } from '.';
 import {
 	calculateMarkPrice,
 	calculateNewMarketAfterTrade,
@@ -160,13 +160,13 @@ function calculateAmountSwapped(
 function calculateAmountToTrade(market: Market, order: Order): BN {
 	if (isVariant(order.orderType, 'limit')) {
 		return calculateAmountToTradeForLimit(market, order);
-	} else if (isVariant(order.orderType, 'stopLimit')) {
-		return calculateAmountToTradeForStopLimit(market, order);
+	} else if (isVariant(order.orderType, 'triggerLimit')) {
+		return calculateAmountToTradeForTriggerLimit(market, order);
 	} else if (isVariant(order.orderType, 'market')) {
 		// should never be a market order queued
 		return ZERO;
 	} else {
-		return calculateAmountToTradeForStop(market, order);
+		return calculateAmountToTradeForTriggerMarket(market, order);
 	}
 }
 
@@ -190,12 +190,15 @@ export function calculateAmountToTradeForLimit(
 		: maxAmountToTrade;
 }
 
-export function calculateAmountToTradeForStopLimit(
+export function calculateAmountToTradeForTriggerLimit(
 	market: Market,
 	order: Order
 ): BN {
 	if (order.baseAssetAmountFilled.eq(ZERO)) {
-		const baseAssetAmount = calculateAmountToTradeForStop(market, order);
+		const baseAssetAmount = calculateAmountToTradeForTriggerMarket(
+			market,
+			order
+		);
 		if (baseAssetAmount.eq(ZERO)) {
 			return ZERO;
 		}
@@ -214,7 +217,10 @@ function isSameDirection(
 	);
 }
 
-function calculateAmountToTradeForStop(market: Market, order: Order): BN {
+function calculateAmountToTradeForTriggerMarket(
+	market: Market,
+	order: Order
+): BN {
 	return isTriggerConditionSatisfied(market, order)
 		? order.baseAssetAmount
 		: ZERO;

package/src/types.ts

@@ -1,5 +1,5 @@
 import { PublicKey, Transaction } from '@solana/web3.js';
-import BN from 'bn.js';
+import { BN } from '.';
 
 // # Utility Types / Enums / Constants
 export class SwapDirection {
@@ -19,8 +19,8 @@ export class OracleSource {
 
 export class OrderType {
 	static readonly LIMIT = { limit: {} };
-	static readonly STOP = { stop: {} };
-	static readonly STOP_LIMIT = { stopLimit: {} };
+	static readonly TRIGGER_MARKET = { triggerMarket: {} };
+	static readonly TRIGGER_LIMIT = { triggerLimit: {} };
 	static readonly MARKET = { market: {} };
 }
 
@@ -345,6 +345,7 @@ export type Order = {
 	userOrderId: number;
 	marketIndex: BN;
 	price: BN;
+	userBaseAssetAmount: BN;
 	baseAssetAmount: BN;
 	baseAssetAmountFilled: BN;
 	quoteAssetAmount: BN;
@@ -358,6 +359,7 @@ export type Order = {
 	referrer: PublicKey;
 	postOnly: boolean;
 	immediateOrCancel: boolean;
+	oraclePriceOffset: BN;
 };
 
 export type OrderParams = {