@typus/typus-sdk 1.2.63 → 1.2.65

package/lib/mainnet.json

@@ -43,8 +43,8 @@
     "SINGLE_COLLATERAL_DEPOSIT_VAULT_REGISTRY": "0xd67cf93a0df61b4b3bbf6170511e0b28b21578d9b87a8f4adafec96322dd284d",
     "METADATA": "/home/metadata",
     "NFT_VERSION": "1.2.6",
-    "NFT_PACKAGE_UPGRADE": "0x1abc57354a357ac988e81d60b76ce5bf0322605d666aec701d40291952150082",
-    "NFT_PACKAGE": "0xbd147bc7f12f38f175d78947a61364e8e077b9b188b00e7094bc0c3623162196",
+    "NFT_PACKAGE": "0x1abc57354a357ac988e81d60b76ce5bf0322605d666aec701d40291952150082",
+    "NFT_PACKAGE_ORIGIN": "0xbd147bc7f12f38f175d78947a61364e8e077b9b188b00e7094bc0c3623162196",
     "DiscountEvent_PACKAGE": "0x1abc57354a357ac988e81d60b76ce5bf0322605d666aec701d40291952150082",
     "NFT_MANAGER_CAP": "0xd1c387021a99a8177d996ab59c5866f69d0f8c9951b538e0688a55357846fe9e",
     "NFT_TRANSFER_POLICY": "0x55475b9e16d9a0176dcef37f83a1921b15f2cbd2711a5f30b9d952c0c8f5f957",

package/lib/utils/nft-staking/user-entry.d.ts

@@ -1,5 +1,6 @@
 import { TransactionBlock } from "@mysten/sui.js/transactions";
 import { KioskClient } from "@mysten/kiosk";
+import { TailsId } from "../typus-nft/fetch";
 /**
     entry fun transfer_nft(
         registry: &mut Registry,
@@ -10,7 +11,7 @@ import { KioskClient } from "@mysten/kiosk";
         ctx: &mut TxContext
     )
 */
-export declare function getTransferNftTx(gasBudget: number, nftPackageId: string, registry: string, kiosk: string, kiosk_cap: string, nft_id: string, receiver: string): Promise<TransactionBlock>;
+export declare function getTransferNftTx(gasBudget: number, nftPackageId: string, registry: string, personalKioskPackageId: string, tails_id: TailsId, receiver: string): Promise<TransactionBlock>;
 export declare function getTransferNftsTx(gasBudget: number, nftPackageId: string, registry: string, kiosks: string[], kiosk_caps: string[], nft_ids: string[], receiver: string): Promise<TransactionBlock>;
 /**
     public fun stake_nft(
@@ -22,8 +23,8 @@ export declare function getTransferNftsTx(gasBudget: number, nftPackageId: strin
         ctx: &mut TxContext
     )
 */
-export declare function getStakeNftTx(gasBudget: number, nftPackageId: string, registry: string, kiosk: string, kiosk_cap: string, nft_id: string): Promise<TransactionBlock>;
-export declare function getSwitchNftTx(gasBudget: number, nftPackageId: string, registry: string, kiosk: string, kiosk_cap: string, nft_id: string, typeArguments: string[]): Promise<TransactionBlock>;
+export declare function getStakeNftTx(gasBudget: number, nftPackageId: string, registry: string, personalKioskPackageId: string, tails_id: TailsId): Promise<TransactionBlock>;
+export declare function getSwitchNftTx(gasBudget: number, nftPackageId: string, registry: string, personalKioskPackageId: string, tails_id: TailsId, typeArguments: string[]): Promise<TransactionBlock>;
 export declare function getCreateKioskAndLockNftTx(kioskClient: KioskClient, gasBudget: number, nftPackageId: string, policy: string, nft_id: string, singer: string): Promise<TransactionBlock>;
 /**
     public fun unstake_nft(
@@ -74,7 +75,7 @@ export declare function getLevelUpTx(gasBudget: number, nftPackageId: string, re
         ctx: &mut TxContext
     )
 */
-export declare function consumeExpCoinUnstakedTx(gasBudget: number, nftPackageId: string, typeArguments: string[], registry: string, kiosk: string, kiosk_cap: string, nft_id: string, exp_coins: string[], amount: string): Promise<TransactionBlock>;
+export declare function consumeExpCoinUnstakedTx(gasBudget: number, nftPackageId: string, typeArguments: string[], registry: string, personalKioskPackageId: string, tails_id: TailsId, exp_coins: string[], amount: string): Promise<TransactionBlock>;
 /**
     entry fun consume_exp_coin_staked<EXP_COIN>(
         registry: &mut Registry,

package/lib/utils/nft-staking/user-entry.js

@@ -66,17 +66,41 @@ var kiosk_1 = require("@mysten/kiosk");
         ctx: &mut TxContext
     )
 */
