@typus/typus-perp-sdk 1.1.29 → 1.1.30-codegen

package/dist/src/user/history.js

@@ -1,67 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseUserHistory = parseUserHistory;
 exports.getGraphQLEvents = getGraphQLEvents;
@@ -72,643 +9,637 @@ exports.getCancelOrderFromSentio = getCancelOrderFromSentio;
 exports.getOrderMatchFromSentio = getOrderMatchFromSentio;
 exports.getRealizeOptionFromSentio = getRealizeOptionFromSentio;
 exports.toSentioToken = toSentioToken;
-var constants_1 = require("@typus/typus-sdk/dist/src/constants");
-var structs_1 = require("../typus_perp/position/structs");
-var structs_2 = require("../typus_perp/trading/structs");
-var structs_3 = require("../../src/typus_perp/lp-pool/structs");
-var sentio_1 = require("../../src/api/sentio");
-var src_1 = require("../../src");
-function parseUserHistory(raw_events) {
-    return __awaiter(this, void 0, void 0, function () {
-        var events;
-        return __generator(this, function (_a) {
-            events = [];
-            raw_events.forEach(function (event) {
-                var _a, _b, _c, _d, _e, _f;
-                var type = event.contents.type.repr;
-                if (type.endsWith("PythPrice")) {
-                    return;
-                }
-                var json = event.contents.json;
-                var timestamp = event.timestamp;
-                var tx_digest = event.transactionBlock.digest;
-                // console.log(type);
-                // console.log(tx_digest);
-                // console.log(json);
-                // console.log(timestamp);
-                var _g = __read(type.split("::"), 3), pkg = _g[0], mod = _g[1], name = _g[2];
-                switch (name) {
-                    case structs_2.CreateTradingOrderEvent.$typeName.split("::")[2]:
-                    case structs_2.CreateTradingOrderWithBidReceiptsEvent.$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);
-                        var market = "".concat(base_token, "/USD");
-                        var size = Number(json.size) / Math.pow(10, (0, constants_1.assetToDecimal)(base_token));
-                        var collateral;
-                        if (json.collateral_amount) {
-                            collateral = Number(json.collateral_amount) / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token));
-                        }
-                        else {
-                            collateral = Number(json.collateral_in_deposit_token) / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token));
-                        }
-                        var order_type = "Limit";
-                        var price = json.trigger_price;
-                        if (json.filled) {
-                            order_type = "Market";
-                            price = json.filled_price;
-                        }
-                        else if (json.reduce_only && !json.is_stop_order) {
-                            order_type = "Take Profit";
-                        }
-                        else if (json.reduce_only && json.is_stop_order) {
-                            order_type = "Stop Loss";
-                        }
-                        var e = {
-                            action: "Place Order",
-                            typeName: name,
-                            order_id: json.order_id,
-                            position_id: json.linked_position_id,
-                            market: market,
-                            side: json.is_long ? "Long" : "Short",
-                            order_type: order_type,
-                            status: json.filled ? "Filled" : "Open",
-                            size: size,
-                            base_token: base_token,
-                            collateral: collateral,
-                            collateral_token: collateral_token,
-                            price: Number(price) / Math.pow(10, 8), // WARNING: fixed decimal
-                            realized_pnl: undefined,
-                            timestamp: timestamp,
-                            tx_digest: tx_digest,
-                            dov_index: json.dov_index,
-                            reduce_only: json.reduce_only,
-                            is_stop_order: json.is_stop_order,
-                            sender: "user",
-                        };
-                        events.push(e);
-                        break;
-                    case structs_1.OrderFilledEvent.$typeName.split("::")[2]:
-                        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 size = Number(json.filled_size) / Math.pow(10, (0, constants_1.assetToDecimal)(base_token));
-                        var price = json.filled_price;
-                        var action;
-                        var related;
-                        var collateral;
-                        var realized_trading_fee = Number(json.realized_trading_fee) + Number(json.realized_borrow_fee);
-                        var realized_fee_in_usd = Number(json.realized_fee_in_usd) / Math.pow(10, 9);
-                        var realized_amount = json.realized_amount_sign ? Number(json.realized_amount) : -Number(json.realized_amount);
-                        // console.log(realized_amount);
-                        var realized_pnl = realized_trading_fee > 0 ? ((realized_amount - realized_trading_fee) * realized_fee_in_usd) / realized_trading_fee : 0;
-                        if (json.linked_position_id != undefined) {
-                            action = "Order Filled (Close Position)";
-                            related = events.findLast(function (e) { return e.position_id === json.linked_position_id && e.market === market; });
-                            // the "Place Order" is emit after Order Filled if filled immediately
-                            var relatedRawEvent = raw_events.find(function (e) {
-                                var type = e.contents.type.repr;
-                                var _a = __read(type.split("::"), 3), pkg = _a[0], mod = _a[1], name = _a[2];
-                                return name === (related === null || related === void 0 ? void 0 : related.typeName) && e.transactionBlock.digest === (related === null || related === void 0 ? void 0 : related.tx_digest) && (related === null || related === void 0 ? void 0 : related.order_id) === json.order_id;
-                            });
-                            if (((_b = (_a = relatedRawEvent === null || relatedRawEvent === void 0 ? void 0 : relatedRawEvent.contents) === null || _a === void 0 ? void 0 : _a.json) === null || _b === void 0 ? void 0 : _b.reduce_only) === false) {
-                                action = "Order Filled (Increase Position)";
-                            }
-                            if (realized_pnl > 0) {
-                                collateral = (realized_amount - realized_trading_fee) / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token));
-                            }
-                        }
-                        else {
-                            action = "Order Filled (Open Position)";
-                            related = events.findLast(function (e) { return e.order_id === json.order_id && e.market === market; });
-                            collateral = related === null || related === void 0 ? void 0 : related.collateral;
-                        }
-                        var e = {
-                            action: action,
-                            typeName: name,
-                            order_id: json.order_id,
-                            position_id: (_c = json.linked_position_id) !== null && _c !== void 0 ? _c : json.new_position_id,
-                            market: market,
-                            side: json.position_side ? "Long" : "Short",
-                            order_type: related === null || related === void 0 ? void 0 : related.order_type,
-                            status: "Filled",
-                            size: size,
-                            base_token: base_token,
-                            collateral: collateral, // TODO: check for option collateral
-                            collateral_token: collateral_token,
-                            price: Number(price) / Math.pow(10, 8), // WARNING: fixed decimal
-                            realized_pnl: realized_pnl,
-                            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_1.RemovePositionEvent.$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)"; });
-                        // 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 + ((_d = events[index].collateral) !== null && _d !== void 0 ? _d : 0) });
-                        }
-                        break;
-                    case structs_1.RealizeFundingEvent.$typeName.split("::")[2]:
-                        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; });
-                        // if realized_funding_sign is true, user pays to pool
-                        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);
-                        // same tx with order filled
-                        var index = events.findLastIndex(function (e) { return e.tx_digest == tx_digest && e.action == "Order Filled (Close Position)"; });
-                        // console.log(index);
-                        if (index !== -1) {
-                            // true => user paid to pool
-                            events[index] = __assign(__assign({}, events[index]), { collateral: (_e = events[index].collateral) !== null && _e !== void 0 ? _e : 0 - realized_funding_fee, realized_pnl: (_f = events[index].realized_pnl) !== null && _f !== void 0 ? _f : 0 - realized_funding_fee_usd });
-                        }
-                        var e = {
-                            action: "Realize 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);
-                        var market = "".concat(base_token, "/USD");
-                        var related = events.findLast(function (e) { return e.order_id === json.order_id && e.market === market; });
-                        var e = {
-                            action: "Cancel Order",
-                            typeName: name,
-                            order_id: json.order_id,
-                            position_id: related === null || related === void 0 ? void 0 : related.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: "Canceled",
-                            size: related === null || related === void 0 ? void 0 : related.size,
-                            base_token: base_token,
-                            collateral: Number(json.released_collateral_amount) / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token)), // WARNING: fixed decimal
-                            collateral_token: collateral_token,
-                            price: Number(json.trigger_price) / Math.pow(10, 8), // WARNING: fixed decimal
-                            realized_pnl: undefined,
-                            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.IncreaseCollateralEvent.$typeName.split("::")[2]:
-                    case structs_2.ReleaseCollateralEvent.$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);
-                        var market = "".concat(base_token, "/USD");
-                        var related = events.find(function (e) { return e.position_id === json.position_id && e.market === market; });
-                        var collateral;
-                        if (json.increased_collateral_amount) {
-                            collateral = Number(json.increased_collateral_amount) * -1;
+const constants_1 = require("@typus/typus-sdk/dist/src/constants");
+const position_1 = require("../generated/typus_perp/position");
+const trading_1 = require("../generated/typus_perp/trading");
+const lp_pool_1 = require("../generated/typus_perp/lp_pool");
+const sentio_1 = require("../../src/api/sentio");
+const src_1 = require("../../src");
+async function parseUserHistory(raw_events) {
+    const events = [];
+    raw_events.forEach((event) => {
+        const type = event.contents.type.repr;
+        if (type.endsWith("PythPrice")) {
+            return;
+        }
+        const json = event.contents.json;
+        const timestamp = event.timestamp;
+        const tx_digest = event.transaction.digest;
+        // console.log(type);
+        // console.log(tx_digest);
+        // console.log(json);
+        // console.log(timestamp);
+        const [pkg, mod, name] = type.split("::");
+        if (mod == "trading") {
+            switch (name) {
+                case trading_1.CreateTradingOrderEvent.name.split("::")[2]:
+                case trading_1.CreateTradingOrderWithBidReceiptsEvent.name.split("::")[2]:
+                    var base_token = (0, constants_1.typeArgToAsset)(json.base_token.name);
+                    var collateral_token = (0, constants_1.typeArgToAsset)(json.collateral_token.name);
+                    var market = `${base_token}/USD`;
+                    var size = Number(json.size) / 10 ** (0, constants_1.assetToDecimal)(base_token);
+                    var collateral;
+                    if (json.collateral_amount) {
+                        collateral = Number(json.collateral_amount) / 10 ** (0, constants_1.assetToDecimal)(collateral_token);
+                    }
+                    else {
+                        collateral = Number(json.collateral_in_deposit_token) / 10 ** (0, constants_1.assetToDecimal)(collateral_token);
+                    }
+                    var order_type = "Limit";
+                    var price = json.trigger_price;
+                    if (json.filled) {
+                        order_type = "Market";
+                        price = json.filled_price;
+                    }
+                    else if (json.reduce_only && !json.is_stop_order) {
+                        order_type = "Take Profit";
+                    }
+                    else if (json.reduce_only && json.is_stop_order) {
+                        order_type = "Stop Loss";
+                    }
+                    var e = {
+                        action: "Place Order",
+                        typeName: name,
+                        order_id: json.order_id,
+                        position_id: json.linked_position_id,
+                        market,
+                        side: json.is_long ? "Long" : "Short",
+                        order_type,
+                        status: json.filled ? "Filled" : "Open",
+                        size,
+                        base_token,
+                        collateral,
+                        collateral_token,
+                        price: Number(price) / 10 ** 8, // WARNING: fixed decimal
+                        realized_pnl: undefined,
+                        timestamp,
+                        tx_digest,
+                        dov_index: json.dov_index,
+                        reduce_only: json.reduce_only,
+                        is_stop_order: json.is_stop_order,
+                        sender: "user",
+                    };
+                    events.push(e);
+                    break;
+                case position_1.OrderFilledEvent.name.split("::")[2]:
+                    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 = `${base_token}/USD`;
+                    var size = Number(json.filled_size) / 10 ** (0, constants_1.assetToDecimal)(base_token);
+                    var price = json.filled_price;
+                    var action;
+                    var related;
+                    var collateral;
+                    var realized_trading_fee = Number(json.realized_trading_fee) + Number(json.realized_borrow_fee);
+                    var realized_fee_in_usd = Number(json.realized_fee_in_usd) / 10 ** 9;
+                    var realized_amount = json.realized_amount_sign ? Number(json.realized_amount) : -Number(json.realized_amount);
+                    // console.log(realized_amount);
+                    var realized_pnl = realized_trading_fee > 0
+                        ? ((realized_amount - realized_trading_fee) * realized_fee_in_usd) / realized_trading_fee
+                        : 0;
+                    if (json.linked_position_id != undefined) {
+                        action = "Order Filled (Close Position)";
+                        related = events.findLast((e) => e.position_id === json.linked_position_id && e.market === market);
+                        // the "Place Order" is emit after Order Filled if filled immediately
+                        const relatedRawEvent = raw_events.find((e) => {
+                            const type = e.contents.type.repr;
+                            const [pkg, mod, name] = type.split("::");
+                            return (name === related?.typeName &&
+                                e.transactionBlock.digest === related?.tx_digest &&
+                                related?.order_id === json.order_id);
+                        });
+                        if (relatedRawEvent?.contents?.json?.reduce_only === false) {
+                            action = "Order Filled (Increase Position)";
                         }
-                        else {
-                            collateral = Number(json.released_collateral_amount);
+                        if (realized_pnl > 0) {
+                            collateral = (realized_amount - realized_trading_fee) / 10 ** (0, constants_1.assetToDecimal)(collateral_token);
                         }
-                        var e = {
-                            action: "Modify Collateral",
-                            typeName: name,
-                            order_id: undefined,
-                            position_id: json.position_id,
-                            market: market,
-                            side: !related
-                                ? undefined
-                                : related.action === "Order Filled (Open Position)"
-                                    ? related.side
-                                    : related.side === "Long"
-                                        ? "Short"
-                                        : "Long",
-                            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: collateral / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token)), // WARNING: fixed decimal
-                            collateral_token: collateral_token,
-                            price: related === null || related === void 0 ? void 0 : related.price,
-                            realized_pnl: undefined,
-                            timestamp: timestamp,
-                            tx_digest: tx_digest,
-                            dov_index: related === null || related === void 0 ? void 0 : related.dov_index,
-                            sender: "user",
+                    }
+                    else {
+                        action = "Order Filled (Open Position)";
+                        related = events.findLast((e) => e.order_id === json.order_id && e.market === market);
+                        collateral = related?.collateral;
+                    }
+                    var e = {
+                        action,
+                        typeName: name,
+                        order_id: json.order_id,
+                        position_id: json.linked_position_id ?? json.new_position_id,
+                        market,
+                        side: json.position_side ? "Long" : "Short",
+                        order_type: related?.order_type,
+                        status: "Filled",
+                        size,
+                        base_token,
+                        collateral, // TODO: check for option collateral
+                        collateral_token,
+                        price: Number(price) / 10 ** 8, // WARNING: fixed decimal
+                        realized_pnl,
+                        timestamp,
+                        tx_digest,
+                        dov_index: related?.dov_index,
+                        sender: "user",
+                    };
+                    events.push(e);
+                    break;
+                case position_1.RemovePositionEvent.name.split("::")[2]:
+                    // same tx with order filled
+                    var index = events.findLastIndex((e) => e.tx_digest == tx_digest && e.action == "Order Filled (Close Position)");
+                    // console.log(index);
+                    if (index !== -1) {
+                        // true => user paid to pool
+                        let remaining_collateral_amount = json.remaining_collateral_amount / 10 ** (0, constants_1.assetToDecimal)(events[index].collateral_token);
+                        events[index] = {
+                            ...events[index],
+                            collateral: remaining_collateral_amount + (events[index].collateral ?? 0),
                         };
-                        events.push(e);
-                        break;
-                    case structs_3.SwapEvent.$typeName.split("::")[2]:
-                        var from_token = (0, constants_1.typeArgToAsset)(json.from_token_type.name);
-                        var to_token = (0, constants_1.typeArgToAsset)(json.to_token_type.name);
-                        var from_price = Number(json.oracle_price_from_token);
-                        var to_price = Number(json.oracle_price_to_token);
-                        var e = {
-                            action: "Swap",
-                            typeName: name,
-                            order_id: undefined,
-                            position_id: undefined,
-                            market: "".concat(from_token, "/").concat(to_token),
-                            side: undefined,
-                            order_type: "Market",
-                            status: "Filled",
-                            size: Number(json.actual_to_amount) / Math.pow(10, (0, constants_1.assetToDecimal)(to_token)),
-                            base_token: to_token,
-                            collateral: Number(json.from_amount) / Math.pow(10, (0, constants_1.assetToDecimal)(from_token)),
-                            collateral_token: from_token,
-                            price: from_price / to_price,
-                            realized_pnl: -Number(json.fee_amount_usd) / Math.pow(10, 9),
-                            timestamp: timestamp,
-                            tx_digest: tx_digest,
-                            dov_index: undefined,
-                            sender: "user",
+                    }
+                    break;
+                case position_1.RealizeFundingEvent.name.split("::")[2]:
+                    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 = `${base_token}/USD`;
+                    var related = events.find((e) => e.position_id === json.position_id && e.market === market);
+                    // if realized_funding_sign is true, user pays to pool
+                    let realized_funding_fee = json.realized_funding_sign
+                        ? -json.realized_funding_fee / 10 ** (0, constants_1.assetToDecimal)(collateral_token)
+                        : json.realized_funding_fee / 10 ** (0, constants_1.assetToDecimal)(collateral_token);
+                    let realized_funding_fee_usd = json.realized_funding_sign
+                        ? -json.realized_funding_fee_usd / 10 ** 9
+                        : json.realized_funding_fee_usd / 10 ** 9;
+                    // same tx with order filled
+                    var index = events.findLastIndex((e) => e.tx_digest == tx_digest && e.action == "Order Filled (Close Position)");
+                    // console.log(index);
+                    if (index !== -1) {
+                        // true => user paid to pool
+                        events[index] = {
+                            ...events[index],
+                            collateral: events[index].collateral ?? 0 - realized_funding_fee,
+                            realized_pnl: events[index].realized_pnl ?? 0 - realized_funding_fee_usd,
                         };
-                        events.push(e);
-                        break;
-                }
-            });
-            // console.log(events);
-            return [2 /*return*/, events];
-        });
-    });
-}
-function getGraphQLEvents(module_1, sender_1) {
-    return __awaiter(this, arguments, void 0, function (module, sender, beforeCursor) {
-        var before, senderFilter, graphql, response, data;
-        if (beforeCursor === void 0) { beforeCursor = null; }
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    before = "";
-                    if (beforeCursor) {
-                        before = "before: \"".concat(beforeCursor, "\",");
                     }
-                    senderFilter = "";
-                    if (sender) {
-                        senderFilter = "sender: \"".concat(sender, "\"");
+                    var e = {
+                        action: "Realize Funding",
+                        typeName: name,
+                        order_id: undefined,
+                        position_id: json.position_id,
+                        market,
+                        side: related?.side,
+                        order_type: related?.order_type,
+                        status: "Filled",
+                        size: related?.size,
+                        base_token,
+                        collateral: realized_funding_fee,
+                        collateral_token,
+                        price: undefined,
+                        realized_pnl: realized_funding_fee_usd,
+                        timestamp,
+                        tx_digest,
+                        dov_index: related?.dov_index,
+                        sender: "user",
+                    };
+                    events.push(e);
+                    break;
+                case trading_1.CancelTradingOrderEvent.name.split("::")[2]:
+                    var base_token = (0, constants_1.typeArgToAsset)(json.base_token.name);
+                    var collateral_token = (0, constants_1.typeArgToAsset)(json.collateral_token.name);
+                    var market = `${base_token}/USD`;
+                    var related = events.findLast((e) => e.order_id === json.order_id && e.market === market);
+                    var e = {
+                        action: "Cancel Order",
+                        typeName: name,
+                        order_id: json.order_id,
+                        position_id: related?.position_id,
+                        market,
+                        side: related?.side,
+                        order_type: related?.order_type,
+                        status: "Canceled",
+                        size: related?.size,
+                        base_token,
+                        collateral: Number(json.released_collateral_amount) / 10 ** (0, constants_1.assetToDecimal)(collateral_token), // WARNING: fixed decimal
+                        collateral_token,
+                        price: Number(json.trigger_price) / 10 ** 8, // WARNING: fixed decimal
+                        realized_pnl: undefined,
+                        timestamp,
+                        tx_digest,
+                        dov_index: related?.dov_index,
+                        sender: "user",
+                    };
+                    events.push(e);
+                    break;
+                case trading_1.IncreaseCollateralEvent.name.split("::")[2]:
+                case trading_1.ReleaseCollateralEvent.name.split("::")[2]:
+                    var base_token = (0, constants_1.typeArgToAsset)(json.base_token.name);
+                    var collateral_token = (0, constants_1.typeArgToAsset)(json.collateral_token.name);
+                    var market = `${base_token}/USD`;
+                    var related = events.find((e) => e.position_id === json.position_id && e.market === market);
+                    var collateral;
+                    if (json.increased_collateral_amount) {
+                        collateral = Number(json.increased_collateral_amount) * -1;
+                    }
+                    else {
+                        collateral = Number(json.released_collateral_amount);
                     }
-                    graphql = JSON.stringify({
-                        query: "\n        {\n        events(\n          last: 50,\n          ".concat(before, "\n          filter: {\n            eventType: \"").concat(module, "\",\n            ").concat(senderFilter, "\n            }\n        ) {\n          pageInfo {\n            hasPreviousPage\n            hasNextPage\n            startCursor\n            endCursor\n          }\n          edges { cursor }\n          nodes {\n            transactionBlock { digest }\n            sendingModule {\n              name\n              package { digest }\n            }\n            sender { address }\n            timestamp\n            contents {\n              type { repr }\n              json\n            }\n          }\n        }}\n          "),
-                    });
-                    return [4 /*yield*/, fetch("https://graphql.".concat(src_1.NETWORK.toLowerCase(), ".sui.io/graphql"), {
-                            method: "POST",
-                            headers: { "Content-Type": "application/json" },
-                            body: graphql,
-                        })];
-                case 1:
-                    response = _a.sent();
-                    if (!response.ok) return [3 /*break*/, 3];
-                    return [4 /*yield*/, response.json()];
-                case 2:
-                    data = _a.sent();
-                    // console.log(data.data.events.pageInfo);
-                    return [2 /*return*/, data.data.events];
-                case 3: return [2 /*return*/];
+                    var e = {
+                        action: "Modify Collateral",
+                        typeName: name,
+                        order_id: undefined,
+                        position_id: json.position_id,
+                        market,
+                        side: !related
+                            ? undefined
+                            : related.action === "Order Filled (Open Position)"
+                                ? related.side
+                                : related.side === "Long"
+                                    ? "Short"
+                                    : "Long",
+                        order_type: related?.order_type,
+                        status: "Filled",
+                        size: related?.size,
+                        base_token,
+                        collateral: collateral / 10 ** (0, constants_1.assetToDecimal)(collateral_token), // WARNING: fixed decimal
+                        collateral_token,
+                        price: related?.price,
+                        realized_pnl: undefined,
+                        timestamp,
+                        tx_digest,
+                        dov_index: related?.dov_index,
+                        sender: "user",
+                    };
+                    events.push(e);
+                    break;
+                case lp_pool_1.SwapEvent.name.split("::")[2]:
+                    var from_token = (0, constants_1.typeArgToAsset)(json.from_token_type.name);
+                    var to_token = (0, constants_1.typeArgToAsset)(json.to_token_type.name);
+                    var from_price = Number(json.oracle_price_from_token);
+                    var to_price = Number(json.oracle_price_to_token);
+                    var e = {
+                        action: "Swap",
+                        typeName: name,
+                        order_id: undefined,
+                        position_id: undefined,
+                        market: `${from_token}/${to_token}`,
+                        side: undefined,
+                        order_type: "Market",
+                        status: "Filled",
+                        size: Number(json.actual_to_amount) / 10 ** (0, constants_1.assetToDecimal)(to_token),
+                        base_token: to_token,
+                        collateral: Number(json.from_amount) / 10 ** (0, constants_1.assetToDecimal)(from_token),
+                        collateral_token: from_token,
+                        price: from_price / to_price,
+                        realized_pnl: -Number(json.fee_amount_usd) / 10 ** 9,
+                        timestamp,
+                        tx_digest,
+                        dov_index: undefined,
+                        sender: "user",
+                    };
+                    events.push(e);
+                    break;
             }
-        });
+        }
     });
