@typus/typus-sdk 1.2.31 → 1.2.33

package/lib/utils/auto-bid/user-entry.js

@@ -137,23 +137,43 @@ registry, strategy_pool, vault_index, signal_index, strategy_index, coins, amoun
     // B_TOKEN
     typeArguments[1] == "0x2::sui::SUI" ||
         typeArguments[1] == "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI") {
-        var _a = __read(amount ? tx.splitCoins(tx.gas, [tx.pure(amount)]) : [tx.pure([])], 1), input_coin = _a[0];
-        tx.moveCall({
-            target: "".concat(packageId, "::auto_bid::update_strategy"),
-            typeArguments: typeArguments,
-            arguments: [
-                tx.object(registry),
-                tx.object(strategy_pool),
-                tx.pure(vault_index),
-                tx.pure(signal_index),
-                tx.pure(strategy_index),
-                tx.pure(size ? [size] : []),
-                tx.pure(price_percentage ? [price_percentage] : []),
-                tx.pure(max_times ? [max_times] : []),
-                tx.pure(target_rounds),
-                input_coin,
-            ],
-        });
+        if (amount) {
+            var _a = __read(tx.splitCoins(tx.gas, [tx.pure(amount)]), 1), input_coin = _a[0];
+            tx.moveCall({
+                target: "".concat(packageId, "::auto_bid::update_strategy"),
+                typeArguments: typeArguments,
+                arguments: [
+                    tx.object(registry),
+                    tx.object(strategy_pool),
+                    tx.pure(vault_index),
+                    tx.pure(signal_index),
+                    tx.pure(strategy_index),
+                    tx.pure(size ? [size] : []),
+                    tx.pure(price_percentage ? [price_percentage] : []),
+                    tx.pure(max_times ? [max_times] : []),
+                    tx.pure(target_rounds),
+                    tx.makeMoveVec({ objects: [input_coin] }),
+                ],
+            });
+        }
+        else {
+            tx.moveCall({
+                target: "".concat(packageId, "::auto_bid::update_strategy"),
+                typeArguments: typeArguments,
+                arguments: [
+                    tx.object(registry),
+                    tx.object(strategy_pool),
+                    tx.pure(vault_index),
+                    tx.pure(signal_index),
+                    tx.pure(strategy_index),
+                    tx.pure(size ? [size] : []),
+                    tx.pure(price_percentage ? [price_percentage] : []),
+                    tx.pure(max_times ? [max_times] : []),
+                    tx.pure(target_rounds),
+                    tx.makeMoveVec({ objects: [] }),
+                ],
+            });
+        }
     }
     else {
         var coin = coins.pop();

package/lib/utils/auto-bid/view-function.d.ts

@@ -4,7 +4,7 @@ export declare function getUserStrategies(provider: SuiClient, packageId: string
 export declare function getVaults(provider: SuiClient, strategyPool: string): Promise<StrategyPoolV2>;
 export interface StrategyPoolV2 {
     id: string;
-    strategies: Map<string, Map<string, StrategyV2[]>>;
+    strategies: Map<string, Map<string, string>>;
     authority: string[];
 }
 export interface StrategyV2 {
@@ -38,3 +38,5 @@ export interface TypusBidReceipt {
     metadata: string;
     u64_padding: string[];
 }
+export declare function getStrategies(provider: SuiClient, strategyIds: string[]): Promise<Map<string, StrategyV2>>;
+export declare function getStrategyIds(provider: SuiClient, parentId: string): Promise<string[]>;

package/lib/utils/auto-bid/view-function.js

@@ -63,7 +63,7 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVaults = exports.getUserStrategies = void 0;
+exports.getStrategyIds = exports.getStrategies = exports.getVaults = exports.getUserStrategies = void 0;
 var bcs_1 = require("@mysten/bcs");
 var transactions_1 = require("@mysten/sui.js/transactions");
 var tools_1 = require("../tools");
@@ -230,7 +230,7 @@ exports.getUserStrategies = getUserStrategies;
 function getVaults(provider, strategyPool) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var pool, vaults, strategies, vaults_1, vaults_1_1, vault, signals, _b, _c, signal, strategy_pool;
+        var pool, vaults, strategies, vaults_1, vaults_1_1, vault, signals, _b, _c, signal, strategyTable, strategy_pool;
         var e_1, _d, e_2, _e;
         return __generator(this, function (_f) {
             switch (_f.label) {
@@ -246,10 +246,9 @@ function getVaults(provider, strategyPool) {
                             try {
                                 for (_b = (e_2 = void 0, __values(vault.fields.value.fields.contents)), _c = _b.next(); !_c.done; _c = _b.next()) {
                                     signal = _c.value;
-                                    // let strategyTable = signal.fields.value.fields.contents;
+                                    strategyTable = signal.fields.value.fields.contents;
                                     // console.log(strategyTable);
-                                    // dynamic fields
-                                    signals.set(signal.fields.key, []);
+                                    signals.set(signal.fields.key, strategyTable.fields.id.id);
                                 }
                             }
                             catch (e_2_1) { e_2 = { error: e_2_1 }; }
@@ -280,3 +279,69 @@ function getVaults(provider, strategyPool) {
     });
 }
 exports.getVaults = getVaults;
+function getStrategies(provider, strategyIds) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function () {
+        var strategies, len, results, results_1, results_1_1, result, fields;
+        var e_3, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    strategies = new Map();
+                    _c.label = 1;
+                case 1:
+                    if (!(strategyIds.length > 0)) return [3 /*break*/, 3];
+                    len = strategyIds.length > 50 ? 50 : strategyIds.length;
+                    return [4 /*yield*/, provider.multiGetObjects({ ids: strategyIds.splice(0, len), options: { showContent: true } })];
+                case 2:
+                    results = _c.sent();
+                    try {
+                        for (results_1 = (e_3 = void 0, __values(results)), results_1_1 = results_1.next(); !results_1_1.done; results_1_1 = results_1.next()) {
+                            result = results_1_1.value;
+                            fields = (_a = result.data) === null || _a === void 0 ? void 0 : _a.content.fields;
+                            // console.log(fields);
+                            strategies.set(fields.name, fields.value.fields);
+                        }
+                    }
+                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                    finally {
+                        try {
+                            if (results_1_1 && !results_1_1.done && (_b = results_1.return)) _b.call(results_1);
+                        }
+                        finally { if (e_3) throw e_3.error; }
+                    }
+                    return [3 /*break*/, 1];
+                case 3: return [2 /*return*/, strategies];
+            }
+        });
+    });
+}
+exports.getStrategies = getStrategies;
+function getStrategyIds(provider, parentId) {
+    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: parentId,
+                    })];
+                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: parentId,
+                            cursor: result.nextCursor,
+                        })];
+                case 3:
+                    result = _a.sent();
+                    datas = datas.concat(result.data);
+                    return [3 /*break*/, 2];
+                case 4: return [2 /*return*/, datas.map(function (data) { return data.objectId; })];
+            }
+        });
+    });
+}
+exports.getStrategyIds = getStrategyIds;

