@typus/typus-perp-sdk 1.1.32-type-test → 1.1.33

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

@@ -1,8 +1,15 @@
-import { Position, TradingOrder } from "../typus_perp/position/structs";
-import { PythClient, TypusConfig } from "@typus/typus-sdk/dist/src/utils";
+import { Markets } from "../../src/generated/typus_perp/trading";
+import { Position, TradingOrder } from "../../src/generated/typus_perp/position";
 import { TOKEN } from "@typus/typus-sdk/dist/src/constants";
 import { Transaction } from "@mysten/sui/transactions";
-export declare function createTradingOrder(config: TypusConfig, tx: Transaction, pythClient: PythClient, input: {
+import { TypusClient } from "../../src/client";
+export declare function findMarketIndex(client: TypusClient, input: {
+    markets: (typeof Markets.$inferType)[];
+    tradingToken: TOKEN;
+}): number | undefined;
+export declare function createTradingOrder(client: TypusClient, tx: Transaction, input: {
+    perpIndex: string;
+    poolIndex: string;
     coins: string[];
     cToken: TOKEN;
     amount: string;
@@ -16,22 +23,25 @@ export declare function createTradingOrder(config: TypusConfig, tx: Transaction,
     suiCoins?: string[];
 }): Promise<Transaction>;
 export declare function zeroCoin(tx: Transaction, typeArgs: [string]): import("@mysten/sui/transactions").TransactionResult;
-export declare function cancelTradingOrder(config: TypusConfig, tx: Transaction, input: {
-    order: TradingOrder;
+export declare function cancelTradingOrder(client: TypusClient, tx: Transaction, input: {
+    order: typeof TradingOrder.$inferType;
     user: string;
 }): Promise<Transaction>;
-export declare function increaseCollateral(config: TypusConfig, tx: Transaction, pythClient: PythClient, input: {
+export declare function increaseCollateral(client: TypusClient, tx: Transaction, input: {
+    oracleContract?: string;
     coins: string[];
     amount: string;
-    position: Position;
+    position: typeof Position.$inferType;
     suiCoins?: string[];
 }): Promise<Transaction>;
-export declare function releaseCollateral(config: TypusConfig, tx: Transaction, pythClient: PythClient, input: {
-    position: Position;
+export declare function releaseCollateral(client: TypusClient, tx: Transaction, input: {
+    oracleContract?: string;
+    position: typeof Position.$inferType;
     amount: string;
     suiCoins?: string[];
 }): Promise<Transaction>;
-export declare function collectPositionFundingFee(config: TypusConfig, tx: Transaction, pythClient: PythClient, input: {
-    position: Position;
+export declare function collectPositionFundingFee(client: TypusClient, tx: Transaction, input: {
+    oracleContract?: string;
+    position: typeof Position.$inferType;
     suiCoins?: string[];
 }): Promise<Transaction>;

package/dist/src/user/order.js

@@ -1,321 +1,224 @@
 "use strict";
-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;
-};
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.findMarketIndex = findMarketIndex;
 exports.createTradingOrder = createTradingOrder;
 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");
-var constants_1 = require("@typus/typus-sdk/dist/src/constants");
-function createTradingOrder(config, tx, pythClient, input) {
-    return __awaiter(this, void 0, void 0, function () {
-        var TOKEN, BASE_TOKEN, tokens, cToken, baseToken, coin, suiCoin, tokens_1, tokens_1_1, token;
-        var _a, e_1, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    TOKEN = input.cToken;
-                    BASE_TOKEN = input.tradingToken;
-                    tokens = Array.from(new Set([TOKEN, BASE_TOKEN]));
-                    cToken = constants_1.tokenType[__1.NETWORK][TOKEN];
-                    baseToken = constants_1.tokenType[__1.NETWORK][BASE_TOKEN];
-                    if (TOKEN == "SUI" && config.sponsored) {
-                        // split together
-                        _a = __read((0, utils_1.splitCoins)(tx, constants_1.tokenType.MAINNET.SUI, input.coins, [input.amount, tokens.length.toString()], config.sponsored), 2), coin = _a[0], suiCoin = _a[1];
-                    }
-                    else if (config.sponsored) {
-                        coin = (0, utils_1.splitCoin)(tx, cToken, input.coins, input.amount, config.sponsored);
-                        suiCoin = (0, utils_1.splitCoin)(tx, constants_1.tokenType.MAINNET.SUI, input.suiCoins, tokens.length.toString(), config.sponsored);
-                    }
-                    else {
-                        coin = (0, utils_1.splitCoin)(tx, cToken, input.coins, input.amount, config.sponsored);
-                        // no suiCoin
-                    }
-                    return [4 /*yield*/, (0, utils_1.updatePyth)(pythClient, tx, tokens, suiCoin)];
-                case 1:
-                    _c.sent();
-                    try {
-                        for (tokens_1 = __values(tokens), tokens_1_1 = tokens_1.next(); !tokens_1_1.done; tokens_1_1 = tokens_1.next()) {
-                            token = tokens_1_1.value;
-                            (0, utils_1.updateOracleWithPythUsd)(pythClient, tx, config.package.oracle, token);
-                        }
-                    }
-                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                    finally {
-                        try {
-                            if (tokens_1_1 && !tokens_1_1.done && (_b = tokens_1.return)) _b.call(tokens_1);
-                        }
-                        finally { if (e_1) throw e_1.error; }
-                    }
-                    (0, functions_1.createTradingOrderV2)(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,
-                        typusEcosystemVersion: config.version.typus,
-                        typusUserRegistry: config.registry.typus.user,
-                        typusLeaderboardRegistry: config.registry.typus.leaderboard,
-                        collateral: coin,
-                        size: BigInt(input.size),
-                        triggerPrice: BigInt(input.triggerPrice),
-                        isLong: input.isLong,
-                        isStopOrder: input.isStopOrder,
-                        reduceOnly: input.reduceOnly,
-                        linkedPositionId: input.linkedPositionId ? BigInt(input.linkedPositionId) : null,
-                        tailsStakingRegistry: config.registry.typus.tailsStaking,
-                        competitionConfig: __1.COMPETITION_CONFIG,
-                    });
-                    return [2 /*return*/, tx];
+const trading_1 = require("../../src/generated/typus_perp/trading");
+const __1 = require("..");
+const utils_1 = require("@typus/typus-sdk/dist/src/utils");
+const utils_2 = require("@typus/typus-sdk/dist/src/utils");
+const constants_1 = require("@typus/typus-sdk/dist/src/constants");
+const utils_3 = require("@mysten/sui/utils");
+function findMarketIndex(client, input) {
+    let target = constants_1.tokenType[client.config.network][input.tradingToken];
+    for (let i = 0; i < input.markets.length; i++) {
+        for (let symbol of input.markets[i].symbols) {
+            if ((0, utils_3.normalizeStructTag)(symbol.name) == target) {
+                return i;
             }
-        });
-    });
+        }
+    }
+}
+async function createTradingOrder(client, tx, input) {
+    // INPUTS
+    let TOKEN = input.cToken;
+    let BASE_TOKEN = input.tradingToken;
+    let tokens = Array.from(new Set([TOKEN, BASE_TOKEN]));
+    let cToken = constants_1.tokenType[__1.NETWORK][TOKEN];
+    let baseToken = constants_1.tokenType[__1.NETWORK][BASE_TOKEN];
+    let coin;
+    let suiCoin;
+    if (TOKEN == "SUI" && client.config.sponsored) {
+        // split together
+        [coin, suiCoin] = (0, utils_2.splitCoins)(tx, constants_1.tokenType.MAINNET.SUI, input.coins, [input.amount, tokens.length.toString()], client.config.sponsored);
+    }
+    else if (client.config.sponsored) {
+        coin = (0, utils_2.splitCoin)(tx, cToken, input.coins, input.amount, client.config.sponsored);
+        suiCoin = (0, utils_2.splitCoin)(tx, constants_1.tokenType.MAINNET.SUI, input.suiCoins, tokens.length.toString(), client.config.sponsored);
+    }
+    else {
+        coin = (0, utils_2.splitCoin)(tx, cToken, input.coins, input.amount, client.config.sponsored);
+        // no suiCoin
+    }
+    const tokensWithoutTypus = Array.from(new Set([TOKEN, BASE_TOKEN])).filter((token) => token !== "TYPUS");
+    await (0, utils_2.updatePyth)(client.pythClient, tx, tokensWithoutTypus, suiCoin);
+    for (let token of tokensWithoutTypus) {
+        (0, utils_2.updateOracleWithPythUsd)(client.pythClient, tx, client.config.package.oracle, token);
+    }
+    if (tokens.includes("TYPUS")) {
+        tx = await (0, utils_1.updateOracleWithSignatureTx)(__1.NETWORK, tx, client.config.package.oracle, constants_1.tokenType[__1.NETWORK]["TYPUS"]);
+    }
+    tx.add((0, trading_1.createTradingOrder)({
+        arguments: {
+            version: __1.PERP_VERSION,
+            registry: __1.MARKET,
+            poolRegistry: __1.LP_POOL,
+            marketIndex: BigInt(input.perpIndex),
+            poolIndex: BigInt(input.poolIndex),
+            typusOracleCToken: constants_1.oracle[__1.NETWORK][TOKEN],
+            typusOracleTradingSymbol: constants_1.oracle[__1.NETWORK][BASE_TOKEN],
+            collateral: coin,
+            size: BigInt(input.size),
+            triggerPrice: BigInt(input.triggerPrice),
+            isLong: input.isLong,
+            isStopOrder: input.isStopOrder,
+            reduceOnly: input.reduceOnly,
+            linkedPositionId: input.linkedPositionId ? BigInt(input.linkedPositionId) : null,
+        },
+        typeArguments: [cToken, baseToken],
+    }));
+    return tx;
 }
 function zeroCoin(tx, typeArgs) {
     return tx.moveCall({
-        target: "0x2::coin::zero",
+        target: `0x2::coin::zero`,
         typeArguments: typeArgs,
         arguments: [],
     });
 }
-function cancelTradingOrder(config, tx, input) {
-    return __awaiter(this, void 0, void 0, function () {
-        var cToken, BASE_TOKEN, coin;
-        return __generator(this, function (_a) {
-            cToken = "0x" + input.order.collateralToken.name;
-            BASE_TOKEN = "0x" + input.order.symbol.baseToken.name;
-            coin = (0, functions_1.cancelTradingOrder)(tx, [cToken, BASE_TOKEN], {
-                version: __1.PERP_VERSION,
-                registry: __1.MARKET,
-                marketIndex: BigInt(0),
-                orderId: input.order.orderId,
-                triggerPrice: input.order.triggerPrice,
-                orderUser: null,
-            });
-            tx.transferObjects([coin], input.user);
-            return [2 /*return*/, tx];
-        });
-    });
+async function cancelTradingOrder(client, tx, input) {
+    let cToken = "0x" + input.order.collateral_token.name;
+    let BASE_TOKEN = "0x" + input.order.symbol.base_token.name;
+    let coin = tx.add((0, trading_1.cancelTradingOrder)({
+        arguments: {
+            version: __1.PERP_VERSION,
+            registry: __1.MARKET,
+            // @ts-ignore
+            marketIndex: BigInt(input.order.marketIndex),
+            orderId: BigInt(input.order.order_id),
+            triggerPrice: BigInt(input.order.trigger_price),
+            orderUser: null,
+        },
+        typeArguments: [cToken, BASE_TOKEN],
+    }));
+    tx.transferObjects([coin], input.user);
+    return tx;
 }
-function increaseCollateral(config, tx, pythClient, input) {
-    return __awaiter(this, void 0, void 0, function () {
-        var TOKEN, BASE_TOKEN, tokens, cToken, baseToken, coin, suiCoin, tokens_2, tokens_2_1, token;
-        var _a, e_2, _b;
-        return __generator(this, function (_c) {
-            switch (_c.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]));
-                    cToken = constants_1.tokenType[__1.NETWORK][TOKEN];
-                    baseToken = constants_1.tokenType[__1.NETWORK][BASE_TOKEN];
-                    if (TOKEN == "SUI" && config.sponsored) {
-                        // split together
-                        _a = __read((0, utils_1.splitCoins)(tx, constants_1.tokenType.MAINNET.SUI, input.coins, [input.amount, tokens.length.toString()], config.sponsored), 2), coin = _a[0], suiCoin = _a[1];
-                    }
-                    else if (config.sponsored) {
-                        coin = (0, utils_1.splitCoin)(tx, cToken, input.coins, input.amount, config.sponsored);
-                        suiCoin = (0, utils_1.splitCoin)(tx, constants_1.tokenType.MAINNET.SUI, input.suiCoins, tokens.length.toString(), config.sponsored);
-                    }
-                    else {
-                        coin = (0, utils_1.splitCoin)(tx, cToken, input.coins, input.amount, config.sponsored);
-                        // no suiCoin
-                    }
-                    return [4 /*yield*/, (0, utils_1.updatePyth)(pythClient, tx, tokens, suiCoin)];
-                case 1:
-                    _c.sent();
-                    try {
-                        for (tokens_2 = __values(tokens), tokens_2_1 = tokens_2.next(); !tokens_2_1.done; tokens_2_1 = tokens_2.next()) {
-                            token = tokens_2_1.value;
-                            (0, utils_1.updateOracleWithPythUsd)(pythClient, tx, config.package.oracle, token);
-                        }
-                    }
-                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                    finally {
-                        try {
-                            if (tokens_2_1 && !tokens_2_1.done && (_b = tokens_2.return)) _b.call(tokens_2);
-                        }
-                        finally { if (e_2) throw e_2.error; }
-                    }
-                    (0, functions_1.increaseCollateral)(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),
-                        collateral: coin,
-                    });
-                    return [2 /*return*/, tx];
-            }
-        });
-    });
+async function increaseCollateral(client, tx, input) {
+    // parse from Position
+    let TOKEN = (0, constants_1.typeArgToAsset)(input.position.collateral_token.name);
+    let BASE_TOKEN = (0, constants_1.typeArgToAsset)(input.position.symbol.base_token.name);
+    let tokens = Array.from(new Set([TOKEN, BASE_TOKEN]));
+    let cToken = constants_1.tokenType[__1.NETWORK][TOKEN];
+    let baseToken = constants_1.tokenType[__1.NETWORK][BASE_TOKEN];
+    let coin;
+    let suiCoin;
+    if (TOKEN == "SUI" && client.config.sponsored) {
+        // split together
+        [coin, suiCoin] = (0, utils_2.splitCoins)(tx, constants_1.tokenType.MAINNET.SUI, input.coins, [input.amount, tokens.length.toString()], client.config.sponsored);
+    }
+    else if (client.config.sponsored) {
+        coin = (0, utils_2.splitCoin)(tx, cToken, input.coins, input.amount, client.config.sponsored);
+        suiCoin = (0, utils_2.splitCoin)(tx, constants_1.tokenType.MAINNET.SUI, input.suiCoins, tokens.length.toString(), client.config.sponsored);
+    }
+    else {
+        coin = (0, utils_2.splitCoin)(tx, cToken, input.coins, input.amount, client.config.sponsored);
+        // no suiCoin
+    }
+    const tokensWithoutTypus = Array.from(new Set([TOKEN, BASE_TOKEN])).filter((token) => token !== "TYPUS");
+    await (0, utils_2.updatePyth)(client.pythClient, tx, tokensWithoutTypus, suiCoin);
+    for (let token of tokensWithoutTypus) {
+        (0, utils_2.updateOracleWithPythUsd)(client.pythClient, tx, client.config.package.oracle, token);
+    }
+    if (tokens.includes("TYPUS")) {
+        const oracleContract = input.oracleContract ?? client.config.package.oracle;
+        tx = await (0, utils_1.updateOracleWithSignatureTx)(__1.NETWORK, tx, oracleContract, constants_1.tokenType[__1.NETWORK]["TYPUS"]);
+    }
+    // @ts-ignore
+    let marketIndex = BigInt(input.position.marketIndex);
+    tx.add((0, trading_1.increaseCollateral)({
+        arguments: {
+            version: __1.PERP_VERSION,
+            registry: __1.MARKET,
+            poolRegistry: __1.LP_POOL,
+            marketIndex: marketIndex,
+            poolIndex: marketIndex,
+            typusOracleCToken: constants_1.oracle[__1.NETWORK][TOKEN],
+            typusOracleTradingSymbol: constants_1.oracle[__1.NETWORK][BASE_TOKEN],
+            positionId: BigInt(input.position.position_id),
+            collateral: coin,
+        },
+        typeArguments: [cToken, baseToken],
+    }));
+    return tx;
 }
-function releaseCollateral(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, baseToken, coin;
-        var e_3, _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_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];
-                    baseToken = constants_1.tokenType[__1.NETWORK][BASE_TOKEN];
-                    coin = (0, functions_1.releaseCollateral)(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),
-                        releaseAmount: BigInt(input.amount),
-                    });
-                    tx.transferObjects([coin], input.position.user);
-                    return [2 /*return*/, tx];
-            }
-        });
-    });
+async function releaseCollateral(client, tx, input) {
+    // parse from Position
+    let TOKEN = (0, constants_1.typeArgToAsset)(input.position.collateral_token.name);
+    let BASE_TOKEN = (0, constants_1.typeArgToAsset)(input.position.symbol.base_token.name);
+    let tokens = Array.from(new Set([TOKEN, BASE_TOKEN]));
+    let suiCoin;
+    if (client.config.sponsored) {
+        suiCoin = (0, utils_2.splitCoin)(tx, constants_1.tokenType.MAINNET.SUI, input.suiCoins, tokens.length.toString(), client.config.sponsored);
+    }
+    const tokensWithoutTypus = Array.from(new Set([TOKEN, BASE_TOKEN])).filter((token) => token !== "TYPUS");
+    await (0, utils_2.updatePyth)(client.pythClient, tx, tokensWithoutTypus, suiCoin);
+    for (let token of tokensWithoutTypus) {
+        (0, utils_2.updateOracleWithPythUsd)(client.pythClient, tx, client.config.package.oracle, token);
+    }
+    if (tokens.includes("TYPUS")) {
+        const oracleContract = input.oracleContract ?? client.config.package.oracle;
+        tx = await (0, utils_1.updateOracleWithSignatureTx)(__1.NETWORK, tx, oracleContract, constants_1.tokenType[__1.NETWORK]["TYPUS"]);
+    }
+    let cToken = constants_1.tokenType[__1.NETWORK][TOKEN];
+    let baseToken = constants_1.tokenType[__1.NETWORK][BASE_TOKEN];
+    // @ts-ignore
+    let marketIndex = BigInt(input.position.marketIndex);
+    let coin = tx.add((0, trading_1.releaseCollateral)({
+        arguments: {
+            version: __1.PERP_VERSION,
+            registry: __1.MARKET,
+            poolRegistry: __1.LP_POOL,
+            marketIndex: marketIndex,
+            poolIndex: marketIndex,
+            typusOracleCToken: constants_1.oracle[__1.NETWORK][TOKEN],
+            typusOracleTradingSymbol: constants_1.oracle[__1.NETWORK][BASE_TOKEN],
+            positionId: BigInt(input.position.position_id),
+            releaseAmount: BigInt(input.amount),
+        },
+        typeArguments: [cToken, baseToken],
+    }));
+    tx.transferObjects([coin], input.position.user);
+    return tx;
 }