+    // console.log(events);
+    return events;
+    // CreateTradingOrderEvent => Place Order
+    //      filled => market order
+    //      reduce_only & !is_stop_order  => TP
+    //      reduce_only & is_stop_order  => SL
+    // CancelTradingOrderEvent => Cancel Order
+    // OrderFilledEvent (position) => Order Filled (Open Position/ Close Position)
+    // ManagerCloseOptionPosition => Exercise Position
+    // RealizedPnlEvent
+    // RealizeFundingEvent
+    // LiquidateEvent + RemovePositionEvent => Liquidation
+    //
+    // SwapEvent => Swap
 }
-function getLiquidateFromSentio(userAddress, startTimestamp, events) {
-    return __awaiter(this, void 0, void 0, function () {
-        var datas, liquidate;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, sentio_1.getFromSentio)("Liquidate", userAddress, startTimestamp.toString())];
-                case 1:
-                    datas = _a.sent();
-                    liquidate = datas.map(function (x) {
-                        var collateral = Number(x.liquidator_fee) + Number(x.value_for_lp_pool);
-                        var base_token = toToken(x.base_token);
-                        var txHistory = {
-                            action: "Liquidation",
-                            typeName: "LiquidateEvent",
-                            order_id: x.order_id,
-                            position_id: x.position_id,
-                            market: "".concat(base_token, "/USD"),
-                            side: undefined,
-                            order_type: "Market",
-                            status: "Filled",
-                            size: Number(x.position_size),
-                            base_token: base_token,
-                            collateral: collateral,
-                            collateral_token: x.collateral_token,
-                            price: Number(x.trading_price),
-                            realized_pnl: -collateral * Number(x.collateral_price),
-                            timestamp: x.timestamp,
-                            tx_digest: x.transaction_hash,
-                            dov_index: undefined,
-                            sender: "cranker",
-                        };
-                        return txHistory;
-                    });
-                    liquidate = liquidate.map(function (x) {
-                        var related = events.find(function (e) { return e.position_id == x.position_id && e.market == x.market; });
-                        // console.log(x);
-                        // console.log(related);
-                        if (related) {
-                            x.side = related.side;
-                            x.dov_index = related.dov_index;
-                        }
-                        return x;
-                    });
-                    // console.log(liquidate);
-                    events = events.concat(liquidate);
-                    events = events.sort(function (a, b) { return Number(new Date(a.timestamp)) - Number(new Date(b.timestamp)); });
-                    return [2 /*return*/, events];
+async function getGraphQLEvents(module, sender, beforeCursor = null) {
+    let before = "";
+    if (beforeCursor) {
+        before = `before: "${beforeCursor}",`;
+    }
+    let senderFilter = "";
+    if (sender) {
+        senderFilter = `sender: "${sender}"`;
+    }
+    var graphql = JSON.stringify({
+        query: `
+        {
+        events(
+          last: 50,
+          ${before}
+          filter: {
+            type: "${module}",
+            ${senderFilter}
+            }
+        ) {
+          pageInfo {
+            hasPreviousPage
+            hasNextPage
+            startCursor
+            endCursor
+          }
+          edges { cursor }
+          nodes {
+            transaction { digest }
+            transactionModule {
+              name
+              package { digest }
+            }
+            sender { address }
+            timestamp
+            contents {
+              type { repr }
+              json
             }
-        });
+          }
+        }}
+          `,
     });
+    let response = await fetch(`https://sui-${src_1.NETWORK.toLowerCase()}.mystenlabs.com/graphql`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: graphql,
+    });
+    // console.log(response);
+    if (response.ok) {
+        let data = await response.json();
+        // console.log(data.data.events.pageInfo);
+        return data.data.events;
+    }
 }