-function getTransferNftTx(gasBudget, nftPackageId, registry, kiosk, kiosk_cap, nft_id, receiver) {
+function getTransferNftTx(gasBudget, nftPackageId, registry, personalKioskPackageId, tails_id, receiver) {
     return __awaiter(this, void 0, void 0, function () {
-        var tx, _a, coin;
-        return __generator(this, function (_b) {
+        var tx, _a, coin, _b, personalKioskCap, borrow;
+        return __generator(this, function (_c) {
             tx = new transactions_1.TransactionBlock();
             _a = __read(tx.splitCoins(tx.gas, [tx.pure(10000000)]), 1), coin = _a[0];
-            tx.moveCall({
-                target: "".concat(nftPackageId, "::tails_staking::transfer_nft"),
-                typeArguments: [],
-                arguments: [tx.object(registry), tx.object(kiosk), tx.object(kiosk_cap), tx.pure(nft_id), tx.pure(receiver), coin],
-            });
+            if (tails_id.isPersonal) {
+                _b = __read(tx.moveCall({
+                    target: "".concat(personalKioskPackageId, "::personal_kiosk::borrow_val"),
+                    arguments: [tx.object(tails_id.kioskCap)],
+                }), 2), personalKioskCap = _b[0], borrow = _b[1];
+                tx.moveCall({
+                    target: "".concat(nftPackageId, "::tails_staking::transfer_nft"),
+                    typeArguments: [],
+                    arguments: [tx.object(registry), tx.object(tails_id.kiosk), personalKioskCap, tx.pure(tails_id.nftId), tx.pure(receiver), coin],
+                });
+                tx.moveCall({
+                    target: "".concat(personalKioskPackageId, "::personal_kiosk::return_val"),
+                    arguments: [tx.object(tails_id.kioskCap), personalKioskCap, borrow],
+                });
+            }
+            else {
+                tx.moveCall({
+                    target: "".concat(nftPackageId, "::tails_staking::transfer_nft"),
+                    typeArguments: [],
+                    arguments: [
+                        tx.object(registry),
+                        tx.object(tails_id.kiosk),
+                        tx.object(tails_id.kioskCap),
+                        tx.pure(tails_id.nftId),
+                        tx.pure(receiver),
+                        coin,
+                    ],
+                });
+            }
             tx.setGasBudget(gasBudget);
             return [2 /*return*/, tx];
         });
@@ -114,27 +138,51 @@ exports.getTransferNftsTx = getTransferNftsTx;
         ctx: &mut TxContext
     )
 */
-function getStakeNftTx(gasBudget, nftPackageId, registry, kiosk, kiosk_cap, nft_id) {
+function getStakeNftTx(gasBudget, nftPackageId, registry, personalKioskPackageId, tails_id) {
     return __awaiter(this, void 0, void 0, function () {
-        var tx, _a, coin;
-        return __generator(this, function (_b) {
+        var tx, _a, coin, _b, personalKioskCap, borrow;
+        return __generator(this, function (_c) {
             tx = new transactions_1.TransactionBlock();
             _a = __read(tx.splitCoins(tx.gas, [tx.pure(50000000)]), 1), coin = _a[0];
-            tx.moveCall({
-                target: "".concat(nftPackageId, "::tails_staking::stake_nft"),
-                typeArguments: [],
-                arguments: [tx.object(registry), tx.object(kiosk), tx.object(kiosk_cap), tx.pure(nft_id), tx.object(constants_1.CLOCK), coin],
-            });
+            if (tails_id.isPersonal) {
+                _b = __read(tx.moveCall({
+                    target: "".concat(personalKioskPackageId, "::personal_kiosk::borrow_val"),
+                    arguments: [tx.object(tails_id.kioskCap)],
+                }), 2), personalKioskCap = _b[0], borrow = _b[1];
+                tx.moveCall({
+                    target: "".concat(nftPackageId, "::tails_staking::stake_nft"),
+                    typeArguments: [],
+                    arguments: [tx.object(registry), tx.object(tails_id.kiosk), personalKioskCap, tx.pure(tails_id.nftId), tx.object(constants_1.CLOCK), coin],
+                });
+                tx.moveCall({
+                    target: "".concat(personalKioskPackageId, "::personal_kiosk::return_val"),
+                    arguments: [tx.object(tails_id.kioskCap), personalKioskCap, borrow],
+                });
+            }
+            else {
+                tx.moveCall({
+                    target: "".concat(nftPackageId, "::tails_staking::stake_nft"),
+                    typeArguments: [],
+                    arguments: [
+                        tx.object(registry),
+                        tx.object(tails_id.kiosk),
+                        tx.object(tails_id.kioskCap),
+                        tx.pure(tails_id.nftId),
+                        tx.object(constants_1.CLOCK),
+                        coin,
+                    ],
+                });
+            }
             tx.setGasBudget(gasBudget);
             return [2 /*return*/, tx];
         });
     });
 }
 exports.getStakeNftTx = getStakeNftTx;
-function getSwitchNftTx(gasBudget, nftPackageId, registry, kiosk, kiosk_cap, nft_id, typeArguments) {
+function getSwitchNftTx(gasBudget, nftPackageId, registry, personalKioskPackageId, tails_id, typeArguments) {
     return __awaiter(this, void 0, void 0, function () {
-        var tx, _a, coin;
-        return __generator(this, function (_b) {
+        var tx, _a, coin, _b, personalKioskCap, borrow;
+        return __generator(this, function (_c) {
             tx = new transactions_1.TransactionBlock();
             _a = __read(tx.splitCoins(tx.gas, [tx.pure(50000000)]), 1), coin = _a[0];
             tx.moveCall({
@@ -152,11 +200,35 @@ function getSwitchNftTx(gasBudget, nftPackageId, registry, kiosk, kiosk_cap, nft
                 typeArguments: typeArguments,
                 arguments: [tx.object(registry), tx.pure("exp_profit")],
             });
-            tx.moveCall({
-                target: "".concat(nftPackageId, "::tails_staking::switch_nft"),
-                typeArguments: [],
-                arguments: [tx.object(registry), tx.object(kiosk), tx.object(kiosk_cap), tx.pure(nft_id), tx.object(constants_1.CLOCK), coin],
-            });
+            if (tails_id.isPersonal) {
+                _b = __read(tx.moveCall({
+                    target: "".concat(personalKioskPackageId, "::personal_kiosk::borrow_val"),
+                    arguments: [tx.object(tails_id.kioskCap)],
+                }), 2), personalKioskCap = _b[0], borrow = _b[1];
+                tx.moveCall({
+                    target: "".concat(nftPackageId, "::tails_staking::switch_nft"),
+                    typeArguments: [],
+                    arguments: [tx.object(registry), tx.object(tails_id.kiosk), personalKioskCap, tx.pure(tails_id.nftId), tx.object(constants_1.CLOCK), coin],
+                });
+                tx.moveCall({
+                    target: "".concat(personalKioskPackageId, "::personal_kiosk::return_val"),
+                    arguments: [tx.object(tails_id.kioskCap), personalKioskCap, borrow],
+                });
+            }
+            else {
+                tx.moveCall({
+                    target: "".concat(nftPackageId, "::tails_staking::switch_nft"),
+                    typeArguments: [],
+                    arguments: [
+                        tx.object(registry),
+                        tx.object(tails_id.kiosk),
+                        tx.object(tails_id.kioskCap),
+                        tx.pure(tails_id.nftId),
+                        tx.object(constants_1.CLOCK),
+                        coin,
+                    ],
+                });
+            }
             tx.setGasBudget(gasBudget);
             return [2 /*return*/, tx];
         });
@@ -457,21 +529,38 @@ exports.getLevelUpTx = getLevelUpTx;
         ctx: &mut TxContext
     )
 */
-function consumeExpCoinUnstakedTx(gasBudget, nftPackageId, typeArguments, registry, kiosk, kiosk_cap, nft_id, exp_coins, amount) {
+function consumeExpCoinUnstakedTx(gasBudget, nftPackageId, typeArguments, registry, personalKioskPackageId, tails_id, exp_coins, amount) {
     return __awaiter(this, void 0, void 0, function () {
-        var tx, coin, _a, input_coin;
-        return __generator(this, function (_b) {
+        var tx, coin, _a, input_coin, _b, personalKioskCap, borrow;
+        return __generator(this, function (_c) {
             tx = new transactions_1.TransactionBlock();
             coin = exp_coins.pop();
             if (exp_coins.length > 0) {
                 tx.mergeCoins(tx.object(coin), exp_coins.map(function (id) { return tx.object(id); }));
             }
             _a = __read(tx.splitCoins(tx.object(coin), [tx.pure(amount)]), 1), input_coin = _a[0];
-            tx.moveCall({
-                target: "".concat(nftPackageId, "::tails_staking::consume_exp_coin_unstaked"),
-                typeArguments: typeArguments,
-                arguments: [tx.object(registry), tx.object(kiosk), tx.object(kiosk_cap), tx.pure(nft_id), input_coin],
-            });
+            if (tails_id.isPersonal) {
+                _b = __read(tx.moveCall({
+                    target: "".concat(personalKioskPackageId, "::personal_kiosk::borrow_val"),
+                    arguments: [tx.object(tails_id.kioskCap)],
+                }), 2), personalKioskCap = _b[0], borrow = _b[1];
+                tx.moveCall({
+                    target: "".concat(nftPackageId, "::tails_staking::consume_exp_coin_unstaked"),
+                    typeArguments: typeArguments,
+                    arguments: [tx.object(registry), tx.object(tails_id.kiosk), personalKioskCap, tx.pure(tails_id.nftId), input_coin],
+                });
+                tx.moveCall({
+                    target: "".concat(personalKioskPackageId, "::personal_kiosk::return_val"),
+                    arguments: [tx.object(tails_id.kioskCap), personalKioskCap, borrow],
+                });
+            }
+            else {
+                tx.moveCall({
+                    target: "".concat(nftPackageId, "::tails_staking::consume_exp_coin_unstaked"),
+                    typeArguments: typeArguments,
+                    arguments: [tx.object(registry), tx.object(tails_id.kiosk), tx.object(tails_id.kioskCap), tx.pure(tails_id.nftId), input_coin],
+                });
+            }
             tx.setGasBudget(gasBudget);
             return [2 /*return*/, tx];
         });

package/lib/utils/typus-dov-single-v2/user-history.d.ts

@@ -21,3 +21,6 @@ export declare function getFromSentio(event: string, userAddress: string, startT
 export declare function getNewBidFromSentio(vaults: {
     [key: string]: Vault;
 }, userAddress: string, startTimestamp: number): Promise<any>;
+export declare function getExerciseFromSentio(vaults: {
+    [key: string]: Vault;
+}, userAddress: string, startTimestamp: number): Promise<any>;

package/lib/utils/typus-dov-single-v2/user-history.js

@@ -55,7 +55,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNewBidFromSentio = exports.getFromSentio = exports.parseTxHistory = exports.getAutoBidEvents = exports.getUserEvents = void 0;
+exports.getExerciseFromSentio = exports.getNewBidFromSentio = exports.getFromSentio = exports.parseTxHistory = exports.getAutoBidEvents = exports.getUserEvents = void 0;
 var token_1 = require("../token");
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
 function getUserEvents(provider, sender, cursor) {
@@ -149,7 +149,7 @@ function parseTxHistory(datas, originPackage, vaults) {
                         }
                     })
                         .reduce(function (promise, event) { return __awaiter(_this, void 0, void 0, function () {
-                        var txHistory, functionType, action, Action, Amount, Index, Period, Vault, RiskLevel, Tails, Exp, d_token, b_token, o_token, i, i, token, amount, deposit_amount, deposit_amount, balance, balance, profit, profit, token, amount, amount, token, amount, size, token, amount, token, amount, size, bidder_balance;
+                        var txHistory, functionType, action, Action, Amount, Index, Period, Vault, RiskLevel, Tails, Exp, d_token, b_token, o_token, i, i, i, token, amount, deposit_amount, deposit_amount, balance, balance, profit, profit, token, amount, amount, token, amount, size, token, amount, token, amount, size, bidder_balance;
                         var _a;
                         var _b;
                         return __generator(this, function (_c) {
@@ -196,9 +196,11 @@ function parseTxHistory(datas, originPackage, vaults) {
                                             Tails = "#".concat(event.parsedJson.number);
                                             break;
                                         case "DailyAttendEvent":
-                                            Action = "Check In";
-                                            Tails = "#".concat(event.parsedJson.number);
-                                            Exp = "10";
+                                            i = txHistory.findIndex(function (x) { return x.txDigest == event.id.txDigest && x.Action == "Collect EXP"; });
+                                            if (i != -1) {
+                                                txHistory[i].Action = "Check In";
+                                                return [2 /*return*/, txHistory];
+                                            }
                                             break;
                                         case "FirstDepositEvent":
                                             Action = "First Deposit";
@@ -274,7 +276,7 @@ function parseTxHistory(datas, originPackage, vaults) {
                                         case "RedeemEvent":
                                             token = (0, token_1.typeArgToAsset)("0x" + event.parsedJson.token.name);
                                             amount = Number(event.parsedJson.amount) / Math.pow(10, (0, token_1.assetToDecimal)(token));
-                                            Action = "Harvest";
+                                            Action = "Harvest Reward";
                                             Amount = "".concat((0, bignumber_js_1.default)(amount).toFixed(), " ").concat(token);
                                             Index = Index;
                                             break;
@@ -430,6 +432,61 @@ function getNewBidFromSentio(vaults, userAddress, startTimestamp) {
     });
 }
 exports.getNewBidFromSentio = getNewBidFromSentio;
+function getExerciseFromSentio(vaults, userAddress, startTimestamp) {
+    return __awaiter(this, void 0, void 0, function () {
+        var apiUrl, headers, requestData, jsonData, response, data;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    apiUrl = "https://app.sentio.xyz/api/v1/analytics/typus/typus_v2/sql/execute";
+                    headers = {
+                        "api-key": "tz3JJ6stG7Fux6ueRSRA5mdpC9U0lozI3",
+                        "Content-Type": "application/json",
+                    };
+                    requestData = {
+                        sqlQuery: {
+                            sql: "\n                SELECT *\n                FROM Exercise N\n                WHERE N.distinct_id = \"".concat(userAddress, "\" && N.timestamp >= ").concat(startTimestamp, "\n                ORDER BY N.timestamp DESC;\n            "),
+                            size: 1000,
+                        },
+                    };
+                    jsonData = JSON.stringify(requestData);
+                    return [4 /*yield*/, fetch(apiUrl, {
+                            method: "POST",
+                            headers: headers,
+                            body: jsonData,
+                        })];
+                case 1:
+                    response = _a.sent();
+                    return [4 /*yield*/, response.json()];
+                case 2:
+                    data = _a.sent();
+                    return [2 /*return*/, data.result.rows.map(function (x) {
+                            var _a = __read(parseVaultInfo(vaults, x.index, "ExerciseEvent"), 6), Period = _a[0], Vault = _a[1], RiskLevel = _a[2], d_token = _a[3], b_token = _a[4], o_token = _a[5];
+                            // console.log(x);
+                            var Action = "Auto Exercise";
+                            if (x.raw_share) {
+                                var size = Number(x.raw_share) / Math.pow(10, (0, token_1.assetToDecimal)(o_token));
+                                Action = "Auto Exercise ".concat(size, " ").concat(o_token);
+                            }
+                            var txHistory = {
+                                Index: x.index,
+                                Period: Period,
+                                Vault: Vault,
+                                RiskLevel: RiskLevel,
+                                Action: Action,
+                                Amount: "".concat(x.amount, " ").concat(x.coin_symbol),
+                                Tails: x.number,
+                                Exp: x.exp_earn,
+                                Date: new Date(x.timestamp),
+                                txDigest: x.transaction_hash,
+                            };
+                            return txHistory;
+                        })];
+            }
+        });
+    });
+}
+exports.getExerciseFromSentio = getExerciseFromSentio;
 function parseVaultInfo(vaults, Index, action) {
     var v = vaults[Index];
     var Period;

package/lib/utils/typus-nft/fetch.d.ts

@@ -1,4 +1,4 @@
-import { SuiClient } from "@mysten/sui.js/client";
+import { SuiClient, SuiObjectResponse } from "@mysten/sui.js/client";
 import { KioskClient } from "@mysten/kiosk";
 export declare function getPool(provider: SuiClient, pool: string): Promise<PoolData>;
 export interface PoolData {
@@ -12,16 +12,19 @@ export interface PoolData {
 export declare const necklaces: string[];
 export declare function getPoolMap(provider: SuiClient, nftConfig: any): Promise<Map<string, PoolData>>;
 export declare function getWhitelistMap(nftConfig: any, wlTokens: any): Promise<Map<string, string[]>>;
-interface TailsId {
+export interface TailsId {
     nftId: string;
     kiosk: string;
     kioskCap: string;
     tails: Tails;
+    isPersonal: boolean;
 }
 export interface kioskOwnerCap {
-    objectId: string;
     kioskId: string;
+    objectId: string;
+    isPersonal: boolean;
 }
+export declare function getkioskOwnerCaps(datas: SuiObjectResponse[]): kioskOwnerCap[];
 export declare function getTailsIds(kioskClient: KioskClient, nftConfig: any, kioskOwnerCaps: kioskOwnerCap[]): Promise<TailsId[]>;
 export interface TailsWithType extends Tails {
     type: string | null | undefined;
@@ -62,5 +65,4 @@ export interface DiscountPoolData {
     balance: string;
     inventory: number;
 }
-export declare function getMintHistory(provider: SuiClient, NFT_PACKAGE_UPGRADE: string, vrf_input: any): Promise<import("@mysten/sui.js/client").PaginatedEvents | undefined>;
-export {};
+export declare function getMintHistory(provider: SuiClient, NFT_PACKAGE: string, vrf_input: any): Promise<import("@mysten/sui.js/client").PaginatedEvents | undefined>;

package/lib/utils/typus-nft/fetch.js

@@ -58,7 +58,7 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMintHistory = exports.getDiscountPool = exports.getTableTails = exports.LevelExpVec = exports.getLevelExp = exports.fieldsToTails = exports.getKioskOwner = exports.getTailsKiosk = exports.getTailsDynamicField = exports.getTails = exports.getTailsIds = exports.getWhitelistMap = exports.getPoolMap = exports.necklaces = exports.getPool = void 0;
+exports.getMintHistory = exports.getDiscountPool = exports.getTableTails = exports.LevelExpVec = exports.getLevelExp = exports.fieldsToTails = exports.getKioskOwner = exports.getTailsKiosk = exports.getTailsDynamicField = exports.getTails = exports.getTailsIds = exports.getkioskOwnerCaps = exports.getWhitelistMap = exports.getPoolMap = exports.necklaces = exports.getPool = void 0;
 function getPool(provider, pool) {
     return __awaiter(this, void 0, void 0, function () {
         var res, fields, poolData;
@@ -157,10 +157,40 @@ function getWhitelistMap(nftConfig, wlTokens) {
     });
 }
 exports.getWhitelistMap = getWhitelistMap;
+function getkioskOwnerCaps(datas) {
+    var e_1, _a;
+    var _b, _c, _d;
+    var kioskOwnerCaps = [];
+    try {
+        for (var datas_1 = __values(datas), datas_1_1 = datas_1.next(); !datas_1_1.done; datas_1_1 = datas_1.next()) {
+            var data = datas_1_1.value;
+            if (((_b = data.data) === null || _b === void 0 ? void 0 : _b.type) == "0x2::kiosk::KioskOwnerCap") {
+                // console.log(data.data?.content);
+                // @ts-ignore
+                var fields = data.data.content.fields;
+                kioskOwnerCaps.push({ objectId: fields.id.id, kioskId: fields.for, isPersonal: false });
+            }
+            else if ((_d = (_c = data.data) === null || _c === void 0 ? void 0 : _c.type) === null || _d === void 0 ? void 0 : _d.endsWith("personal_kiosk::PersonalKioskCap")) {
+                // @ts-ignore
+                var fields = data.data.content.fields;
+                kioskOwnerCaps.push({ objectId: fields.id.id, kioskId: fields.cap.fields.for, isPersonal: true });
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (datas_1_1 && !datas_1_1.done && (_a = datas_1.return)) _a.call(datas_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return kioskOwnerCaps;
+}
+exports.getkioskOwnerCaps = getkioskOwnerCaps;
 function getTailsIds(kioskClient, nftConfig, kioskOwnerCaps) {
     return __awaiter(this, void 0, void 0, function () {
-        var Tails, _loop_1, kioskOwnerCaps_1, kioskOwnerCaps_1_1, kioskOwnerCap, e_1_1;
-        var e_1, _a;
+        var Tails, _loop_1, kioskOwnerCaps_1, kioskOwnerCaps_1_1, kioskOwnerCap, e_2_1;
+        var e_2, _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -173,15 +203,16 @@ function getTailsIds(kioskClient, nftConfig, kioskOwnerCaps) {
                                 case 1:
                                     res = _c.sent();
                                     tails = res.items
-                                        .filter(function (item) { return item.type == "".concat(nftConfig.NFT_PACKAGE, "::typus_nft::Tails"); })
+                                        .filter(function (item) { return item.type == "".concat(nftConfig.NFT_PACKAGE_ORIGIN, "::typus_nft::Tails"); })
                                         .map(function (item) {
                                         // console.log(item.data);
                                         // @ts-ignore
                                         var tails = item.data;
                                         var t = {
-                                            nftId: item.objectId,
                                             kiosk: kioskOwnerCap.kioskId,
                                             kioskCap: kioskOwnerCap.objectId,
+                                            isPersonal: kioskOwnerCap.isPersonal,
+                                            nftId: item.objectId,
                                             tails: tails,
                                         };
                                         return t;
@@ -209,14 +240,14 @@ function getTailsIds(kioskClient, nftConfig, kioskOwnerCaps) {
                     return [3 /*break*/, 2];
                 case 5: return [3 /*break*/, 8];
                 case 6:
-                    e_1_1 = _b.sent();
-                    e_1 = { error: e_1_1 };
+                    e_2_1 = _b.sent();
+                    e_2 = { error: e_2_1 };
                     return [3 /*break*/, 8];
                 case 7:
                     try {
                         if (kioskOwnerCaps_1_1 && !kioskOwnerCaps_1_1.done && (_a = kioskOwnerCaps_1.return)) _a.call(kioskOwnerCaps_1);
                     }
-                    finally { if (e_1) throw e_1.error; }
+                    finally { if (e_2) throw e_2.error; }
                     return [7 /*endfinally*/];
                 case 8: return [2 /*return*/, Tails];
             }
@@ -227,7 +258,7 @@ exports.getTailsIds = getTailsIds;
 function getTails(provider, tailsIds) {
     return __awaiter(this, void 0, void 0, function () {
         var Tails, len, results, results_1, results_1_1, result, fields, tails;
-        var e_2, _a;
+        var e_3, _a;
         var _b, _c;
         return __generator(this, function (_d) {
             switch (_d.label) {
@@ -241,19 +272,19 @@ function getTails(provider, tailsIds) {
                 case 2:
                     results = _d.sent();
                     try {
-                        for (results_1 = (e_2 = void 0, __values(results)), results_1_1 = results_1.next(); !results_1_1.done; results_1_1 = results_1.next()) {
+                        for (results_1 = (e_3 = void 0, __values(results)), results_1_1 = results_1.next(); !results_1_1.done; results_1_1 = results_1.next()) {
                             result = results_1_1.value;
                             fields = (_b = result.data) === null || _b === void 0 ? void 0 : _b.content.fields;
                             tails = fieldsToTails(fields);
                             Tails.push(__assign(__assign({}, tails), { type: (_c = result.data) === null || _c === void 0 ? void 0 : _c.type }));
                         }
                     }
-                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
                     finally {
                         try {
                             if (results_1_1 && !results_1_1.done && (_a = results_1.return)) _a.call(results_1);
                         }
-                        finally { if (e_2) throw e_2.error; }
+                        finally { if (e_3) throw e_3.error; }
                     }
                     return [3 /*break*/, 1];
                 case 3: return [2 /*return*/, Tails];
@@ -265,7 +296,7 @@ exports.getTails = getTails;
 function getTailsDynamicField(provider, tailsIds) {
     return __awaiter(this, void 0, void 0, function () {
         var Tails, tailsToDynamicField, len, results, results_2, results_2_1, result, owner, fields, tails;
-        var e_3, _a;
+        var e_4, _a;
         var _b, _c, _d;
         return __generator(this, function (_e) {
             switch (_e.label) {
@@ -280,7 +311,7 @@ function getTailsDynamicField(provider, tailsIds) {
                 case 2:
                     results = _e.sent();
                     try {
-                        for (results_2 = (e_3 = void 0, __values(results)), results_2_1 = results_2.next(); !results_2_1.done; results_2_1 = results_2.next()) {
+                        for (results_2 = (e_4 = void 0, __values(results)), results_2_1 = results_2.next(); !results_2_1.done; results_2_1 = results_2.next()) {
                             result = results_2_1.value;
                             owner = (_b = result.data) === null || _b === void 0 ? void 0 : _b.owner.ObjectOwner;
                             fields = (_c = result.data) === null || _c === void 0 ? void 0 : _c.content.fields;
@@ -294,12 +325,12 @@ function getTailsDynamicField(provider, tailsIds) {
                             }
                         }
                     }
-                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                    catch (e_4_1) { e_4 = { error: e_4_1 }; }
                     finally {
                         try {
                             if (results_2_1 && !results_2_1.done && (_a = results_2.return)) _a.call(results_2);
                         }
-                        finally { if (e_3) throw e_3.error; }
+                        finally { if (e_4) throw e_4.error; }
                     }
                     return [3 /*break*/, 1];
                 case 3: return [2 /*return*/, [Tails, tailsToDynamicField]];
@@ -311,7 +342,7 @@ exports.getTailsDynamicField = getTailsDynamicField;
 function getTailsKiosk(provider, tailsToDynamicField) {
     return __awaiter(this, void 0, void 0, function () {
         var DynamicFieldToKiosk, dynamicFields, i, len, results, results_3, results_3_1, result, owner;
-        var e_4, _a;
+        var e_5, _a;
         var _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
@@ -330,19 +361,19 @@ function getTailsKiosk(provider, tailsToDynamicField) {
                 case 2:
                     results = _c.sent();
                     try {
-                        for (results_3 = (e_4 = void 0, __values(results)), results_3_1 = results_3.next(); !results_3_1.done; results_3_1 = results_3.next()) {
+                        for (results_3 = (e_5 = void 0, __values(results)), results_3_1 = results_3.next(); !results_3_1.done; results_3_1 = results_3.next()) {
                             result = results_3_1.value;
                             owner = (_b = result.data) === null || _b === void 0 ? void 0 : _b.owner.ObjectOwner;
                             DynamicFieldToKiosk.set(dynamicFields.at(i), owner);
                             i += 1;
                         }
                     }
-                    catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                    catch (e_5_1) { e_5 = { error: e_5_1 }; }
                     finally {
                         try {
                             if (results_3_1 && !results_3_1.done && (_a = results_3.return)) _a.call(results_3);
                         }
-                        finally { if (e_4) throw e_4.error; }
+                        finally { if (e_5) throw e_5.error; }
                     }
                     return [3 /*break*/, 1];
                 case 3: return [2 /*return*/, DynamicFieldToKiosk];
@@ -354,7 +385,7 @@ exports.getTailsKiosk = getTailsKiosk;
 function getKioskOwner(provider, DynamicFieldToKiosk) {
     return __awaiter(this, void 0, void 0, function () {
         var KioskToOwner, kiosks, uniqueKiosks, i, len, results, results_4, results_4_1, result, owner;
-        var e_5, _a;
+        var e_6, _a;
         var _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
@@ -376,19 +407,19 @@ function getKioskOwner(provider, DynamicFieldToKiosk) {
                 case 2:
                     results = _c.sent();
                     try {
-                        for (results_4 = (e_5 = void 0, __values(results)), results_4_1 = results_4.next(); !results_4_1.done; results_4_1 = results_4.next()) {
+                        for (results_4 = (e_6 = void 0, __values(results)), results_4_1 = results_4.next(); !results_4_1.done; results_4_1 = results_4.next()) {
                             result = results_4_1.value;
                             owner = (_b = result.data) === null || _b === void 0 ? void 0 : _b.content.fields.owner;
                             KioskToOwner.set(uniqueKiosks.at(i), owner);
                             i += 1;
                         }
                     }
-                    catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                    catch (e_6_1) { e_6 = { error: e_6_1 }; }
                     finally {
                         try {
                             if (results_4_1 && !results_4_1.done && (_a = results_4.return)) _a.call(results_4);
                         }
-                        finally { if (e_5) throw e_5.error; }
+                        finally { if (e_6) throw e_6.error; }
                     }
                     return [3 /*break*/, 1];
                 case 3: return [2 /*return*/, KioskToOwner];
@@ -503,14 +534,14 @@ function getDiscountPool(provider, pool) {
     });
 }
 exports.getDiscountPool = getDiscountPool;
-function getMintHistory(provider, NFT_PACKAGE_UPGRADE, vrf_input) {
+function getMintHistory(provider, NFT_PACKAGE, vrf_input) {
     return __awaiter(this, void 0, void 0, function () {
         var eventFilter, result, res, eventFilter_1, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     eventFilter = {
-                        MoveEventType: "".concat(NFT_PACKAGE_UPGRADE, "::discount_mint::DiscountEventV3"),
+                        MoveEventType: "".concat(NFT_PACKAGE, "::discount_mint::DiscountEventV3"),
                     };
                     return [4 /*yield*/, provider.queryEvents({ query: eventFilter, order: "descending" })];
                 case 1:

package/package.json

@@ -2,7 +2,7 @@
     "name": "@typus/typus-sdk",
     "author": "Typus",
     "description": "typus sdk",
-    "version": "1.2.63",
+    "version": "1.2.65",
     "dependencies": {
         "@mysten/bcs": "^0.7.3",
         "@mysten/kiosk": "0.7.12",