From a000470087c6f5b9183ec4f14bf46bccdb5d9cfc Mon Sep 17 00:00:00 2001
From: Thaddeus <thad@tardis.dev>
Date: Mon, 2 May 2022 18:16:03 +0200
Subject: [PATCH] feat: add experimental expiryTimestamp support in l3 data

---
 src/data_mapper.ts | 27 +++++++++++++++++++--------
 src/types.ts       |  3 ++-
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/data_mapper.ts b/src/data_mapper.ts
index 83a064a..98c1242 100644
--- a/src/data_mapper.ts
+++ b/src/data_mapper.ts
@@ -6,7 +6,9 @@ import {
   PerpEventLayout,
   PerpEventQueueHeaderLayout,
   PerpMarket,
-  PerpOrder
+  PerpOrder,
+  U64_MAX_BN,
+  ZERO_BN
 } from '@blockworks-foundation/mango-client'
 import BN from 'bn.js'
 import { CircularBuffer } from './helpers'
@@ -146,7 +148,8 @@ export class DataMapper {
                   size: fillOrderWithoutOpenOrder.size,
                   account: fillOrderWithoutOpenOrder.account,
                   accountSlot: fillOrderWithoutOpenOrder.accountSlot,
-                  eventTimestamp: fillOrderWithoutOpenOrder.eventTimestamp
+                  eventTimestamp: fillOrderWithoutOpenOrder.eventTimestamp,
+                  expiryTimestamp: undefined
                 }
 
                 l3Diff.push(openMessage)
@@ -626,7 +629,8 @@ export class DataMapper {
           size: item.size,
           account: item.account,
           accountSlot: item.accountSlot,
-          eventTimestamp: item.eventTimestamp
+          eventTimestamp: item.eventTimestamp,
+          expiryTimestamp: item.expiryTimestamp
         })
       }
 
@@ -902,7 +906,7 @@ export class DataMapper {
   }
 
   private _mapToOrderMessage(
-    { orderId, clientId, side, price, account, accountSlot, eventTimestamp }: OrderItem,
+    { orderId, clientId, side, price, account, accountSlot, eventTimestamp, expiryTimestamp }: OrderItem,
     type: 'open' | 'change',
     size: string,
     timestamp: string,
@@ -922,7 +926,8 @@ export class DataMapper {
         size,
         account,
         accountSlot,
-        eventTimestamp
+        eventTimestamp,
+        expiryTimestamp
       }
     } else {
       return {
@@ -937,7 +942,8 @@ export class DataMapper {
         price,
         size,
         account,
-        accountSlot
+        accountSlot,
+        expiryTimestamp
       }
     }
   }
@@ -950,7 +956,8 @@ export class DataMapper {
     size,
     owner,
     openOrdersSlot,
-    timestamp
+    timestamp,
+    expiryTimestamp
   }: PerpOrder) => {
     const orderItem: OrderItem = {
       orderId: orderId.toString(),
@@ -960,7 +967,11 @@ export class DataMapper {
       size: size.toFixed(this._options.sizeDecimalPlaces),
       account: owner.toBase58(),
       accountSlot: openOrdersSlot,
-      eventTimestamp: new Date(timestamp.toNumber() * 1000).toISOString()
+      eventTimestamp: new Date(timestamp.toNumber() * 1000).toISOString(),
+      expiryTimestamp:
+        expiryTimestamp.eq(ZERO_BN) || expiryTimestamp.eq(U64_MAX_BN)
+          ? undefined
+          : new Date(expiryTimestamp.toNumber() * 1000).toISOString()
     }
 
     return orderItem
diff --git a/src/types.ts b/src/types.ts
index 0ce5bf1..97ebbb7 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -68,7 +68,7 @@ export interface Trade extends DataMessage, WithEventTimestamp {
   readonly makerFeeCost: number
 }
 
-export interface Fill extends DataMessage, OrderItem {
+export interface Fill extends DataMessage, Omit<OrderItem, 'expiryTimestamp'> {
   readonly type: 'fill'
   readonly maker: boolean
   readonly feeCost: number
@@ -82,6 +82,7 @@ export type OrderItem = {
   readonly clientId: string
   readonly account: string
   readonly accountSlot: number
+  readonly expiryTimestamp: string | undefined
 } & WithEventTimestamp
 
 export interface Open extends DataMessage, OrderItem {