-function getRealizeFundingFromSentio(userAddress, startTimestamp, events) {
-    return __awaiter(this, void 0, void 0, function () {
-        var datas, realizeFunding;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, sentio_1.getFromSentio)("RealizeFunding", userAddress, startTimestamp.toString())];
-                case 1:
-                    datas = _a.sent();
-                    realizeFunding = datas.map(function (x) {
-                        var base_token = toToken(x.base_token);
-                        var txHistory = {
-                            action: "Realize Funding",
-                            typeName: "RealizeFundingEvent",
-                            order_id: undefined,
-                            position_id: x.position_id,
-                            market: "".concat(base_token, "/USD"),
-                            side: undefined,
-                            order_type: undefined,
-                            status: "Filled",
-                            size: undefined,
-                            base_token: base_token,
-                            collateral: -Number(x.realized_funding_fee),
-                            collateral_token: x.collateral_token,
-                            price: undefined,
-                            realized_pnl: -Number(x.realized_funding_fee_usd),
-                            timestamp: x.timestamp,
-                            tx_digest: x.transaction_hash,
-                            dov_index: undefined,
-                            sender: "cranker",
-                        };
-                        return txHistory;
-                    });
-                    // deduplicate
-                    realizeFunding = realizeFunding.filter(function (x) { return events.findIndex(function (y) { return y.tx_digest == x.tx_digest && y.action == "Realize Funding"; }) == -1; });
-                    realizeFunding = realizeFunding.map(function (x) {
-                        var _a, _b, _c, _d;
-                        // find related position
-                        var related = events.find(function (e) { return e.position_id === x.position_id && e.market === x.market; });
-                        // console.log(x, related);
-                        if (related) {
-                            x.side = related.side;
-                            x.order_type = related.order_type;
-                            x.size = related.size;
-                            x.dov_index = related.dov_index;
-                        }
-                        // same tx with order filled
-                        var index = events.findLastIndex(function (e) { return e.tx_digest == x.tx_digest && e.action == "Order Filled (Close Position)"; });
-                        // console.log(index);
-                        if (index !== -1) {
-                            // true => user paid to pool
-                            events[index] = __assign(__assign({}, events[index]), { collateral: ((_a = events[index].collateral) !== null && _a !== void 0 ? _a : 0) - ((_b = x.collateral) !== null && _b !== void 0 ? _b : 0), realized_pnl: ((_c = events[index].realized_pnl) !== null && _c !== void 0 ? _c : 0) - ((_d = x.realized_pnl) !== null && _d !== void 0 ? _d : 0) });
-                        }
-                        return x;
-                    });
-                    // console.log(realizeFunding);
-                    events = events.concat(realizeFunding);
-                    events = events.sort(function (a, b) { return Number(new Date(a.timestamp)) - Number(new Date(b.timestamp)); });
-                    return [2 /*return*/, events];
-            }
-        });
+async function getLiquidateFromSentio(userAddress, startTimestamp, events) {
+    const datas = await (0, sentio_1.getFromSentio)("Liquidate", userAddress, startTimestamp.toString());
+    // console.log(datas);
+    let liquidate = datas.map((x) => {
+        let collateral = Number(x.liquidator_fee) + Number(x.value_for_lp_pool);
+        let base_token = toToken(x.base_token);
+        let txHistory = {
+            action: "Liquidation",
+            typeName: "LiquidateEvent",
+            order_id: x.order_id,
+            position_id: x.position_id,
+            market: `${base_token}/USD`,
+            side: undefined,
+            order_type: "Market",
+            status: "Filled",
+            size: Number(x.position_size),
+            base_token,
+            collateral,
+            collateral_token: x.collateral_token,
+            price: Number(x.trading_price),
+            realized_pnl: -collateral * Number(x.collateral_price),
+            timestamp: x.timestamp,
+            tx_digest: x.transaction_hash,
+            dov_index: undefined,
+            sender: "cranker",
+        };
+        return txHistory;
     });
+    liquidate = liquidate.map((x) => {
+        let related = events.find((e) => e.position_id == x.position_id && e.market == x.market);
+        // console.log(x);
+        // console.log(related);
+        if (related) {
+            x.side = related.side;
+            x.dov_index = related.dov_index;
+        }
+        return x;
+    });
+    // console.log(liquidate);
+    events = events.concat(liquidate);
+    events = events.sort((a, b) => Number(new Date(a.timestamp)) - Number(new Date(b.timestamp)));
+    return events;
 }
