@typus/typus-sdk 1.2.57 → 1.2.58-v1

package/lib/utils/recap2023.js

@@ -68,7 +68,7 @@ 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");
+// import { getUserHistory } from "../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 +92,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 +135,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 +154,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/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_v2"),
+            target: "".concat(input.typusDovSinglePackageId, "::tails_staking::new_bid"),
             typeArguments: input.typeArguments,
             arguments: [
                 input.tx.object(input.typusDovSingleRegistry),
@@ -453,11 +453,6 @@ 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({
@@ -474,7 +469,7 @@ function getNewBidTx(input) {
             arguments: [input.tx.object(balance)],
         });
         var result = input.tx.moveCall({
-            target: "".concat(input.typusDovSinglePackageId, "::tails_staking::new_bid_v2"),
+            target: "".concat(input.typusDovSinglePackageId, "::tails_staking::new_bid"),
             typeArguments: input.typeArguments,
             arguments: [
                 input.tx.object(input.typusDovSingleRegistry),
@@ -485,11 +480,6 @@ 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,9 +1,6 @@
-import { SuiClient, SuiEvent } from "@mysten/sui.js/client";
+import { EventId, 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 getUserEvents(provider: SuiClient, sender: string, cursor?: EventId | null): Promise<[SuiEvent[], EventId | null | undefined]>;
 export declare function getAutoBidEvents(provider: SuiClient, originPackage: string, startTimeMs: number): Promise<SuiEvent[]>;
 export interface TxHistory {
     Index: string | undefined;
@@ -17,4 +14,7 @@ export interface TxHistory {
     Date: Date;
     txDigest: string;
 }
+export declare function parseTxHistory(datas: Array<any>, originPackage: string, vaults: {
+    [key: string]: Vault;
+}): Promise<Array<TxHistory>>;
 export declare function getFromSentio(event: string, userAddress: string, startTimestamp: string): Promise<any[]>;

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

@@ -39,45 +39,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFromSentio = exports.getAutoBidEvents = exports.getUserEvents = exports.getUserHistory = void 0;
+exports.getFromSentio = exports.parseTxHistory = exports.getAutoBidEvents = exports.getUserEvents = void 0;
 var token_1 = require("../token");
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
-function getUserHistory(provider, originPackage, vaults, sender, startTimeMs) {
+function getUserEvents(provider, sender, cursor) {
     return __awaiter(this, void 0, void 0, function () {
-        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.sort(function (a, b) { return Number(b.timestampMs) - Number(a.timestampMs); }), 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;
+        var senderFilter, hasNextPage, datas, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -85,14 +52,13 @@ function getUserEvents(provider, sender, startTimeMs) {
                         Sender: sender,
                     };
                     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",
+                            order: "ascending",
                             cursor: cursor,
                         })];
                 case 2:
@@ -102,11 +68,8 @@ function getUserEvents(provider, sender, startTimeMs) {
                     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];
+                case 3: return [2 /*return*/, [datas, cursor]];
             }
         });
     });
@@ -159,9 +122,18 @@ function parseTxHistory(datas, originPackage, vaults) {
                         .filter(function (event) {
                         var type = event.type;
                         return event.packageId == originPackage || type.includes("typus_nft::First") || type.includes("typus_nft::ExpUpEvent");
+                    })
+                        .sort(function (a, b) {
+                        // From Old to New!
+                        if (a.timestampMs == b.timestampMs) {
+                            return Number(a.id.eventSeq) - Number(b.id.eventSeq);
+                        }
+                        else {
+                            return Number(a.timestampMs) - Number(b.timestampMs);
+                        }
                     })
                         .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, 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 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, profit, token, amount, amount, token, amount, size, token, amount, token, amount, size, bidder_balance;
                         var _a;
                         return __generator(this, function (_b) {
                             switch (_b.label) {
@@ -170,6 +142,7 @@ 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];
+                                    Tails = undefined;
                                     Index = event.parsedJson.index || event.parsedJson.vault_index;
                                     if (Index) {
                                         v = vaults[Index];
@@ -281,10 +254,7 @@ function parseTxHistory(datas, originPackage, vaults) {
                                             break;
                                         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];
-                                                }
+                                            if (i != -1 && txHistory[i].Tails == undefined) {
                                                 txHistory[i].Tails = "#".concat(event.parsedJson.number);
                                                 txHistory[i].Exp = event.parsedJson.exp_earn;
                                                 return [2 /*return*/, txHistory];
@@ -295,9 +265,7 @@ function parseTxHistory(datas, originPackage, vaults) {
                                                 Exp = event.parsedJson.exp_earn;
                                             }
                                             else {
-                                                // Action = undefined;
-                                                Tails = "#".concat(event.parsedJson.number);
-                                                Exp = event.parsedJson.exp_earn;
+                                                return [2 /*return*/, txHistory];
                                             }
                                             break;
                                         case "TransferNftEvent":
@@ -376,6 +344,11 @@ function parseTxHistory(datas, originPackage, vaults) {
                                                 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 "WithdrawProfitEvent":
+                                            Action = "Harvest Gain";
+                                            profit = Number(event.parsedJson.profit) / Math.pow(10, (0, token_1.assetToDecimal)(d_token));
+                                            Amount = "".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));
@@ -415,7 +388,6 @@ function parseTxHistory(datas, originPackage, vaults) {
                                             Tails = "#".concat(event.parsedJson.number);
                                             break;
                                         case "NewBidEvent":
-                                            i = txHistory.findIndex(function (x) { return x.txDigest == event.id.txDigest; });
                                             o_token = (0, token_1.typeArgToAsset)("0x" + event.parsedJson.o_token.name);
                                             b_token = (0, token_1.typeArgToAsset)("0x" + event.parsedJson.b_token.name);
                                             size = Number(event.parsedJson.size) / Math.pow(10, (0, token_1.assetToDecimal)(o_token));
@@ -425,15 +397,6 @@ function parseTxHistory(datas, originPackage, vaults) {
                                             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;
-                                                txHistory[i].RiskLevel = RiskLevel;
-                                                return [2 /*return*/, txHistory];
-                                            }
                                             break;
                                         default:
                                             return [2 /*return*/, txHistory];
@@ -461,6 +424,7 @@ function parseTxHistory(datas, originPackage, vaults) {
         });
     });
 }
+exports.parseTxHistory = parseTxHistory;
 function getFromSentio(event, userAddress, startTimestamp) {
     return __awaiter(this, void 0, void 0, function () {
         var apiUrl, headers, requestData, jsonData, response, data;

package/package.json

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