@typus/typus-sdk 1.0.32 → 1.0.34

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

@@ -1,5 +1,5 @@
 export declare function getDepositorLeaderBoard(start?: string, end?: string, step?: number): Promise<LeaderBoard[]>;
-export declare function getBidderLeaderBoard(start?: string, end?: string, step?: number): Promise<LeaderBoard[]>;
+export declare function getBidderLeaderBoard(startTimestamp?: string, end?: string): Promise<LeaderBoard[]>;
 interface LeaderBoard {
     user: string;
     score: number;

package/lib/utils/leader-board.js

@@ -37,52 +37,34 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBidderLeaderBoard = exports.getDepositorLeaderBoard = void 0;
-var apiUrl = "https://app.sentio.xyz/api/v1/metrics/wayne/typus/query_range";
+var apiUrl = "https://app.sentio.xyz/api/v1/insights/wayne/typus/query";
 var headers = {
     "api-key": "oBOW8DsO1izVrINCy6Tmxga9YcWeOL87O",
     "Content-Type": "application/json",
 };
 var depositorRequestData = {
+    timeRange: {
+        start: "-7d",
+        end: "now",
+        step: 3600,
+    },
+    limit: 200,
     queries: [
         {
-            query: "callPortfolioHarvest",
-            alias: "",
-            id: "a",
-            labelSelector: {},
-            aggregate: {
-                op: "SUM",
-                grouping: ["user"],
-            },
-            functions: [],
-            disabled: true,
-        },
-        {
-            query: "callPortfolioCompound",
-            alias: "",
-            id: "b",
-            labelSelector: {},
-            aggregate: {
-                op: "SUM",
-                grouping: ["user"],
+            metricsQuery: {
+                query: "depositTvl",
+                alias: "",
+                id: "a",
+                labelSelector: {
+                // user: "0x823bd0c4d601d625b1b1555dbe17da495db71070a4365205467838aecc32cbad",
+                },
+                aggregate: {
+                    op: "SUM",
+                    grouping: ["user"],
+                },
             },
-            functions: [],
-            disabled: true,
         },
     ],
-    formulas: [
-        {
-            expression: "a+b",
-            alias: "Score",
-            id: "A",
-            disabled: false,
-        },
-    ],
-    timeRange: {
-        start: "now",
-        end: "now",
-        step: 1,
-    },
-    samplesLimit: 200,
 };
 function getDepositorLeaderBoard(start, end, step) {
     return __awaiter(this, void 0, void 0, function () {
@@ -112,11 +94,17 @@ function getDepositorLeaderBoard(start, end, step) {
                 case 2:
                     data = _a.sent();
                     samples = data.results[0].matrix.samples;
-                    leader_board = samples.map(function (element) {
+                    leader_board = samples
+                        .map(function (element) {
                         // console.log("metric:", element.metric, "values: ", element.values);
                         // console.log("user:", element.metric.labels.user, "score: ", element.values.at(-1).value);
-                        return { user: element.metric.labels.user, score: element.values.at(-1).value };
-                    });
+                        var sum = element.values.reduce(function (acc, curr) { return acc + curr.value / 1000000000 / 24 / 7 / 2; }, 0);
+                        return {
+                            user: element.metric.labels.user,
+                            score: sum,
+                        };
+                    })
+                        .filter(function (element) { return element.score != 0; });
                     leader_board.sort(function (a, b) { return b.score - a.score; });
                     // console.log(leader_board);
                     return [2 /*return*/, leader_board];
@@ -127,43 +115,42 @@ function getDepositorLeaderBoard(start, end, step) {
 }
 exports.getDepositorLeaderBoard = getDepositorLeaderBoard;
 var bidderRequestData = {
+    timeRange: {
+        start: "-7d",
+        end: "now",
+        step: 3600,
+    },
+    limit: 200,
     queries: [
         {
-            query: "callPortfolioNewBid",
-            alias: "Score",
-            id: "a",
-            labelSelector: {},
-            aggregate: {
-                op: "SUM",
-                grouping: ["user"],
+            metricsQuery: {
+                query: "totalNewBid",
+                alias: "",
+                id: "a",
+                labelSelector: {},
+                aggregate: {
+                    op: "SUM",
+                    grouping: ["user"],
+                },
+                functions: [],
+                disabled: false,
             },
-            functions: [],
-            disabled: false,
+            dataSource: "METRICS",
         },
     ],
-    formulas: [],
-    timeRange: {
-        start: "now",
-        end: "now",
-        step: 1,
-    },
-    samplesLimit: 200,
 };
-function getBidderLeaderBoard(start, end, step) {
+function getBidderLeaderBoard(startTimestamp, end) {
     return __awaiter(this, void 0, void 0, function () {
         var jsonData, response, data, samples, leader_board;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    if (start) {
-                        bidderRequestData.timeRange.start = start;
+                    if (startTimestamp) {
+                        bidderRequestData.timeRange.start = startTimestamp;
                     }
                     if (end) {
                         bidderRequestData.timeRange.end = end;
                     }
-                    if (step) {
-                        bidderRequestData.timeRange.step = step;
-                    }
                     jsonData = JSON.stringify(bidderRequestData);
                     return [4 /*yield*/, fetch(apiUrl, {
                             method: "POST",
@@ -177,11 +164,22 @@ function getBidderLeaderBoard(start, end, step) {
                 case 2:
                     data = _a.sent();
                     samples = data.results[0].matrix.samples;
-                    leader_board = samples.map(function (element) {
+                    leader_board = samples
+                        .map(function (element) {
                         // console.log("metric:", element.metric, "values: ", element.values);
                         // console.log("user:", element.metric.labels.user, "score: ", element.values.at(-1).value);
-                        return { user: element.metric.labels.user, score: element.values.at(-1).value };
-                    });
+                        var a = 0;
+                        var log_0 = element.values.at(0);
+                        if (log_0.timestamp == startTimestamp) {
+                            a = log_0.value;
+                        }
+                        var b = element.values.at(-1).value;
+                        return {
+                            user: element.metric.labels.user,
+                            score: (b - a) / 1000000000,
+                        };
+                    })
+                        .filter(function (element) { return element.score != 0; });
                     leader_board.sort(function (a, b) { return b.score - a.score; });
                     // console.log(leader_board);
                     return [2 /*return*/, leader_board];
@@ -191,7 +189,8 @@ function getBidderLeaderBoard(start, end, step) {
     });
 }
 exports.getBidderLeaderBoard = getBidderLeaderBoard;
-// (async () => {
-//     console.log(await getDepositorLeaderBoard("1682434800"));
-//     console.log(await getBidderLeaderBoard("1682434800"));
-// })();
+(function () { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        return [2 /*return*/];
+    });
+}); })();

package/lib/utils/typus-dov-single/registry.d.ts

@@ -0,0 +1,14 @@
+import { JsonRpcProvider } from "@mysten/sui.js";
+export interface Registry {
+    version: string;
+    numOfVault: string;
+    depositVaultRegistry: string;
+    bidVaultRegistry: string;
+    restrictActivationTimePeriod: {
+        fromTsMs: string;
+        toTsMs: string;
+    };
+    authority: string[];
+}
+export declare function getRegistry(provider: JsonRpcProvider, registry: string): Promise<Registry>;
+export declare function getPackageVersion(provider: JsonRpcProvider, packageId: string): Promise<bigint>;

package/lib/utils/typus-dov-single/registry.js

@@ -0,0 +1,104 @@
+"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 };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPackageVersion = exports.getRegistry = void 0;
+var tools_1 = require("../tools");
+function getRegistry(provider, registry) {
+    return __awaiter(this, void 0, void 0, function () {
+        var result, _a, _b;
+        var _c, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
+                case 0: return [4 /*yield*/, provider.getObject({ id: registry, options: { showContent: true } })];
+                case 1:
+                    result = _e.sent();
+                    _c = {
+                        // @ts-ignore
+                        version: result.data.content.fields.version,
+                        // @ts-ignore
+                        numOfVault: result.data.content.fields.num_of_vault,
+                        // @ts-ignore
+                        depositVaultRegistry: result.data.content.fields.deposit_vault_registry.fields.id.id,
+                        // @ts-ignore
+                        bidVaultRegistry: result.data.content.fields.bid_vault_registry.fields.id.id,
+                        restrictActivationTimePeriod: {
+                            // @ts-ignore
+                            fromTsMs: result.data.content.fields.restrict_activation_time_period.fields.from_ts_ms,
+                            // @ts-ignore
+                            toTsMs: result.data.content.fields.restrict_activation_time_period.fields.to_ts_ms,
+                        }
+                    };
+                    _b = (_a = provider).multiGetObjects;
+                    _d = {};
+                    return [4 /*yield*/, provider.getDynamicFields({
+                            // @ts-ignore
+                            parentId: result.data.content.fields.authority.fields.whitelist.fields.id.id,
+                        })];
+                case 2: return [4 /*yield*/, _b.apply(_a, [(_d.ids = (_e.sent()).data.map(function (x) { return x.objectId; }),
+                            _d.options = { showContent: true },
+                            _d)])];
+                case 3: return [2 /*return*/, (_c.authority = (_e.sent()).map(function (x) {
+                        // @ts-ignore
+                        return x.data.content.fields.name;
+                    }),
+                        _c)];
+            }
+        });
+    });
+}
+exports.getRegistry = getRegistry;
+function getPackageVersion(provider, packageId) {
+    return __awaiter(this, void 0, void 0, function () {
+        var packageData, version;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, provider.getObject({
+                        id: packageId,
+                        options: {
+                            showContent: true,
+                        },
+                    })];
+                case 1:
+                    packageData = _a.sent();
+                    version = new RegExp("upgrade_registry[^\\[]+\\[[^\\[]+\\[([^\\]]+)\\]").exec(packageData.data.content.disassembled.typus_dov_single)[1];
+                    return [2 /*return*/, (0, tools_1.U64FromBytes)(version.split(", ").reverse())];
+            }
+        });
+    });
+}
+exports.getPackageVersion = getPackageVersion;

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

@@ -254,7 +254,7 @@ function getNewBidTx(gasBudget, packageId, typeArguments, registry, index, price
         var tx, _a, coin;
         return __generator(this, function (_b) {
             tx = new sui_js_1.TransactionBlock();
-            if (typeArguments[0] == sui_js_1.SUI_TYPE_ARG) {
+            if (typeArguments[1] == sui_js_1.SUI_TYPE_ARG) {
                 _a = __read(tx.splitCoins(tx.gas, [tx.pure(premium_required)]), 1), coin = _a[0];
                 tx.moveCall({
                     target: "".concat(packageId, "::typus_dov_single::new_bid"),

package/package.json

@@ -1,84 +1,84 @@
 {
-    "name": "@typus/typus-sdk",
-    "author": "Typus",
-    "description": "typus sdk",
-    "version": "1.0.32",
-    "dependencies": {
-        "@mysten/sui.js": "^0.33.0",
-        "@types/node": "^17.0.0",
-        "bignumber.js": "^9.1.1",
-        "bs58": "^4.0.1",
-        "builtin-modules": "^1.1.1",
-        "chai": "^4.3.7",
-        "decimal.js": "^10.3.1",
-        "diff": "^4.0.2",
-        "dotenv": "^10.0.0",
-        "encrypt-with-password": "^1.0.0",
-        "escape-string-regexp": "^1.0.5",
-        "esprima": "^4.0.1",
-        "fetch": "^1.1.0",
-        "fs.realpath": "^1.0.0",
-        "function-bind": "^1.1.1",
-        "glob": "^7.2.0",
-        "has": "^1.0.3",
-        "has-flag": "^3.0.0",
-        "inflight": "^1.0.6",
-        "inherits": "^2.0.4",
-        "is-core-module": "^2.8.0",
-        "js-sha3": "^0.8.0",
-        "js-tokens": "^4.0.0",
-        "js-yaml": "^3.14.1",
-        "math-erf": "^1.0.0",
-        "minimatch": "^3.0.4",
-        "minimist": "^1.2.5",
-        "mkdirp": "^0.5.5",
-        "mocha": "^10.1.0",
-        "moment": "^2.29.4",
-        "node-cron": "^3.0.2",
-        "once": "^1.4.0",
-        "path-is-absolute": "^1.0.1",
-        "path-parse": "^1.0.7",
-        "random-bigint": "^0.0.1",
-        "resolve": "^1.20.0",
-        "rxjs": "^7.5.5",
-        "semver": "^5.7.1",
-        "sprintf-js": "^1.0.3",
-        "superstruct": "^0.16.0",
-        "supports-color": "^5.5.0",
-        "ts-mocha": "^10.0.0",
-        "tslib": "^1.14.1",
-        "tsutils": "^2.29.0",
-        "typed-rpc": "^3.0.0",
-        "wrappy": "^1.0.2",
-        "ws": "^8.11.0",
-        "xmlhttprequest": "^1.8.0"
-    },
-    "devDependencies": {
-        "@types/bs58": "^4.0.1",
-        "@types/expect": "^24.3.0",
-        "@types/mocha": "^9.0.0",
-        "@types/rx": "^4.1.2",
-        "prettier": "^2.5.1",
-        "tslint": "^6.1.3",
-        "tslint-config-prettier": "^1.18.0",
-        "typescript": "^4.5.4"
-    },
-    "main": "lib/index.js",
-    "files": [
-        "lib"
-    ],
-    "types": "lib/index.d.ts",
-    "scripts": {
-        "test": "rm -rf lib && tsc && ts-mocha test/test*.ts",
-        "build": "rm -rf lib && tsc"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/Typus-Lab/typus-sdk.git"
-    },
-    "license": "ISC",
-    "bugs": {
-        "url": "https://github.com/Typus-Lab/typus-sdk/issues"
-    },
-    "homepage": "https://github.com/Typus-Lab/typus-sdk#readme"
+  "name": "@typus/typus-sdk",
+  "author": "Typus",
+  "description": "typus sdk",
+  "version": "1.0.34",
+  "dependencies": {
+    "@mysten/sui.js": "^0.33.0",
+    "@types/node": "^17.0.0",
+    "bignumber.js": "^9.1.1",
+    "bs58": "^4.0.1",
+    "builtin-modules": "^1.1.1",
+    "chai": "^4.3.7",
+    "decimal.js": "^10.3.1",
+    "diff": "^4.0.2",
+    "dotenv": "^10.0.0",
+    "encrypt-with-password": "^1.0.0",
+    "escape-string-regexp": "^1.0.5",
+    "esprima": "^4.0.1",
+    "fetch": "^1.1.0",
+    "fs.realpath": "^1.0.0",
+    "function-bind": "^1.1.1",
+    "glob": "^7.2.0",
+    "has": "^1.0.3",
+    "has-flag": "^3.0.0",
+    "inflight": "^1.0.6",
+    "inherits": "^2.0.4",
+    "is-core-module": "^2.8.0",
+    "js-sha3": "^0.8.0",
+    "js-tokens": "^4.0.0",
+    "js-yaml": "^3.14.1",
+    "math-erf": "^1.0.0",
+    "minimatch": "^3.0.4",
+    "minimist": "^1.2.5",
+    "mkdirp": "^0.5.5",
+    "mocha": "^10.1.0",
+    "moment": "^2.29.4",
+    "node-cron": "^3.0.2",
+    "once": "^1.4.0",
+    "path-is-absolute": "^1.0.1",
+    "path-parse": "^1.0.7",
+    "random-bigint": "^0.0.1",
+    "resolve": "^1.20.0",
+    "rxjs": "^7.5.5",
+    "semver": "^5.7.1",
+    "sprintf-js": "^1.0.3",
+    "superstruct": "^0.16.0",
+    "supports-color": "^5.5.0",
+    "ts-mocha": "^10.0.0",
+    "tslib": "^1.14.1",
+    "tsutils": "^2.29.0",
+    "typed-rpc": "^3.0.0",
+    "wrappy": "^1.0.2",
+    "ws": "^8.11.0",
+    "xmlhttprequest": "^1.8.0"
+  },
+  "devDependencies": {
+    "@types/bs58": "^4.0.1",
+    "@types/expect": "^24.3.0",
+    "@types/mocha": "^9.0.0",
+    "@types/rx": "^4.1.2",
+    "prettier": "^2.5.1",
+    "tslint": "^6.1.3",
+    "tslint-config-prettier": "^1.18.0",
+    "typescript": "^4.5.4"
+  },
+  "main": "lib/index.js",
+  "files": [
+    "lib"
+  ],
+  "types": "lib/index.d.ts",
+  "scripts": {
+    "test": "rm -rf lib && tsc && ts-mocha test/test*.ts",
+    "build": "rm -rf lib && tsc"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Typus-Lab/typus-sdk.git"
+  },
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/Typus-Lab/typus-sdk/issues"
+  },
+  "homepage": "https://github.com/Typus-Lab/typus-sdk#readme"
 }