-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];
-            }
-        });
-    });
+async function collectPositionFundingFee(client, tx, input) {
+    // parse from Position
+    let TOKEN = (0, constants_1.typeArgToAsset)(input.position.collateral_token.name);
+    let BASE_TOKEN = (0, constants_1.typeArgToAsset)(input.position.symbol.base_token.name);
+    let tokens = Array.from(new Set([TOKEN, BASE_TOKEN]));
+    let suiCoin;
+    if (client.config.sponsored) {
+        suiCoin = (0, utils_2.splitCoin)(tx, constants_1.tokenType.MAINNET.SUI, input.suiCoins, tokens.length.toString(), client.config.sponsored);
+    }
+    const tokensWithoutTypus = Array.from(new Set([TOKEN, BASE_TOKEN])).filter((token) => token !== "TYPUS");
+    await (0, utils_2.updatePyth)(client.pythClient, tx, tokensWithoutTypus, suiCoin);
+    for (let token of tokensWithoutTypus) {
+        (0, utils_2.updateOracleWithPythUsd)(client.pythClient, tx, client.config.package.oracle, token);
+    }
+    if (tokens.includes("TYPUS")) {
+        const oracleContract = input.oracleContract ?? client.config.package.oracle;
+        tx = await (0, utils_1.updateOracleWithSignatureTx)(__1.NETWORK, tx, oracleContract, constants_1.tokenType[__1.NETWORK]["TYPUS"]);
+    }
+    let cToken = constants_1.tokenType[__1.NETWORK][TOKEN];
+    let baseToken = constants_1.tokenType[__1.NETWORK][BASE_TOKEN];
+    // @ts-ignore
+    let marketIndex = BigInt(input.position.marketIndex);
+    tx.add((0, trading_1.collectPositionFundingFee)({
+        arguments: {
+            version: __1.PERP_VERSION,
+            registry: __1.MARKET,
+            poolRegistry: __1.LP_POOL,
+            marketIndex: marketIndex,
+            poolIndex: marketIndex,
+            typusOracleCToken: constants_1.oracle[__1.NETWORK][TOKEN],
+            typusOracleTradingSymbol: constants_1.oracle[__1.NETWORK][BASE_TOKEN],
+            positionId: BigInt(input.position.position_id),
+        },
+        typeArguments: [cToken, baseToken],
+    }));
+    return tx;
 }

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

