@typus/typus-perp-sdk 1.1.49 → 1.1.51

package/dist/src/api/sentio.d.ts

@@ -1,5 +1,5 @@
 import { TOKEN } from "@typus/typus-sdk/dist/src/constants";
-export declare function getFromSentio(event: string, userAddress: string, startTimestamp: string, cranker?: boolean): Promise<any[]>;
+export declare function getFromSentio(event: string, userAddress: string, startTimestamp: string, endTimestamp?: string, cranker?: boolean): Promise<any[]>;
 export declare function getRecentTradesFromSentio(base_token?: TOKEN): Promise<any[]>;
 /**
  * Inputs:

package/dist/src/api/sentio.js

@@ -17,7 +17,7 @@ const headers = {
     "api-key": "hCsD8shJaUbbiNLMKBG3oKhr9PL3H5EJ5",
     "Content-Type": "application/json",
 };
-async function getFromSentio(event, userAddress, startTimestamp, cranker) {
+async function getFromSentio(event, userAddress, startTimestamp, endTimestamp, cranker) {
     let apiUrl = "https://app.sentio.xyz/api/v1/analytics/typus/typus_perp/sql/execute";
     // add cranker fileter
     let crankerFilter = "";
@@ -29,7 +29,7 @@ async function getFromSentio(event, userAddress, startTimestamp, cranker) {
             sql: `
                 SELECT *
                 FROM ${event}
-                WHERE distinct_id = '${userAddress}' AND timestamp >= ${startTimestamp} ${crankerFilter}
+                WHERE distinct_id = '${userAddress}' AND timestamp >= ${startTimestamp} ${endTimestamp ? `AND timestamp <= ${endTimestamp}` : ''} ${crankerFilter}
                 ORDER BY timestamp DESC;
             `,
             size: 1000,

package/dist/src/user/history.d.ts

@@ -27,10 +27,11 @@ export interface Event {
 }
 export declare function parseUserHistory(raw_events: any, matchingDatas: any): Promise<Event[]>;
 export declare function getGraphQLEvents(module: string, sender: string | null, beforeCursor?: string | null): Promise<any>;
+export declare function getArchivePlaceOrderEvents(userAddress: string, startTimestamp: number, endTimestamp: number, events: Event[]): Promise<Event[]>;
 export declare function getLiquidateFromSentio(userAddress: string, startTimestamp: number, events: Event[]): Promise<Event[]>;
 export declare function getRealizeFundingFromSentio(userAddress: string, startTimestamp: number, events: Event[]): Promise<Event[]>;
-export declare function getRemovePositionFromSentio(userAddress: string, startTimestamp: number, events: Event[]): Promise<Event[]>;
+export declare function getRemovePositionFromSentio(userAddress: string, startTimestamp: number, events: Event[], datas?: any[]): Promise<Event[]>;
 export declare function getCancelOrderFromSentio(userAddress: string, startTimestamp: number, events: Event[]): Promise<Event[]>;
-export declare function getOrderMatchFromSentio(userAddress: string, startTimestamp: number, events: Event[], datas?: any[]): Promise<Event[]>;
+export declare function getOrderMatchFromSentio(userAddress: string, startTimestamp: number, events: Event[], removeEventDatas: any[], datas?: any[], archiveDatas?: Event[]): Promise<Event[]>;
 export declare function getRealizeOptionFromSentio(userAddress: string, startTimestamp: number, events: Event[]): Promise<Event[]>;
 export declare function toSentioToken(name: TOKEN): string;

package/dist/src/user/history.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseUserHistory = parseUserHistory;
 exports.getGraphQLEvents = getGraphQLEvents;
+exports.getArchivePlaceOrderEvents = getArchivePlaceOrderEvents;
 exports.getLiquidateFromSentio = getLiquidateFromSentio;
 exports.getRealizeFundingFromSentio = getRealizeFundingFromSentio;
 exports.getRemovePositionFromSentio = getRemovePositionFromSentio;
@@ -424,6 +425,34 @@ async function getGraphQLEvents(module, sender, beforeCursor = null) {
         return data.data.events;
     }
 }
+async function getArchivePlaceOrderEvents(userAddress, startTimestamp, endTimestamp, events) {
+    const datas = await (0, sentio_1.getFromSentio)("PlaceOrder", userAddress, startTimestamp.toString(), endTimestamp.toString(), false);
+    let placeOrders = datas.map((x) => {
+        let base_token = toToken(x.base_token);
+        let txHistory = {
+            action: "Place Order",
+            typeName: "PlaceOrderEvent",
+            order_id: x.order_id,
+            position_id: x.position_id,
+            market: `${base_token}/USD`,
+            side: undefined,
+            order_type: x.order_type,
+            status: x.status,
+            size: Number(x.position_size),
+            base_token,
+            collateral: x.collateral,
+            collateral_token: x.collateral_token,
+            price: Number(x.trading_price),
+            realized_pnl: undefined,
+            timestamp: x.timestamp,
+            tx_digest: x.transaction_hash,
+            dov_index: undefined,
+            sender: "user",
+        };
+        return txHistory;
+    });
+    return placeOrders;
+}
 async function getLiquidateFromSentio(userAddress, startTimestamp, events) {
     const datas = await (0, sentio_1.getFromSentio)("Liquidate", userAddress, startTimestamp.toString());
     // console.log(datas);
@@ -524,8 +553,9 @@ async function getRealizeFundingFromSentio(userAddress, startTimestamp, events)
     events = events.sort((a, b) => Number(new Date(a.timestamp)) - Number(new Date(b.timestamp)));
     return events;
 }
-async function getRemovePositionFromSentio(userAddress, startTimestamp, events) {
-    const datas = await (0, sentio_1.getFromSentio)("RemovePosition", userAddress, startTimestamp.toString());
+async function getRemovePositionFromSentio(userAddress, startTimestamp, events, datas) {
+    if (!datas)
+        datas = await (0, sentio_1.getFromSentio)("RemovePosition", userAddress, startTimestamp.toString());
     // console.log(datas);
     datas.forEach((x) => {
         // console.log(x);
@@ -544,7 +574,7 @@ async function getRemovePositionFromSentio(userAddress, startTimestamp, events)
     return events;
 }
 async function getCancelOrderFromSentio(userAddress, startTimestamp, events) {
-    const datas = await (0, sentio_1.getFromSentio)("CancelOrder", userAddress, startTimestamp.toString(), true);
+    const datas = await (0, sentio_1.getFromSentio)("CancelOrder", userAddress, startTimestamp.toString(), undefined, true);
     // console.log(datas);
     let cancelOrder = datas.map((x) => {
         let collateral = Number(x.released_collateral_amount);
@@ -590,9 +620,9 @@ async function getCancelOrderFromSentio(userAddress, startTimestamp, events) {
     events = events.sort((a, b) => Number(new Date(a.timestamp)) - Number(new Date(b.timestamp)));
     return events;
 }
-async function getOrderMatchFromSentio(userAddress, startTimestamp, events, datas) {
+async function getOrderMatchFromSentio(userAddress, startTimestamp, events, removeEventDatas, datas, archiveDatas) {
     if (!datas)
-        datas = await (0, sentio_1.getFromSentio)("OrderFilled", userAddress, startTimestamp.toString(), true);
+        datas = await (0, sentio_1.getFromSentio)("OrderFilled", userAddress, startTimestamp.toString(), undefined, true);
     let order_match = datas.map((x) => {
         let base_token = toToken(x.base_token);
         let txHistory = {
@@ -626,14 +656,25 @@ async function getOrderMatchFromSentio(userAddress, startTimestamp, events, data
     order_match = order_match.map((x) => {
         // find related order
         let related = events.findLast((e) => e.order_id == x.order_id && e.market == x.market);
-        // console.log(x, related);
         if (related) {
             x.order_type = related.order_type;
             if (related?.position_id !== null) {
                 const origin_order_filled_event = order_match.findLast(e => e.market == x.market && e.position_id == related?.position_id);
                 if (origin_order_filled_event) {
-                    const origin_order_place_event = events.findLast((e) => e.order_id == origin_order_filled_event?.order_id && e.market == origin_order_filled_event?.market);
-                    x.collateral = origin_order_place_event?.collateral ?? related.collateral;
+                    let origin_order_place_event = events.findLast((e) => e.order_id == origin_order_filled_event?.order_id && e.market == origin_order_filled_event.market);
+                    if (!origin_order_place_event && archiveDatas) {
+                        origin_order_place_event = archiveDatas.findLast((e) => e.order_id == origin_order_filled_event?.order_id && e.base_token == origin_order_filled_event.base_token);
+                    }
+                    const related_collateral = origin_order_place_event?.collateral ?? 0;
+                    const isPartialClose = removeEventDatas.findIndex(r => r.transaction_hash === x.tx_digest);
+                    if (isPartialClose !== -1) {
+                        x.collateral = (0, bignumber_js_1.default)(x.collateral ?? 0).plus(related_collateral).toNumber();
+                    }
+                    else if (x.collateral) {
+                        if (x.collateral < 0) {
+                            x.collateral = undefined;
+                        }
+                    }
                 }
             }
             x.dov_index = related.dov_index;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@typus/typus-perp-sdk",
-    "version": "1.1.49",
+    "version": "1.1.51",
     "repository": "https://github.com/Typus-Lab/typus-perp-sdk.git",
     "author": "Typus",
     "description": "typus perp sdk",
@@ -45,4 +45,4 @@
     },
     "homepage": "https://github.com/Typus-Lab/typus-perp-sdk#readme",
     "packageManager": "yarn@4.10.3+sha512.c38cafb5c7bb273f3926d04e55e1d8c9dfa7d9c3ea1f36a4868fa028b9e5f72298f0b7f401ad5eb921749eb012eb1c3bb74bf7503df3ee43fd600d14a018266f"
-}
+}