@typus/typus-sdk 1.2.58 → 1.2.59-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/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);

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

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

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

@@ -35,11 +35,27 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
 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.getNewBidFromSentio = exports.getFromSentio = 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) {
@@ -66,7 +82,7 @@ function getUserHistory(provider, originPackage, vaults, sender, startTimeMs) {
                             return false;
                         }
                     }));
-                    return [4 /*yield*/, parseTxHistory(datas.sort(function (a, b) { return Number(b.timestampMs) - Number(a.timestampMs); }), originPackage, vaults)];
+                    return [4 /*yield*/, parseTxHistory(datas, originPackage, vaults)];
                 case 3:
                     txHistory = _a.sent();
                     return [2 /*return*/, txHistory];
@@ -159,9 +175,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, 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 +195,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 +307,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 +318,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":
@@ -420,7 +441,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));
@@ -430,15 +450,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];
@@ -500,10 +511,157 @@ function getFromSentio(event, userAddress, startTimestamp) {
     });
 }
 exports.getFromSentio = getFromSentio;
-function getUserHistoryFromSentio(vaults, sender, startTimeMs) {
+function getNewBidFromSentio(vaults, userAddress, startTimestamp) {
     return __awaiter(this, void 0, void 0, function () {
+        var apiUrl, headers, requestData, jsonData, response, data;
         return __generator(this, function (_a) {
-            return [2 /*return*/];
+            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\n                JOIN (\n                    SELECT number, distinct_id, exp_earn, transaction_hash, log_index\n                    FROM ExpUp\n                ) S ON N.transaction_hash = S.transaction_hash && N.log_index + 1 = S.log_index\n                WHERE N.distinct_id = \"".concat(userAddress, "\" && N.timestamp >= ").concat(startTimestamp, "\n                ORDER BY N.timestamp DESC;\n            "),
+                            size: 1000,
+                        },
+                    };
+                    jsonData = JSON.stringify(requestData);
+                    return [4 /*yield*/, fetch(apiUrl, {
+                            method: "POST",
+                            headers: headers,
+                            body: jsonData,
+                        })];
+                case 1:
+                    response = _a.sent();
+                    return [4 /*yield*/, response.json()];
+                case 2:
+                    data = _a.sent();
+                    return [2 /*return*/, data.result.rows.map(function (x) {
+                            var _a = __read(parseVaultInfo(vaults, x.index, "NewBidEvent"), 6), Period = _a[0], Vault = _a[1], RiskLevel = _a[2], d_token = _a[3], b_token = _a[4], o_token = _a[5];
+                            var txHistory = {
+                                Index: x.index,
+                                Period: Period,
+                                Vault: Vault,
+                                RiskLevel: RiskLevel,
+                                Action: "Auto Bid" + " ".concat(x.size, " ").concat(x.o_token),
+                                Amount: x.bidder_balance + " ".concat(x.b_token),
+                                Tails: x.number,
+                                Exp: x.exp_earn,
+                                Date: new Date(Number(x.ts_ms)),
+                                txDigest: x.transaction_hash,
+                            };
+                            return txHistory;
+                        })];
+            }
         });
     });
 }
+exports.getNewBidFromSentio = getNewBidFromSentio;
+function parseVaultInfo(vaults, Index, action) {
+    var v = vaults[Index];
+    var Period;
+    var Vault;
+    var RiskLevel;
+    var d_token;
+    var b_token;
+    var o_token;
+    var period;
+    if (v) {
+        switch (v.info.period) {
+            case "0":
+                period = "Daily";
+                break;
+            case "1":
+                period = "Weekly";
+                break;
+            case "2":
+                period = "Monthly";
+                break;
+            case "3":
+                period = "Hourly";
+                break;
+            case "4":
+                period = "10 Minutes";
+                break;
+            default:
+                period = "";
+                break;
+        }
+        Period = period;
+        var optionType = void 0;
+        switch (v.info.optionType) {
+            case "0":
+                switch (action) {
+                    case "DepositEvent":
+                    case "WithdrawEvent":
+                    case "UnsubscribeEvent":
+                    case "ClaimEvent":
+                    case "CompoundEvent":
+                    case "HarvestEvent":
+                    case "RedeemEvent":
+                        optionType = "Covered Call";
+                        break;
+                    default:
+                        optionType = "Call";
+                        break;
+                }
+                break;
+            case "1":
+                switch (action) {
+                    case "DepositEvent":
+                    case "WithdrawEvent":
+                    case "UnsubscribeEvent":
+                    case "ClaimEvent":
+                    case "CompoundEvent":
+                    case "HarvestEvent":
+                    case "RedeemEvent":
+                        optionType = "Put Selling";
+                        break;
+                    default:
+                        optionType = "Put";
+                        break;
+                }
+                break;
+            case "2":
+                optionType = "Call Spread";
+                break;
+            case "3":
+                optionType = "Put Spread";
+                break;
+            case "4":
+                optionType = "Capped Call";
+                break;
+            case "5":
+                optionType = "Capped Put";
+                break;
+            case "6":
+                optionType = "Capped Call";
+                break;
+            default:
+                optionType = "";
+                break;
+        }
+        switch (v.config.riskLevel) {
+            case "1":
+                RiskLevel = "Conservative";
+                break;
+            case "2":
+                RiskLevel = "Moderate";
+                break;
+            case "3":
+                RiskLevel = "Aggressive";
+                break;
+            default:
+                RiskLevel = "";
+                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);
+    }
+    return [Period, Vault, RiskLevel, d_token, b_token, o_token];
+}

package/package.json

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