@typus/typus-sdk 1.2.588 → 1.3.1

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, kioskOwnerCap } from "../typus-nft/fetch";
 /**
     entry fun transfer_nft(
         registry: &mut Registry,
@@ -10,8 +11,8 @@ 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 getTransferNftsTx(gasBudget: number, nftPackageId: string, registry: string, kiosks: string[], kiosk_caps: string[], nft_ids: 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, personalKioskPackageId: string, registry: string, tailsIds: TailsId[], receiver: string): Promise<TransactionBlock>;
 /**
     public fun stake_nft(
         registry: &mut Registry,
@@ -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(
@@ -34,7 +35,7 @@ export declare function getCreateKioskAndLockNftTx(kioskClient: KioskClient, gas
         ctx: &mut TxContext
     )
 */
-export declare function getUnstakeNftTx(gasBudget: number, nftPackageId: string, registry: string, kiosk: string, kiosk_cap: string, typeArguments: string[]): Promise<TransactionBlock>;
+export declare function getUnstakeNftTx(gasBudget: number, nftPackageId: string, registry: string, typeArguments: string[], kioskOwnerCap: kioskOwnerCap, personalKioskPackageId: string): Promise<TransactionBlock>;
 /**
     public fun daily_attend(
         registry: &mut Registry,
@@ -50,7 +51,7 @@ export declare function getDailyAttendTx(gasBudget: number, nftPackageId: string
         ctx: &mut TxContext
     )
 */
-export declare function getSnapshotTx(gasBudget: number, nftPackageId: string, registry: string): Promise<TransactionBlock>;
+export declare function getSnapshotTx(gasBudget: number, typusEcosystemVersion: string, typusUserRegistry: string, typusDovSinglePackageId: string, registry: string, amount: string): Promise<TransactionBlock>;
 export declare function getNewBidTx(gasBudget: number, packageId: string, typeArguments: string[], registry: string, additional_config_registry: string, index: string, priceOracle: string, coins: string[], size: string, premium_required: string, // fe float * b_token_decimal
 usingSponsoredGasCoin?: boolean): Promise<TransactionBlock>;
 export declare function getDepositTx(gasBudget: number, packageId: string, typeArguments: string[], registry: string, additional_config_registry: string, index: string, coins: string[], amount: string, usingSponsoredGasCoin?: boolean): Promise<TransactionBlock>;
@@ -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,36 +66,91 @@ 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];
         });
     });
 }
 exports.getTransferNftTx = getTransferNftTx;