@@ -1,19 +1,29 @@
-import { Transaction } from "@mysten/sui/transactions";
-import { PythClient, TypusConfig } from "@typus/typus-sdk/dist/src/utils";
+import { Transaction, TransactionObjectArgument } from "@mysten/sui/transactions";
 import { TOKEN } from "@typus/typus-sdk/dist/src/constants";
-export declare function createTradingOrderWithBidReceiptByAutoBid(config: TypusConfig, tx: Transaction, pythClient: PythClient, input: {
+import { TypusClient } from "../../src/client";
+export declare function splitBidReceiptTx(client: TypusClient, tx: Transaction, input: {
+    index: string;
+    receipts: TransactionObjectArgument[];
+    share?: string;
+    recipient: string;
+}): import("@mysten/sui/transactions").TransactionResult;
+export declare function createTradingOrderWithBidReceiptByAutoBid(client: TypusClient, tx: Transaction, input: {
+    perpIndex: string;
+    poolIndex: string;
     cToken: TOKEN;
     tradingToken: TOKEN;
     isLong: boolean;
     user: string;
-    index: string;
+    dovIndex: string;
     bToken: TOKEN;
     signalIndex: string;
     strategyIndex: string;
     share?: string;
     suiCoins?: string[];
 }): Promise<Transaction>;
-export declare function createTradingOrderWithBidReceipt(config: TypusConfig, tx: Transaction, pythClient: PythClient, input: {
+export declare function createTradingOrderWithBidReceipt(client: TypusClient, tx: Transaction, input: {
+    perpIndex: string;
+    poolIndex: string;
     cToken: TOKEN;
     tradingToken: TOKEN;
     isLong: boolean;
@@ -24,7 +34,8 @@ export declare function createTradingOrderWithBidReceipt(config: TypusConfig, tx
     share?: string;
     suiCoins?: string[];
 }): Promise<Transaction>;
-export declare function reduceOptionCollateralPositionSize(config: TypusConfig, tx: Transaction, pythClient: PythClient, input: {
+export declare function reduceOptionCollateralPositionSize(client: TypusClient, tx: Transaction, input: {
+    perpIndex: string;
     cToken: TOKEN;
     tradingToken: TOKEN;
     bToken: string;