@typus/typus-perp-sdk 1.1.4 → 1.1.5

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

@@ -1,5 +1,5 @@
 import { TOKEN } from "@typus/typus-sdk/dist/src/constants";
-export type actionType = "Place Order" | "Cancel Order" | "Order Filled (Open Position)" | "Order Filled (Close Position)" | "Realized PnL" | "Modify Collateral" | "Exercise Position" | "Liquidation" | "Force Close Position" | "Swap" | "Realized Funding";
+export type actionType = "Place Order" | "Cancel Order" | "Order Filled (Open Position)" | "Order Filled (Close Position)" | "Realized PnL" | "Modify Collateral" | "Exercise Position" | "Liquidation" | "Force Close Position" | "Swap";
 export type sideType = "Long" | "Short";
 export type orderType = "Market" | "Limit" | "Take Profit" | "Stop Loss";
 export type statusType = "Open" | "Filled" | "Canceled";

package/dist/src/user/history.js

@@ -81,7 +81,7 @@ function parseUserHistory(raw_events) {
         return __generator(this, function (_a) {
             events = [];
             raw_events.forEach(function (event) {
-                var _a;
+                var _a, _b;
                 var type = event.contents.type.repr;
                 if (type.endsWith("PythPrice")) {
                     return;
@@ -93,7 +93,7 @@ function parseUserHistory(raw_events) {
                 // console.log(tx_digest);
                 // console.log(json);
                 // console.log(timestamp);
-                var _b = __read(type.split("::"), 3), pkg = _b[0], mod = _b[1], name = _b[2];
+                var _c = __read(type.split("::"), 3), pkg = _c[0], mod = _c[1], name = _c[2];
                 switch (name) {
                     case structs_2.CreateTradingOrderEvent.$typeName.split("::")[2]:
                     case structs_2.CreateTradingOrderWithBidReceiptsEvent.$typeName.split("::")[2]:
@@ -186,60 +186,16 @@ function parseUserHistory(raw_events) {
                         };
                         events.push(e);
                         break;
-                    case structs_1.RemovePositionEvent.$typeName.split("::")[2]:
+                    case structs_1.RealizeFundingEvent.$typeName.split("::")[2]:
                         // same tx with order filled
-                        var index = events.findLastIndex(function (e) { return e.tx_digest == tx_digest && e.action == "Order Filled (Close Position)"; });
+                        var index = events.findLastIndex(function (e) { return e.tx_digest == tx_digest; });
                         // console.log(index);
                         if (index !== -1) {
                             // true => user paid to pool
-                            var remaining_collateral_amount = json.remaining_collateral_amount / Math.pow(10, (0, constants_1.assetToDecimal)(events[index].collateral_token));
-                            events[index] = __assign(__assign({}, events[index]), { collateral: remaining_collateral_amount + Math.max(0, events[index].realized_pnl) });
+                            var x = json.realized_funding_sign ? json.realized_funding_fee_usd / Math.pow(10, 9) : -json.realized_funding_fee_usd / Math.pow(10, 9);
+                            events[index] = __assign(__assign({}, events[index]), { realized_pnl: ((_b = events[index].realized_pnl) !== null && _b !== void 0 ? _b : 0) - x });
                         }
                         break;
-                    case structs_1.RealizeFundingEvent.$typeName.split("::")[2]:
-                        // // same tx with order filled
-                        // var index = events.findLastIndex((e) => e.tx_digest == tx_digest);
-                        // // console.log(index);
-                        // if (index !== -1) {
-                        //     // true => user paid to pool
-                        //     let x = json.realized_funding_sign ? json.realized_funding_fee_usd / 10 ** 9 : -json.realized_funding_fee_usd / 10 ** 9;
-                        //     events[index] = {
-                        //         ...events[index],
-                        //         realized_pnl: (events[index].realized_pnl ?? 0) - x,
-                        //     };
-                        // }
-                        var base_token = (0, constants_1.typeArgToAsset)(json.symbol.base_token.name);
-                        var collateral_token = (0, constants_1.typeArgToAsset)(json.collateral_token.name);
-                        var market = "".concat(base_token, "/USD");
-                        var related = events.find(function (e) { return e.position_id === json.position_id && e.market === market; });
-                        var realized_funding_fee = json.realized_funding_sign
-                            ? json.realized_funding_fee / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token))
-                            : -json.realized_funding_fee / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token));
-                        var realized_funding_fee_usd = json.realized_funding_sign
-                            ? json.realized_funding_fee_usd / Math.pow(10, 9)
-                            : -json.realized_funding_fee_usd / Math.pow(10, 9);
-                        var e = {
-                            action: "Realized Funding",
-                            typeName: name,
-                            order_id: undefined,
-                            position_id: json.position_id,
-                            market: market,
-                            side: related === null || related === void 0 ? void 0 : related.side,
-                            order_type: related === null || related === void 0 ? void 0 : related.order_type,
-                            status: "Filled",
-                            size: related === null || related === void 0 ? void 0 : related.size,
-                            base_token: base_token,
-                            collateral: realized_funding_fee,
-                            collateral_token: collateral_token,
-                            price: undefined,
-                            realized_pnl: realized_funding_fee_usd,
-                            timestamp: timestamp,
-                            tx_digest: tx_digest,
-                            dov_index: related === null || related === void 0 ? void 0 : related.dov_index,
-                            sender: "user",
-                        };
-                        events.push(e);
-                        break;
                     case structs_2.CancelTradingOrderEvent.$typeName.split("::")[2]:
                         var base_token = (0, constants_1.typeArgToAsset)(json.base_token.name);
                         var collateral_token = (0, constants_1.typeArgToAsset)(json.collateral_token.name);

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "@typus/typus-perp-sdk",
-    "version": "1.1.4",
+    "version": "1.1.5",
     "repository": "https://github.com/Typus-Lab/typus-perp-sdk.git",
     "author": "Typus",
     "description": "typus perp sdk",
     "license": "MIT",
     "dependencies": {
-        "@typus/typus-sdk": "1.8.5"
+        "@typus/typus-sdk": "1.8.6"
     },
     "devDependencies": {
         "@types/bs58": "^4.0.1",