@typus/typus-perp-sdk 1.1.5 → 1.1.7

package/dist/src/user/history.js

@@ -66,6 +66,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseUserHistory = parseUserHistory;
 exports.getGraphQLEvents = getGraphQLEvents;
 exports.getLiquidateFromSentio = getLiquidateFromSentio;
+exports.getRealizeFundingFromSentio = getRealizeFundingFromSentio;
+exports.getRemovePositionFromSentio = getRemovePositionFromSentio;
+exports.getCancelOrderFromSentio = getCancelOrderFromSentio;
 exports.getOrderMatchFromSentio = getOrderMatchFromSentio;
 exports.getRealizeOptionFromSentio = getRealizeOptionFromSentio;
 exports.toSentioToken = toSentioToken;
@@ -81,7 +84,7 @@ function parseUserHistory(raw_events) {
         return __generator(this, function (_a) {
             events = [];
             raw_events.forEach(function (event) {
-                var _a, _b;
+                var _a;
                 var type = event.contents.type.repr;
                 if (type.endsWith("PythPrice")) {
                     return;
@@ -93,7 +96,7 @@ function parseUserHistory(raw_events) {
                 // console.log(tx_digest);
                 // console.log(json);
                 // console.log(timestamp);
-                var _c = __read(type.split("::"), 3), pkg = _c[0], mod = _c[1], name = _c[2];
+                var _b = __read(type.split("::"), 3), pkg = _b[0], mod = _b[1], name = _b[2];
                 switch (name) {
                     case structs_2.CreateTradingOrderEvent.$typeName.split("::")[2]:
                     case structs_2.CreateTradingOrderWithBidReceiptsEvent.$typeName.split("::")[2]:
@@ -186,16 +189,61 @@ function parseUserHistory(raw_events) {
                         };
                         events.push(e);
                         break;
-                    case structs_1.RealizeFundingEvent.$typeName.split("::")[2]:
+                    case structs_1.RemovePositionEvent.$typeName.split("::")[2]:
                         // same tx with order filled
-                        var index = events.findLastIndex(function (e) { return e.tx_digest == tx_digest; });
+                        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 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 });
+                            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) });
                         }
                         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; });
+                        // 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);
+                        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);
@@ -385,18 +433,156 @@ function getLiquidateFromSentio(userAddress, startTimestamp, 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: "Realized 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 == "Realized Funding"; }) == -1; });
+                    realizeFunding = realizeFunding.map(function (x) {
+                        // 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;
+                        }
+                        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];
+            }
+        });
+    });
+}
+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].realized_pnl) });
+                        }
+                    });
+                    return [2 /*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];
+            }
+        });
+    });
+}
 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())];
+                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)" : "Order Filled (Close Position)",
+                            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,
@@ -413,13 +599,14 @@ function getOrderMatchFromSentio(userAddress, startTimestamp, events) {
                             timestamp: x.timestamp,
                             tx_digest: x.transaction_hash,
                             dov_index: undefined,
-                            sender: "cranker",
+                            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) {

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

@@ -31,3 +31,7 @@ export declare function releaseCollateral(config: TypusConfig, tx: Transaction,
     amount: string;
     suiCoins?: string[];
 }): Promise<Transaction>;
+export declare function collectPositionFundingFee(config: TypusConfig, tx: Transaction, pythClient: PythClient, input: {
+    position: Position;
+    suiCoins?: string[];
+}): Promise<Transaction>;

package/dist/src/user/order.js

@@ -68,6 +68,7 @@ exports.zeroCoin = zeroCoin;
 exports.cancelTradingOrder = cancelTradingOrder;
 exports.increaseCollateral = increaseCollateral;
 exports.releaseCollateral = releaseCollateral;
+exports.collectPositionFundingFee = collectPositionFundingFee;
 var functions_1 = require("../typus_perp/trading/functions");
 var __1 = require("..");
 var utils_1 = require("@typus/typus-sdk/dist/src/utils");
@@ -271,3 +272,50 @@ function releaseCollateral(config, tx, pythClient, input) {
         });
     });
 }
+function collectPositionFundingFee(config, tx, pythClient, input) {
+    return __awaiter(this, void 0, void 0, function () {
+        var TOKEN, BASE_TOKEN, tokens, suiCoin, tokens_4, tokens_4_1, token, cToken, baseToken;
+        var e_4, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    TOKEN = (0, constants_1.typeArgToAsset)(input.position.collateralToken.name);
+                    BASE_TOKEN = (0, constants_1.typeArgToAsset)(input.position.symbol.baseToken.name);
+                    tokens = Array.from(new Set([TOKEN, BASE_TOKEN]));
+                    if (config.sponsored) {
+                        suiCoin = (0, utils_1.splitCoin)(tx, constants_1.tokenType.MAINNET.SUI, input.suiCoins, tokens.length.toString(), config.sponsored);
+                    }
+                    return [4 /*yield*/, (0, utils_1.updatePyth)(pythClient, tx, tokens, suiCoin)];
+                case 1:
+                    _b.sent();
+                    try {
+                        for (tokens_4 = __values(tokens), tokens_4_1 = tokens_4.next(); !tokens_4_1.done; tokens_4_1 = tokens_4.next()) {
+                            token = tokens_4_1.value;
+                            (0, utils_1.updateOracleWithPythUsd)(pythClient, tx, config.package.oracle, token);
+                        }
+                    }
+                    catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                    finally {
+                        try {
+                            if (tokens_4_1 && !tokens_4_1.done && (_a = tokens_4.return)) _a.call(tokens_4);
+                        }
+                        finally { if (e_4) throw e_4.error; }
+                    }
+                    cToken = constants_1.tokenType[__1.NETWORK][TOKEN];
+                    baseToken = constants_1.tokenType[__1.NETWORK][BASE_TOKEN];
+                    (0, functions_1.collectPositionFundingFee)(tx, [cToken, baseToken], {
+                        version: __1.PERP_VERSION,
+                        registry: __1.MARKET,
+                        poolRegistry: __1.LP_POOL,
+                        marketIndex: BigInt(0),
+                        poolIndex: BigInt(0),
+                        typusOracleCToken: constants_1.oracle[__1.NETWORK][TOKEN],
+                        typusOracleTradingSymbol: constants_1.oracle[__1.NETWORK][BASE_TOKEN],
+                        clock: constants_1.CLOCK,
+                        positionId: BigInt(input.position.positionId),
+                    });
+                    return [2 /*return*/, tx];
+            }
+        });
+    });
+}

