@typus/typus-sdk 1.2.36 → 1.2.37

package/lib/mainnet.json

@@ -30,12 +30,12 @@
     "SCALLOP_MARKET": "0xa757975255146dc9686aa823b7838b507f315d704f428cbadad2f4ea061939d9",
     "SCALLOP_REWARD_POOL_FOR_SUI": "0x162250ef72393a4ad3d46294c4e1bdfcb03f04c869d390e7efbfc995353a7ee9",
     "SCALLOP_REWARD_POOL_FOR_USDC": "0xf4268cc9b9413b9bfe09e8966b8de650494c9e5784bf0930759cfef4904daff8",
-    "VERSION": "2.12.0",
+    "VERSION": "2.18.12",
     "EXP_GUESS_PACKAGE": "0x32d670520a10a87b8c042d2259c2d1f7c319329bafcf6f893ad9aaf01a43db8b",
     "EXP_GUESS_PACKAGE_ORIGIN": "0x32d670520a10a87b8c042d2259c2d1f7c319329bafcf6f893ad9aaf01a43db8b",
     "EXP_GUESS_REGISTRY": "0x70c6cbe6764b315cee1b24f483a0fc8307f047f1fab2a0d4438624845e6ba3f2",
     "FRAMEWORK_PACKAGE": "0xb4f25230ba74837d8299e92951306100c4a532e8c48cc3d8828abe9b91c8b274",
-    "SINGLE_COLLATERAL_PACKAGE": "0x44bb378242396440e1fd6d7befcb35bb8df5623605db5d79313924ad5e8946a6",
+    "SINGLE_COLLATERAL_PACKAGE": "0x05b81d86deb99c33a46042ee92a0e6665cea64dffa3ad23a114ce08f449b8bdb",
     "SINGLE_COLLATERAL_PACKAGE_ORIGIN": "0x321848bf1ae327a9e022ccb3701940191e02fa193ab160d9c0e49cd3c003de3a",
     "SINGLE_COLLATERAL_REGISTRY": "0x3d70b09359e3ca8301ae0abeda4f2fdf72ce313ba58c919ce568e5f535fd2ea8",
     "SINGLE_COLLATERAL_PORTFOLIO_VAULT_REGISTRY": "0xa1a186d050e3172ef4701c16048c99b11f785969874fa2642b9cbcf59cde7fc0",
@@ -65,5 +65,6 @@
     "sui_network": "0xed5f3eebda1be7cd74ebb883852738996ea4b7d651eb1b5a77bb5d7f221b5b2a",
     "mysten_labs": "0x985a37095c597ecfa072b0f389df689ee4d9c99bcf4b175aa53be52e2e5f25b8",
     "none": "0x88dba869e789d0725ae55fbb446f6e38065b67e1f26b10ec57322b18f4de9892",
-    "diceProfitSharing": "0x42ba35a057e38baf19e916b0f9ad5d98bb23b7fc246b4d659fc21c608790e872"
+    "diceProfitSharing": "0x42ba35a057e38baf19e916b0f9ad5d98bb23b7fc246b4d659fc21c608790e872",
+    "STRATEGY_POOL": "0x2c60ddd50d76beb00faa025962d566359a6ea05b1f7f19ac6bd050f4db8c885c"
 }

package/lib/utils/leader-board.d.ts

@@ -4,9 +4,11 @@ interface LeaderBoard {
     user: string;
     score: number;
 }
-interface ExpEarn {
-    address: string;
+export interface ExpLeaderBoard {
+    nft_id: string;
     total_exp_earn: number;
+    owner: string | undefined;
 }
-export declare function getExpLeaderBoard(startTimestamp: string, endTimestamp?: string): Promise<ExpEarn[]>;
+export declare function getExpLeaderBoardWithOwner(expLeaderBoard: ExpLeaderBoard[], ownerMap: Map<string, string>): Promise<ExpLeaderBoard[]>;
+export declare function getExpLeaderBoard(startTimestamp: string, endTimestamp?: string): Promise<ExpLeaderBoard[]>;
 export {};

package/lib/utils/leader-board.js

@@ -52,7 +52,7 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExpLeaderBoard = exports.getBidderLeaderBoard = exports.getDepositorLeaderBoard = void 0;
+exports.getExpLeaderBoard = exports.getExpLeaderBoardWithOwner = exports.getBidderLeaderBoard = exports.getDepositorLeaderBoard = void 0;
 var apiUrl = "https://app.sentio.xyz/api/v1/insights/wayne/typus/query";
 var headers = {
     "api-key": "oBOW8DsO1izVrINCy6Tmxga9YcWeOL87O",
@@ -267,6 +267,17 @@ function getBidderLeaderBoard(startTimestamp, end) {
     });
 }
 exports.getBidderLeaderBoard = getBidderLeaderBoard;