-function getTransferNftsTx(gasBudget, nftPackageId, registry, kiosks, kiosk_caps, nft_ids, receiver) {
+function getTransferNftsTx(gasBudget, nftPackageId, personalKioskPackageId, registry, tailsIds, receiver) {
     return __awaiter(this, void 0, void 0, function () {
-        var tx, i, _a, coin;
-        return __generator(this, function (_b) {
+        var tx, i, _a, coin, _b, personalKioskCap, borrow;
+        return __generator(this, function (_c) {
             tx = new transactions_1.TransactionBlock();
             i = 0;
-            while (i < kiosks.length) {
+            while (i < tailsIds.length) {
                 _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(kiosks[i]), tx.object(kiosk_caps[i]), tx.pure(nft_ids[i]), tx.pure(receiver), coin],
-                });
+                if (tailsIds[i].isPersonal) {
+                    _b = __read(tx.moveCall({
+                        target: "".concat(personalKioskPackageId, "::personal_kiosk::borrow_val"),
+                        arguments: [tx.object(tailsIds[i].kioskCap)],
+                    }), 2), personalKioskCap = _b[0], borrow = _b[1];
+                    tx.moveCall({
+                        target: "".concat(nftPackageId, "::tails_staking::transfer_nft"),
+                        typeArguments: [],
+                        arguments: [
+                            tx.object(registry),
+                            tx.object(tailsIds[i].kiosk),
+                            personalKioskCap,
+                            tx.pure(tailsIds[i].nftId),
+                            tx.pure(receiver),
+                            coin,
+                        ],
+                    });
+                    tx.moveCall({
+                        target: "".concat(personalKioskPackageId, "::personal_kiosk::return_val"),
+                        arguments: [tx.object(tailsIds[i].kioskCap), personalKioskCap, borrow],
+                    });
+                }
+                else {
+                    tx.moveCall({
+                        target: "".concat(nftPackageId, "::tails_staking::transfer_nft"),
+                        typeArguments: [],
+                        arguments: [
+                            tx.object(registry),
+                            tx.object(tailsIds[i].kiosk),
+                            tx.object(tailsIds[i].kioskCap),
+                            tx.pure(tailsIds[i].nftId),
+                            tx.pure(receiver),
+                            coin,
+                        ],
+                    });
+                }
                 i += 1;
             }
             tx.setGasBudget(gasBudget);
@@ -114,34 +169,58 @@ 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({
-                target: "".concat(nftPackageId, "::tails_staking::snapshot"),
-                typeArguments: [],
-                arguments: [tx.object(registry), tx.object(constants_1.CLOCK)],
-            });
+            // tx.moveCall({
+            //     target: `${nftPackageId}::tails_staking::snapshot`,
+            //     typeArguments: [],
+            //     arguments: [tx.object(registry), tx.object(CLOCK)],
+            // });
             tx.moveCall({
                 target: "".concat(nftPackageId, "::tails_staking::claim_profit_sharing"),
                 typeArguments: typeArguments,
@@ -152,11 +231,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];
         });
@@ -199,16 +302,16 @@ exports.getCreateKioskAndLockNftTx = getCreateKioskAndLockNftTx;
         ctx: &mut TxContext
     )
 */
-function getUnstakeNftTx(gasBudget, nftPackageId, registry, kiosk, kiosk_cap, typeArguments) {
+function getUnstakeNftTx(gasBudget, nftPackageId, registry, typeArguments, kioskOwnerCap, personalKioskPackageId) {
     return __awaiter(this, void 0, void 0, function () {
-        var tx;
-        return __generator(this, function (_a) {
+        var tx, _a, personalKioskCap, borrow;
+        return __generator(this, function (_b) {
             tx = new transactions_1.TransactionBlock();
-            tx.moveCall({
-                target: "".concat(nftPackageId, "::tails_staking::snapshot"),
-                typeArguments: [],
-                arguments: [tx.object(registry), tx.object(constants_1.CLOCK)],
-            });
+            // tx.moveCall({
+            //     target: `${nftPackageId}::tails_staking::snapshot`,
+            //     typeArguments: [],
+            //     arguments: [tx.object(registry), tx.object(CLOCK)],
+            // });
             tx.moveCall({
                 target: "".concat(nftPackageId, "::tails_staking::claim_profit_sharing"),
                 typeArguments: typeArguments,
@@ -219,11 +322,28 @@ function getUnstakeNftTx(gasBudget, nftPackageId, registry, kiosk, kiosk_cap, ty
                 typeArguments: typeArguments,
                 arguments: [tx.object(registry), tx.pure("exp_profit")],
             });
-            tx.moveCall({
-                target: "".concat(nftPackageId, "::tails_staking::unstake_nft"),
-                typeArguments: [],
-                arguments: [tx.object(registry), tx.object(kiosk), tx.object(kiosk_cap)],
-            });
+            if (kioskOwnerCap.isPersonal) {
+                _a = __read(tx.moveCall({
+                    target: "".concat(personalKioskPackageId, "::personal_kiosk::borrow_val"),
+                    arguments: [tx.object(kioskOwnerCap.objectId)],
+                }), 2), personalKioskCap = _a[0], borrow = _a[1];
+                tx.moveCall({
+                    target: "".concat(nftPackageId, "::tails_staking::unstake_nft"),
+                    typeArguments: [],
+                    arguments: [tx.object(registry), tx.object(kioskOwnerCap.kioskId), tx.object(personalKioskCap)],
+                });
+                tx.moveCall({
+                    target: "".concat(personalKioskPackageId, "::personal_kiosk::return_val"),
+                    arguments: [tx.object(kioskOwnerCap.objectId), personalKioskCap, borrow],
+                });
+            }
+            else {
+                tx.moveCall({
+                    target: "".concat(nftPackageId, "::tails_staking::unstake_nft"),
+                    typeArguments: [],
+                    arguments: [tx.object(registry), tx.object(kioskOwnerCap.kioskId), tx.object(kioskOwnerCap.objectId)],
+                });
+            }
             tx.setGasBudget(gasBudget);
             return [2 /*return*/, tx];
         });
@@ -260,15 +380,15 @@ exports.getDailyAttendTx = getDailyAttendTx;
         ctx: &mut TxContext
     )
 */
-function getSnapshotTx(gasBudget, nftPackageId, registry) {
+function getSnapshotTx(gasBudget, typusEcosystemVersion, typusUserRegistry, typusDovSinglePackageId, registry, amount) {
     return __awaiter(this, void 0, void 0, function () {
         var tx;
         return __generator(this, function (_a) {
             tx = new transactions_1.TransactionBlock();
             tx.moveCall({
-                target: "".concat(nftPackageId, "::tails_staking::snapshot"),
+                target: "".concat(typusDovSinglePackageId, "::tails_staking::snapshot"),
                 typeArguments: [],
-                arguments: [tx.object(registry), tx.object(constants_1.CLOCK)],
+                arguments: [tx.object(typusEcosystemVersion), tx.object(typusUserRegistry), tx.object(registry), tx.pure(amount)],
             });
             tx.setGasBudget(gasBudget);
             return [2 /*return*/, tx];
@@ -457,21 +577,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/price.js

@@ -112,7 +112,7 @@ function getPythLatestPrice() {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    apiUrlWithParams = "https://hermes.pyth.network/api/latest_price_feeds?ids[]=0x23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744&ids[]=0xe5b274b2611143df055d6e7cd8d93fe1961716bcd4dca1cad87a83bc1e78c1ef&ids[]=0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a&ids[]=0xe62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43&ids[]=0xff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace&ids[]=0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d&ids[]=0xf9c2e890443dd995d0baafc08eea3358be1ffb874f93f99c30b3816c460bbac3&ids[]=0x03ae4db29ed4ae33d323568895aa00337e658e348b37509f5372ae51f0af00d5&ids[]=0x2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b&ids[]=0xdcef50dd0a4cd2dcc17e45df1676dcb336a11a61c69df7a0299b0150c672d25c&ids[]=0x7a5bc1d2b56ad029048cd63964b3ad2776eadf812edc1a43a31406cb54bff592&ids[]=0x53614f1cb0c031d4af66c04cb9c756234adad0e1cee85303795091499a4084eb";
+                    apiUrlWithParams = "https://hermes.pyth.network/api/latest_price_feeds?ids[]=0x23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744&ids[]=0xe5b274b2611143df055d6e7cd8d93fe1961716bcd4dca1cad87a83bc1e78c1ef&ids[]=0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a&ids[]=0xe62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43&ids[]=0xff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace&ids[]=0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d&ids[]=0xf9c2e890443dd995d0baafc08eea3358be1ffb874f93f99c30b3816c460bbac3&ids[]=0x03ae4db29ed4ae33d323568895aa00337e658e348b37509f5372ae51f0af00d5&ids[]=0x2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b&ids[]=0xdcef50dd0a4cd2dcc17e45df1676dcb336a11a61c69df7a0299b0150c672d25c&ids[]=0x7a5bc1d2b56ad029048cd63964b3ad2776eadf812edc1a43a31406cb54bff592&ids[]=0x53614f1cb0c031d4af66c04cb9c756234adad0e1cee85303795091499a4084eb&ids[]=0x88250f854c019ef4f88a5c073d52a18bb1c6ac437033f5932cd017d24917ab46&ids[]=0xe393449f6aff8a4b6d3e1165a7c9ebec103685f3b41e60db4277b5b6d10e7326";
                     return [4 /*yield*/, fetch(apiUrlWithParams, {
                             method: "GET",
                             headers: { "Content-Type": "application/json" },
@@ -204,4 +204,6 @@ var pythId = {
     dcef50dd0a4cd2dcc17e45df1676dcb336a11a61c69df7a0299b0150c672d25c: "DOGE",
     "7a5bc1d2b56ad029048cd63964b3ad2776eadf812edc1a43a31406cb54bff592": "INJ",
     "53614f1cb0c031d4af66c04cb9c756234adad0e1cee85303795091499a4084eb": "SEI",
+    "88250f854c019ef4f88a5c073d52a18bb1c6ac437033f5932cd017d24917ab46": "NAVX",
+    e393449f6aff8a4b6d3e1165a7c9ebec103685f3b41e60db4277b5b6d10e7326: "USDY",
 };

package/lib/utils/recap2023.js

@@ -68,7 +68,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.recap2023 = void 0;
 var mainnet_json_1 = __importDefault(require("../mainnet.json"));
-var user_history_1 = require("../utils/typus-dov-single-v2/user-history");
 var view_function_1 = require("../utils/typus-dov-single-v2/view-function");
 var client_1 = require("@mysten/sui.js/client");
 var price_1 = require("../utils/price");
@@ -92,9 +91,7 @@ function recap2023(user) {
                     return [4 /*yield*/, (0, view_function_1.getVaults)(provider, mainnet_json_1.default.SINGLE_COLLATERAL_PACKAGE, mainnet_json_1.default.SINGLE_COLLATERAL_REGISTRY, [])];
                 case 1:
                     vaults = _p.sent();
-                    return [4 /*yield*/, (0, user_history_1.getUserHistory)(provider, mainnet_json_1.default.SINGLE_COLLATERAL_PACKAGE_ORIGIN, vaults, user, 0)];
-                case 2:
-                    userHistory = _p.sent();
+                    userHistory = [];
                     console.log(userHistory);
                     earn = new Map();
                     try {
@@ -137,7 +134,7 @@ function recap2023(user) {
                     // console.log(earn);
                     earn.delete("");
                     return [4 /*yield*/, (0, price_1.getLatestPriceUSD)()];
-                case 3:
+                case 2:
                     prices = _p.sent();
                     sum = 0;
                     try {
@@ -156,7 +153,7 @@ function recap2023(user) {
                         finally { if (e_2) throw e_2.error; }
                     }
                     return [4 /*yield*/, (0, fetch_1.getUserStake)(provider, mainnet_json_1.default.NFT_TABLE, user)];
-                case 4:
+                case 3:
                     res_1 = _p.sent();
                     // console.log(res_1!.number); // null
                     return [2 /*return*/, [sum, res_1]];

package/lib/utils/tails-exp-dice/fetch.js

@@ -116,7 +116,7 @@ function getHistory(provider, dicePackage, playgrounds) {
                     history = _a.sent();
                     _a.label = 3;
                 case 3:
-                    if (!result.hasNextPage) return [3 /*break*/, 6];
+                    if (!(result.hasNextPage && history.length <= 60)) return [3 /*break*/, 6];
                     return [4 /*yield*/, provider.queryEvents({ query: eventFilter, order: "descending", cursor: result.nextCursor })];
                 case 4:
                     result = _a.sent();

package/lib/utils/token.js

@@ -10,6 +10,8 @@ exports.typeArgsToAssets = typeArgsToAssets;
 function typeArgToAsset(typeArg) {
     var typeArgs = typeArg.split("::");
     switch ((0, utils_1.normalizeSuiAddress)(typeArgs[0])) {
+        case "0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55":
+            return "VSUI";
         case "0x027792d9fed7f9844eb4839566001bb6f6cb4804f66aa2da6fe1ee242d896881":
             return "WBTC";
         case "0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5":
@@ -90,6 +92,10 @@ function assetToDecimal(asset) {
             return 9;
         case "SCA":
             return 9;
+        case "HASUI":
+            return 9;
+        case "VSUI":
+            return 9;
     }
 }
 exports.assetToDecimal = assetToDecimal;

package/lib/utils/tools.d.ts

@@ -1,2 +1,6 @@
+import BigNumber from "bignumber.js";
 export declare function U64FromBytes(x: any): bigint;
 export declare function AddressFromBytes(x: any): string;
+export declare const insertAt: (str: string, sub: string, pos: number) => string;
+export declare const checkNumber: (str: any) => boolean;
+export declare const countFloating: (value: number | BigNumber) => number;

package/lib/utils/tools.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AddressFromBytes = exports.U64FromBytes = void 0;
+exports.countFloating = exports.checkNumber = exports.insertAt = exports.AddressFromBytes = exports.U64FromBytes = void 0;
+var bignumber_js_1 = __importDefault(require("bignumber.js"));
 function U64FromBytes(x) {
     var u64 = BigInt(0);
     for (var i = 0; i < x.length; i++) {
@@ -18,3 +22,24 @@ function AddressFromBytes(x) {
     return address;
 }
 exports.AddressFromBytes = AddressFromBytes;
+var insertAt = function (str, sub, pos) { return "".concat(str.slice(0, pos)).concat(sub).concat(str.slice(pos)); };
+exports.insertAt = insertAt;
+var checkNumber = function (str) {
+    if (typeof str != "string")
+        return false; // we only process strings!
+    return (
+    // @ts-ignore
+    !isNaN(str) && // use type coercion to parse the _entirety_ of the string (`parseFloat` alone does not do this)...
+        !isNaN(parseFloat(str))); // ...and ensure strings of whitespace fail
+};
+exports.checkNumber = checkNumber;
+var countFloating = function (value) {
+    var num = (0, bignumber_js_1.default)(value).toFixed().replace(/,/g, "");
+    if (value instanceof bignumber_js_1.default) {
+        num = value.toFixed().replace(/,/g, "");
+    }
+    if (!num.includes("."))
+        return 0;
+    return num.split(".")[1].length;
+};
+exports.countFloating = countFloating;

package/lib/utils/typus-dov-single-v2/authorized-entry.js

@@ -96,7 +96,7 @@ function getOtcTx(gasBudget_1, packageId_1, typeArguments_1, registry_1, index_1
                         tx.pure(incentiveBidValue),
                         tx.pure(incentiveFeeBalanceValue),
                         tx.pure(depositorIncentiveValue),
-                        tx.pure(constants_1.CLOCK),
+                        tx.object(constants_1.CLOCK),
                     ],
                 });
             }
@@ -115,7 +115,7 @@ function getOtcTx(gasBudget_1, packageId_1, typeArguments_1, registry_1, index_1
                         tx.pure(incentiveBidValue),
                         tx.pure(incentiveFeeBalanceValue),
                         tx.pure(depositorIncentiveValue),
-                        tx.pure(constants_1.CLOCK),
+                        tx.object(constants_1.CLOCK),
                     ],
                 });
             }

package/lib/utils/typus-dov-single-v2/depositorPnl.js

@@ -36,7 +36,7 @@ function getDepositorCashFlows(userHistory) {
         for (var userHistory_1 = __values(userHistory), userHistory_1_1 = userHistory_1.next(); !userHistory_1_1.done; userHistory_1_1 = userHistory_1.next()) {
             var history_1 = userHistory_1_1.value;
             var index = history_1.Index;
-            if (history_1.Action.startsWith("Harvest")) {
+            if (history_1.Action.startsWith("Harvest Reward")) {
                 var _h = __read((_c = history_1.Amount) === null || _c === void 0 ? void 0 : _c.split(" "), 2), amount = _h[0], token = _h[1];
                 if (depositorCashFlows.has(index)) {
                     var depositorCashFlow = depositorCashFlows.get(index);