@drift-labs/sdk 0.2.0-master.40 → 0.2.0-master.41

package/src/dlob/DLOB.ts

@@ -22,8 +22,9 @@ import {
 	StateAccount,
 	isMarketOrder,
 	isLimitOrder,
-	hasLimitPrice,
 	getOptionalLimitPrice,
+	mustBeTriggered,
+	isTriggered,
 } from '..';
 import { PublicKey } from '@solana/web3.js';
 import { DLOBNode, DLOBNodeType, TriggerOrderNode } from '..';
@@ -253,8 +254,7 @@ export class DLOB {
 
 	public getListForOrder(order: Order): NodeList<any> | undefined {
 		const isInactiveTriggerOrder =
-			isOneOfVariant(order.orderType, ['triggerMarket', 'triggerLimit']) &&
-			!order.triggered;
+			mustBeTriggered(order) && !isTriggered(order);
 
 		let type: DLOBNodeType;
 		if (isInactiveTriggerOrder) {
@@ -651,10 +651,7 @@ export class DLOB {
 					const user = this.userMap.get(
 						bestGenerator.next.value.userAccount.toString()
 					);
-					if (
-						user?.getUserAccount().isBeingLiquidated ||
-						user?.getUserAccount().isBankrupt
-					) {
+					if (user?.isBeingLiquidated()) {
 						bestGenerator.next = bestGenerator.generator.next();
 						continue;
 					}
@@ -740,10 +737,7 @@ export class DLOB {
 					const user = this.userMap.get(
 						bestGenerator.next.value.userAccount.toString()
 					);
-					if (
-						user?.getUserAccount().isBeingLiquidated ||
-						user?.getUserAccount().isBankrupt
-					) {
+					if (user?.isBeingLiquidated()) {
 						bestGenerator.next = bestGenerator.generator.next();
 						continue;
 					}
@@ -804,8 +798,11 @@ export class DLOB {
 			bidNode
 		);
 
-		// If order doesn't have limit price, cant be maker
-		if (!hasLimitPrice(makerNode.order, slot)) {
+		// If maker is market order and auction is complete, cant be maker
+		if (
+			isMarketOrder(makerNode.order) &&
+			isAuctionComplete(makerNode.order, slot)
+		) {
 			return {
 				crossingNodes: [],
 				exhaustedSide: makerSide,

package/src/driftClient.ts

@@ -586,6 +586,24 @@ export class DriftClient {
 		);
 	}
 
+	public async getUserAccountsForAuthority(
+		authority: PublicKey
+	): Promise<UserAccount[]> {
+		const programAccounts = await this.program.account.user.all([
+			{
+				memcmp: {
+					offset: 8,
+					/** data to match, as base-58 encoded string and limited to less than 129 bytes */
+					bytes: bs58.encode(authority.toBuffer()),
+				},
+			},
+		]);
+
+		return programAccounts.map(
+			(programAccount) => programAccount.account as UserAccount
+		);
+	}
+
 	public async deleteUser(subAccountId = 0): Promise<TransactionSignature> {
 		const userAccountPublicKey = getUserAccountPublicKeySync(
 			this.program.programId,
@@ -2933,7 +2951,8 @@ export class DriftClient {
 		userAccount: UserAccount,
 		assetMarketIndex: number,
 		liabilityMarketIndex: number,
-		maxLiabilityTransfer: BN
+		maxLiabilityTransfer: BN,
+		limitPrice?: BN
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.txSender.send(
 			wrapInTx(
@@ -2942,7 +2961,8 @@ export class DriftClient {
 					userAccount,
 					assetMarketIndex,
 					liabilityMarketIndex,
-					maxLiabilityTransfer
+					maxLiabilityTransfer,
+					limitPrice
 				)
 			),
 			[],
@@ -2958,7 +2978,8 @@ export class DriftClient {
 		userAccount: UserAccount,
 		assetMarketIndex: number,
 		liabilityMarketIndex: number,
-		maxLiabilityTransfer: BN
+		maxLiabilityTransfer: BN,
+		limitPrice?: BN
 	): Promise<TransactionInstruction> {
 		const userStatsPublicKey = getUserStatsAccountPublicKey(
 			this.program.programId,
@@ -2978,6 +2999,7 @@ export class DriftClient {
 			assetMarketIndex,
 			liabilityMarketIndex,
 			maxLiabilityTransfer,
+			limitPrice || null,
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),
@@ -2997,7 +3019,8 @@ export class DriftClient {
 		userAccount: UserAccount,
 		perpMarketIndex: number,
 		liabilityMarketIndex: number,
-		maxLiabilityTransfer: BN
+		maxLiabilityTransfer: BN,
+		limitPrice?: BN
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.txSender.send(
 			wrapInTx(
@@ -3006,7 +3029,8 @@ export class DriftClient {
 					userAccount,
 					perpMarketIndex,
 					liabilityMarketIndex,
-					maxLiabilityTransfer
+					maxLiabilityTransfer,
+					limitPrice
 				)
 			),
 			[],
@@ -3022,7 +3046,8 @@ export class DriftClient {
 		userAccount: UserAccount,
 		perpMarketIndex: number,
 		liabilityMarketIndex: number,
-		maxLiabilityTransfer: BN
+		maxLiabilityTransfer: BN,
+		limitPrice?: BN
 	): Promise<TransactionInstruction> {
 		const userStatsPublicKey = getUserStatsAccountPublicKey(
 			this.program.programId,
@@ -3042,6 +3067,7 @@ export class DriftClient {
 			perpMarketIndex,
 			liabilityMarketIndex,
 			maxLiabilityTransfer,
+			limitPrice || null,
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),
@@ -3061,7 +3087,8 @@ export class DriftClient {
 		userAccount: UserAccount,
 		perpMarketIndex: number,
 		assetMarketIndex: number,
-		maxPnlTransfer: BN
+		maxPnlTransfer: BN,
+		limitPrice?: BN
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.txSender.send(
 			wrapInTx(
@@ -3070,7 +3097,8 @@ export class DriftClient {
 					userAccount,
 					perpMarketIndex,
 					assetMarketIndex,
-					maxPnlTransfer
+					maxPnlTransfer,
+					limitPrice
 				)
 			),
 			[],
@@ -3086,7 +3114,8 @@ export class DriftClient {
 		userAccount: UserAccount,
 		perpMarketIndex: number,
 		assetMarketIndex: number,
-		maxPnlTransfer: BN
+		maxPnlTransfer: BN,
+		limitPrice?: BN
 	): Promise<TransactionInstruction> {
 		const userStatsPublicKey = getUserStatsAccountPublicKey(
 			this.program.programId,
@@ -3106,6 +3135,7 @@ export class DriftClient {
 			perpMarketIndex,
 			assetMarketIndex,
 			maxPnlTransfer,
+			limitPrice || null,
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),

package/src/events/eventList.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EventList = void 0;
+class Node {
+    constructor(event, next, prev) {
+        this.event = event;
+        this.next = next;
+        this.prev = prev;
+    }
+}
+class EventList {
+    constructor(eventType, maxSize, sortFn, orderDirection) {
+        this.eventType = eventType;
+        this.maxSize = maxSize;
+        this.sortFn = sortFn;
+        this.orderDirection = orderDirection;
+        this.size = 0;
+    }
+    insert(event) {
+        this.size++;
+        const newNode = new Node(event);
+        if (this.head === undefined) {
+            this.head = this.tail = newNode;
+            return;
+        }
+        if (this.sortFn(this.head.event, newNode.event) ===
+            (this.orderDirection === 'asc' ? 'less than' : 'greater than')) {
+            this.head.prev = newNode;
+            newNode.next = this.head;
+            this.head = newNode;
+        }
+        else {
+            let currentNode = this.head;
+            while (currentNode.next !== undefined &&
+                this.sortFn(currentNode.next.event, newNode.event) !==
+                    (this.orderDirection === 'asc' ? 'less than' : 'greater than')) {
+                currentNode = currentNode.next;
+            }
+            newNode.next = currentNode.next;
+            if (currentNode.next !== undefined) {
+                newNode.next.prev = newNode;
+            }
+            currentNode.next = newNode;
+            newNode.prev = currentNode;
+        }
+        if (this.size > this.maxSize) {
+            this.detach();
+        }
+    }
+    detach() {
+        const node = this.tail;
+        if (node.prev !== undefined) {
+            node.prev.next = node.next;
+        }
+        else {
+            this.head = node.next;
+        }
+        if (node.next !== undefined) {
+            node.next.prev = node.prev;
+        }
+        else {
+            this.tail = node.prev;
+        }
+        this.size--;
+    }
+    toArray() {
+        return Array.from(this);
+    }
+    *[Symbol.iterator]() {
+        let node = this.head;
+        while (node) {
+            yield node.event;
+            node = node.next;
+        }
+    }
+}
+exports.EventList = EventList;

package/src/events/types.ts

@@ -11,6 +11,8 @@ import {
 	LPRecord,
 	InsuranceFundRecord,
 	SpotInterestRecord,
+	InsuranceFundStakeRecord,
+	CurveRecord,
 } from '../index';
 
 export type EventSubscriptionOptions = {
@@ -39,6 +41,8 @@ export const DefaultEventSubscriptionOptions: EventSubscriptionOptions = {
 		'LPRecord',
 		'InsuranceFundRecord',
 		'SpotInterestRecord',
+		'InsuranceFundStakeRecord',
+		'CurveRecord',
 	],
 	maxEventsPerType: 4096,
 	orderBy: 'blockchain',
@@ -77,6 +81,8 @@ export type EventMap = {
 	LPRecord: Event<LPRecord>;
 	InsuranceFundRecord: Event<InsuranceFundRecord>;
 	SpotInterestRecord: Event<SpotInterestRecord>;
+	InsuranceFundStakeRecord: Event<InsuranceFundStakeRecord>;
+	CurveRecord: Event<CurveRecord>;
 };
 
 export type EventType = keyof EventMap;

package/src/examples/makeTradeExample.js

@@ -0,0 +1,157 @@
+'use strict';
+var __awaiter =
+	(this && this.__awaiter) ||
+	function (thisArg, _arguments, P, generator) {
+		function adopt(value) {
+			return value instanceof P
+				? value
+				: new P(function (resolve) {
+						resolve(value);
+				  });
+		}
+		return new (P || (P = Promise))(function (resolve, reject) {
+			function fulfilled(value) {
+				try {
+					step(generator.next(value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function rejected(value) {
+				try {
+					step(generator['throw'](value));
+				} catch (e) {
+					reject(e);
+				}
+			}
+			function step(result) {
+				result.done
+					? resolve(result.value)
+					: adopt(result.value).then(fulfilled, rejected);
+			}
+			step((generator = generator.apply(thisArg, _arguments || [])).next());
+		});
+	};
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.getTokenAddress = void 0;
+const anchor_1 = require('@project-serum/anchor');
+const __1 = require('..');
+const spl_token_1 = require('@solana/spl-token');
+const web3_js_1 = require('@solana/web3.js');
+const __2 = require('..');
+const banks_1 = require('../constants/spotMarkets');
+const getTokenAddress = (mintAddress, userPubKey) => {
+	return spl_token_1.Token.getAssociatedTokenAddress(
+		new web3_js_1.PublicKey(`ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL`),
+		spl_token_1.TOKEN_PROGRAM_ID,
+		new web3_js_1.PublicKey(mintAddress),
+		new web3_js_1.PublicKey(userPubKey)
+	);
+};
+exports.getTokenAddress = getTokenAddress;
+const main = () =>
+	__awaiter(void 0, void 0, void 0, function* () {
+		// Initialize Drift SDK
+		const sdkConfig = __2.initialize({ env: 'devnet' });
+		// Set up the Wallet and Provider
+		const privateKey = process.env.BOT_PRIVATE_KEY; // stored as an array string
+		const keypair = web3_js_1.Keypair.fromSecretKey(
+			Uint8Array.from(JSON.parse(privateKey))
+		);
+		const wallet = new __1.Wallet(keypair);
+		// Set up the Connection
+		const rpcAddress = process.env.RPC_ADDRESS; // can use: https://api.devnet.solana.com for devnet; https://api.mainnet-beta.solana.com for mainnet;
+		const connection = new web3_js_1.Connection(rpcAddress);
+		// Set up the Provider
+		const provider = new anchor_1.AnchorProvider(
+			connection,
+			wallet,
+			anchor_1.AnchorProvider.defaultOptions()
+		);
+		// Check SOL Balance
+		const lamportsBalance = yield connection.getBalance(wallet.publicKey);
+		console.log('SOL balance:', lamportsBalance / Math.pow(10, 9));
+		// Misc. other things to set up
+		const usdcTokenAddress = yield exports.getTokenAddress(
+			sdkConfig.USDC_MINT_ADDRESS,
+			wallet.publicKey.toString()
+		);
+		// Set up the Drift Clearing House
+		const clearingHousePublicKey = new web3_js_1.PublicKey(
+			sdkConfig.CLEARING_HOUSE_PROGRAM_ID
+		);
+		const clearingHouse = new __2.ClearingHouse({
+			connection,
+			wallet: provider.wallet,
+			programID: clearingHousePublicKey,
+		});
+		yield clearingHouse.subscribe();
+		// Set up Clearing House user client
+		const user = new __2.ClearingHouseUser({
+			clearingHouse,
+			userAccountPublicKey: yield clearingHouse.getUserAccountPublicKey(),
+		});
+		//// Check if clearing house account exists for the current wallet
+		const userAccountExists = yield user.exists();
+		if (!userAccountExists) {
+			//// Create a Clearing House account by Depositing some USDC ($10,000 in this case)
+			const depositAmount = new anchor_1.BN(10000).mul(__2.QUOTE_PRECISION);
+			yield clearingHouse.initializeUserAccountAndDepositCollateral(
+				depositAmount,
+				yield exports.getTokenAddress(
+					usdcTokenAddress.toString(),
+					wallet.publicKey.toString()
+				),
+				banks_1.SpotMarkets['devnet'][0].marketIndex
+			);
+		}
+		yield user.subscribe();
+		// Get current price
+		const solMarketInfo = sdkConfig.PERP_MARKETS.find(
+			(market) => market.baseAssetSymbol === 'SOL'
+		);
+		const currentMarketPrice = __2.calculateMarkPrice(
+			clearingHouse.getMarketAccount(solMarketInfo.marketIndex),
+			undefined
+		);
+		const formattedPrice = __2.convertToNumber(
+			currentMarketPrice,
+			__2.PRICE_PRECISION
+		);
+		console.log(`Current Market Price is $${formattedPrice}`);
+		// Estimate the slippage for a $5000 LONG trade
+		const solMarketAccount = clearingHouse.getMarketAccount(
+			solMarketInfo.marketIndex
+		);
+		const longAmount = new anchor_1.BN(5000).mul(__2.QUOTE_PRECISION);
+		const slippage = __2.convertToNumber(
+			__2.calculateTradeSlippage(
+				__2.PositionDirection.LONG,
+				longAmount,
+				solMarketAccount,
+				'quote',
+				undefined
+			)[0],
+			__2.PRICE_PRECISION
+		);
+		console.log(
+			`Slippage for a $5000 LONG on the SOL market would be $${slippage}`
+		);
+		// Make a $5000 LONG trade
+		yield clearingHouse.openPosition(
+			__2.PositionDirection.LONG,
+			longAmount,
+			solMarketInfo.marketIndex
+		);
+		console.log(`LONGED $5000 SOL`);
+		// Reduce the position by $2000
+		const reduceAmount = new anchor_1.BN(2000).mul(__2.QUOTE_PRECISION);
+		yield clearingHouse.openPosition(
+			__2.PositionDirection.SHORT,
+			reduceAmount,
+			solMarketInfo.marketIndex
+		);
+		// Close the rest of the position
+		yield clearingHouse.closePosition(solMarketInfo.marketIndex);
+	});
+main();