-function getRemovePositionFromSentio(userAddress, startTimestamp, events) {
-    return __awaiter(this, void 0, void 0, function () {
-        var datas;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, sentio_1.getFromSentio)("RemovePosition", userAddress, startTimestamp.toString())];
-                case 1:
-                    datas = _a.sent();
-                    // console.log(datas);
-                    datas.forEach(function (x) {
-                        // console.log(x);
-                        // same tx with order filled
-                        var index = events.findLastIndex(function (e) { return e.tx_digest == x.transaction_hash && e.action == "Force Close Position"; });
-                        // console.log(index);
-                        if (index !== -1) {
-                            // true => user paid to pool
-                            var remaining_collateral_amount = x.remaining_collateral_amount;
-                            events[index] = __assign(__assign({}, events[index]), { collateral: remaining_collateral_amount + Math.max(0, events[index].collateral) });
-                        }
-                    });
-                    return [2 /*return*/, events];
-            }
-        });
+async function getRealizeFundingFromSentio(userAddress, startTimestamp, events) {
+    const datas = await (0, sentio_1.getFromSentio)("RealizeFunding", userAddress, startTimestamp.toString());
+    // console.log(datas);
+    let realizeFunding = datas.map((x) => {
+        let base_token = toToken(x.base_token);
+        let txHistory = {
+            action: "Realize Funding",
+            typeName: "RealizeFundingEvent",
+            order_id: undefined,
+            position_id: x.position_id,
+            market: `${base_token}/USD`,
+            side: undefined,
+            order_type: undefined,
+            status: "Filled",
+            size: undefined,
+            base_token,
+            collateral: -Number(x.realized_funding_fee),
+            collateral_token: x.collateral_token,
+            price: undefined,
+            realized_pnl: -Number(x.realized_funding_fee_usd),
+            timestamp: x.timestamp,
+            tx_digest: x.transaction_hash,
+            dov_index: undefined,
+            sender: "cranker",
+        };
+        return txHistory;
     });
+    // deduplicate
+    realizeFunding = realizeFunding.filter((x) => events.findIndex((y) => y.tx_digest == x.tx_digest && y.action == "Realize Funding") == -1);
+    realizeFunding = realizeFunding.map((x) => {
+        // find related position
+        var related = events.find((e) => e.position_id === x.position_id && e.market === x.market);
+        // console.log(x, related);
+        if (related) {
+            x.side = related.side;
+            x.order_type = related.order_type;
+            x.size = related.size;
+            x.dov_index = related.dov_index;
+        }
+        // same tx with order filled
+        var index = events.findLastIndex((e) => e.tx_digest == x.tx_digest && e.action == "Order Filled (Close Position)");
+        // console.log(index);
+        if (index !== -1) {
+            // true => user paid to pool
+            events[index] = {
+                ...events[index],
+                collateral: (events[index].collateral ?? 0) - (x.collateral ?? 0),
+                realized_pnl: (events[index].realized_pnl ?? 0) - (x.realized_pnl ?? 0),
+            };
+        }
+        return x;
+    });
+    // console.log(realizeFunding);
+    events = events.concat(realizeFunding);
+    events = events.sort((a, b) => Number(new Date(a.timestamp)) - Number(new Date(b.timestamp)));
+    return events;
 }