package/lib/utils/leader-board.js

@@ -302,16 +302,3 @@ function getExpLeaderBoard(startTimestamp, endTimestamp) {
     });
 }
 exports.getExpLeaderBoard = getExpLeaderBoard;
-(function () { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
-            case 0:
-                _b = (_a = console).log;
-                return [4 /*yield*/, getExpLeaderBoard("1707721200", "1708326000")];
-            case 1:
-                _b.apply(_a, [_c.sent()]);
-                return [2 /*return*/];
-        }
-    });
-}); })();

package/lib/utils/price.js

@@ -80,19 +80,27 @@ function getPairPrices(pair, startTs, endTs) {
 exports.getPairPrices = getPairPrices;
 function getLatestPrice(pair) {
     return __awaiter(this, void 0, void 0, function () {
-        var currentTimestampInSeconds, minuteAgo, res;
+        var currentTimestampInSeconds, minuteAgo, res, e_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     currentTimestampInSeconds = Math.floor(new Date().getTime() / 1000);
                     minuteAgo = currentTimestampInSeconds - 60;
-                    return [4 /*yield*/, getPairPrices(pair, minuteAgo.toString(), currentTimestampInSeconds.toString())];
+                    _a.label = 1;
                 case 1:
+                    _a.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, getPairPrices(pair, minuteAgo.toString(), currentTimestampInSeconds.toString())];
+                case 2:
                     res = _a.sent();
                     if (res.at(-1)) {
                         return [2 /*return*/, res.at(-1).price];
                     }
+                    return [3 /*break*/, 4];
+                case 3:
+                    e_1 = _a.sent();
+                    console.log(e_1);
                     return [2 /*return*/, "0"];
+                case 4: return [2 /*return*/, "0"];
             }
         });
     });
