@typus/typus-sdk 1.2.50 → 1.2.52

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.18.13",
+    "VERSION": "2.19.3",
     "EXP_GUESS_PACKAGE": "0x32d670520a10a87b8c042d2259c2d1f7c319329bafcf6f893ad9aaf01a43db8b",
     "EXP_GUESS_PACKAGE_ORIGIN": "0x32d670520a10a87b8c042d2259c2d1f7c319329bafcf6f893ad9aaf01a43db8b",
     "EXP_GUESS_REGISTRY": "0x70c6cbe6764b315cee1b24f483a0fc8307f047f1fab2a0d4438624845e6ba3f2",
     "FRAMEWORK_PACKAGE": "0xb4f25230ba74837d8299e92951306100c4a532e8c48cc3d8828abe9b91c8b274",
-    "SINGLE_COLLATERAL_PACKAGE": "0xb12e58dee672ad3161e023ac2315e2d39866fbf0960abcb1ce755f24f5578b59",
+    "SINGLE_COLLATERAL_PACKAGE": "0x7de806a4277bc31aa12afdce194c38f89cb2f171539a426375dbe730db2d0221",
     "SINGLE_COLLATERAL_PACKAGE_ORIGIN": "0x321848bf1ae327a9e022ccb3701940191e02fa193ab160d9c0e49cd3c003de3a",
     "SINGLE_COLLATERAL_REGISTRY": "0x3d70b09359e3ca8301ae0abeda4f2fdf72ce313ba58c919ce568e5f535fd2ea8",
     "SINGLE_COLLATERAL_PORTFOLIO_VAULT_REGISTRY": "0xa1a186d050e3172ef4701c16048c99b11f785969874fa2642b9cbcf59cde7fc0",

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

@@ -319,6 +319,11 @@ function getNewBidTx(input) {
         ],
     });
     input.tx.transferObjects([input.tx.object(result[0])], input.user);
+    var fud_coin = input.tx.moveCall({
+        target: "".concat(input.mfudPackageId, "::mfud::burn"),
+        arguments: [input.tx.object(input.mfudRegistry), input.tx.object(result[1])],
+    });
+    input.tx.transferObjects([input.tx.object(fud_coin)], input.user);
     return input.tx;
 }
 exports.getNewBidTx = getNewBidTx;

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

