@typus/typus-perp-sdk 1.1.5-pnl → 1.1.6

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

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

package/dist/src/api/sentio.js

@@ -51,16 +51,20 @@ var headers = {
     "api-key": "ffJa6FwxeJNrQP8NZ5doEMXqdSA7XM6mT",
     "Content-Type": "application/json",
 };
-function getFromSentio(event, userAddress, startTimestamp) {
+function getFromSentio(event, userAddress, startTimestamp, cranker) {
     return __awaiter(this, void 0, void 0, function () {
-        var apiUrl, requestData, jsonData, response, data;
+        var apiUrl, crankerFilter, requestData, jsonData, response, data;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     apiUrl = "https://app.sentio.xyz/api/v1/analytics/typus/typus_perp_mainnet/sql/execute";
+                    crankerFilter = "";
+                    if (cranker) {
+                        crankerFilter = "AND is_cranker == true";
+                    }
                     requestData = {
                         sqlQuery: {
-                            sql: "\n                SELECT *\n                FROM ".concat(event, "\n                WHERE distinct_id = '").concat(userAddress, "' AND timestamp >= ").concat(startTimestamp, "\n                ORDER BY timestamp DESC;\n            "),
+                            sql: "\n                SELECT *\n                FROM ".concat(event, "\n                WHERE distinct_id = '").concat(userAddress, "' AND timestamp >= ").concat(startTimestamp, " ").concat(crankerFilter, "\n                ORDER BY timestamp DESC;\n            "),
                             size: 1000,
                         },
                     };

package/dist/src/index.js

@@ -36,7 +36,7 @@ transactions_1.Transaction.registerGlobalSerializationPlugin("namedPackagesPlugi
 exports.PERP_PACKAGE_ID = exports.NETWORK == "MAINNET"
     ? "0xe27969a70f93034de9ce16e6ad661b480324574e68d15a64b513fd90eb2423e5"
     : "0x585924f160f83ef16f8927ec117e4d740abb6f4e571ecfa89ff3e973042cb1b9";
-exports.PERP_PUBLISHED_AT = exports.NETWORK == "MAINNET" ? "0xb52138bfce4e79d0d25c69b1d9dfe6ec81a821ed3ef03cdb1c077cb4ac9c9b9d" : "@typus/perp";
+exports.PERP_PUBLISHED_AT = exports.NETWORK == "MAINNET" ? "0x5687fc97b7a4adc65c282f1e4d7d1154c30a27cfdbbb9571481dcbacb50dd754" : "@typus/perp";
 exports.PERP_PKG_V1 = exports.NETWORK == "MAINNET"
     ? "0xe27969a70f93034de9ce16e6ad661b480324574e68d15a64b513fd90eb2423e5"
     : "0x585924f160f83ef16f8927ec117e4d740abb6f4e571ecfa89ff3e973042cb1b9";

package/dist/src/typus_perp/trading/functions.d.ts

@@ -106,6 +106,11 @@ export interface CheckOptionCollateralEnoughArgs {
     clock: TransactionObjectInput;
 }
 export declare function checkOptionCollateralEnough(tx: Transaction, typeArg: string, args: CheckOptionCollateralEnoughArgs, published_at?: string): import("@mysten/sui/transactions").TransactionResult;
+export interface CheckPositionUserMatchedArgs {
+    position: TransactionObjectInput;
+    user: string | TransactionArgument;
+}
+export declare function checkPositionUserMatched(tx: Transaction, args: CheckPositionUserMatchedArgs, published_at?: string): import("@mysten/sui/transactions").TransactionResult;
 export interface CheckReserveEnoughArgs {
     symbolMarket: TransactionObjectInput;
     liquidityPool: TransactionObjectInput;
@@ -116,6 +121,18 @@ export interface CheckReserveEnoughArgs {
     tradingPairOraclePriceDecimal: bigint | TransactionArgument;
 }
 export declare function checkReserveEnough(tx: Transaction, typeArg: string, args: CheckReserveEnoughArgs, published_at?: string): import("@mysten/sui/transactions").TransactionResult;
+export interface CollectPositionFundingFeeArgs {
+    version: TransactionObjectInput;
+    registry: TransactionObjectInput;
+    poolRegistry: TransactionObjectInput;
+    typusOracleCToken: TransactionObjectInput;
+    typusOracleTradingSymbol: TransactionObjectInput;
+    clock: TransactionObjectInput;
+    marketIndex: bigint | TransactionArgument;
+    poolIndex: bigint | TransactionArgument;
+    positionId: bigint | TransactionArgument;
+}
+export declare function collectPositionFundingFee(tx: Transaction, typeArgs: [string, string], args: CollectPositionFundingFeeArgs, published_at?: string): import("@mysten/sui/transactions").TransactionResult;
 export interface CreateTradingOrderArgs {
     version: TransactionObjectInput;
     registry: TransactionObjectInput;
@@ -198,6 +215,25 @@ export interface CreateTradingOrderWithBidReceiptV2Args {
     user: string | TransactionArgument;
 }
 export declare function createTradingOrderWithBidReceiptV2(tx: Transaction, typeArgs: [string, string, string], args: CreateTradingOrderWithBidReceiptV2Args, published_at?: string): import("@mysten/sui/transactions").TransactionResult;
+export interface CreateTradingOrderWithBidReceiptV3Args {
+    version: TransactionObjectInput;
+    registry: TransactionObjectInput;
+    poolRegistry: TransactionObjectInput;
+    dovRegistry: TransactionObjectInput;
+    typusOracleCToken: TransactionObjectInput;
+    typusOracleTradingSymbol: TransactionObjectInput;
+    clock: TransactionObjectInput;
+    marketIndex: bigint | TransactionArgument;
+    poolIndex: bigint | TransactionArgument;
+    typusEcosystemVersion: TransactionObjectInput;
+    typusUserRegistry: TransactionObjectInput;
+    typusLeaderboardRegistry: TransactionObjectInput;
+    tailsStakingRegistry: TransactionObjectInput;
+    competitionConfig: TransactionObjectInput;
+    collateralBidReceipt: TransactionObjectInput;
+    isLong: boolean | TransactionArgument;
+}
+export declare function createTradingOrderWithBidReceiptV3(tx: Transaction, typeArgs: [string, string, string], args: CreateTradingOrderWithBidReceiptV3Args, published_at?: string): import("@mysten/sui/transactions").TransactionResult;
 export interface CreateUserAccountArgs {
     version: TransactionObjectInput;
     registry: TransactionObjectInput;
@@ -245,7 +281,6 @@ export interface ExecuteOrder_Args {
     collateralOraclePriceDecimal: bigint | TransactionArgument;
     tradingPairOraclePrice: bigint | TransactionArgument;
     tradingPairOraclePriceDecimal: bigint | TransactionArgument;
-    tradingFeeMbp: bigint | TransactionArgument;
     typusEcosystemVersion: TransactionObjectInput;
     typusUserRegistry: TransactionObjectInput;
     typusLeaderboardRegistry: TransactionObjectInput;
@@ -356,6 +391,11 @@ export interface GetOrdersArgs {
     orderTypeTag: number | TransactionArgument;
 }
 export declare function getOrders(tx: Transaction, args: GetOrdersArgs, published_at?: string): import("@mysten/sui/transactions").TransactionResult;
+export interface GetTradingFeeConfigArgs {
+    marketConfig: TransactionObjectInput;
+    isOptionPosition: boolean | TransactionArgument;
+}
+export declare function getTradingFeeConfig(tx: Transaction, args: GetTradingFeeConfigArgs, published_at?: string): import("@mysten/sui/transactions").TransactionResult;
 export interface GetUserOrdersArgs {
     version: TransactionObjectInput;
     registry: TransactionObjectInput;
@@ -383,7 +423,6 @@ export interface IncreaseCollateralArgs {
     collateral: TransactionObjectInput;
 }
 export declare function increaseCollateral(tx: Transaction, typeArgs: [string, string], args: IncreaseCollateralArgs, published_at?: string): import("@mysten/sui/transactions").TransactionResult;
-export declare function init(tx: Transaction, published_at?: string): import("@mysten/sui/transactions").TransactionResult;
 export interface InitUserAccountTableArgs {
     version: TransactionObjectInput;
     registry: TransactionObjectInput;
@@ -449,12 +488,6 @@ export interface ManagerCloseOptionPositionV2Args {
     positionId: bigint | TransactionArgument;
 }
 export declare function managerCloseOptionPositionV2(tx: Transaction, typeArgs: [string, string, string], args: ManagerCloseOptionPositionV2Args, published_at?: string): import("@mysten/sui/transactions").TransactionResult;
-export interface ManagerHotfixRemoveMarketSymbolArgs {
-    version: TransactionObjectInput;
-    registry: TransactionObjectInput;
-    marketIndex: bigint | TransactionArgument;
-}
-export declare function managerHotfixRemoveMarketSymbol(tx: Transaction, typeArg: string, args: ManagerHotfixRemoveMarketSymbolArgs, published_at?: string): import("@mysten/sui/transactions").TransactionResult;
 export interface ManagerReducePositionArgs {
     version: TransactionObjectInput;
     registry: TransactionObjectInput;

package/dist/src/typus_perp/trading/functions.js

@@ -10,11 +10,14 @@ exports.cancelTradingOrder = cancelTradingOrder;
 exports.checkCollateralEnoughWhenAddingPosition = checkCollateralEnoughWhenAddingPosition;
 exports.checkCollateralEnoughWhenReducingPosition = checkCollateralEnoughWhenReducingPosition;
 exports.checkOptionCollateralEnough = checkOptionCollateralEnough;
+exports.checkPositionUserMatched = checkPositionUserMatched;
 exports.checkReserveEnough = checkReserveEnough;
+exports.collectPositionFundingFee = collectPositionFundingFee;
 exports.createTradingOrder = createTradingOrder;
 exports.createTradingOrderV2 = createTradingOrderV2;
 exports.createTradingOrderWithBidReceipt = createTradingOrderWithBidReceipt;
 exports.createTradingOrderWithBidReceiptV2 = createTradingOrderWithBidReceiptV2;
+exports.createTradingOrderWithBidReceiptV3 = createTradingOrderWithBidReceiptV3;
 exports.createUserAccount = createUserAccount;
 exports.depositUserAccount = depositUserAccount;
 exports.deprecated = deprecated;
@@ -33,16 +36,15 @@ exports.getMaxReleasingCollateralAmount = getMaxReleasingCollateralAmount;
 exports.getMutMarketId = getMutMarketId;
 exports.getMutOrders = getMutOrders;
 exports.getOrders = getOrders;
+exports.getTradingFeeConfig = getTradingFeeConfig;
 exports.getUserOrders = getUserOrders;
 exports.getUserPositions = getUserPositions;
 exports.increaseCollateral = increaseCollateral;
-exports.init = init;
 exports.initUserAccountTable = initUserAccountTable;
 exports.liquidate = liquidate;
 exports.managerCancelOrderByOpenInterestLimit = managerCancelOrderByOpenInterestLimit;
 exports.managerCloseOptionPosition = managerCloseOptionPosition;
 exports.managerCloseOptionPositionV2 = managerCloseOptionPositionV2;
-exports.managerHotfixRemoveMarketSymbol = managerHotfixRemoveMarketSymbol;
 exports.managerReducePosition = managerReducePosition;
 exports.managerReducePositionV2 = managerReducePositionV2;
 exports.managerRemoveOrder = managerRemoveOrder;
@@ -234,6 +236,13 @@ function checkOptionCollateralEnough(tx, typeArg, args, published_at) {
         ],
     });
 }
+function checkPositionUserMatched(tx, args, published_at) {
+    if (published_at === void 0) { published_at = __1.PUBLISHED_AT; }
+    return tx.moveCall({
+        target: "".concat(published_at, "::trading::check_position_user_matched"),
+        arguments: [(0, util_1.obj)(tx, args.position), (0, util_1.pure)(tx, args.user, "address")],
+    });
+}
 function checkReserveEnough(tx, typeArg, args, published_at) {
     if (published_at === void 0) { published_at = __1.PUBLISHED_AT; }
     return tx.moveCall({
@@ -250,6 +259,24 @@ function checkReserveEnough(tx, typeArg, args, published_at) {
         ],
     });
 }
+function collectPositionFundingFee(tx, typeArgs, args, published_at) {
+    if (published_at === void 0) { published_at = __1.PUBLISHED_AT; }
+    return tx.moveCall({
+        target: "".concat(published_at, "::trading::collect_position_funding_fee"),
+        typeArguments: typeArgs,
+        arguments: [
+            (0, util_1.obj)(tx, args.version),
+            (0, util_1.obj)(tx, args.registry),
+            (0, util_1.obj)(tx, args.poolRegistry),
+            (0, util_1.obj)(tx, args.typusOracleCToken),
+            (0, util_1.obj)(tx, args.typusOracleTradingSymbol),
+            (0, util_1.obj)(tx, args.clock),
+            (0, util_1.pure)(tx, args.marketIndex, "u64"),
+            (0, util_1.pure)(tx, args.poolIndex, "u64"),
+            (0, util_1.pure)(tx, args.positionId, "u64"),
+        ],
+    });
+}
 function createTradingOrder(tx, typeArgs, args, published_at) {
     if (published_at === void 0) { published_at = __1.PUBLISHED_AT; }
     return tx.moveCall({
@@ -356,6 +383,31 @@ function createTradingOrderWithBidReceiptV2(tx, typeArgs, args, published_at) {
         ],
     });
 }
+function createTradingOrderWithBidReceiptV3(tx, typeArgs, args, published_at) {
+    if (published_at === void 0) { published_at = __1.PUBLISHED_AT; }
+    return tx.moveCall({
+        target: "".concat(published_at, "::trading::create_trading_order_with_bid_receipt_v3"),
+        typeArguments: typeArgs,
+        arguments: [
+            (0, util_1.obj)(tx, args.version),
+            (0, util_1.obj)(tx, args.registry),
+            (0, util_1.obj)(tx, args.poolRegistry),
+            (0, util_1.obj)(tx, args.dovRegistry),
+            (0, util_1.obj)(tx, args.typusOracleCToken),
+            (0, util_1.obj)(tx, args.typusOracleTradingSymbol),
+            (0, util_1.obj)(tx, args.clock),
+            (0, util_1.pure)(tx, args.marketIndex, "u64"),
+            (0, util_1.pure)(tx, args.poolIndex, "u64"),
+            (0, util_1.obj)(tx, args.typusEcosystemVersion),
+            (0, util_1.obj)(tx, args.typusUserRegistry),
+            (0, util_1.obj)(tx, args.typusLeaderboardRegistry),
+            (0, util_1.obj)(tx, args.tailsStakingRegistry),
+            (0, util_1.obj)(tx, args.competitionConfig),
+            (0, util_1.obj)(tx, args.collateralBidReceipt),
+            (0, util_1.pure)(tx, args.isLong, "bool"),
+        ],
+    });
+}
 function createUserAccount(tx, args, published_at) {
     if (published_at === void 0) { published_at = __1.PUBLISHED_AT; }
     return tx.moveCall({
@@ -419,7 +471,6 @@ function executeOrder_(tx, typeArg, args, published_at) {
             (0, util_1.pure)(tx, args.collateralOraclePriceDecimal, "u64"),
             (0, util_1.pure)(tx, args.tradingPairOraclePrice, "u64"),
             (0, util_1.pure)(tx, args.tradingPairOraclePriceDecimal, "u64"),
-            (0, util_1.pure)(tx, args.tradingFeeMbp, "u64"),
             (0, util_1.obj)(tx, args.typusEcosystemVersion),
             (0, util_1.obj)(tx, args.typusUserRegistry),
             (0, util_1.obj)(tx, args.typusLeaderboardRegistry),
@@ -576,6 +627,13 @@ function getOrders(tx, args, published_at) {
         arguments: [(0, util_1.obj)(tx, args.symbolMarket), (0, util_1.pure)(tx, args.isTokenCollateral, "bool"), (0, util_1.pure)(tx, args.orderTypeTag, "u8")],
     });
 }
+function getTradingFeeConfig(tx, args, published_at) {
+    if (published_at === void 0) { published_at = __1.PUBLISHED_AT; }
+    return tx.moveCall({
+        target: "".concat(published_at, "::trading::get_trading_fee_config"),
+        arguments: [(0, util_1.obj)(tx, args.marketConfig), (0, util_1.pure)(tx, args.isOptionPosition, "bool")],
+    });
+}
 function getUserOrders(tx, args, published_at) {
     if (published_at === void 0) { published_at = __1.PUBLISHED_AT; }
     return tx.moveCall({
@@ -609,10 +667,6 @@ function increaseCollateral(tx, typeArgs, args, published_at) {
         ],
     });
 }
-function init(tx, published_at) {
-    if (published_at === void 0) { published_at = __1.PUBLISHED_AT; }
-    return tx.moveCall({ target: "".concat(published_at, "::trading::init"), arguments: [] });
-}
 function initUserAccountTable(tx, args, published_at) {
     if (published_at === void 0) { published_at = __1.PUBLISHED_AT; }
     return tx.moveCall({
@@ -703,14 +757,6 @@ function managerCloseOptionPositionV2(tx, typeArgs, args, published_at) {
         ],
     });
 }
-function managerHotfixRemoveMarketSymbol(tx, typeArg, args, published_at) {
-    if (published_at === void 0) { published_at = __1.PUBLISHED_AT; }
-    return tx.moveCall({
-        target: "".concat(published_at, "::trading::manager_hotfix_remove_market_symbol"),
-        typeArguments: [typeArg],
-        arguments: [(0, util_1.obj)(tx, args.version), (0, util_1.obj)(tx, args.registry), (0, util_1.pure)(tx, args.marketIndex, "u64")],
-    });
-}
 function managerReducePosition(tx, typeArgs, args, published_at) {
     if (published_at === void 0) { published_at = __1.PUBLISHED_AT; }
     return tx.moveCall({

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

@@ -1,5 +1,5 @@
 import { TOKEN } from "@typus/typus-sdk/dist/src/constants";
-export type actionType = "Place Order" | "Cancel Order" | "Order Filled (Open Position)" | "Order Filled (Close Position)" | "Realized PnL" | "Modify Collateral" | "Exercise Position" | "Liquidation" | "Force Close Position" | "Swap" | "Realized Funding";
+export type actionType = "Place Order" | "Cancel Order" | "Order Filled (Open Position)" | "Order Filled (Close Position)" | "Realized PnL" | "Modify Collateral" | "Exercise Position" | "Liquidation" | "Force Cancel Order" | "Force Close Position" | "Swap" | "Realized Funding";
 export type sideType = "Long" | "Short";
 export type orderType = "Market" | "Limit" | "Take Profit" | "Stop Loss";
 export type statusType = "Open" | "Filled" | "Canceled";
@@ -26,6 +26,9 @@ export interface Event {
 export declare function parseUserHistory(raw_events: any): Promise<Event[]>;
 export declare function getGraphQLEvents(module: string, sender: string | null, beforeCursor?: string | null): Promise<any>;
 export declare function getLiquidateFromSentio(userAddress: string, startTimestamp: number, events: Event[]): Promise<Event[]>;
+export declare function getRealizeFundingFromSentio(userAddress: string, startTimestamp: number, events: Event[]): Promise<Event[]>;
+export declare function getRemovePositionFromSentio(userAddress: string, startTimestamp: number, events: Event[]): Promise<Event[]>;
+export declare function getCancelOrderFromSentio(userAddress: string, startTimestamp: number, events: Event[]): Promise<Event[]>;
 export declare function getOrderMatchFromSentio(userAddress: string, startTimestamp: number, events: Event[]): Promise<Event[]>;
 export declare function getRealizeOptionFromSentio(userAddress: string, startTimestamp: number, events: Event[]): Promise<Event[]>;
 export declare function toSentioToken(name: TOKEN): string;

package/dist/src/user/history.js

@@ -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;
@@ -430,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,
@@ -458,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-pnl",
+    "version": "1.1.6",
     "repository": "https://github.com/Typus-Lab/typus-perp-sdk.git",
     "author": "Typus",
     "description": "typus perp sdk",