@drift-labs/sdk 0.2.0-master.22 → 0.2.0-master.25

package/src/events/sort.ts

@@ -6,8 +6,8 @@ import {
 	SortFn,
 	Event,
 } from './types';
-import { OrderRecord } from '../types';
-import { PublicKey, ZERO } from '../index';
+import { OrderActionRecord } from '../types';
+import { ZERO } from '../index';
 
 function clientSortAscFn(): 'less than' {
 	return 'less than';
@@ -24,21 +24,17 @@ function defaultBlockchainSortFn(
 	return currentEvent.slot <= newEvent.slot ? 'less than' : 'greater than';
 }
 
-function orderRecordSortFn(
-	currentEvent: Event<OrderRecord>,
-	newEvent: Event<OrderRecord>
+function orderActionRecordSortFn(
+	currentEvent: Event<OrderActionRecord>,
+	newEvent: Event<OrderActionRecord>
 ): 'less than' | 'greater than' {
-	const currentEventMarketIndex = !currentEvent.maker.equals(PublicKey.default)
-		? currentEvent.makerOrder.marketIndex
-		: currentEvent.takerOrder.marketIndex;
-	const newEventMarketIndex = !newEvent.maker.equals(PublicKey.default)
-		? newEvent.makerOrder.marketIndex
-		: newEvent.takerOrder.marketIndex;
+	const currentEventMarketIndex = currentEvent.marketIndex;
+	const newEventMarketIndex = newEvent.marketIndex;
 	if (!currentEventMarketIndex.eq(newEventMarketIndex)) {
 		return currentEvent.ts.lte(newEvent.ts) ? 'less than' : 'greater than';
 	}
 
-	if (currentEvent.fillRecordId.gt(ZERO) && newEvent.fillRecordId.gt(ZERO)) {
+	if (currentEvent.fillRecordId?.gt(ZERO) && newEvent.fillRecordId?.gt(ZERO)) {
 		return currentEvent.fillRecordId.lte(newEvent.fillRecordId)
 			? 'less than'
 			: 'greater than';
@@ -57,8 +53,8 @@ export function getSortFn(
 	}
 
 	switch (eventType) {
-		case 'OrderRecord':
-			return orderRecordSortFn;
+		case 'OrderActionRecord':
+			return orderActionRecordSortFn;
 		default:
 			return defaultBlockchainSortFn;
 	}

package/src/events/types.ts

@@ -5,8 +5,10 @@ import {
 	FundingRateRecord,
 	LiquidationRecord,
 	NewUserRecord,
+	OrderActionRecord,
 	OrderRecord,
 	SettlePnlRecord,
+	LPRecord,
 } from '../index';
 
 export type EventSubscriptionOptions = {
@@ -28,9 +30,11 @@ export const DefaultEventSubscriptionOptions: EventSubscriptionOptions = {
 		'FundingPaymentRecord',
 		'LiquidationRecord',
 		'OrderRecord',
+		'OrderActionRecord',
 		'FundingRateRecord',
 		'NewUserRecord',
 		'SettlePnlRecord',
+		'LPRecord',
 	],
 	maxEventsPerType: 4096,
 	orderBy: 'blockchain',
@@ -63,8 +67,10 @@ export type EventMap = {
 	LiquidationRecord: Event<LiquidationRecord>;
 	FundingRateRecord: Event<FundingRateRecord>;
 	OrderRecord: Event<OrderRecord>;
+	OrderActionRecord: Event<OrderActionRecord>;
 	SettlePnlRecord: Event<SettlePnlRecord>;
 	NewUserRecord: Event<NewUserRecord>;
+	LPRecord: Event<LPRecord>;
 };
 
 export type EventType = keyof EventMap;
@@ -86,7 +92,7 @@ export type logProviderCallback = (
 
 export interface LogProvider {
 	isSubscribed(): boolean;
-	subscribe(callback: logProviderCallback): boolean;
+	subscribe(callback: logProviderCallback, skipHistory?: boolean): boolean;
 	unsubscribe(): Promise<boolean>;
 }
 

package/src/examples/makeTradeExample.ts

@@ -10,6 +10,8 @@ import {
 	PositionDirection,
 	convertToNumber,
 	calculateTradeSlippage,
+	BulkAccountLoader,
+	Markets,
 	MARK_PRICE_PRECISION,
 	QUOTE_PRECISION,
 } from '..';
@@ -27,9 +29,11 @@ export const getTokenAddress = (
 	);
 };
 
+const cluster = 'devnet';
+
 const main = async () => {
 	// Initialize Drift SDK
-	const sdkConfig = initialize({ env: 'devnet' });
+	const sdkConfig = initialize({ env: cluster });
 
 	// Set up the Wallet and Provider
 	const privateKey = process.env.BOT_PRIVATE_KEY; // stored as an array string
@@ -63,10 +67,21 @@ const main = async () => {
 	const clearingHousePublicKey = new PublicKey(
 		sdkConfig.CLEARING_HOUSE_PROGRAM_ID
 	);
+	const bulkAccountLoader = new BulkAccountLoader(
+		connection,
+		'confirmed',
+		1000
+	);
 	const clearingHouse = new ClearingHouse({
 		connection,
 		wallet: provider.wallet,
 		programID: clearingHousePublicKey,
+		marketIndexes: Markets[cluster].map((market) => market.marketIndex),
+		bankIndexes: Banks[cluster].map((bank) => bank.bankIndex),
+		accountSubscription: {
+			type: 'polling',
+			accountLoader: bulkAccountLoader,
+		},
 	});
 	await clearingHouse.subscribe();
 
@@ -74,6 +89,10 @@ const main = async () => {
 	const user = new ClearingHouseUser({
 		clearingHouse,
 		userAccountPublicKey: await clearingHouse.getUserAccountPublicKey(),
+		accountSubscription: {
+			type: 'polling',
+			accountLoader: bulkAccountLoader,
+		},
 	});
 
 	//// Check if clearing house account exists for the current wallet