@@ -442,7 +442,7 @@ function getNewBidTx(input) {
             input.typeArguments[1] == "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI")) {
         var _a = __read(input.tx.splitCoins(input.tx.gas, [input.tx.pure(input.premium_required)]), 1), coin = _a[0];
         var result = input.tx.moveCall({
-            target: "".concat(input.typusDovSinglePackageId, "::tails_staking::new_bid"),
+            target: "".concat(input.typusDovSinglePackageId, "::tails_staking::new_bid_v2"),
             typeArguments: input.typeArguments,
             arguments: [
                 input.tx.object(input.typusDovSingleRegistry),
@@ -453,6 +453,11 @@ function getNewBidTx(input) {
             ],
         });
         input.tx.transferObjects([input.tx.object(result[0])], input.user);
+        input.tx.moveCall({
+            target: "".concat(input.typusFrameworkPackageId, "::utils::transfer_coins"),
+            typeArguments: [input.typeArguments[1]],
+            arguments: [input.tx.object(result[1]), input.tx.pure(input.user)],
+        });
     }
     else {
         var balance = input.tx.moveCall({
@@ -469,7 +474,7 @@ function getNewBidTx(input) {
             arguments: [input.tx.object(balance)],
         });
         var result = input.tx.moveCall({
-            target: "".concat(input.typusDovSinglePackageId, "::tails_staking::new_bid"),
+            target: "".concat(input.typusDovSinglePackageId, "::tails_staking::new_bid_v2"),
             typeArguments: input.typeArguments,
             arguments: [
                 input.tx.object(input.typusDovSingleRegistry),
@@ -480,6 +485,11 @@ function getNewBidTx(input) {
             ],
         });
         input.tx.transferObjects([input.tx.object(result[0])], input.user);
+        input.tx.moveCall({
+            target: "".concat(input.typusFrameworkPackageId, "::utils::transfer_coins"),
+            typeArguments: [input.typeArguments[1]],
+            arguments: [input.tx.object(result[1]), input.tx.pure(input.user)],
+        });
     }
     return input.tx;
 }

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

@@ -1,11 +1,13 @@
-import { SuiClient } from "@mysten/sui.js/client";
+import { SuiClient, SuiEvent } from "@mysten/sui.js/client";
 import { Vault } from "./view-function";
 export declare function getUserHistory(provider: SuiClient, originPackage: string, vaults: {
     [key: string]: Vault;
 }, sender: string, startTimeMs: number): Promise<TxHistory[]>;
+export declare function getUserEvents(provider: SuiClient, sender: string, startTimeMs: number): Promise<SuiEvent[]>;
+export declare function getAutoBidEvents(provider: SuiClient, originPackage: string, startTimeMs: number): Promise<SuiEvent[]>;
 export interface TxHistory {
     Index: string | undefined;
-    Action: string;
+    Action: string | undefined;
     Period: string | undefined;
     Amount: string | undefined;
     Vault: string | undefined;
@@ -15,3 +17,4 @@ export interface TxHistory {
     Date: Date;
     txDigest: string;
 }
+export declare function getUserBid(startTimestamp: string, userAddress: string): Promise<any[]>;

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

@@ -39,44 +39,116 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserHistory = void 0;
+exports.getUserBid = exports.getAutoBidEvents = exports.getUserEvents = exports.getUserHistory = void 0;
 var token_1 = require("../token");
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
 function getUserHistory(provider, originPackage, vaults, sender, startTimeMs) {
     return __awaiter(this, void 0, void 0, function () {
-        var senderFilter, result, txHistory, nextPage;
+        var datas1, datas2, datas, txHistory;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, getUserEvents(provider, sender, startTimeMs)];
+                case 1:
+                    datas1 = _a.sent();
+                    return [4 /*yield*/, getAutoBidEvents(provider, originPackage, startTimeMs)];
+                case 2:
+                    datas2 = _a.sent();
+                    datas = datas1.concat(datas2.filter(function (x) {
+                        // @ts-ignore
+                        if (x.parsedJson.signer) {
+                            // @ts-ignore
+                            return x.parsedJson.signer == sender;
+                        }
+                        else if (x.type.endsWith("ExpUpEvent")) {
+                            return true;
+                        }
+                        else {
+                            return false;
+                        }
+                    }));
+                    return [4 /*yield*/, parseTxHistory(datas, originPackage, vaults)];
+                case 3:
+                    txHistory = _a.sent();
+                    return [2 /*return*/, txHistory];
+            }
+        });
+    });
+}
+exports.getUserHistory = getUserHistory;
+function getUserEvents(provider, sender, startTimeMs) {
+    return __awaiter(this, void 0, void 0, function () {
+        var senderFilter, hasNextPage, cursor, datas, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     senderFilter = {
                         Sender: sender,
                     };
-                    return [4 /*yield*/, provider.queryEvents({ query: senderFilter, order: "descending" })];
+                    hasNextPage = true;
+                    cursor = undefined;
+                    datas = [];
+                    _a.label = 1;
                 case 1:
+                    if (!hasNextPage) return [3 /*break*/, 3];
+                    return [4 /*yield*/, provider.queryEvents({
+                            query: senderFilter,
+                            order: "descending",
+                            cursor: cursor,
+                        })];
+                case 2:
                     result = _a.sent();
-                    return [4 /*yield*/, parseTxHistory(result.data, originPackage, vaults)];
+                    // console.log(result);
+                    hasNextPage = result.hasNextPage;
+                    cursor = result.nextCursor;
+                    // @ts-ignore
+                    datas = datas.concat(result.data);
+                    if (hasNextPage && Number(result.data[result.data.length - 1].timestampMs) < startTimeMs) {
+                        return [3 /*break*/, 3];
+                    }
+                    return [3 /*break*/, 1];
+                case 3: return [2 /*return*/, datas];
+            }
+        });
+    });
+}
+exports.getUserEvents = getUserEvents;
+function getAutoBidEvents(provider, originPackage, startTimeMs) {
+    return __awaiter(this, void 0, void 0, function () {
+        var moduleFilter, hasNextPage, cursor, datas, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    moduleFilter = {
+                        MoveModule: { package: originPackage, module: "auto_bid" },
+                    };
+                    hasNextPage = true;
+                    cursor = undefined;
+                    datas = [];
+                    _a.label = 1;
+                case 1:
+                    if (!hasNextPage) return [3 /*break*/, 3];
+                    return [4 /*yield*/, provider.queryEvents({
+                            query: moduleFilter,
+                            order: "descending",
+                            cursor: cursor,
+                        })];
                 case 2:
-                    txHistory = _a.sent();
-                    _a.label = 3;
-                case 3:
-                    if (!result.hasNextPage) return [3 /*break*/, 6];
-                    return [4 /*yield*/, provider.queryEvents({ query: senderFilter, cursor: result.nextCursor })];
-                case 4:
                     result = _a.sent();
-                    return [4 /*yield*/, parseTxHistory(result.data, originPackage, vaults)];
-                case 5:
-                    nextPage = _a.sent();
-                    txHistory = txHistory.concat(nextPage);
-                    if (result.hasNextPage && Number(result.data[24].timestampMs) < startTimeMs) {
-                        return [3 /*break*/, 6];
+                    // console.log(result);
+                    hasNextPage = result.hasNextPage;
+                    cursor = result.nextCursor;
+                    // @ts-ignore
+                    datas = datas.concat(result.data);
+                    if (hasNextPage && Number(result.data[result.data.length - 1].timestampMs) < startTimeMs) {
+                        return [3 /*break*/, 3];
                     }
-                    return [3 /*break*/, 3];
-                case 6: return [2 /*return*/, txHistory];
+                    return [3 /*break*/, 1];
+                case 3: return [2 /*return*/, datas];
             }
         });
     });
 }
