@typus/typus-perp-sdk 1.1.50 → 1.1.52

package/dist/src/api/sentio.js

@@ -696,7 +696,7 @@ async function getLeaderboardFromSentio(startTs, endTs, type = LeaderboardType.C
                     WHERE o.base_token NOT IN (
                         'XAU', 'XAG', 'USOIL', 'JPY', 'SPYX', 'QQQX',
                         'TSLAX', 'NVDAX', 'AAPLX', 'GOOGLX', 'METAX',
-                        'COINX', 'CRCLX'
+                        'COINX', 'CRCLX', 'MSTRX', 'HOODX'
                     )
                     AND s.timestamp >= ${startTs} AND s.timestamp < ${endTs}
                 ),
@@ -750,7 +750,7 @@ async function getLeaderboardFromSentio(startTs, endTs, type = LeaderboardType.C
                         WHERE o.base_token IN (
                             'XAU', 'XAG', 'USOIL', 'JPY', 'SPYX', 'QQQX',
                             'TSLAX', 'NVDAX', 'AAPLX', 'GOOGLX', 'METAX',
-                            'COINX', 'CRCLX'
+                            'COINX', 'CRCLX', 'MSTRX', 'HOODX'
                         )
                         AND s.timestamp >= ${startTs} AND s.timestamp < ${endTs}
                     ),

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

@@ -30,8 +30,8 @@ export declare function getGraphQLEvents(module: string, sender: string | null,
 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[], archiveDatas?: Event[]): 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

@@ -553,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);
@@ -619,7 +620,7 @@ 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, archiveDatas) {
+async function getOrderMatchFromSentio(userAddress, startTimestamp, events, removeEventDatas, datas, archiveDatas) {
     if (!datas)
         datas = await (0, sentio_1.getFromSentio)("OrderFilled", userAddress, startTimestamp.toString(), undefined, true);
     let order_match = datas.map((x) => {
@@ -665,7 +666,15 @@ async function getOrderMatchFromSentio(userAddress, startTimestamp, events, data
                         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;
-                    x.collateral = (0, bignumber_js_1.default)(x.collateral ?? 0).plus(related_collateral).toNumber();
+                    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.50",
+    "version": "1.1.52",
     "repository": "https://github.com/Typus-Lab/typus-perp-sdk.git",
     "author": "Typus",
     "description": "typus perp sdk",
@@ -8,7 +8,7 @@
     "dependencies": {
         "@mysten/bcs": "1.9.2",
         "@mysten/sui": "1.44.0",
-        "@typus/typus-sdk": "1.8.41"
+        "@typus/typus-sdk": "1.8.42"
     },
     "resolutions": {
         "@mysten/bcs": "1.9.2",