@typus/typus-perp-sdk 1.0.20 → 1.0.21-tk1

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

@@ -2,19 +2,20 @@ import { Transaction } from "@mysten/sui/transactions";
 import { LiquidityPool } from "../typus_perp/lp-pool/structs";
 import { PythClient, TypusConfig } from "@typus/typus-sdk/dist/src/utils";
 import { TOKEN } from "@typus/typus-sdk/dist/src/constants";
+import { StakePool } from "../../src/typus_stake_pool/stake-pool/structs";
 export declare function mintStakeLp(config: TypusConfig, tx: Transaction, pythClient: PythClient, input: {
     lpPool: LiquidityPool;
+    stakePool: StakePool;
     coins: string[];
     cTOKEN: TOKEN;
-    iTOKEN: TOKEN;
     amount: string;
     userShareId: string | null;
     user: string;
 }): Promise<Transaction>;
 export declare function unstakeBurn(config: TypusConfig, tx: Transaction, pythClient: PythClient, input: {
     lpPool: LiquidityPool;
+    stakePool: StakePool;
     cTOKEN: TOKEN;
-    iTOKEN: TOKEN;
     userShareId: string;
     share: string | null;
     user: string;
@@ -31,7 +32,7 @@ export declare function unsubscribe(config: TypusConfig, tx: Transaction, input:
     share: string | null;
 }): Promise<Transaction>;
 export declare function harvestStakeReward(config: TypusConfig, tx: Transaction, input: {
+    stakePool: StakePool;
     userShareId: string;
     user: string;
-    iTOKEN: TOKEN;
 }): Promise<Transaction>;

package/dist/src/user/tlp.js

@@ -75,27 +75,26 @@ var constants_1 = require("@typus/typus-sdk/dist/src/constants");
 var __1 = require("..");
 function mintStakeLp(config, tx, pythClient, input) {
     return __awaiter(this, void 0, void 0, function () {
-        var tokens, cToken, tokens_1, tokens_1_1, token, coin, destination, iToken, iCoin, lpCoin;
-        var e_1, _a, _b, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var tokens, tokens_1, tokens_1_1, token, coin, destination, iTokens, iTokens_1, iTokens_1_1, iToken, iCoin, cToken, lpCoin;
+        var e_1, _a, _b, _c, e_2, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
                     tokens = input.lpPool.tokenPools.map(function (p) { return (0, constants_1.typeArgToAsset)("0x" + p.tokenType.name); });
                     // console.log("tokens", tokens);
                     return [4 /*yield*/, (0, utils_1.updatePyth)(pythClient, tx, tokens)];
                 case 1:
                     // console.log("tokens", tokens);
-                    _d.sent();
-                    cToken = constants_1.tokenType[__1.NETWORK][input.cTOKEN];
+                    _e.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);
                             (0, functions_1.updateLiquidityValue)(tx, constants_1.tokenType[__1.NETWORK][token], {
                                 version: __1.PERP_VERSION,
                                 registry: __1.LP_POOL,
                                 index: BigInt(0),
-                                pythState: utils_1.pythStateId[__1.NETWORK],
-                                oracle: utils_1.priceInfoObjectIds[__1.NETWORK][token],
+                                oracle: constants_1.oracle[__1.NETWORK][token],
                                 clock: constants_1.CLOCK,
                             });
                         }
@@ -117,25 +116,37 @@ function mintStakeLp(config, tx, pythClient, input) {
                         }
                         _c = __read(tx.splitCoins(destination, [input.amount]), 1), coin = _c[0];
                     }
-                    iToken = constants_1.tokenType[__1.NETWORK][input.iTOKEN];
                     // console.log(iToken);
                     if (input.userShareId) {
-                        iCoin = (0, functions_2.harvestPerUserShare)(tx, iToken, {
-                            version: __1.STAKE_POOL_VERSION,
-                            registry: __1.STAKE_POOL,
-                            index: BigInt(0),
-                            userShareId: BigInt(input.userShareId),
-                            clock: constants_1.CLOCK,
-                        });
-                        tx.transferObjects([iCoin], input.user);
+                        iTokens = input.stakePool.incentives.map(function (i) { return i.tokenType.name; });
+                        try {
+                            for (iTokens_1 = __values(iTokens), iTokens_1_1 = iTokens_1.next(); !iTokens_1_1.done; iTokens_1_1 = iTokens_1.next()) {
+                                iToken = iTokens_1_1.value;
+                                iCoin = (0, functions_2.harvestPerUserShare)(tx, iToken, {
+                                    version: __1.STAKE_POOL_VERSION,
+                                    registry: __1.STAKE_POOL,
+                                    index: BigInt(0),
+                                    userShareId: BigInt(input.userShareId),
+                                    clock: constants_1.CLOCK,
+                                });
+                                tx.transferObjects([iCoin], input.user);
+                            }
+                        }
+                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                        finally {
+                            try {
+                                if (iTokens_1_1 && !iTokens_1_1.done && (_d = iTokens_1.return)) _d.call(iTokens_1);
+                            }
+                            finally { if (e_2) throw e_2.error; }
+                        }
                     }
+                    cToken = constants_1.tokenType[__1.NETWORK][input.cTOKEN];
                     lpCoin = (0, functions_1.mintLp)(tx, [cToken, __1.TLP_TOKEN], {
                         version: __1.PERP_VERSION,
                         registry: __1.LP_POOL,
                         treasuryCaps: __1.TLP_TREASURY_CAP,
                         index: BigInt(0),
-                        pythState: utils_1.pythStateId[__1.NETWORK],
-                        oracle: utils_1.priceInfoObjectIds[__1.NETWORK][input.cTOKEN],
+                        oracle: constants_1.oracle[__1.NETWORK][input.cTOKEN],
                         coin: coin,
                         clock: constants_1.CLOCK,
                     });
@@ -154,48 +165,57 @@ function mintStakeLp(config, tx, pythClient, input) {
 }
 function unstakeBurn(config, tx, pythClient, input) {
     return __awaiter(this, void 0, void 0, function () {
-        var tokens, cToken, oracle, tokens_2, tokens_2_1, token, iToken, iCoin, lpCoin, coin;
-        var e_2, _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var tokens, tokens_2, tokens_2_1, token, iTokens, iTokens_2, iTokens_2_1, iToken, iCoin, lpCoin, cToken, coin;
+        var e_3, _a, e_4, _b;
+        return __generator(this, function (_c) {
+            switch (_c.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();
-                    cToken = constants_1.tokenType[__1.NETWORK][input.cTOKEN];
-                    oracle = utils_1.priceInfoObjectIds[__1.NETWORK][input.cTOKEN];
+                    _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);
                             (0, functions_1.updateLiquidityValue)(tx, constants_1.tokenType[__1.NETWORK][token], {
                                 version: __1.PERP_VERSION,
                                 registry: __1.LP_POOL,
                                 index: BigInt(0),
-                                pythState: utils_1.pythStateId[__1.NETWORK],
-                                oracle: utils_1.priceInfoObjectIds[__1.NETWORK][token],
+                                oracle: constants_1.oracle[__1.NETWORK][token],
                                 clock: constants_1.CLOCK,
                             });
                         }
                     }
-                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
                     finally {
                         try {
                             if (tokens_2_1 && !tokens_2_1.done && (_a = tokens_2.return)) _a.call(tokens_2);
                         }
-                        finally { if (e_2) throw e_2.error; }
+                        finally { if (e_3) throw e_3.error; }
                     }
-                    iToken = constants_1.tokenType[__1.NETWORK][input.iTOKEN];
-                    // console.log(iToken);
                     if (input.userShareId) {
-                        iCoin = (0, functions_2.harvestPerUserShare)(tx, iToken, {
-                            version: __1.STAKE_POOL_VERSION,
-                            registry: __1.STAKE_POOL,
-                            index: BigInt(0),
-                            userShareId: BigInt(input.userShareId),
-                            clock: constants_1.CLOCK,
-                        });
-                        tx.transferObjects([iCoin], input.user);
+                        iTokens = input.stakePool.incentives.map(function (i) { return i.tokenType.name; });
+                        try {
+                            for (iTokens_2 = __values(iTokens), iTokens_2_1 = iTokens_2.next(); !iTokens_2_1.done; iTokens_2_1 = iTokens_2.next()) {
+                                iToken = iTokens_2_1.value;
+                                iCoin = (0, functions_2.harvestPerUserShare)(tx, iToken, {
+                                    version: __1.STAKE_POOL_VERSION,
+                                    registry: __1.STAKE_POOL,
+                                    index: BigInt(0),
+                                    userShareId: BigInt(input.userShareId),
+                                    clock: constants_1.CLOCK,
+                                });
+                                tx.transferObjects([iCoin], input.user);
+                            }
+                        }
+                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                        finally {
+                            try {
+                                if (iTokens_2_1 && !iTokens_2_1.done && (_b = iTokens_2.return)) _b.call(iTokens_2);
+                            }
+                            finally { if (e_4) throw e_4.error; }
+                        }
                     }
                     lpCoin = (0, functions_2.unstake)(tx, __1.TLP_TOKEN, {
                         version: __1.STAKE_POOL_VERSION,
@@ -203,15 +223,14 @@ function unstakeBurn(config, tx, pythClient, input) {
                         index: BigInt(0),
                         userShareId: BigInt(input.userShareId),
                         clock: constants_1.CLOCK,
-                        unstakedShares: input.share ? BigInt(input.share) : null,
                     });
+                    cToken = constants_1.tokenType[__1.NETWORK][input.cTOKEN];
                     coin = (0, functions_1.burnLp)(tx, [cToken, __1.TLP_TOKEN], {
                         version: __1.PERP_VERSION,
                         registry: __1.LP_POOL,
                         treasuryCaps: __1.TLP_TREASURY_CAP,
                         index: BigInt(0),
-                        pythState: utils_1.pythStateId[__1.NETWORK],
-                        oracle: oracle,
+                        oracle: constants_1.oracle[__1.NETWORK][input.cTOKEN],
                         coin: lpCoin,
                         clock: constants_1.CLOCK,
                     });
@@ -223,15 +242,15 @@ function unstakeBurn(config, tx, pythClient, input) {
 }
 function swap(config, tx, pythClient, input) {
     return __awaiter(this, void 0, void 0, function () {
-        var fromToken, toToken, coin, destination, token;
+        var coin, destination, fromToken, toToken, token;
         var _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0: return [4 /*yield*/, (0, utils_1.updatePyth)(pythClient, tx, [input.FROM_TOKEN, input.TO_TOKEN])];
                 case 1:
                     _c.sent();
-                    fromToken = constants_1.tokenType[__1.NETWORK][input.FROM_TOKEN];
-                    toToken = constants_1.tokenType[__1.NETWORK][input.TO_TOKEN];
+                    (0, utils_1.updateOracleWithPythUsd)(pythClient, tx, config.package.oracle, input.FROM_TOKEN);
+                    (0, utils_1.updateOracleWithPythUsd)(pythClient, tx, config.package.oracle, input.TO_TOKEN);
                     if (input.FROM_TOKEN == "SUI") {
                         _a = __read(tx.splitCoins(tx.gas, [input.amount]), 1), coin = _a[0];
                     }
@@ -242,14 +261,15 @@ function swap(config, tx, pythClient, input) {
                         }
                         _b = __read(tx.splitCoins(destination, [input.amount]), 1), coin = _b[0];
                     }
+                    fromToken = constants_1.tokenType[__1.NETWORK][input.FROM_TOKEN];
+                    toToken = constants_1.tokenType[__1.NETWORK][input.TO_TOKEN];
                     token = (0, functions_1.swap)(tx, [fromToken, toToken], {
                         version: __1.PERP_VERSION,
                         registry: __1.LP_POOL,
-                        pythState: utils_1.pythStateId[__1.NETWORK],
                         clock: constants_1.CLOCK,
                         index: BigInt(0),
-                        oracleFromToken: utils_1.priceInfoObjectIds[__1.NETWORK][input.FROM_TOKEN],
-                        oracleToToken: utils_1.priceInfoObjectIds[__1.NETWORK][input.TO_TOKEN],
+                        oracleFromToken: constants_1.oracle[__1.NETWORK][input.FROM_TOKEN],
+                        oracleToToken: constants_1.oracle[__1.NETWORK][input.TO_TOKEN],
                         fromCoin: coin,
                         minToAmount: BigInt(0),
                     });
@@ -276,17 +296,30 @@ function unsubscribe(config, tx, input) {
 }
 function harvestStakeReward(config, tx, input) {
     return __awaiter(this, void 0, void 0, function () {
-        var iToken, iCoin;
-        return __generator(this, function (_a) {
-            iToken = constants_1.tokenType[__1.NETWORK][input.iTOKEN];
-            iCoin = (0, functions_2.harvestPerUserShare)(tx, iToken, {
-                version: __1.STAKE_POOL_VERSION,
-                registry: __1.STAKE_POOL,
-                index: BigInt(0),
-                userShareId: BigInt(input.userShareId),
-                clock: constants_1.CLOCK,
-            });
-            tx.transferObjects([iCoin], input.user);
+        var iTokens, iTokens_3, iTokens_3_1, iToken, iCoin;
+        var e_5, _a;
+        return __generator(this, function (_b) {
+            iTokens = input.stakePool.incentives.map(function (i) { return i.tokenType.name; });
+            try {
+                for (iTokens_3 = __values(iTokens), iTokens_3_1 = iTokens_3.next(); !iTokens_3_1.done; iTokens_3_1 = iTokens_3.next()) {
+                    iToken = iTokens_3_1.value;
+                    iCoin = (0, functions_2.harvestPerUserShare)(tx, iToken, {
+                        version: __1.STAKE_POOL_VERSION,
+                        registry: __1.STAKE_POOL,
+                        index: BigInt(0),
+                        userShareId: BigInt(input.userShareId),
+                        clock: constants_1.CLOCK,
+                    });
+                    tx.transferObjects([iCoin], input.user);
+                }
+            }
+            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+            finally {
+                try {
+                    if (iTokens_3_1 && !iTokens_3_1.done && (_a = iTokens_3.return)) _a.call(iTokens_3);
+                }
+                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.20",
+    "version": "1.0.21-tk1",
     "repository": "https://github.com/Typus-Lab/typus-perp-sdk.git",
     "author": "Typus",
     "description": "typus perp sdk",
     "license": "MIT",
     "dependencies": {
-        "@typus/typus-sdk": "1.6.1"
+        "@typus/typus-sdk": "1.6.4-tk3"
     },
     "devDependencies": {
         "@types/bs58": "^4.0.1",

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

@@ -1,13 +0,0 @@
-import { Transaction, TransactionArgument, TransactionObjectInput } from "@mysten/sui/transactions";
-export interface GetPriceArgs {
-    state: TransactionObjectInput;
-    priceInfoObject: TransactionObjectInput;
-    clock: TransactionObjectInput;
-}
-export declare function getPrice(tx: Transaction, args: GetPriceArgs): import("@mysten/sui/transactions").TransactionResult;
-export declare function getEmaPrice(tx: Transaction, priceInfoObject: TransactionObjectInput): import("@mysten/sui/transactions").TransactionResult;
-export interface GetPriceInfoObjectIdArgs {
-    state: TransactionObjectInput;
-    priceIdentifierBytes: Array<number | TransactionArgument> | TransactionArgument;
-}
-export declare function getPriceInfoObjectId(tx: Transaction, args: GetPriceInfoObjectIdArgs): import("@mysten/sui/transactions").TransactionResult;

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

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPrice = getPrice;
-exports.getEmaPrice = getEmaPrice;
-exports.getPriceInfoObjectId = getPriceInfoObjectId;
-var __1 = require("..");
-var util_1 = require("../../_framework/util");
-function getPrice(tx, args) {
-    return tx.moveCall({
-        target: "".concat(__1.PUBLISHED_AT, "::oracle::get_price"),
-        arguments: [(0, util_1.obj)(tx, args.state), (0, util_1.obj)(tx, args.priceInfoObject), (0, util_1.obj)(tx, args.clock)],
-    });
-}
-function getEmaPrice(tx, priceInfoObject) {
-    return tx.moveCall({ target: "".concat(__1.PUBLISHED_AT, "::oracle::get_ema_price"), arguments: [(0, util_1.obj)(tx, priceInfoObject)] });
-}
-function getPriceInfoObjectId(tx, args) {
-    return tx.moveCall({
-        target: "".concat(__1.PUBLISHED_AT, "::oracle::get_price_info_object_id"),
-        arguments: [(0, util_1.obj)(tx, args.state), (0, util_1.pure)(tx, args.priceIdentifierBytes, "vector<u8>")],
-    });
-}

package/dist/src/typus_perp/oracle/structs.d.ts

@@ -1,111 +0,0 @@
-import { ID } from "../../_dependencies/source/0x2/object/structs";
-import { PhantomReified, Reified, StructClass, ToField, ToTypeStr } from "../../_framework/reified";
-import { FieldsWithTypes } from "../../_framework/util";
-import { PKG_V1 } from "../index";
-import { SuiClient, SuiObjectData, SuiParsedData } from "@mysten/sui/client";
-export declare function isPythPrice(type: string): boolean;
-export interface PythPriceFields {
-    price: ToField<"u64">;
-    conf: ToField<"u64">;
-    timestamp: ToField<"u64">;
-    decimal: ToField<"u64">;
-}
-export type PythPriceReified = Reified<PythPrice, PythPriceFields>;
-export declare class PythPrice implements StructClass {
-    __StructClass: true;
-    static readonly $typeName: string;
-    static readonly $numTypeParams = 0;
-    static readonly $isPhantom: readonly [];
-    readonly $typeName: string;
-    readonly $fullTypeName: `${typeof PKG_V1}::oracle::PythPrice`;
-    readonly $typeArgs: [];
-    readonly $isPhantom: readonly [];
-    readonly price: ToField<"u64">;
-    readonly conf: ToField<"u64">;
-    readonly timestamp: ToField<"u64">;
-    readonly decimal: ToField<"u64">;
-    private constructor();
-    static reified(): PythPriceReified;
-    static get r(): import("../../_framework/reified").StructClassReified<PythPrice, PythPriceFields>;
-    static phantom(): PhantomReified<ToTypeStr<PythPrice>>;
-    static get p(): PhantomReified<"::oracle::PythPrice" | "0x7c19f81d9d411e78305d7af8dad25317c56bb449fede8a78b6021232478f0509::oracle::PythPrice">;
-    static get bcs(): import("@mysten/sui/bcs").BcsType<{
-        price: string;
-        conf: string;
-        timestamp: string;
-        decimal: string;
-    }, {
-        price: string | number | bigint;
-        conf: string | number | bigint;
-        timestamp: string | number | bigint;
-        decimal: string | number | bigint;
-    }>;
-    static fromFields(fields: Record<string, any>): PythPrice;
-    static fromFieldsWithTypes(item: FieldsWithTypes): PythPrice;
-    static fromBcs(data: Uint8Array): PythPrice;
-    toJSONField(): {
-        price: string;
-        conf: string;
-        timestamp: string;
-        decimal: string;
-    };
-    toJSON(): {
-        price: string;
-        conf: string;
-        timestamp: string;
-        decimal: string;
-        $typeName: string;
-        $typeArgs: [];
-    };
-    static fromJSONField(field: any): PythPrice;
-    static fromJSON(json: Record<string, any>): PythPrice;
-    static fromSuiParsedData(content: SuiParsedData): PythPrice;
-    static fromSuiObjectData(data: SuiObjectData): PythPrice;
-    static fetch(client: SuiClient, id: string): Promise<PythPrice>;
-}
-export declare function isPythPriceInfoObject(type: string): boolean;
-export interface PythPriceInfoObjectFields {
-    id: ToField<ID>;
-}
-export type PythPriceInfoObjectReified = Reified<PythPriceInfoObject, PythPriceInfoObjectFields>;
-export declare class PythPriceInfoObject implements StructClass {
-    __StructClass: true;
-    static readonly $typeName: string;
-    static readonly $numTypeParams = 0;
-    static readonly $isPhantom: readonly [];
-    readonly $typeName: string;
-    readonly $fullTypeName: `${typeof PKG_V1}::oracle::PythPriceInfoObject`;
-    readonly $typeArgs: [];
-    readonly $isPhantom: readonly [];
-    readonly id: ToField<ID>;
-    private constructor();
-    static reified(): PythPriceInfoObjectReified;
-    static get r(): import("../../_framework/reified").StructClassReified<PythPriceInfoObject, PythPriceInfoObjectFields>;
-    static phantom(): PhantomReified<ToTypeStr<PythPriceInfoObject>>;
-    static get p(): PhantomReified<"::oracle::PythPriceInfoObject" | "0x7c19f81d9d411e78305d7af8dad25317c56bb449fede8a78b6021232478f0509::oracle::PythPriceInfoObject">;
-    static get bcs(): import("@mysten/sui/bcs").BcsType<{
-        id: {
-            bytes: string;
-        };
-    }, {
-        id: {
-            bytes: string;
-        };
-    }>;
-    static fromFields(fields: Record<string, any>): PythPriceInfoObject;
-    static fromFieldsWithTypes(item: FieldsWithTypes): PythPriceInfoObject;
-    static fromBcs(data: Uint8Array): PythPriceInfoObject;
-    toJSONField(): {
-        id: string;
-    };
-    toJSON(): {
-        id: string;
-        $typeName: string;
-        $typeArgs: [];
-    };
-    static fromJSONField(field: any): PythPriceInfoObject;
-    static fromJSON(json: Record<string, any>): PythPriceInfoObject;
-    static fromSuiParsedData(content: SuiParsedData): PythPriceInfoObject;
-    static fromSuiObjectData(data: SuiObjectData): PythPriceInfoObject;
-    static fetch(client: SuiClient, id: string): Promise<PythPriceInfoObject>;
-}