-exports.getUserHistory = getUserHistory;
+exports.getAutoBidEvents = getAutoBidEvents;
 function parseTxHistory(datas, originPackage, vaults) {
     return __awaiter(this, void 0, void 0, function () {
         var results;
@@ -89,7 +161,7 @@ function parseTxHistory(datas, originPackage, vaults) {
                         return event.packageId == originPackage || type.includes("typus_nft::First") || type.includes("typus_nft::ExpUpEvent");
                     })
                         .reduce(function (promise, event) { return __awaiter(_this, void 0, void 0, function () {
-                        var txHistory, functionType, action, Action, Amount, Index, Period, Vault, RiskLevel, Tails, Exp, o_token, v, period, optionType, i, i, token, amount, token, amount, amount, token, amount, size, token, amount, token, amount, i, b_token, size, bidder_balance;
+                        var txHistory, functionType, action, Action, Amount, Index, Period, Vault, RiskLevel, Tails, Exp, d_token, b_token, o_token, v, period, optionType, i, i, token, amount, deposit_amount, deposit_amount, balance, balance, profit, token, amount, amount, token, amount, size, token, amount, token, amount, i, size, bidder_balance;
                         var _a;
                         return __generator(this, function (_b) {
                             switch (_b.label) {
@@ -98,9 +170,9 @@ function parseTxHistory(datas, originPackage, vaults) {
                                     txHistory = _b.sent();
                                     functionType = (_a = new RegExp("^([^::]+)::([^::]+)::([^<]+)").exec(event.type)) === null || _a === void 0 ? void 0 : _a.slice(1, 4);
                                     action = functionType[2];
-                                    Index = event.parsedJson.index;
-                                    if (event.parsedJson.index) {
-                                        v = vaults[event.parsedJson.index];
+                                    Index = event.parsedJson.index || event.parsedJson.vault_index;
+                                    if (Index) {
+                                        v = vaults[Index];
                                         if (v) {
                                             period = void 0;
                                             switch (v.info.period) {
@@ -192,6 +264,8 @@ function parseTxHistory(datas, originPackage, vaults) {
                                                     break;
                                             }
                                             Vault = "".concat(v.info.settlementBaseName, " ").concat(period, " ").concat(optionType);
+                                            d_token = (0, token_1.typeArgToAsset)("0x" + v.info.depositToken);
+                                            b_token = (0, token_1.typeArgToAsset)("0x" + v.info.bidToken);
                                             o_token = (0, token_1.typeArgToAsset)("0x" + v.info.settlementBase);
                                         }
                                     }
@@ -208,15 +282,23 @@ function parseTxHistory(datas, originPackage, vaults) {
                                         case "ExpUpEvent":
                                             i = txHistory.findIndex(function (x) { return x.txDigest == event.id.txDigest && x.Action != "First Deposit" && x.Action != "Stake"; });
                                             if (i != -1) {
+                                                if (txHistory[i].Tails) {
+                                                    return [2 /*return*/, txHistory];
+                                                }
                                                 txHistory[i].Tails = "#".concat(event.parsedJson.number);
                                                 txHistory[i].Exp = event.parsedJson.exp_earn;
                                                 return [2 /*return*/, txHistory];
                                             }
-                                            else {
+                                            else if (event.id.eventSeq == 0) {
                                                 Action = "Collect EXP";
                                                 Tails = "#".concat(event.parsedJson.number);
                                                 Exp = event.parsedJson.exp_earn;
                                             }
+                                            else {
+                                                // Action = undefined;
+                                                Tails = "#".concat(event.parsedJson.number);
+                                                Exp = event.parsedJson.exp_earn;
+                                            }
                                             break;
                                         case "TransferNftEvent":
                                             Action = "Transfer";
@@ -240,8 +322,13 @@ function parseTxHistory(datas, originPackage, vaults) {
                                             break;
                                         case "LevelUpEvent":
                                             Action = "Level Up to Level ".concat(event.parsedJson.level);
-                                            Tails = "#".concat(event.parsedJson.number);
-                                            break;
+                                            if (event.parsedJson.number) {
+                                                Tails = "#".concat(event.parsedJson.number);
+                                                break;
+                                            }
+                                            else {
+                                                return [2 /*return*/, txHistory];
+                                            }
                                         case "DepositEvent":
                                         case "WithdrawEvent":
                                         case "UnsubscribeEvent":
@@ -252,8 +339,11 @@ function parseTxHistory(datas, originPackage, vaults) {
                                             token = (0, token_1.typeArgToAsset)("0x" + event.parsedJson.token.name);
                                             amount = Number(event.parsedJson.amount) / Math.pow(10, Number(event.parsedJson.decimal));
                                             Action = action.slice(0, action.length - 5);
+                                            if (Action == "Harvest") {
+                                                Action = "Harvest Reward";
+                                            }
                                             Amount = "".concat((0, bignumber_js_1.default)(amount).toFixed(), " ").concat(token);
-                                            Index = event.parsedJson.index;
+                                            Index = Index;
                                             if (i != -1) {
                                                 txHistory[i].Action = Action;
                                                 txHistory[i].Amount = Amount;
@@ -263,12 +353,35 @@ function parseTxHistory(datas, originPackage, vaults) {
                                                 return [2 /*return*/, txHistory];
                                             }
                                             break;
+                                        case "NewStrategyEventV2":
+                                            Action = "Create Strategy";
+                                            deposit_amount = Number(event.parsedJson.deposit_amount) / Math.pow(10, (0, token_1.assetToDecimal)(b_token));
+                                            Amount = "".concat((0, bignumber_js_1.default)(deposit_amount).toFixed(), " ").concat(b_token);
+                                            break;
+                                        case "UpdateStrategyEvent":
+                                            Action = "Update Strategy";
+                                            deposit_amount = Number(event.parsedJson.deposit_amount) / Math.pow(10, (0, token_1.assetToDecimal)(b_token));
+                                            Amount = "".concat((0, bignumber_js_1.default)(deposit_amount).toFixed(), " ").concat(b_token);
+                                            break;
+                                        case "CloseStrategyEventV2":
+                                            Action = "Close Strategy";
+                                            if (b_token == d_token) {
+                                                balance = (Number(event.parsedJson.u64_padding[0]) + Number(event.parsedJson.u64_padding[1])) /
+                                                    Math.pow(10, (0, token_1.assetToDecimal)(b_token));
+                                                Amount = "".concat((0, bignumber_js_1.default)(balance).toFixed(), " ").concat(b_token);
+                                            }
+                                            else {
+                                                balance = Number(event.parsedJson.u64_padding[0]) / Math.pow(10, (0, token_1.assetToDecimal)(b_token));
+                                                profit = Number(event.parsedJson.u64_padding[1]) / Math.pow(10, (0, token_1.assetToDecimal)(d_token));
+                                                Amount = "".concat((0, bignumber_js_1.default)(balance).toFixed(), " ").concat(b_token, "\n").concat((0, bignumber_js_1.default)(profit).toFixed(), " ").concat(d_token);
+                                            }
+                                            break;
                                         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";
                                             Amount = "".concat((0, bignumber_js_1.default)(amount).toFixed(), " ").concat(token);
-                                            Index = event.parsedJson.index;
+                                            Index = Index;
                                             break;
                                         case "TransferBidReceiptEvent":
                                             amount = Number(event.parsedJson.amount) / Math.pow(10, Number(event.parsedJson.decimal));
@@ -284,6 +397,9 @@ function parseTxHistory(datas, originPackage, vaults) {
                                                 size = Number(event.parsedJson.u64_padding[0]) / Math.pow(10, (0, token_1.assetToDecimal)(o_token));
                                                 Action = "Exercise ".concat(size, " ").concat(o_token);
                                             }
+                                            if (event.sender != event.parsedJson.signer) {
+                                                Action = "Auto " + Action;
+                                            }
                                             break;
                                         case "RefundEvent":
                                             token = (0, token_1.typeArgToAsset)("0x" + event.parsedJson.token.name);
@@ -306,7 +422,12 @@ function parseTxHistory(datas, originPackage, vaults) {
                                             bidder_balance = Number(event.parsedJson.bidder_balance) / Math.pow(10, (0, token_1.assetToDecimal)(b_token));
                                             Action = action.slice(0, action.length - 5) + " ".concat(size, " ").concat(o_token);
                                             Amount = "".concat((0, bignumber_js_1.default)(bidder_balance).toFixed(), " ").concat(b_token);
+                                            if (event.sender != event.parsedJson.signer) {
+                                                Action = "Auto " + Action;
+                                            }
                                             if (i != -1) {
+                                                txHistory[i].Index = Index;
+                                                txHistory[i].Period = Period;
                                                 txHistory[i].Action = Action;
                                                 txHistory[i].Amount = Amount;
                                                 txHistory[i].Vault = Vault;
@@ -340,3 +461,37 @@ function parseTxHistory(datas, originPackage, vaults) {
         });
     });
 }
+function getUserBid(startTimestamp, userAddress) {
+    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 NewBid\n                WHERE distinct_id = \"".concat(userAddress, "\" && timestamp >= ").concat(startTimestamp, "\n                ORDER BY 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];
+            }
+        });
+    });
+}
+exports.getUserBid = getUserBid;

package/package.json

@@ -2,7 +2,7 @@
     "name": "@typus/typus-sdk",
     "author": "Typus",
     "description": "typus sdk",
-    "version": "1.2.50",
+    "version": "1.2.52",
     "dependencies": {
         "@mysten/bcs": "^0.7.3",
         "@mysten/kiosk": "0.8.4",