-function getCancelOrderFromSentio(userAddress, startTimestamp, events) {
-    return __awaiter(this, void 0, void 0, function () {
-        var datas, cancelOrder;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, sentio_1.getFromSentio)("CancelOrder", userAddress, startTimestamp.toString(), true)];
-                case 1:
-                    datas = _a.sent();
-                    cancelOrder = datas.map(function (x) {
-                        var collateral = Number(x.released_collateral_amount);
-                        var base_token = toToken(x.base_token);
-                        var txHistory = {
-                            action: "Force Cancel Order",
-                            typeName: "CancelTradingOrderEvent",
-                            order_id: x.order_id,
-                            position_id: undefined,
-                            market: "".concat(base_token, "/USD"),
-                            side: undefined,
-                            order_type: undefined,
-                            status: "Canceled",
-                            size: undefined,
-                            base_token: base_token,
-                            collateral: collateral,
-                            collateral_token: x.collateral_token,
-                            price: undefined,
-                            realized_pnl: undefined,
-                            timestamp: x.timestamp,
-                            tx_digest: x.transaction_hash,
-                            dov_index: undefined,
-                            sender: "cranker",
-                        };
-                        return txHistory;
-                    });
-                    // no duplicate
-                    cancelOrder = cancelOrder.map(function (x) {
-                        // find related order
-                        var related = events.findLast(function (e) { return e.order_id == x.order_id && e.market == x.market; });
-                        // console.log(x, related);
-                        if (related) {
-                            x.position_id = related.position_id;
-                            x.side = related.side;
-                            x.order_type = related.order_type;
-                            x.size = related.size;
-                            x.price = related.price;
-                        }
-                        return x;
-                    });
-                    // console.log(cancelOrder);
-                    events = events.concat(cancelOrder);
-                    events = events.sort(function (a, b) { return Number(new Date(a.timestamp)) - Number(new Date(b.timestamp)); });
-                    return [2 /*return*/, events];
-            }
-        });
+async function getRemovePositionFromSentio(userAddress, startTimestamp, events) {
+    const datas = await (0, sentio_1.getFromSentio)("RemovePosition", userAddress, startTimestamp.toString());
+    // console.log(datas);
+    datas.forEach((x) => {
+        // console.log(x);
+        // same tx with order filled
+        var index = events.findLastIndex((e) => e.tx_digest == x.transaction_hash && e.action == "Force Close Position");
+        // console.log(index);
+        if (index !== -1) {
+            // true => user paid to pool
+            let remaining_collateral_amount = x.remaining_collateral_amount;
+            events[index] = {
+                ...events[index],
+                collateral: remaining_collateral_amount + Math.max(0, events[index].collateral),
+            };
+        }
     });
+    return events;
 }