package/dist/src/user/orderWithBidReceipt.js

@@ -94,7 +94,7 @@ function createTradingOrderWithBidReceiptByAutoBid(config, tx, pythClient, input
                     cToken = constants_1.tokenType[__1.NETWORK][TOKEN];
                     bToken = constants_1.tokenType[__1.NETWORK][input.bToken];
                     baseToken = constants_1.tokenType[__1.NETWORK][BASE_TOKEN];
-                    (0, functions_1.createTradingOrderWithBidReceiptV2)(tx, [cToken, bToken, baseToken], {
+                    (0, functions_1.createTradingOrderWithBidReceiptV3)(tx, [cToken, bToken, baseToken], {
                         version: __1.PERP_VERSION,
                         registry: __1.MARKET,
                         poolRegistry: __1.LP_POOL,
@@ -109,7 +109,6 @@ function createTradingOrderWithBidReceiptByAutoBid(config, tx, pythClient, input
                         isLong: input.isLong,
                         dovRegistry: config.registry.dov.dovSingle,
                         collateralBidReceipt: collateralBidReceipt,
-                        user: input.user,
                         tailsStakingRegistry: config.registry.typus.tailsStaking,
                         competitionConfig: __1.COMPETITION_CONFIG,
                     });
@@ -156,7 +155,7 @@ function createTradingOrderWithBidReceipt(config, tx, pythClient, input) {
                     cToken = constants_1.tokenType[__1.NETWORK][TOKEN];
                     bToken = constants_1.tokenType[__1.NETWORK][input.bToken];
                     baseToken = constants_1.tokenType[__1.NETWORK][BASE_TOKEN];
-                    (0, functions_1.createTradingOrderWithBidReceiptV2)(tx, [cToken, bToken, baseToken], {
+                    (0, functions_1.createTradingOrderWithBidReceiptV3)(tx, [cToken, bToken, baseToken], {
                         version: __1.PERP_VERSION,
                         registry: __1.MARKET,
                         poolRegistry: __1.LP_POOL,
@@ -171,7 +170,6 @@ function createTradingOrderWithBidReceipt(config, tx, pythClient, input) {
                         isLong: input.isLong,
                         dovRegistry: config.registry.dov.dovSingle,
                         collateralBidReceipt: collateralBidReceipt,
-                        user: input.user,
                         tailsStakingRegistry: config.registry.typus.tailsStaking,
                         competitionConfig: __1.COMPETITION_CONFIG,
                     });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@typus/typus-perp-sdk",
-    "version": "1.1.5",
+    "version": "1.1.7",
     "repository": "https://github.com/Typus-Lab/typus-perp-sdk.git",
     "author": "Typus",
     "description": "typus perp sdk",