@typus/typus-perp-sdk 1.1.3 → 1.1.5-funding-collect

package/dist/src/user/history.js

@@ -81,7 +81,7 @@ function parseUserHistory(raw_events) {
         return __generator(this, function (_a) {
             events = [];
             raw_events.forEach(function (event) {
-                var _a, _b;
+                var _a;
                 var type = event.contents.type.repr;
                 if (type.endsWith("PythPrice")) {
                     return;
@@ -93,7 +93,7 @@ function parseUserHistory(raw_events) {
                 // console.log(tx_digest);
                 // console.log(json);
                 // console.log(timestamp);
-                var _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 +186,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);

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.d.ts

@@ -1,6 +1,17 @@
 import { Transaction } from "@mysten/sui/transactions";
 import { PythClient, TypusConfig } from "@typus/typus-sdk/dist/src/utils";
 import { TOKEN } from "@typus/typus-sdk/dist/src/constants";
+export declare function createTradingOrderWithBidReceiptByAutoBid(config: TypusConfig, tx: Transaction, pythClient: PythClient, input: {
+    cToken: TOKEN;
+    tradingToken: TOKEN;
+    isLong: boolean;
+    user: string;
+    index: string;
+    bToken: TOKEN;
+    signalIndex: string;
+    strategyIndex: string;
+    suiCoins?: string[];
+}): Promise<Transaction>;
 export declare function createTradingOrderWithBidReceipt(config: TypusConfig, tx: Transaction, pythClient: PythClient, input: {
     cToken: TOKEN;
     tradingToken: TOKEN;

package/dist/src/user/orderWithBidReceipt.js

@@ -47,14 +47,16 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createTradingOrderWithBidReceiptByAutoBid = createTradingOrderWithBidReceiptByAutoBid;
 exports.createTradingOrderWithBidReceipt = createTradingOrderWithBidReceipt;
 exports.reduceOptionCollateralPositionSize = reduceOptionCollateralPositionSize;
 var functions_1 = require("../typus_perp/trading/functions");
 var utils_1 = require("@typus/typus-sdk/dist/src/utils");
 var constants_1 = require("@typus/typus-sdk/dist/src/constants");
 var typus_dov_single_v2_1 = require("@typus/typus-sdk/dist/src/typus-dov-single-v2");
+var user_entry_1 = require("@typus/typus-sdk/dist/src/auto-bid/user-entry");
 var __1 = require("..");
-function createTradingOrderWithBidReceipt(config, tx, pythClient, input) {
+function createTradingOrderWithBidReceiptByAutoBid(config, tx, pythClient, input) {
     return __awaiter(this, void 0, void 0, function () {
         var TOKEN, BASE_TOKEN, tokens, suiCoin, tokens_1, tokens_1_1, token, collateralBidReceipt, cToken, bToken, baseToken;
         var e_1, _a;
@@ -83,11 +85,11 @@ function createTradingOrderWithBidReceipt(config, tx, pythClient, input) {
                         }
                         finally { if (e_1) throw e_1.error; }
                     }
-                    collateralBidReceipt = (0, typus_dov_single_v2_1.getSplitBidReceiptTx)(config, tx, {
-                        index: input.index,
-                        receipts: input.bidReceipts,
-                        share: input.share, // if undefined, merge all receipts
-                        recipient: input.user,
+                    collateralBidReceipt = (0, user_entry_1.getWithdrawBidReceiptTx)(config, tx, {
+                        vaultIndex: input.index,
+                        signalIndex: input.signalIndex,
+                        strategyIndex: input.strategyIndex,
+                        user: input.user,
                     });
                     cToken = constants_1.tokenType[__1.NETWORK][TOKEN];
                     bToken = constants_1.tokenType[__1.NETWORK][input.bToken];
@@ -116,9 +118,9 @@ function createTradingOrderWithBidReceipt(config, tx, pythClient, input) {
         });
     });
 }
-function reduceOptionCollateralPositionSize(config, tx, pythClient, input) {
+function createTradingOrderWithBidReceipt(config, tx, pythClient, input) {
     return __awaiter(this, void 0, void 0, function () {
-        var TOKEN, BASE_TOKEN, tokens, suiCoin, tokens_2, tokens_2_1, token, cToken, bToken, baseToken;
+        var TOKEN, BASE_TOKEN, tokens, suiCoin, tokens_2, tokens_2_1, token, collateralBidReceipt, cToken, bToken, baseToken;
         var e_2, _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
@@ -145,6 +147,68 @@ function reduceOptionCollateralPositionSize(config, tx, pythClient, input) {
                         }
                         finally { if (e_2) throw e_2.error; }
                     }
+                    collateralBidReceipt = (0, typus_dov_single_v2_1.getSplitBidReceiptTx)(config, tx, {
+                        index: input.index,
+                        receipts: input.bidReceipts,
+                        share: input.share, // if undefined, merge all receipts
+                        recipient: input.user,
+                    });
+                    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], {
+                        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,
+                        typusEcosystemVersion: config.version.typus,
+                        typusUserRegistry: config.registry.typus.user,
+                        typusLeaderboardRegistry: config.registry.typus.leaderboard,
+                        isLong: input.isLong,
+                        dovRegistry: config.registry.dov.dovSingle,
+                        collateralBidReceipt: collateralBidReceipt,
+                        user: input.user,
+                        tailsStakingRegistry: config.registry.typus.tailsStaking,
+                        competitionConfig: __1.COMPETITION_CONFIG,
+                    });
+                    return [2 /*return*/, tx];
+            }
+        });
+    });
+}
+function reduceOptionCollateralPositionSize(config, tx, pythClient, input) {
+    return __awaiter(this, void 0, void 0, function () {
+        var TOKEN, BASE_TOKEN, tokens, suiCoin, tokens_3, tokens_3_1, token, cToken, bToken, baseToken;
+        var e_3, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    TOKEN = input.cToken;
+                    BASE_TOKEN = input.tradingToken;
+                    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_3 = __values(tokens), tokens_3_1 = tokens_3.next(); !tokens_3_1.done; tokens_3_1 = tokens_3.next()) {
+                            token = tokens_3_1.value;
+                            (0, utils_1.updateOracleWithPythUsd)(pythClient, tx, config.package.oracle, token);
+                        }
+                    }
+                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                    finally {
+                        try {
+                            if (tokens_3_1 && !tokens_3_1.done && (_a = tokens_3.return)) _a.call(tokens_3);
+                        }
+                        finally { if (e_3) throw e_3.error; }
+                    }
                     cToken = constants_1.tokenType[__1.NETWORK][TOKEN];
                     bToken = constants_1.tokenType[__1.NETWORK][input.bToken];
                     baseToken = constants_1.tokenType[__1.NETWORK][BASE_TOKEN];

package/package.json

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