-function getOrderMatchFromSentio(userAddress, startTimestamp, events) {
-    return __awaiter(this, void 0, void 0, function () {
-        var datas, order_match;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, sentio_1.getFromSentio)("OrderFilled", userAddress, startTimestamp.toString(), true)];
-                case 1:
-                    datas = _a.sent();
-                    order_match = datas.map(function (x) {
-                        var base_token = toToken(x.base_token);
-                        var txHistory = {
-                            action: x.order_type == "Open"
-                                ? "Order Filled (Open Position)"
-                                : x.sender == "0x978f65df8570a075298598a9965c18de9087f9e888eb3430fe20334f5c554cfd"
-                                    ? "Force Close Position"
-                                    : "Order Filled (Close Position)",
-                            typeName: "OrderFilledEvent",
-                            order_id: x.order_id,
-                            position_id: x.position_id,
-                            market: "".concat(base_token, "/USD"),
-                            side: x.side,
-                            order_type: undefined,
-                            status: "Filled",
-                            size: Number(x.filled_size),
-                            base_token: base_token,
-                            collateral: Number(x.realized_amount) - Number(x.realized_fee),
-                            collateral_token: x.collateral_token,
-                            price: Number(x.filled_price),
-                            realized_pnl: Number(x.realized_pnl),
-                            timestamp: x.timestamp,
-                            tx_digest: x.transaction_hash,
-                            dov_index: undefined,
-                            sender: x.is_cranker ? "cranker" : "user",
-                        };
-                        return txHistory;
-                    });
-                    // deduplicate
-                    order_match = order_match.filter(function (x) { return events.findIndex(function (y) { return y.tx_digest == x.tx_digest; }) == -1; });
-                    order_match = order_match.map(function (x) {
-                        // find related order
-                        var related = events.findLast(function (e) { return e.order_id == x.order_id && e.market == x.market; });
-                        // console.log(x, related);
-                        if (related) {
-                            x.order_type = related.order_type;
-                            x.collateral = related.collateral;
-                            x.dov_index = related.dov_index;
-                        }
-                        else {
-                            x.order_type = "Market";
-                            var related_1 = events.findLast(function (e) { return e.position_id == x.position_id && e.market == x.market; });
-                            x.dov_index = related_1 === null || related_1 === void 0 ? void 0 : related_1.dov_index;
-                        }
-                        return x;
-                    });
-                    // console.log(order_match);
-                    events = events.concat(order_match);
-                    events = events.sort(function (a, b) { return Number(new Date(a.timestamp)) - Number(new Date(b.timestamp)); });
-                    return [2 /*return*/, events];
-            }
-        });
+async function getCancelOrderFromSentio(userAddress, startTimestamp, events) {
+    const datas = await (0, sentio_1.getFromSentio)("CancelOrder", userAddress, startTimestamp.toString(), true);
+    // console.log(datas);
+    let cancelOrder = datas.map((x) => {
+        let collateral = Number(x.released_collateral_amount);
+        let base_token = toToken(x.base_token);
+        let txHistory = {
+            action: "Force Cancel Order",
+            typeName: "CancelTradingOrderEvent",
+            order_id: x.order_id,
+            position_id: undefined,
+            market: `${base_token}/USD`,
+            side: undefined,
+            order_type: undefined,
+            status: "Canceled",
+            size: undefined,
+            base_token,
+            collateral,
+            collateral_token: x.collateral_token,
+            price: undefined,
+            realized_pnl: undefined,
+            timestamp: x.timestamp,
+            tx_digest: x.transaction_hash,
+            dov_index: undefined,
+            sender: "cranker",
+        };
+        return txHistory;
+    });
+    // no duplicate
+    cancelOrder = cancelOrder.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.position_id = related.position_id;
+            x.side = related.side;
+            x.order_type = related.order_type;
+            x.size = related.size;
+            x.price = related.price;
+        }
+        return x;
     });
