@typus/typus-perp-sdk 1.0.59 → 1.0.61-ui-upgrade-e

package/dist/src/typus_stake_pool/stake-pool/functions.d.ts

@@ -45,6 +45,7 @@ export interface DepositIncentiveArgs {
     coin: TransactionObjectInput;
 }
 export declare function depositIncentive(tx: Transaction, typeArg: string, args: DepositIncentiveArgs, published_at?: string): import("@mysten/sui/transactions").TransactionResult;
+export declare function deprecated(tx: Transaction, published_at?: string): import("@mysten/sui/transactions").TransactionResult;
 export interface GetIncentiveArgs {
     stakePool: TransactionObjectInput;
     tokenType: TransactionObjectInput;
@@ -196,3 +197,11 @@ export interface WithdrawIncentiveArgs {
     amount: bigint | TransactionArgument | TransactionArgument | null;
 }
 export declare function withdrawIncentive(tx: Transaction, typeArg: string, args: WithdrawIncentiveArgs, published_at?: string): import("@mysten/sui/transactions").TransactionResult;
+export interface WithdrawIncentiveV2Args {
+    version: TransactionObjectInput;
+    registry: TransactionObjectInput;
+    index: bigint | TransactionArgument;
+    amount: bigint | TransactionArgument | TransactionArgument | null;
+    clock: TransactionObjectInput;
+}
+export declare function withdrawIncentiveV2(tx: Transaction, typeArg: string, args: WithdrawIncentiveV2Args, published_at?: string): import("@mysten/sui/transactions").TransactionResult;

package/dist/src/typus_stake_pool/stake-pool/functions.js

@@ -7,6 +7,7 @@ exports.calculateIncentive = calculateIncentive;
 exports.createUserLastIncentiveTsMs = createUserLastIncentiveTsMs;
 exports.deactivateIncentiveToken = deactivateIncentiveToken;
 exports.depositIncentive = depositIncentive;
+exports.deprecated = deprecated;
 exports.getIncentive = getIncentive;
 exports.getIncentiveTokens = getIncentiveTokens;
 exports.getLastIncentivePriceIndex = getLastIncentivePriceIndex;
@@ -33,6 +34,7 @@ exports.updateIncentiveConfig = updateIncentiveConfig;
 exports.updatePoolInfoU64Padding = updatePoolInfoU64Padding;
 exports.updateUnlockCountdownTsMs = updateUnlockCountdownTsMs;
 exports.withdrawIncentive = withdrawIncentive;
+exports.withdrawIncentiveV2 = withdrawIncentiveV2;
 var __1 = require("..");
 var structs_1 = require("../../_dependencies/source/0x1/option/structs");
 var util_1 = require("../../_framework/util");
@@ -97,6 +99,10 @@ function depositIncentive(tx, typeArg, args, published_at) {
         arguments: [(0, util_1.obj)(tx, args.version), (0, util_1.obj)(tx, args.registry), (0, util_1.pure)(tx, args.index, "u64"), (0, util_1.obj)(tx, args.coin)],
     });
 }
+function deprecated(tx, published_at) {
+    if (published_at === void 0) { published_at = __1.PUBLISHED_AT; }
+    return tx.moveCall({ target: "".concat(published_at, "::stake_pool::deprecated"), arguments: [] });
+}
 function getIncentive(tx, args, published_at) {
     if (published_at === void 0) { published_at = __1.PUBLISHED_AT; }
     return tx.moveCall({
@@ -329,3 +335,17 @@ function withdrawIncentive(tx, typeArg, args, published_at) {
         ],
     });
 }
+function withdrawIncentiveV2(tx, typeArg, args, published_at) {
+    if (published_at === void 0) { published_at = __1.PUBLISHED_AT; }
+    return tx.moveCall({
+        target: "".concat(published_at, "::stake_pool::withdraw_incentive_v2"),
+        typeArguments: [typeArg],
+        arguments: [
+            (0, util_1.obj)(tx, args.version),
+            (0, util_1.obj)(tx, args.registry),
+            (0, util_1.pure)(tx, args.index, "u64"),
+            (0, util_1.pure)(tx, args.amount, "".concat(structs_1.Option.$typeName, "<u64>")),
+            (0, util_1.obj)(tx, args.clock),
+        ],
+    });
+}

package/dist/src/user/order.js

@@ -122,7 +122,7 @@ function createTradingOrder(config, tx, pythClient, input) {
                         }
                         finally { if (e_1) throw e_1.error; }
                     }
