@drift-labs/sdk 2.49.0-beta.2 → 2.49.0-beta.3

package/VERSION

@@ -1 +1 @@
-2.49.0-beta.2
+2.49.0-beta.3

package/lib/events/eventSubscriber.js

@@ -23,7 +23,7 @@ class EventSubscriber {
         this.txEventCache = new txEventCache_1.TxEventCache(this.options.maxTx);
         this.eventListMap = new Map();
         for (const eventType of this.options.eventTypes) {
-            this.eventListMap.set(eventType, new eventList_1.EventList(eventType, this.options.maxEventsPerType, (0, sort_1.getSortFn)(this.options.orderBy, this.options.orderDir, eventType), this.options.orderDir));
+            this.eventListMap.set(eventType, new eventList_1.EventList(eventType, this.options.maxEventsPerType, (0, sort_1.getSortFn)(this.options.orderBy, this.options.orderDir), this.options.orderDir));
         }
         this.eventEmitter = new events_1.EventEmitter();
         if (this.options.logProviderConfig.type === 'websocket') {

package/lib/events/sort.d.ts

@@ -1,2 +1,2 @@
-import { EventSubscriptionOrderBy, EventSubscriptionOrderDirection, EventType, SortFn } from './types';
-export declare function getSortFn(orderBy: EventSubscriptionOrderBy, orderDir: EventSubscriptionOrderDirection, eventType: EventType): SortFn;
+import { EventSubscriptionOrderBy, EventSubscriptionOrderDirection, SortFn } from './types';
+export declare function getSortFn(orderBy: EventSubscriptionOrderBy, orderDir: EventSubscriptionOrderDirection): SortFn;

package/lib/events/sort.js

@@ -1,41 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSortFn = void 0;
-const index_1 = require("../index");
 function clientSortAscFn() {
     return 'less than';
 }
 function clientSortDescFn() {
     return 'greater than';
 }
-function defaultBlockchainSortFn(currentEvent, newEvent) {
-    return currentEvent.slot <= newEvent.slot ? 'less than' : 'greater than';
-}
-function orderActionRecordSortFn(currentEvent, newEvent) {
-    var _a, _b;
-    const currentEventMarketIndex = currentEvent.marketIndex;
-    const newEventMarketIndex = newEvent.marketIndex;
-    if (currentEventMarketIndex !== newEventMarketIndex) {
-        return currentEvent.ts.lte(newEvent.ts) ? 'less than' : 'greater than';
-    }
-    if (((_a = currentEvent.fillRecordId) === null || _a === void 0 ? void 0 : _a.gt(index_1.ZERO)) && ((_b = newEvent.fillRecordId) === null || _b === void 0 ? void 0 : _b.gt(index_1.ZERO))) {
-        return currentEvent.fillRecordId.lte(newEvent.fillRecordId)
+function blockchainSortFn(currentEvent, newEvent) {
+    if (currentEvent.slot == newEvent.slot) {
+        return currentEvent.txSigIndex < newEvent.txSigIndex
             ? 'less than'
             : 'greater than';
     }
-    else {
-        return currentEvent.ts.lte(newEvent.ts) ? 'less than' : 'greater than';
-    }
+    return currentEvent.slot < newEvent.slot ? 'less than' : 'greater than';
 }
-function getSortFn(orderBy, orderDir, eventType) {
+function getSortFn(orderBy, orderDir) {
     if (orderBy === 'client') {
         return orderDir === 'asc' ? clientSortAscFn : clientSortDescFn;
     }
-    switch (eventType) {
-        case 'OrderActionRecord':
-            return orderActionRecordSortFn;
-        default:
-            return defaultBlockchainSortFn;
-    }
+    return blockchainSortFn;
 }
 exports.getSortFn = getSortFn;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.49.0-beta.2",
+	"version": "2.49.0-beta.3",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/events/eventSubscriber.ts

@@ -47,7 +47,7 @@ export class EventSubscriber {
 				new EventList(
 					eventType,
 					this.options.maxEventsPerType,
-					getSortFn(this.options.orderBy, this.options.orderDir, eventType),
+					getSortFn(this.options.orderBy, this.options.orderDir),
 					this.options.orderDir
 				)
 			);

package/src/events/sort.ts

@@ -4,10 +4,7 @@ import {
 	EventSubscriptionOrderDirection,
 	EventType,
 	SortFn,
-	Event,
 } from './types';
-import { OrderActionRecord } from '../types';
-import { ZERO } from '../index';
 
 function clientSortAscFn(): 'less than' {
 	return 'less than';
@@ -17,45 +14,26 @@ function clientSortDescFn(): 'greater than' {
 	return 'greater than';
 }
 
-function defaultBlockchainSortFn(
+function blockchainSortFn(
 	currentEvent: EventMap[EventType],
 	newEvent: EventMap[EventType]
 ): 'less than' | 'greater than' {
-	return currentEvent.slot <= newEvent.slot ? 'less than' : 'greater than';
-}
-
-function orderActionRecordSortFn(
-	currentEvent: Event<OrderActionRecord>,
-	newEvent: Event<OrderActionRecord>
-): 'less than' | 'greater than' {
-	const currentEventMarketIndex = currentEvent.marketIndex;
-	const newEventMarketIndex = newEvent.marketIndex;
-	if (currentEventMarketIndex !== newEventMarketIndex) {
-		return currentEvent.ts.lte(newEvent.ts) ? 'less than' : 'greater than';
-	}
-
-	if (currentEvent.fillRecordId?.gt(ZERO) && newEvent.fillRecordId?.gt(ZERO)) {
-		return currentEvent.fillRecordId.lte(newEvent.fillRecordId)
+	if (currentEvent.slot == newEvent.slot) {
+		return currentEvent.txSigIndex < newEvent.txSigIndex
 			? 'less than'
 			: 'greater than';
-	} else {
-		return currentEvent.ts.lte(newEvent.ts) ? 'less than' : 'greater than';
 	}
+
+	return currentEvent.slot < newEvent.slot ? 'less than' : 'greater than';
 }
 
 export function getSortFn(
 	orderBy: EventSubscriptionOrderBy,
-	orderDir: EventSubscriptionOrderDirection,
-	eventType: EventType
+	orderDir: EventSubscriptionOrderDirection
 ): SortFn {
 	if (orderBy === 'client') {
 		return orderDir === 'asc' ? clientSortAscFn : clientSortDescFn;
 	}
 
-	switch (eventType) {
-		case 'OrderActionRecord':
-			return orderActionRecordSortFn;
-		default:
-			return defaultBlockchainSortFn;
-	}
+	return blockchainSortFn;
 }