+    // console.log(cancelOrder);
+    events = events.concat(cancelOrder);
+    events = events.sort((a, b) => Number(new Date(a.timestamp)) - Number(new Date(b.timestamp)));
+    return events;
 }
-function getRealizeOptionFromSentio(userAddress, startTimestamp, events) {
-    return __awaiter(this, void 0, void 0, function () {
-        var datas, exercise, filter_exercise;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, sentio_1.getFromSentio)("RealizeOption", userAddress, startTimestamp.toString())];
-                case 1:
-                    datas = _a.sent();
-                    exercise = datas.map(function (x) {
-                        var base_token = toToken(x.base_token);
-                        var txHistory = {
-                            action: "Exercise Position",
-                            typeName: "RealizeOptionPositionEvent",
-                            order_id: undefined,
-                            position_id: x.position_id,
-                            market: "".concat(base_token, "/USD"),
-                            side: undefined,
-                            order_type: "Market",
-                            status: "Filled",
-                            size: undefined,
-                            base_token: base_token,
-                            collateral: Number(x.user_remaining_value),
-                            collateral_token: x.collateral_token,
-                            price: undefined,
-                            realized_pnl: Number(x.user_remaining_in_usd),
-                            timestamp: x.timestamp,
-                            tx_digest: x.transaction_hash,
-                            dov_index: undefined,
-                            sender: "cranker",
-                        };
-                        // console.log(txHistory);
-                        return txHistory;
-                    });
-                    filter_exercise = exercise.reduce(function (acc, x) {
-                        var _a, _b, _c, _d;
-                        var related_index = events.findLastIndex(function (e) { return e.position_id == x.position_id && e.market == x.market && e.tx_digest == x.tx_digest; });
-                        // console.log(x);
-                        // console.log(related_index);
-                        if (related_index != -1) {
-                            var related = events[related_index];
-                            if (related.sender == "cranker") {
-                                x.side = related.side;
-                                x.size = related.size;
-                                x.dov_index = related.dov_index;
-                                // add to close event
-                                related.collateral = Number((_a = related.collateral) !== null && _a !== void 0 ? _a : 0) + Number((_b = x.collateral) !== null && _b !== void 0 ? _b : 0);
-                                related.realized_pnl = Number((_c = related.realized_pnl) !== null && _c !== void 0 ? _c : 0) + Number((_d = x.realized_pnl) !== null && _d !== void 0 ? _d : 0);
-                                x.collateral = undefined;
-                                x.realized_pnl = undefined;
-                                acc.push(x);
-                            }
-                        }
-                        return acc;
-                    }, new Array());
-                    // console.log(filter_exercise);
-                    events = events.concat(filter_exercise);
-                    events = events.sort(function (a, b) { return Number(new Date(a.timestamp)) - Number(new Date(b.timestamp)); });
-                    return [2 /*return*/, events];
-            }
-        });
+async function getOrderMatchFromSentio(userAddress, startTimestamp, events) {
+    const datas = await (0, sentio_1.getFromSentio)("OrderFilled", userAddress, startTimestamp.toString(), true);
+    // console.log(datas);
+    let order_match = datas.map((x) => {
+        let base_token = toToken(x.base_token);
+        let txHistory = {
+            action: x.order_type == "Open"
+                ? "Order Filled (Open Position)"
+                : x.sender == "0x978f65df8570a075298598a9965c18de9087f9e888eb3430fe20334f5c554cfd"
+                    ? "Force Close Position"
+                    : "Order Filled (Close Position)",
+            typeName: "OrderFilledEvent",
+            order_id: x.order_id,
+            position_id: x.position_id,
+            market: `${base_token}/USD`,
+            side: x.side,
+            order_type: undefined,
+            status: "Filled",
+            size: Number(x.filled_size),
+            base_token,
+            collateral: Number(x.realized_amount) - Number(x.realized_fee),
+            collateral_token: x.collateral_token,
+            price: Number(x.filled_price),
+            realized_pnl: Number(x.realized_pnl),
+            timestamp: x.timestamp,
+            tx_digest: x.transaction_hash,
+            dov_index: undefined,
+            sender: x.is_cranker ? "cranker" : "user",
+        };
+        return txHistory;
+    });
+    // deduplicate
+    order_match = order_match.filter((x) => events.findIndex((y) => y.tx_digest == x.tx_digest) == -1);
+    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;
+            x.collateral = related.collateral;
+            x.dov_index = related.dov_index;
+        }
+        else {
+            x.order_type = "Market";
+            let related = events.findLast((e) => e.position_id == x.position_id && e.market == x.market);
+            x.dov_index = related?.dov_index;
+        }
+        return x;
     });