-                    (0, functions_1.createTradingOrder)(tx, [cToken, baseToken], {
+                    (0, functions_1.createTradingOrderV2)(tx, [cToken, baseToken], {
                         version: __1.PERP_VERSION,
                         registry: __1.MARKET,
                         poolRegistry: __1.LP_POOL,
@@ -141,6 +141,8 @@ function createTradingOrder(config, tx, pythClient, input) {
                         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];
             }

package/dist/src/user/orderWithBidReceipt.js

@@ -89,7 +89,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.createTradingOrderWithBidReceipt)(tx, [cToken, bToken, baseToken], {
+                    (0, functions_1.createTradingOrderWithBidReceiptV2)(tx, [cToken, bToken, baseToken], {
                         version: __1.PERP_VERSION,
                         registry: __1.MARKET,
                         poolRegistry: __1.LP_POOL,
@@ -105,6 +105,8 @@ function createTradingOrderWithBidReceipt(config, tx, pythClient, input) {
                         dovRegistry: config.registry.dov.dovSingle,
                         collateralBidReceipt: collateralBidReceipt,
                         user: input.user,
+                        tailsStakingRegistry: config.registry.typus.tailsStaking,
+                        competitionConfig: __1.COMPETITION_CONFIG,
                     });
                     return [2 /*return*/, tx];
             }
@@ -140,7 +142,7 @@ function reduceOptionCollateralPositionSize(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.reduceOptionCollateralPositionSize)(tx, [cToken, bToken, baseToken], {
+                    (0, functions_1.reduceOptionCollateralPositionSizeV2)(tx, [cToken, bToken, baseToken], {
                         version: __1.PERP_VERSION,
                         registry: __1.MARKET,
                         poolRegistry: __1.LP_POOL,
@@ -155,6 +157,8 @@ function reduceOptionCollateralPositionSize(config, tx, pythClient, input) {
                         dovRegistry: config.registry.dov.dovSingle,
                         positionId: BigInt(input.positionId),
                         orderSize: input.orderSize ? BigInt(input.orderSize) : null,
+                        tailsStakingRegistry: config.registry.typus.tailsStaking,
+                        competitionConfig: __1.COMPETITION_CONFIG,
                     });
                     return [2 /*return*/, tx];
             }

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

@@ -14,23 +14,41 @@ export declare function mintStakeLp(config: TypusConfig, tx: Transaction, pythCl
     amount: string;
     userShareId: string | null;
     user: string;
+    stake: boolean;
 }): Promise<Transaction>;
-export declare function unstakeBurn(config: TypusConfig, tx: Transaction, pythClient: PythClient, input: {
+export declare function stakeLp(config: TypusConfig, tx: Transaction, input: {
+    stakePool: StakePool;
+    lpCoins: string[];
+    amount: string;
+    userShareId: string | null;
+    user: string;
+}): Promise<Transaction>;
+export declare function unstake(config: TypusConfig, tx: Transaction, input: {
     lpPool: LiquidityPool;
     stakePool: StakePool;
-    cTOKEN: TOKEN;
     userShareId: string;
     share: string | null;
     user: string;
 }): Promise<Transaction>;
-export declare function burnTlp(config: TypusConfig, tx: Transaction, pythClient: PythClient, input: {
+export declare function unstakeRedeem(config: TypusConfig, tx: Transaction, pythClient: PythClient, input: {
     lpPool: LiquidityPool;
     stakePool: StakePool;
-    cTOKEN: TOKEN;
-    lpCoin: string;
+    userShareId: string;
+    share: string | null;
+    user: string;
+}): Promise<Transaction>;
+export declare function redeemTlp(config: TypusConfig, tx: Transaction, pythClient: PythClient, input: {
+    lpPool: LiquidityPool;
+    lpCoins: string[];
     share: string | null;
     user: string;
 }): Promise<Transaction>;
+export declare function claim(config: TypusConfig, tx: Transaction, pythClient: PythClient, input: {
+    lpPool: LiquidityPool;
+    stakePool: StakePool;
+    cTOKEN: TOKEN;
+    user: string;
+}): Promise<Transaction>;
 export declare function swap(config: TypusConfig, tx: Transaction, pythClient: PythClient, input: {
     coins: string[];
     FROM_TOKEN: TOKEN;
@@ -38,10 +56,6 @@ export declare function swap(config: TypusConfig, tx: Transaction, pythClient: P
     amount: string;
     user: string;
 }): Promise<Transaction>;
-export declare function unsubscribe(config: TypusConfig, tx: Transaction, input: {
-    userShareId: string;
-    share: string | null;
-}): Promise<Transaction>;
 export declare function harvestStakeReward(config: TypusConfig, tx: Transaction, input: {
     stakePool: StakePool;
     userShareId: string;

package/dist/src/user/tlp.js

@@ -65,10 +65,12 @@ var __read = (this && this.__read) || function (o, n) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.snapshot = snapshot;
 exports.mintStakeLp = mintStakeLp;
-exports.unstakeBurn = unstakeBurn;
-exports.burnTlp = burnTlp;
+exports.stakeLp = stakeLp;
+exports.unstake = unstake;
+exports.unstakeRedeem = unstakeRedeem;
+exports.redeemTlp = redeemTlp;
+exports.claim = claim;
 exports.swap = swap;
-exports.unsubscribe = unsubscribe;
 exports.harvestStakeReward = harvestStakeReward;
 var functions_1 = require("../typus_perp/lp-pool/functions");
 var functions_2 = require("../typus_stake_pool/stake-pool/functions");
@@ -148,22 +150,78 @@ function mintStakeLp(config, tx, pythClient, input) {
                         coin: coin,
                         clock: constants_1.CLOCK,
                     });
-                    (0, functions_2.stake)(tx, __1.TLP_TOKEN, {
-                        version: __1.STAKE_POOL_VERSION,
-                        registry: __1.STAKE_POOL,
-                        index: BigInt(0),
-                        lpToken: lpCoin,
-                        clock: constants_1.CLOCK,
-                        userShareId: input.userShareId ? BigInt(input.userShareId) : null,
-                    });
+                    if (input.stake) {
+                        (0, functions_2.stake)(tx, __1.TLP_TOKEN, {
+                            version: __1.STAKE_POOL_VERSION,
+                            registry: __1.STAKE_POOL,
+                            index: BigInt(0),
+                            lpToken: lpCoin,
+                            clock: constants_1.CLOCK,
+                            userShareId: input.userShareId ? BigInt(input.userShareId) : null,
+                        });
+                    }
+                    else {
+                        tx.transferObjects([lpCoin], input.user);
+                    }
                     return [2 /*return*/, tx];
             }
         });
     });
 }
-function unstakeBurn(config, tx, pythClient, input) {
+function stakeLp(config, tx, input) {
+    return __awaiter(this, void 0, void 0, function () {
+        var coin, destination;
+        var _a;
+        return __generator(this, function (_b) {
+            destination = input.lpCoins.pop();
+            if (input.lpCoins.length > 0) {
+                tx.mergeCoins(destination, input.lpCoins);
+            }
+            _a = __read(tx.splitCoins(destination, [input.amount]), 1), coin = _a[0];
+            // console.log(iToken);
+            if (input.userShareId) {
+                harvestStakeReward(config, tx, { stakePool: input.stakePool, userShareId: input.userShareId, user: input.user });
+            }
+            (0, functions_2.stake)(tx, __1.TLP_TOKEN, {
+                version: __1.STAKE_POOL_VERSION,
+                registry: __1.STAKE_POOL,
+                index: BigInt(0),
+                lpToken: coin,
+                clock: constants_1.CLOCK,
+                userShareId: input.userShareId ? BigInt(input.userShareId) : null,
+            });
+            return [2 /*return*/, tx];
+        });
+    });
+}
+function unstake(config, tx, input) {
+    return __awaiter(this, void 0, void 0, function () {
+        var lpCoin;
+        return __generator(this, function (_a) {
+            harvestStakeReward(config, tx, { stakePool: input.stakePool, userShareId: input.userShareId, user: input.user });
+            (0, functions_2.unsubscribe)(tx, __1.TLP_TOKEN, {
+                version: __1.STAKE_POOL_VERSION,
+                registry: __1.STAKE_POOL,
+                index: BigInt(0),
+                userShareId: BigInt(input.userShareId),
+                clock: constants_1.CLOCK,
+                unsubscribedShares: input.share ? BigInt(input.share) : null,
+            });
+            lpCoin = (0, functions_2.unstake)(tx, __1.TLP_TOKEN, {
+                version: __1.STAKE_POOL_VERSION,
+                registry: __1.STAKE_POOL,
+                index: BigInt(0),
+                userShareId: BigInt(input.userShareId),
+                clock: constants_1.CLOCK,
+            });
+            tx.transferObjects([lpCoin], input.user);
+            return [2 /*return*/, tx];
+        });
+    });
+}
+function unstakeRedeem(config, tx, pythClient, input) {
     return __awaiter(this, void 0, void 0, function () {
-        var tokens, tokens_2, tokens_2_1, token, lpCoin, burnCoin, cToken, coin;
+        var tokens, tokens_2, tokens_2_1, token, lpCoin, balance;
         var e_2, _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
@@ -193,6 +251,14 @@ function unstakeBurn(config, tx, pythClient, input) {
                         finally { if (e_2) throw e_2.error; }
                     }
                     harvestStakeReward(config, tx, { stakePool: input.stakePool, userShareId: input.userShareId, user: input.user });
+                    (0, functions_2.unsubscribe)(tx, __1.TLP_TOKEN, {
+                        version: __1.STAKE_POOL_VERSION,
+                        registry: __1.STAKE_POOL,
+                        index: BigInt(0),
+                        userShareId: BigInt(input.userShareId),
+                        clock: constants_1.CLOCK,
+                        unsubscribedShares: input.share ? BigInt(input.share) : null,
+                    });
                     lpCoin = (0, functions_2.unstake)(tx, __1.TLP_TOKEN, {
                         version: __1.STAKE_POOL_VERSION,
                         registry: __1.STAKE_POOL,
@@ -200,32 +266,26 @@ function unstakeBurn(config, tx, pythClient, input) {
                         userShareId: BigInt(input.userShareId),
                         clock: constants_1.CLOCK,
                     });
-                    if (input.share) {
-                        burnCoin = tx.splitCoins(lpCoin, [input.share]);
-                        tx.transferObjects([lpCoin], input.user);
-                    }
-                    else {
-                        burnCoin = lpCoin;
-                    }
-                    cToken = constants_1.tokenType[__1.NETWORK][input.cTOKEN];
-                    coin = (0, functions_1.burnLp)(tx, [cToken, __1.TLP_TOKEN], {
+                    balance = tx.moveCall({
+                        target: "0x2::coin::into_balance",
+                        typeArguments: [__1.TLP_TOKEN],
+                        arguments: [lpCoin],
+                    });
+                    (0, functions_1.redeem)(tx, __1.TLP_TOKEN, {
                         version: __1.PERP_VERSION,
                         registry: __1.LP_POOL,
-                        treasuryCaps: __1.TLP_TREASURY_CAP,
                         index: BigInt(0),
-                        oracle: constants_1.oracle[__1.NETWORK][input.cTOKEN],
-                        coin: burnCoin,
                         clock: constants_1.CLOCK,
+                        balance: balance,
                     });
-                    tx.transferObjects([coin], input.user);
                     return [2 /*return*/, tx];
             }
         });
     });
 }
-function burnTlp(config, tx, pythClient, input) {
+function redeemTlp(config, tx, pythClient, input) {
     return __awaiter(this, void 0, void 0, function () {
-        var tokens, tokens_3, tokens_3_1, token, lpCoin, burnCoin, cToken, coin;
+        var tokens, tokens_3, tokens_3_1, token, destination, lpCoin, burnCoin, balance;
         var e_3, _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
@@ -254,24 +314,75 @@ function burnTlp(config, tx, pythClient, input) {
                         }
                         finally { if (e_3) throw e_3.error; }
                     }
-                    lpCoin = tx.object(input.lpCoin);
+                    destination = input.lpCoins.pop();
+                    if (input.lpCoins.length > 0) {
+                        tx.mergeCoins(destination, input.lpCoins);
+                    }
+                    lpCoin = tx.object(destination);
                     if (input.share) {
                         burnCoin = tx.splitCoins(lpCoin, [input.share]);
                     }
                     else {
                         burnCoin = lpCoin;
                     }
+                    balance = tx.moveCall({
+                        target: "0x2::coin::into_balance",
+                        typeArguments: [__1.TLP_TOKEN],
+                        arguments: [burnCoin],
+                    });
+                    (0, functions_1.redeem)(tx, __1.TLP_TOKEN, {
+                        version: __1.PERP_VERSION,
+                        registry: __1.LP_POOL,
+                        index: BigInt(0),
+                        clock: constants_1.CLOCK,
+                        balance: balance,
+                    });
+                    return [2 /*return*/, tx];
+            }
+        });
+    });
+}
+function claim(config, tx, pythClient, input) {
+    return __awaiter(this, void 0, void 0, function () {
+        var tokens, tokens_4, tokens_4_1, token_1, cToken, token;
+        var e_4, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    tokens = input.lpPool.tokenPools.map(function (p) { return (0, constants_1.typeArgToAsset)("0x" + p.tokenType.name); });
+                    return [4 /*yield*/, (0, utils_1.updatePyth)(pythClient, tx, tokens)];
+                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_1 = tokens_4_1.value;
+                            (0, utils_1.updateOracleWithPythUsd)(pythClient, tx, config.package.oracle, token_1);
+                            (0, functions_1.updateLiquidityValue)(tx, constants_1.tokenType[__1.NETWORK][token_1], {
+                                version: __1.PERP_VERSION,
+                                registry: __1.LP_POOL,
+                                index: BigInt(0),
+                                oracle: constants_1.oracle[__1.NETWORK][token_1],
+                                clock: constants_1.CLOCK,
+                            });
+                        }
+                    }
+                    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][input.cTOKEN];
-                    coin = (0, functions_1.burnLp)(tx, [cToken, __1.TLP_TOKEN], {
+                    token = (0, functions_1.claim)(tx, [__1.TLP_TOKEN, cToken], {
                         version: __1.PERP_VERSION,
                         registry: __1.LP_POOL,
-                        treasuryCaps: __1.TLP_TREASURY_CAP,
                         index: BigInt(0),
-                        oracle: constants_1.oracle[__1.NETWORK][input.cTOKEN],
-                        coin: burnCoin,
                         clock: constants_1.CLOCK,
+                        treasuryCaps: __1.TLP_TREASURY_CAP,
+                        oracle: constants_1.oracle[__1.NETWORK][input.cTOKEN],
                     });
-                    tx.transferObjects([coin], input.user);
+                    tx.transferObjects([token], input.user);
                     return [2 /*return*/, tx];
             }
         });
@@ -316,34 +427,10 @@ function swap(config, tx, pythClient, input) {
         });
     });
 }
