@typus/typus-perp-sdk 1.0.18 → 1.0.19

package/dist/src/fetch.js

@@ -401,20 +401,22 @@ function getUserStake(config, user) {
 /// returns [liquidationPrice, pnl(in USD)]
 function getLiquidationPriceAndPnl(config, pythClient, input) {
     return __awaiter(this, void 0, void 0, function () {
-        var provider, tx, pythTokens, _a, _b, position, TOKEN, BASE_TOKEN, _c, _d, position, TOKEN, BASE_TOKEN, res, results;
-        var e_3, _e, e_4, _f;
-        var _g;
-        return __generator(this, function (_h) {
-            switch (_h.label) {
+        var provider, tx, cTokens, pythTokens, _a, _b, position, TOKEN, BASE_TOKEN, _c, _d, cToken, _e, _f, position, TOKEN, BASE_TOKEN, res, results;
+        var e_3, _g, e_4, _h, e_5, _j;
+        var _k, _l;
+        return __generator(this, function (_m) {
+            switch (_m.label) {
                 case 0:
                     provider = new client_1.SuiClient({ url: config.rpcEndpoint });
                     tx = new transactions_1.Transaction();
+                    cTokens = ["SUI"];
                     pythTokens = [];
                     try {
                         for (_a = __values(input.positions), _b = _a.next(); !_b.done; _b = _a.next()) {
                             position = _b.value;
                             TOKEN = (0, constants_1.typeArgToToken)(position.collateralToken.name);
                             BASE_TOKEN = (0, constants_1.typeArgToToken)(position.symbol.baseToken.name);
+                            cTokens.push(TOKEN);
                             pythTokens.push(TOKEN);
                             pythTokens.push(BASE_TOKEN);
                         }
@@ -422,16 +424,32 @@ function getLiquidationPriceAndPnl(config, pythClient, input) {
                     catch (e_3_1) { e_3 = { error: e_3_1 }; }
                     finally {
                         try {
-                            if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
+                            if (_b && !_b.done && (_g = _a.return)) _g.call(_a);
                         }
                         finally { if (e_3) throw e_3.error; }
                     }
                     return [4 /*yield*/, (0, utils_1.updatePyth)(pythClient, tx, Array.from(new Set(pythTokens)))];
                 case 1:
-                    _h.sent();
+                    _m.sent();
                     try {
-                        for (_c = __values(input.positions), _d = _c.next(); !_d.done; _d = _c.next()) {
-                            position = _d.value;
+                        for (_c = __values(Array.from(new Set(cTokens))), _d = _c.next(); !_d.done; _d = _c.next()) {
+                            cToken = _d.value;
+                            if (config.oracle[cToken.toLocaleLowerCase()]) {
+                                // @ts-ignore
+                                (0, utils_1.updateOracleWithPyth)(pythClient, tx, config.package.oracle, config.oracle[cToken.toLocaleLowerCase()], cToken, "wUSDC");
+                            }
+                        }
+                    }
+                    catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                    finally {
+                        try {
+                            if (_d && !_d.done && (_h = _c.return)) _h.call(_c);
+                        }
+                        finally { if (e_4) throw e_4.error; }
+                    }
+                    try {
+                        for (_e = __values(input.positions), _f = _e.next(); !_f.done; _f = _e.next()) {
+                            position = _f.value;
                             TOKEN = (0, constants_1.typeArgToToken)(position.collateralToken.name);
                             BASE_TOKEN = (0, constants_1.typeArgToToken)(position.symbol.baseToken.name);
                             (0, functions_1.getEstimatedLiquidationPriceAndPnl)(tx, [position.collateralToken.name, position.symbol.baseToken.name], {
@@ -445,20 +463,22 @@ function getLiquidationPriceAndPnl(config, pythClient, input) {
                                 oracleTradingSymbol: utils_1.priceInfoObjectIds[_1.NETWORK][BASE_TOKEN],
                                 clock: constants_1.CLOCK,
                                 positionId: position.positionId,
+                                dovRegistry: config.registry.dov.dovSingle,
+                                typusOracle: (_k = config.oracle[TOKEN.toLocaleLowerCase()]) !== null && _k !== void 0 ? _k : config.oracle["sui"],
                             });
                         }
                     }
-                    catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                    catch (e_5_1) { e_5 = { error: e_5_1 }; }
                     finally {
                         try {
-                            if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
+                            if (_f && !_f.done && (_j = _e.return)) _j.call(_e);
                         }
-                        finally { if (e_4) throw e_4.error; }
+                        finally { if (e_5) throw e_5.error; }
                     }
                     return [4 /*yield*/, provider.devInspectTransactionBlock({ sender: input.user, transactionBlock: tx })];
                 case 2:
-                    res = _h.sent();
-                    results = (_g = res.results) === null || _g === void 0 ? void 0 : _g.slice(-input.positions.length).map(function (x) {
+                    res = _m.sent();
+                    results = (_l = res.results) === null || _l === void 0 ? void 0 : _l.slice(-input.positions.length).map(function (x) {
                         // console.log(x);
                         var liquidationPrice = bcs_1.bcs.u64().parse(Uint8Array.from(x.returnValues[0][0]));
                         var isProfit = bcs_1.bcs.bool().parse(Uint8Array.from(x.returnValues[1][0]));

package/dist/src/typus_perp/lp-pool/functions.d.ts

@@ -319,6 +319,12 @@ export interface UpdateRemoveLiquidityTokenProcessTokenArgs {
     updatePositionToken: boolean | TransactionArgument;
 }
 export declare function updateRemoveLiquidityTokenProcessToken(tx: Transaction, typeArg: string, args: UpdateRemoveLiquidityTokenProcessTokenArgs): import("@mysten/sui/transactions").TransactionResult;
+export interface UpdateReserveAmountArgs {
+    liquidityPool: TransactionObjectInput;
+    addReserve: boolean | TransactionArgument;
+    dReserve: bigint | TransactionArgument;
+}
+export declare function updateReserveAmount(tx: Transaction, typeArg: string, args: UpdateReserveAmountArgs): import("@mysten/sui/transactions").TransactionResult;
 export interface UpdateSpotConfigArgs {
     version: TransactionObjectInput;
     registry: TransactionObjectInput;

package/dist/src/typus_perp/lp-pool/functions.js

@@ -49,6 +49,7 @@ exports.updateLiquidityValue = updateLiquidityValue;
 exports.updateMarginConfig = updateMarginConfig;
 exports.updateRemoveLiquidityTokenProcessStatus = updateRemoveLiquidityTokenProcessStatus;
 exports.updateRemoveLiquidityTokenProcessToken = updateRemoveLiquidityTokenProcessToken;
+exports.updateReserveAmount = updateReserveAmount;
 exports.updateSpotConfig = updateSpotConfig;
 exports.updateTvl = updateTvl;
 exports.viewSwapResult = viewSwapResult;
@@ -477,6 +478,13 @@ function updateRemoveLiquidityTokenProcessToken(tx, typeArg, args) {
         arguments: [(0, util_1.obj)(tx, args.process), (0, util_1.pure)(tx, args.updatePositionToken, "bool")],
     });
 }
+function updateReserveAmount(tx, typeArg, args) {
+    return tx.moveCall({
+        target: "".concat(__1.PUBLISHED_AT, "::lp_pool::update_reserve_amount"),
+        typeArguments: [typeArg],
+        arguments: [(0, util_1.obj)(tx, args.liquidityPool), (0, util_1.pure)(tx, args.addReserve, "bool"), (0, util_1.pure)(tx, args.dReserve, "u64")],
+    });
+}
 function updateSpotConfig(tx, typeArg, args) {
     return tx.moveCall({
         target: "".concat(__1.PUBLISHED_AT, "::lp_pool::update_spot_config"),

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

@@ -174,11 +174,11 @@ export interface EmitRealizedFundingEventArgs {
 export declare function emitRealizedFundingEvent(tx: Transaction, args: EmitRealizedFundingEventArgs): import("@mysten/sui/transactions").TransactionResult;
 export interface GetEstimatedLiquidationPriceArgs {
     position: TransactionObjectInput;
+    isSameToken: boolean | TransactionArgument;
     collateralOraclePrice: bigint | TransactionArgument;
     collateralOraclePriceDecimal: bigint | TransactionArgument;
-    tradingPairOraclePrice: bigint | TransactionArgument;
-    tradingPairOraclePriceDecimal: bigint | TransactionArgument;
     tradingFeeMbp: bigint | TransactionArgument;
+    maintenanceMarginRateBp: bigint | TransactionArgument;
 }
 export declare function getEstimatedLiquidationPrice(tx: Transaction, args: GetEstimatedLiquidationPriceArgs): import("@mysten/sui/transactions").TransactionResult;
 export declare function getMaxOrderTypeTag(tx: Transaction): import("@mysten/sui/transactions").TransactionResult;
@@ -229,13 +229,16 @@ export declare function getPositionSide(tx: Transaction, position: TransactionOb
 export declare function getPositionSize(tx: Transaction, position: TransactionObjectInput): import("@mysten/sui/transactions").TransactionResult;
 export declare function getPositionSizeDecimal(tx: Transaction, position: TransactionObjectInput): import("@mysten/sui/transactions").TransactionResult;
 export declare function getPositionSymbol(tx: Transaction, position: TransactionObjectInput): import("@mysten/sui/transactions").TransactionResult;
-export declare function getPositionUnrealizedCost(tx: Transaction, position: TransactionObjectInput): import("@mysten/sui/transactions").TransactionResult;
 export declare function getPositionUnrealizedFundingSign(tx: Transaction, position: TransactionObjectInput): import("@mysten/sui/transactions").TransactionResult;
 export declare function getPositionUser(tx: Transaction, position: TransactionObjectInput): import("@mysten/sui/transactions").TransactionResult;
 export declare function getReserveAmount(tx: Transaction, position: TransactionObjectInput): import("@mysten/sui/transactions").TransactionResult;
 export interface IncreaseCollateralArgs {
     position: TransactionObjectInput;
     collateral: TransactionObjectInput;
+    collateralOraclePrice: bigint | TransactionArgument;
+    collateralOraclePriceDecimal: bigint | TransactionArgument;
+    tradingPairOraclePrice: bigint | TransactionArgument;
+    tradingPairOraclePriceDecimal: bigint | TransactionArgument;
 }
 export declare function increaseCollateral(tx: Transaction, typeArg: string, args: IncreaseCollateralArgs): import("@mysten/sui/transactions").TransactionResult;
 export declare function isOptionCollateralOrder(tx: Transaction, order: TransactionObjectInput): import("@mysten/sui/transactions").TransactionResult;
@@ -302,6 +305,10 @@ export declare function realizeFunding(tx: Transaction, typeArg: string, args: R
 export interface ReleaseCollateralArgs {
     position: TransactionObjectInput;
     releaseAmount: bigint | TransactionArgument;
+    collateralOraclePrice: bigint | TransactionArgument;
+    collateralOraclePriceDecimal: bigint | TransactionArgument;
+    tradingPairOraclePrice: bigint | TransactionArgument;
+    tradingPairOraclePriceDecimal: bigint | TransactionArgument;
 }
 export declare function releaseCollateral(tx: Transaction, typeArg: string, args: ReleaseCollateralArgs): import("@mysten/sui/transactions").TransactionResult;
 export interface RemoveOrderArgs {
@@ -329,6 +336,13 @@ export interface RemovePositionWithBidReceiptsArgs {
     position: TransactionObjectInput;
 }
 export declare function removePositionWithBidReceipts(tx: Transaction, args: RemovePositionWithBidReceiptsArgs): import("@mysten/sui/transactions").TransactionResult;
+export interface UpdateOptionPositionCollateralAmountArgs {
+    dovRegistry: TransactionObjectInput;
+    typusOracle: TransactionObjectInput;
+    position: TransactionObjectInput;
+    clock: TransactionObjectInput;
+}
+export declare function updateOptionPositionCollateralAmount(tx: Transaction, typeArg: string, args: UpdateOptionPositionCollateralAmountArgs): import("@mysten/sui/transactions").TransactionResult;
 export interface UpdatePositionBorrowRateAndFundingRateArgs {
     position: TransactionObjectInput;
     collateralOraclePrice: bigint | TransactionArgument;

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

@@ -46,7 +46,6 @@ exports.getPositionSide = getPositionSide;
 exports.getPositionSize = getPositionSize;
 exports.getPositionSizeDecimal = getPositionSizeDecimal;
 exports.getPositionSymbol = getPositionSymbol;
-exports.getPositionUnrealizedCost = getPositionUnrealizedCost;
 exports.getPositionUnrealizedFundingSign = getPositionUnrealizedFundingSign;
 exports.getPositionUser = getPositionUser;
 exports.getReserveAmount = getReserveAmount;
@@ -64,6 +63,7 @@ exports.removeOrderWithBidReceipts = removeOrderWithBidReceipts;
 exports.removePosition = removePosition;
 exports.removePositionLinkedOrderInfo = removePositionLinkedOrderInfo;
 exports.removePositionWithBidReceipts = removePositionWithBidReceipts;
+exports.updateOptionPositionCollateralAmount = updateOptionPositionCollateralAmount;
 exports.updatePositionBorrowRateAndFundingRate = updatePositionBorrowRateAndFundingRate;
 var __1 = require("..");
 var structs_1 = require("../../_dependencies/source/0x1/option/structs");
@@ -307,11 +307,11 @@ function getEstimatedLiquidationPrice(tx, args) {
         target: "".concat(__1.PUBLISHED_AT, "::position::get_estimated_liquidation_price"),
         arguments: [
             (0, util_1.obj)(tx, args.position),
+            (0, util_1.pure)(tx, args.isSameToken, "bool"),
             (0, util_1.pure)(tx, args.collateralOraclePrice, "u64"),
             (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.pure)(tx, args.maintenanceMarginRateBp, "u64"),
         ],
     });
 }
@@ -425,9 +425,6 @@ function getPositionSizeDecimal(tx, position) {
 function getPositionSymbol(tx, position) {
     return tx.moveCall({ target: "".concat(__1.PUBLISHED_AT, "::position::get_position_symbol"), arguments: [(0, util_1.obj)(tx, position)] });
 }
-function getPositionUnrealizedCost(tx, position) {
-    return tx.moveCall({ target: "".concat(__1.PUBLISHED_AT, "::position::get_position_unrealized_cost"), arguments: [(0, util_1.obj)(tx, position)] });
-}
 function getPositionUnrealizedFundingSign(tx, position) {
     return tx.moveCall({ target: "".concat(__1.PUBLISHED_AT, "::position::get_position_unrealized_funding_sign"), arguments: [(0, util_1.obj)(tx, position)] });
 }
@@ -441,7 +438,14 @@ function increaseCollateral(tx, typeArg, args) {
     return tx.moveCall({
         target: "".concat(__1.PUBLISHED_AT, "::position::increase_collateral"),
         typeArguments: [typeArg],
-        arguments: [(0, util_1.obj)(tx, args.position), (0, util_1.obj)(tx, args.collateral)],
+        arguments: [
+            (0, util_1.obj)(tx, args.position),
+            (0, util_1.obj)(tx, args.collateral),
+            (0, util_1.pure)(tx, args.collateralOraclePrice, "u64"),
+            (0, util_1.pure)(tx, args.collateralOraclePriceDecimal, "u64"),
+            (0, util_1.pure)(tx, args.tradingPairOraclePrice, "u64"),
+            (0, util_1.pure)(tx, args.tradingPairOraclePriceDecimal, "u64"),
+        ],
     });
 }
 function isOptionCollateralOrder(tx, order) {
@@ -533,7 +537,14 @@ function releaseCollateral(tx, typeArg, args) {
     return tx.moveCall({
         target: "".concat(__1.PUBLISHED_AT, "::position::release_collateral"),
         typeArguments: [typeArg],
-        arguments: [(0, util_1.obj)(tx, args.position), (0, util_1.pure)(tx, args.releaseAmount, "u64")],
+        arguments: [
+            (0, util_1.obj)(tx, args.position),
+            (0, util_1.pure)(tx, args.releaseAmount, "u64"),
+            (0, util_1.pure)(tx, args.collateralOraclePrice, "u64"),
+            (0, util_1.pure)(tx, args.collateralOraclePriceDecimal, "u64"),
+            (0, util_1.pure)(tx, args.tradingPairOraclePrice, "u64"),
+            (0, util_1.pure)(tx, args.tradingPairOraclePriceDecimal, "u64"),
+        ],
     });
 }
 function removeOrder(tx, typeArg, args) {
@@ -568,6 +579,13 @@ function removePositionWithBidReceipts(tx, args) {
         arguments: [(0, util_1.obj)(tx, args.version), (0, util_1.obj)(tx, args.position)],
     });
 }
+function updateOptionPositionCollateralAmount(tx, typeArg, args) {
+    return tx.moveCall({
+        target: "".concat(__1.PUBLISHED_AT, "::position::update_option_position_collateral_amount"),
+        typeArguments: [typeArg],
+        arguments: [(0, util_1.obj)(tx, args.dovRegistry), (0, util_1.obj)(tx, args.typusOracle), (0, util_1.obj)(tx, args.position), (0, util_1.obj)(tx, args.clock)],
+    });
+}
 function updatePositionBorrowRateAndFundingRate(tx, args) {
     return tx.moveCall({
         target: "".concat(__1.PUBLISHED_AT, "::position::update_position_borrow_rate_and_funding_rate"),

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

@@ -223,6 +223,8 @@ export interface GetEstimatedLiquidationPriceAndPnlArgs {
     version: TransactionObjectInput;
     registry: TransactionObjectInput;
     poolRegistry: TransactionObjectInput;
+    dovRegistry: TransactionObjectInput;
+    typusOracle: TransactionObjectInput;
     marketIndex: bigint | TransactionArgument;
     poolIndex: bigint | TransactionArgument;
     pythState: TransactionObjectInput;

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

@@ -359,6 +359,8 @@ function getEstimatedLiquidationPriceAndPnl(tx, typeArgs, args) {
             (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.typusOracle),
             (0, util_1.pure)(tx, args.marketIndex, "u64"),
             (0, util_1.pure)(tx, args.poolIndex, "u64"),
             (0, util_1.obj)(tx, args.pythState),

package/dist/src/user/orderWithBidReceipt.js

@@ -51,13 +51,16 @@ function createTradingOrderWithBidReceipt(config, tx, pythClient, input) {
                 case 0:
                     TOKEN = input.cToken;
                     BASE_TOKEN = input.tradingToken;
-                    return [4 /*yield*/, (0, utils_1.updatePyth)(pythClient, tx, [TOKEN, BASE_TOKEN])];
+                    // deduplicate
+                    return [4 /*yield*/, (0, utils_1.updatePyth)(pythClient, tx, Array.from(new Set([TOKEN, BASE_TOKEN, "wUSDC"])))];
                 case 1:
+                    // deduplicate
                     _a.sent();
                     cToken = constants_1.tokenType[__1.NETWORK][TOKEN];
                     bToken = constants_1.tokenType[__1.NETWORK][input.bToken];
                     baseToken = constants_1.tokenType[__1.NETWORK][BASE_TOKEN];
-                    (0, utils_1.updateOracleWithPyth)(pythClient, tx, config.package.oracle, config.oracle[BASE_TOKEN.toLocaleLowerCase()], BASE_TOKEN, "USDC");
+                    // TODO: use updateOracleWithPythUsd
+                    (0, utils_1.updateOracleWithPyth)(pythClient, tx, config.package.oracle, config.oracle[BASE_TOKEN.toLocaleLowerCase()], BASE_TOKEN, "wUSDC");
                     if (input.share) {
                         collateralBidReceipt = (0, typus_dov_single_v2_1.getSplitBidReceiptTx)(config, tx, {
                             index: input.index,
@@ -101,13 +104,13 @@ function reduceOptionCollateralPositionSize(config, tx, pythClient, input) {
                 case 0:
                     TOKEN = input.cToken;
                     BASE_TOKEN = input.tradingToken;
-                    return [4 /*yield*/, (0, utils_1.updatePyth)(pythClient, tx, [TOKEN, BASE_TOKEN])];
+                    return [4 /*yield*/, (0, utils_1.updatePyth)(pythClient, tx, [TOKEN, BASE_TOKEN, "wUSDC"])];
                 case 1:
                     _a.sent();
                     cToken = constants_1.tokenType[__1.NETWORK][TOKEN];
                     bToken = constants_1.tokenType[__1.NETWORK][input.bToken];
                     baseToken = constants_1.tokenType[__1.NETWORK][BASE_TOKEN];
-                    (0, utils_1.updateOracleWithPyth)(pythClient, tx, config.package.oracle, config.oracle[BASE_TOKEN.toLocaleLowerCase()], BASE_TOKEN, "USDC");
+                    (0, utils_1.updateOracleWithPyth)(pythClient, tx, config.package.oracle, config.oracle[BASE_TOKEN.toLocaleLowerCase()], BASE_TOKEN, "wUSDC");
                     (0, functions_1.reduceOptionCollateralPositionSize)(tx, [cToken, bToken, baseToken], {
                         version: __1.PERP_VERSION,
                         registry: __1.MARKET,

package/package.json

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