@@ -130,8 +138,8 @@ function getPythLatestPrice() {
 exports.getPythLatestPrice = getPythLatestPrice;
 function getLatestPriceUSD() {
     return __awaiter(this, void 0, void 0, function () {
-        var prices, _a, _b, pair, currentTimestampInSeconds, minuteAgo, res, price, e_1_1;
-        var e_1, _c;
+        var prices, _a, _b, pair, currentTimestampInSeconds, minuteAgo, res, price, e_2_1;
+        var e_2, _c;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0: return [4 /*yield*/, getPythLatestPrice()];
@@ -158,14 +166,14 @@ function getLatestPriceUSD() {
                     return [3 /*break*/, 3];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_1_1 = _d.sent();
-                    e_1 = { error: e_1_1 };
+                    e_2_1 = _d.sent();
+                    e_2 = { error: e_2_1 };
                     return [3 /*break*/, 9];
                 case 8:
                     try {
                         if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                     }
-                    finally { if (e_1) throw e_1.error; }
+                    finally { if (e_2) throw e_2.error; }
                     return [7 /*endfinally*/];
                 case 9: return [2 /*return*/, prices];
             }

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

@@ -0,0 +1,12 @@
+import { TxHistory } from "../../utils/typus-dov-single-v2/user-history";
+export declare function getDepositorCashFlows(userHistory: TxHistory[]): Promise<Map<string, DepositorCashFlow>>;
+interface DepositorCashFlow {
+    D_TOKEN: string | undefined;
+    totalDeposit: number;
+    totalWithdraw: number;
+    totalClaim: number;
+    totalCompound: number;
+    netDeposit: number | undefined;
+    totalHarvest: Map<string, number>;
+}
+export {};

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

@@ -0,0 +1,220 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDepositorCashFlows = void 0;
+function getDepositorCashFlows(userHistory) {
+    var _a, _b, _c, _d, _e;
+    return __awaiter(this, void 0, void 0, function () {
+        var depositorCashFlows, userHistory_1, userHistory_1_1, history_1, index, _f, amount, token, depositorCashFlow, totalHarvest, sum, totalHarvest, depositorCashFlow, _g, amount, token, depositorCashFlow, depositorCashFlow, _h, amount, token, depositorCashFlow, depositorCashFlow, _j, amount, token, depositorCashFlow, depositorCashFlow, _k, amount, token, depositorCashFlow, depositorCashFlow, _l, _m, _o, index, share;
+        var e_1, _p, e_2, _q;
+        return __generator(this, function (_r) {
+            depositorCashFlows = new Map();
+            try {
+                for (userHistory_1 = __values(userHistory), userHistory_1_1 = userHistory_1.next(); !userHistory_1_1.done; userHistory_1_1 = userHistory_1.next()) {
+                    history_1 = userHistory_1_1.value;
+                    index = history_1.Index;
+                    if (history_1.Action.startsWith("Harvest")) {
+                        _f = __read((_a = history_1.Amount) === null || _a === void 0 ? void 0 : _a.split(" "), 2), amount = _f[0], token = _f[1];
+                        if (depositorCashFlows.has(index)) {
+                            depositorCashFlow = depositorCashFlows.get(index);
+                            totalHarvest = depositorCashFlow.totalHarvest;
+                            if (totalHarvest.has(token)) {
+                                sum = totalHarvest.get(token);
+                                totalHarvest.set(token, sum + Number(amount));
+                            }
+                            else {
+                                totalHarvest.set(token, Number(amount));
+                            }
+                            depositorCashFlow.totalHarvest = totalHarvest;
+                            depositorCashFlows.set(index, depositorCashFlow);
+                        }
+                        else {
+                            totalHarvest = new Map();
+                            totalHarvest.set(token, Number(amount));
+                            depositorCashFlow = {
+                                D_TOKEN: undefined,
+                                totalDeposit: 0,
+                                totalWithdraw: 0,
+                                totalClaim: 0,
+                                totalCompound: 0,
+                                netDeposit: undefined,
+                                totalHarvest: totalHarvest,
+                            };
+                            depositorCashFlows.set(index, depositorCashFlow);
+                        }
+                    }
+                    else if (history_1.Action.startsWith("Deposit")) {
+                        _g = __read((_b = history_1.Amount) === null || _b === void 0 ? void 0 : _b.split(" "), 2), amount = _g[0], token = _g[1];
+                        if (depositorCashFlows.has(index)) {
+                            depositorCashFlow = depositorCashFlows.get(index);
+                            depositorCashFlow.D_TOKEN = token;
+                            depositorCashFlow.totalDeposit += Number(amount);
+                            depositorCashFlows.set(index, depositorCashFlow);
+                        }
+                        else {
+                            depositorCashFlow = {
+                                D_TOKEN: token,
+                                totalDeposit: Number(amount),
+                                totalWithdraw: 0,
+                                totalClaim: 0,
+                                totalCompound: 0,
+                                netDeposit: undefined,
+                                totalHarvest: new Map(),
+                            };
+                            depositorCashFlows.set(index, depositorCashFlow);
+                        }
+                    }
+                    else if (history_1.Action.startsWith("Withdraw")) {
+                        _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)) {
+                            depositorCashFlow = depositorCashFlows.get(index);
+                            depositorCashFlow.D_TOKEN = token;
+                            depositorCashFlow.totalWithdraw += Number(amount);
+                            depositorCashFlows.set(index, depositorCashFlow);
+                        }
+                        else {
+                            depositorCashFlow = {
+                                D_TOKEN: token,
+                                totalDeposit: 0,
+                                totalWithdraw: Number(amount),
+                                totalClaim: 0,
+                                totalCompound: 0,
+                                netDeposit: undefined,
+                                totalHarvest: new Map(),
+                            };
+                            depositorCashFlows.set(index, depositorCashFlow);
+                        }
+                    }
+                    else if (history_1.Action == "Claim") {
+                        _j = __read((_d = history_1.Amount) === null || _d === void 0 ? void 0 : _d.split(" "), 2), amount = _j[0], token = _j[1];
+                        if (depositorCashFlows.has(index)) {
+                            depositorCashFlow = depositorCashFlows.get(index);
+                            depositorCashFlow.D_TOKEN = token;
+                            depositorCashFlow.totalClaim += Number(amount);
+                            depositorCashFlows.set(index, depositorCashFlow);
+                        }
+                        else {
+                            depositorCashFlow = {
+                                D_TOKEN: token,
+                                totalDeposit: 0,
+                                totalWithdraw: 0,
+                                totalClaim: Number(amount),
+                                totalCompound: 0,
+                                netDeposit: undefined,
+                                totalHarvest: new Map(),
+                            };
+                            depositorCashFlows.set(index, depositorCashFlow);
+                        }
+                    }
+                    else if (history_1.Action == "Compound") {
+                        _k = __read((_e = history_1.Amount) === null || _e === void 0 ? void 0 : _e.split(" "), 2), amount = _k[0], token = _k[1];
+                        if (depositorCashFlows.has(index)) {
+                            depositorCashFlow = depositorCashFlows.get(index);
+                            depositorCashFlow.D_TOKEN = token;
+                            depositorCashFlow.totalCompound += Number(amount);
+                            depositorCashFlows.set(index, depositorCashFlow);
+                        }
+                        else {
+                            depositorCashFlow = {
+                                D_TOKEN: token,
+                                totalDeposit: 0,
+                                totalWithdraw: 0,
+                                totalClaim: 0,
+                                totalCompound: Number(amount),
+                                netDeposit: undefined,
+                                totalHarvest: new Map(),
+                            };
+                            depositorCashFlows.set(index, depositorCashFlow);
+                        }
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (userHistory_1_1 && !userHistory_1_1.done && (_p = userHistory_1.return)) _p.call(userHistory_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            try {
+                // console.log(depositorCashFlows);
+                for (_l = __values(depositorCashFlows.entries()), _m = _l.next(); !_m.done; _m = _l.next()) {
+                    _o = __read(_m.value, 2), index = _o[0], share = _o[1];
+                    share.netDeposit = share.totalDeposit + share.totalCompound - share.totalWithdraw - share.totalClaim;
+                    depositorCashFlows.set(index, share);
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (_m && !_m.done && (_q = _l.return)) _q.call(_l);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+            return [2 /*return*/, depositorCashFlows];
+        });
+    });
+}
+exports.getDepositorCashFlows = getDepositorCashFlows;

package/package.json

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