-function unsubscribe(config, tx, input) {
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            (0, functions_2.snapshot)(tx, {
-                version: __1.STAKE_POOL_VERSION,
-                registry: __1.STAKE_POOL,
-                index: BigInt(0),
-                clock: constants_1.CLOCK,
-                userShareId: BigInt(input.userShareId),
-                typusEcosystemVersion: config.version.typus,
-                typusUserRegistry: config.registry.typus.user,
-            });
-            (0, functions_2.unsubscribe)(tx, __1.TLP_TOKEN, {
-                version: __1.STAKE_POOL_VERSION,
-                registry: __1.STAKE_POOL,
-                index: BigInt(0),
-                userShareId: BigInt(input.userShareId),
-                clock: constants_1.CLOCK,
-                unsubscribedShares: input.share ? BigInt(input.share) : null,
-            });
-            return [2 /*return*/, tx];
-        });
-    });
-}
 function harvestStakeReward(config, tx, input) {
     return __awaiter(this, void 0, void 0, function () {
         var iTokens, iTokens_1, iTokens_1_1, iToken, iCoin;
-        var e_4, _a;
+        var e_5, _a;
         return __generator(this, function (_b) {
             iTokens = input.stakePool.incentives.map(function (i) { return i.tokenType.name; });
             (0, functions_2.snapshot)(tx, {
@@ -381,12 +468,12 @@ function harvestStakeReward(config, tx, input) {
                     }
                 }
             }
-            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            catch (e_5_1) { e_5 = { error: e_5_1 }; }
             finally {
                 try {
                     if (iTokens_1_1 && !iTokens_1_1.done && (_a = iTokens_1.return)) _a.call(iTokens_1);
                 }
-                finally { if (e_4) throw e_4.error; }
+                finally { if (e_5) throw e_5.error; }
             }
             return [2 /*return*/, tx];
         });

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "@typus/typus-perp-sdk",
-    "version": "1.0.59",
+    "version": "1.0.61-ui-upgrade-e",
     "repository": "https://github.com/Typus-Lab/typus-perp-sdk.git",
     "author": "Typus",
     "description": "typus perp sdk",
     "license": "MIT",
     "dependencies": {
-        "@typus/typus-sdk": "1.6.21"
+        "@typus/typus-sdk": "1.6.30"
     },
     "devDependencies": {
         "@types/bs58": "^4.0.1",