+function getExpLeaderBoardWithOwner(expLeaderBoard, ownerMap) {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            return [2 /*return*/, expLeaderBoard.map(function (l) {
+                    l.owner = ownerMap.get(l.nft_id);
+                    return l;
+                })];
+        });
+    });
+}
+exports.getExpLeaderBoardWithOwner = getExpLeaderBoardWithOwner;
 function getExpLeaderBoard(startTimestamp, endTimestamp) {
     return __awaiter(this, void 0, void 0, function () {
         var apiUrl, headers, _endTimestamp, requestData, jsonData, response, data;
@@ -278,11 +289,25 @@ function getExpLeaderBoard(startTimestamp, endTimestamp) {
                         "api-key": "tz3JJ6stG7Fux6ueRSRA5mdpC9U0lozI3",
                         "Content-Type": "application/json",
                     };
-                    _endTimestamp = endTimestamp ? endTimestamp : "99999999999";
+                    _endTimestamp = endTimestamp ? endTimestamp : "9999999999";
                     requestData = {
                         sqlQuery: {
-                            sql: "SELECT S.distinct_id AS address, SUM(E.exp_earn) AS total_exp_earn\n                    FROM ExpUp E\n                    JOIN (\n                        SELECT number, distinct_id\n                        FROM StakeNft\n                        WHERE (number, timestamp) IN (\n                            SELECT number, MAX(timestamp) AS max_timestamp\n                            FROM StakeNft\n                            GROUP BY number\n                        )\n                    ) S ON E.number = S.number\n                    WHERE E.timestamp >= ".concat(startTimestamp, " && E.timestamp < ").concat(endTimestamp, "\n                    GROUP BY address\n                    ORDER BY total_exp_earn DESC;"),
-                            size: 100,
+                            // sql: `SELECT S.distinct_id AS owner, SUM(E.exp_earn) AS total_exp_earn
+                            //         FROM ExpUp E
+                            //         JOIN (
+                            //             SELECT number, distinct_id
+                            //             FROM StakeNft
+                            //             WHERE (number, timestamp) IN (
+                            //                 SELECT number, MAX(timestamp) AS max_timestamp
+                            //                 FROM StakeNft
+                            //                 GROUP BY number
+                            //             )
+                            //         ) S ON E.number = S.number
+                            //         WHERE E.timestamp >= ${startTimestamp} && E.timestamp < ${_endTimestamp}
+                            //         GROUP BY owner
+                            //         ORDER BY total_exp_earn DESC;`,
+                            sql: "\n                SELECT E.nft_id as nft_id, SUM(E.exp_earn) as total_exp_earn\n                FROM ExpUp E\n                WHERE E.timestamp >= ".concat(startTimestamp, " && E.timestamp < ").concat(_endTimestamp, "\n                GROUP BY nft_id\n                ORDER BY total_exp_earn DESC;\n            "),
+                            size: 200,
                         },
                     };
                     jsonData = JSON.stringify(requestData);

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

@@ -1,4 +1,5 @@
 import { TransactionBlock } from "@mysten/sui.js/transactions";
-export declare function getSetProfitSharingTx(gasBudget: number, packageId: string, registry: string, level_profits: number[], amount: number, coins: string[], typeArguments: string[]): Promise<TransactionBlock>;
+export declare function getSetProfitSharingTx(gasBudget: number, packageId: string, registry: string, name: "dice_profit_sharing" | "exp_profit_sharing", level_profits: number[], amount: number, coins: string[], typeArguments: string[]): Promise<TransactionBlock>;
 export declare function getAllocateProfitSharingTx(gasBudget: number, packageId: string, registry: string, users: string[], typeArguments: string[]): Promise<TransactionBlock>;
-export declare function getRemoveProfitSharingTx(gasBudget: number, packageId: string, registry: string, typeArgumentsRemove: string[]): Promise<TransactionBlock>;
+export declare function getAllocateProfitSharingValueTx(gasBudget: number, packageId: string, registry: string, users: string[], values: string[], typeArguments: string[]): Promise<TransactionBlock>;
+export declare function getRemoveProfitSharingTx(gasBudget: number, packageId: string, registry: string, name: "dice_profit_sharing" | "exp_profit_sharing", typeArgumentsRemove: string[]): Promise<TransactionBlock>;

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

@@ -52,9 +52,9 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRemoveProfitSharingTx = exports.getAllocateProfitSharingTx = exports.getSetProfitSharingTx = void 0;
+exports.getRemoveProfitSharingTx = exports.getAllocateProfitSharingValueTx = exports.getAllocateProfitSharingTx = exports.getSetProfitSharingTx = void 0;
 var transactions_1 = require("@mysten/sui.js/transactions");
-function getSetProfitSharingTx(gasBudget, packageId, registry, level_profits, amount, coins, typeArguments) {
+function getSetProfitSharingTx(gasBudget, packageId, registry, name, level_profits, amount, coins, typeArguments) {
     return __awaiter(this, void 0, void 0, function () {
         var tx, _a, input_coin, coin, _b, input_coin;
         return __generator(this, function (_c) {
@@ -65,7 +65,7 @@ function getSetProfitSharingTx(gasBudget, packageId, registry, level_profits, am
                 tx.moveCall({
                     target: "".concat(packageId, "::tails_staking::set_profit_sharing"),
                     typeArguments: typeArguments,
-                    arguments: [tx.object(registry), tx.pure(level_profits), input_coin],
+                    arguments: [tx.object(registry), tx.pure(name), tx.pure(level_profits), input_coin],
                 });
             }
             else {
@@ -77,7 +77,7 @@ function getSetProfitSharingTx(gasBudget, packageId, registry, level_profits, am
                 tx.moveCall({
                     target: "".concat(packageId, "::tails_staking::set_profit_sharing"),
                     typeArguments: typeArguments,
-                    arguments: [tx.object(registry), tx.pure(level_profits), input_coin],
+                    arguments: [tx.object(registry), tx.pure(name), tx.pure(level_profits), input_coin],
                 });
             }
             tx.setGasBudget(gasBudget);
@@ -102,7 +102,23 @@ function getAllocateProfitSharingTx(gasBudget, packageId, registry, users, typeA
     });
 }
 exports.getAllocateProfitSharingTx = getAllocateProfitSharingTx;
-function getRemoveProfitSharingTx(gasBudget, packageId, registry, typeArgumentsRemove) {
+function getAllocateProfitSharingValueTx(gasBudget, packageId, registry, users, values, typeArguments) {
+    return __awaiter(this, void 0, void 0, function () {
+        var tx;
+        return __generator(this, function (_a) {
+            tx = new transactions_1.TransactionBlock();
+            tx.moveCall({
+                target: "".concat(packageId, "::tails_staking::allocate_profit_sharing_w_value"),
+                typeArguments: typeArguments,
+                arguments: [tx.object(registry), tx.pure(users), tx.pure(values)],
+            });
+            tx.setGasBudget(gasBudget);
+            return [2 /*return*/, tx];
+        });
+    });
+}
+exports.getAllocateProfitSharingValueTx = getAllocateProfitSharingValueTx;
+function getRemoveProfitSharingTx(gasBudget, packageId, registry, name, typeArgumentsRemove) {
     return __awaiter(this, void 0, void 0, function () {
         var tx;
         return __generator(this, function (_a) {
@@ -110,7 +126,7 @@ function getRemoveProfitSharingTx(gasBudget, packageId, registry, typeArgumentsR
             tx.moveCall({
                 target: "".concat(packageId, "::tails_staking::remove_profit_sharing"),
                 typeArguments: typeArgumentsRemove,
-                arguments: [tx.object(registry)],
+                arguments: [tx.object(registry), tx.pure(name)],
             });
             tx.setGasBudget(gasBudget);
             return [2 /*return*/, tx];

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

@@ -1,4 +1,5 @@
 import { SuiClient } from "@mysten/sui.js/client";
 import { Tails } from "../typus-nft/fetch";
 export declare function getUserStake(provider: SuiClient, nft_table: string, user: string): Promise<Tails | null>;
+export declare function getNftTable(provider: SuiClient, nft_table: string): Promise<import("@mysten/sui.js/client").DynamicFieldInfo[]>;
 export declare function getDailyAttendExp(provider: SuiClient, dailyAttendExp: string): Promise<any>;

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

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDailyAttendExp = exports.getUserStake = void 0;
+exports.getDailyAttendExp = exports.getNftTable = exports.getUserStake = void 0;
 var fetch_1 = require("../typus-nft/fetch");
 function getUserStake(provider, nft_table, user) {
     var _a;
@@ -64,6 +64,36 @@ function getUserStake(provider, nft_table, user) {
     });
 }
 exports.getUserStake = getUserStake;
+function getNftTable(provider, nft_table) {
+    return __awaiter(this, void 0, void 0, function () {
+        var result, datas;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, provider.getDynamicFields({
+                        parentId: nft_table,
+                    })];
+                case 1:
+                    result = _a.sent();
+                    datas = result.data;
+                    _a.label = 2;
+                case 2:
+                    if (!result.hasNextPage) return [3 /*break*/, 4];
+                    return [4 /*yield*/, provider.getDynamicFields({
+                            parentId: nft_table,
+                            cursor: result.nextCursor,
+                        })];
+                case 3:
+                    result = _a.sent();
+                    datas = datas.concat(result.data);
+                    return [3 /*break*/, 2];
+                case 4: 
+                // console.log(datas);
+                return [2 /*return*/, datas];
+            }
+        });
+    });
+}
+exports.getNftTable = getNftTable;
 function getDailyAttendExp(provider, dailyAttendExp) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {

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

@@ -83,4 +83,4 @@ export declare function consumeExpCoinUnstakedTx(gasBudget: number, nftPackageId
     )
 */
 export declare function consumeExpCoinStakedTx(gasBudget: number, nftPackageId: string, typeArguments: string[], registry: string, exp_coins: string[], amount: string): Promise<TransactionBlock>;
-export declare function getClaimProfitSharingTx(gasBudget: number, packageId: string, registry: string, typeArguments: string[]): Promise<TransactionBlock>;
+export declare function getClaimProfitSharingTx(gasBudget: number, packageId: string, registry: string, name: "dice_profit" | "exp_profit", typeArguments: string[]): Promise<TransactionBlock>;

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

@@ -145,7 +145,12 @@ function getSwitchNftTx(gasBudget, nftPackageId, registry, kiosk, kiosk_cap, nft
             tx.moveCall({
                 target: "".concat(nftPackageId, "::tails_staking::claim_profit_sharing"),
                 typeArguments: typeArguments,
-                arguments: [tx.object(registry)],
+                arguments: [tx.object(registry), tx.pure("dice_profit")],
+            });
+            tx.moveCall({
+                target: "".concat(nftPackageId, "::tails_staking::claim_profit_sharing"),
+                typeArguments: typeArguments,
+                arguments: [tx.object(registry), tx.pure("exp_profit")],
             });
             tx.moveCall({
                 target: "".concat(nftPackageId, "::tails_staking::switch_nft"),
@@ -207,7 +212,12 @@ function getUnstakeNftTx(gasBudget, nftPackageId, registry, kiosk, kiosk_cap, ty
             tx.moveCall({
                 target: "".concat(nftPackageId, "::tails_staking::claim_profit_sharing"),
                 typeArguments: typeArguments,
-                arguments: [tx.object(registry)],
+                arguments: [tx.object(registry), tx.pure("dice_profit")],
+            });
+            tx.moveCall({
+                target: "".concat(nftPackageId, "::tails_staking::claim_profit_sharing"),
+                typeArguments: typeArguments,
+                arguments: [tx.object(registry), tx.pure("exp_profit")],
             });
             tx.moveCall({
                 target: "".concat(nftPackageId, "::tails_staking::unstake_nft"),
@@ -496,7 +506,7 @@ function consumeExpCoinStakedTx(gasBudget, nftPackageId, typeArguments, registry
     });
 }
 exports.consumeExpCoinStakedTx = consumeExpCoinStakedTx;
-function getClaimProfitSharingTx(gasBudget, packageId, registry, typeArguments) {
+function getClaimProfitSharingTx(gasBudget, packageId, registry, name, typeArguments) {
     return __awaiter(this, void 0, void 0, function () {
         var tx;
         return __generator(this, function (_a) {
@@ -504,7 +514,7 @@ function getClaimProfitSharingTx(gasBudget, packageId, registry, typeArguments)
             tx.moveCall({
                 target: "".concat(packageId, "::tails_staking::claim_profit_sharing"),
                 typeArguments: typeArguments,
-                arguments: [tx.object(registry)],
+                arguments: [tx.object(registry), tx.pure(name)],
             });
             tx.setGasBudget(gasBudget);
             return [2 /*return*/, tx];

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

@@ -160,7 +160,7 @@ function getTailsIds(kioskClient, nftConfig, address) {
                         var res, tails;
                         return __generator(this, function (_e) {
                             switch (_e.label) {
-                                case 0: return [4 /*yield*/, kioskClient.getKiosk({ id: kioskOwnerCap.kioskId, options: { withKioskFields: true, withObjects: true } })];
+                                case 0: return [4 /*yield*/, kioskClient.getKiosk({ id: kioskOwnerCap.kioskId })];
                                 case 1:
                                     res = _e.sent();
                                     tails = res.items

package/package.json

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