+    // console.log(order_match);
+    events = events.concat(order_match);
+    events = events.sort((a, b) => Number(new Date(a.timestamp)) - Number(new Date(b.timestamp)));
+    return events;
+}
+async function getRealizeOptionFromSentio(userAddress, startTimestamp, events) {
+    const datas = await (0, sentio_1.getFromSentio)("RealizeOption", userAddress, startTimestamp.toString());
+    // console.log(datas);
+    let exercise = datas.map((x) => {
+        let base_token = toToken(x.base_token);
+        let txHistory = {
+            action: "Exercise Position",
+            typeName: "RealizeOptionPositionEvent",
+            order_id: undefined,
+            position_id: x.position_id,
+            market: `${base_token}/USD`,
+            side: undefined,
+            order_type: "Market",
+            status: "Filled",
+            size: undefined,
+            base_token,
+            collateral: Number(x.user_remaining_value),
+            collateral_token: x.collateral_token,
+            price: undefined,
+            realized_pnl: Number(x.user_remaining_in_usd),
+            timestamp: x.timestamp,
+            tx_digest: x.transaction_hash,
+            dov_index: undefined,
+            sender: "cranker",
+        };
+        // console.log(txHistory);
+        return txHistory;
+    });
+    let filter_exercise = exercise.reduce((acc, x) => {
+        let related_index = events.findLastIndex((e) => e.position_id == x.position_id && e.market == x.market && e.tx_digest == x.tx_digest);
+        // console.log(x);
+        // console.log(related_index);
+        if (related_index != -1) {
+            let related = events[related_index];
+            if (related.sender == "cranker") {
+                x.side = related.side;
+                x.size = related.size;
+                x.dov_index = related.dov_index;
+                // add to close event
+                related.collateral = Number(related.collateral ?? 0) + Number(x.collateral ?? 0);
+                related.realized_pnl = Number(related.realized_pnl ?? 0) + Number(x.realized_pnl ?? 0);
+                x.collateral = undefined;
+                x.realized_pnl = undefined;
+                acc.push(x);
+            }
+        }
+        return acc;
+    }, new Array());
+    // console.log(filter_exercise);
+    events = events.concat(filter_exercise);
+    events = events.sort((a, b) => Number(new Date(a.timestamp)) - Number(new Date(b.timestamp)));
+    return events;
 }
 // export function toRecentTrades(events: Event[]): Event[] {
 //     let trades: Event[] = [];
@@ -731,7 +662,7 @@ function toToken(name) {
         case "ETH":
         case "SOL":
         case "APT":
-            return "w".concat(name);
+            return `w${name}`;
         case "WUSDC":
             return "wUSDC";
         default: