@drift-labs/sdk 0.2.0-master.31 → 0.2.0-master.33

package/src/dlob/NodeList.ts

@@ -34,6 +34,12 @@ export class NodeList<NodeType extends keyof DLOBNodeMap>
 		private sortDirection: SortDirection
 	) {}
 
+	public clear() {
+		this.head = undefined;
+		this.length = 0;
+		this.nodeMap.clear();
+	}
+
 	public insert(
 		order: Order,
 		marketType: MarketTypeStr,
@@ -99,7 +105,7 @@ export class NodeList<NodeType extends keyof DLOBNodeMap>
 		const newOrderSortPrice = newNode.sortValue;
 
 		if (newOrderSortPrice.eq(currentOrderSortPrice)) {
-			return newOrder.ts.lt(currentOrder.ts);
+			return newOrder.slot.lt(currentOrder.slot);
 		}
 
 		if (this.sortDirection === 'asc') {

package/src/events/eventSubscriber.ts

@@ -26,6 +26,7 @@ export class EventSubscriber {
 	private logProvider: LogProvider;
 	public eventEmitter: StrictEventEmitter<EventEmitter, EventSubscriberEvents>;
 	private lastSeenSlot: number;
+	private lastSeenBlockTime: number | undefined;
 	public lastSeenTxSig: string;
 
 	public constructor(
@@ -70,8 +71,8 @@ export class EventSubscriber {
 				return true;
 			}
 
-			this.logProvider.subscribe((txSig, slot, logs) => {
-				this.handleTxLogs(txSig, slot, logs);
+			this.logProvider.subscribe((txSig, slot, logs, mostRecentBlockTime) => {
+				this.handleTxLogs(txSig, slot, logs, mostRecentBlockTime);
 			}, true);
 
 			return true;
@@ -85,7 +86,8 @@ export class EventSubscriber {
 	private handleTxLogs(
 		txSig: TransactionSignature,
 		slot: number,
-		logs: string[]
+		logs: string[],
+		mostRecentBlockTime: number | undefined
 	): void {
 		if (this.txEventCache.has(txSig)) {
 			return;
@@ -94,6 +96,10 @@ export class EventSubscriber {
 		const wrappedEvents = this.parseEventsFromLogs(txSig, slot, logs);
 		for (const wrappedEvent of wrappedEvents) {
 			this.eventListMap.get(wrappedEvent.eventType).insert(wrappedEvent);
+		}
+
+		// dont emit event till we've added all the events to the eventListMap
+		for (const wrappedEvent of wrappedEvents) {
 			this.eventEmitter.emit('newEvent', wrappedEvent);
 		}
 
@@ -106,6 +112,14 @@ export class EventSubscriber {
 		if (slot > this.lastSeenSlot) {
 			this.lastSeenTxSig = txSig;
 		}
+
+		if (
+			this.lastSeenBlockTime === undefined ||
+			mostRecentBlockTime > this.lastSeenBlockTime
+		) {
+			this.lastSeenBlockTime = mostRecentBlockTime;
+		}
+
 		this.txEventCache.add(txSig, wrappedEvents);
 	}
 
@@ -134,7 +148,7 @@ export class EventSubscriber {
 			beforeTx = response.earliestTx;
 
 			for (const { txSig, slot, logs } of response.transactionLogs) {
-				this.handleTxLogs(txSig, slot, logs);
+				this.handleTxLogs(txSig, slot, logs, response.mostRecentBlockTime);
 			}
 		}
 	}

package/src/events/fetchLogs.ts

@@ -3,6 +3,7 @@ import {
 	Connection,
 	Finality,
 	PublicKey,
+	TransactionResponse,
 	TransactionSignature,
 } from '@solana/web3.js';
 import { WrappedEvents } from './types';
@@ -14,8 +15,17 @@ type FetchLogsResponse = {
 	earliestSlot: number;
 	mostRecentSlot: number;
 	transactionLogs: Log[];
+	mostRecentBlockTime: number | undefined;
 };
 
+function mapTransactionResponseToLog(transaction: TransactionResponse): Log {
+	return {
+		txSig: transaction.transaction.signatures[0],
+		slot: transaction.slot,
+		logs: transaction.meta.logMessages,
+	};
+}
+
 export async function fetchLogs(
 	connection: Connection,
 	programId: PublicKey,
@@ -57,11 +67,7 @@ export async function fetchLogs(
 				);
 
 				return transactions.map((transaction) => {
-					return {
-						txSig: transaction.transaction.signatures[0],
-						slot: transaction.slot,
-						logs: transaction.meta.logMessages,
-					};
+					return mapTransactionResponseToLog(transaction);
 				});
 			})
 		)
@@ -76,6 +82,7 @@ export async function fetchLogs(
 		mostRecentTx: mostRecent.signature,
 		earliestSlot: earliest.slot,
 		mostRecentSlot: mostRecent.slot,
+		mostRecentBlockTime: mostRecent.blockTime,
 	};
 }
 
@@ -93,6 +100,14 @@ export class LogParser {
 		this.program = program;
 	}
 
+	public parseEventsFromTransaction(
+		transaction: TransactionResponse
+	): WrappedEvents {
+		const transactionLogObject = mapTransactionResponseToLog(transaction);
+
+		return this.parseEventsFromLogs(transactionLogObject);
+	}
+
 	public parseEventsFromLogs(event: Log): WrappedEvents {
 		const records: WrappedEvents = [];
 		// @ts-ignore

package/src/events/pollingLogProvider.ts

@@ -58,7 +58,7 @@ export class PollingLogProvider implements LogProvider {
 				const { mostRecentTx, transactionLogs } = response;
 
 				for (const { txSig, slot, logs } of transactionLogs) {
-					callback(txSig, slot, logs);
+					callback(txSig, slot, logs, response.mostRecentBlockTime);
 				}
 
 				this.mostRecentSeenTx = mostRecentTx;

package/src/events/types.ts

@@ -93,7 +93,8 @@ export type SortFn = (
 export type logProviderCallback = (
 	txSig: TransactionSignature,
 	slot: number,
-	logs: string[]
+	logs: string[],
+	mostRecentBlockTime: number | undefined
 ) => void;
 
 export interface LogProvider {

package/src/events/webSocketLogProvider.ts

@@ -17,7 +17,7 @@ export class WebSocketLogProvider implements LogProvider {
 		this.subscriptionId = this.connection.onLogs(
 			this.programId,
 			(logs, ctx) => {
-				callback(logs.signature, ctx.slot, logs.logs);
+				callback(logs.signature, ctx.slot, logs.logs, undefined);
 			},
 			this.commitment
 		);

package/src/factory/bigNum.ts

@@ -306,7 +306,11 @@ export class BigNum {
 	 * @param fixedPrecision
 	 * @returns
 	 */
-	public toFixed(fixedPrecision: number): string {
+	public toFixed(fixedPrecision: number, rounded = false): string {
+		if (rounded) {
+			return this.toRounded(fixedPrecision).toFixed(fixedPrecision);
+		}
+
 		const printString = this.print();
 
 		const [leftSide, rightSide] = printString.split(BigNum.delim);
@@ -322,7 +326,41 @@ export class BigNum {
 	}
 
 	private getZeroes(count: number) {
-		return new Array(count).fill('0').join('');
+		return new Array(Math.max(count, 0)).fill('0').join('');
+	}
+
+	public toRounded(roundingPrecision: number) {
+		const printString = this.toString();
+
+		let shouldRoundUp = false;
+
+		const roundingDigitChar = printString[roundingPrecision];
+
+		if (roundingDigitChar) {
+			const roundingDigitVal = Number(roundingDigitChar);
+			if (roundingDigitVal >= 5) shouldRoundUp = true;
+		}
+
+		if (shouldRoundUp) {
+			const valueWithRoundedPrecisionAdded = this.add(
+				BigNum.from(
+					new BN(10).pow(new BN(printString.length - roundingPrecision)),
+					this.precision
+				)
+			);
+
+			const roundedUpPrintString =
+				valueWithRoundedPrecisionAdded.toString().slice(0, roundingPrecision) +
+				this.getZeroes(printString.length - roundingPrecision);
+
+			return BigNum.from(roundedUpPrintString, this.precision);
+		} else {
+			const roundedDownPrintString =
+				printString.slice(0, roundingPrecision) +
+				this.getZeroes(printString.length - roundingPrecision);
+
+			return BigNum.from(roundedDownPrintString, this.precision);
+		}
 	}
 
 	/**
@@ -330,7 +368,18 @@ export class BigNum {
 	 * @param fixedPrecision
 	 * @returns
 	 */
-	public toPrecision(fixedPrecision: number, trailingZeroes = false): string {
+	public toPrecision(
+		fixedPrecision: number,
+		trailingZeroes = false,
+		rounded = false
+	): string {
+		if (rounded) {
+			return this.toRounded(fixedPrecision).toPrecision(
+				fixedPrecision,
+				trailingZeroes
+			);
+		}
+
 		const printString = this.print();
 
 		let precisionPrintString = printString.slice(0, fixedPrecision + 1);
@@ -404,8 +453,8 @@ export class BigNum {
 		return precisionPrintString;
 	}
 
-	public toTradePrecision(): string {
-		return this.toPrecision(6, true);
+	public toTradePrecision(rounded = false): string {
+		return this.toPrecision(6, true, rounded);
 	}
 
 	/**
@@ -448,7 +497,11 @@ export class BigNum {
 		return `${prefix}${val.replace('-', '')}`;
 	}
 
-	public toMillified(precision = 3): string {
+	public toMillified(precision = 3, rounded = false): string {
+		if (rounded) {
+			return this.toRounded(precision).toMillified(precision);
+		}
+
 		const stringVal = this.print();
 
 		const [leftSide] = stringVal.split(BigNum.delim);