@typus/typus-sdk 1.0.72 → 1.0.74

package/lib/config.json

@@ -0,0 +1,32 @@
+{
+    "VERSION": "2.10.0",
+    "DB_NAME": "testnet_2_8_0",
+    "RPC_ENDPOINT": "https://fullnode.testnet.sui.io:443",
+    "SINGLE_COLLATERAL_PACKAGE": "0xc9a09a5d71159aec4fc43cdc80bc2e37b03c39151d72ae005921f3e5325a1cb5",
+    "SINGLE_COLLATERAL_PACKAGE_ORIGIN": "0x867a84b70d1f44ea10c02cb099dad5a46c074675afa3b728bd0c11f653e2cb18",
+    "SINGLE_COLLATERAL_MANAGER_CAP": "0x7040e5c1a4691d7df2208a577802b05784b8926ad157ebf99b46a185636f2e07",
+    "SINGLE_COLLATERAL_REGISTRY": "0x7808d2e668101969e67b6713df9dd96a57deba23baf4cd6754258756f332ef88",
+    "SINGLE_COLLATERAL_ADDITIONAL_CONFIG_REGISTRY": "0x3247cb9bde56b63cf4ce79670caed0f9ebc28f839586b07c5b1d79fb7450dde8",
+    "SINGLE_COLLATERAL_DEPOSIT_VAULT_REGISTRY": "0x6d63f91afacfdef3fb8e798b9bcda6b99e3e52730dab00c35ea195505c9efc2b",
+    "SINGLE_COLLATERAL_BID_VAULT_REGISTRY": "0x90e723d05a6f7da2b94bdc88772a205e3a3b90babf69b369adef024756c79da5",
+    "SINGLE_COLLATERAL_DEPOSIT_VAULT_USER_SHARE_REGISTRY": "0x3d8ddc0f8eadb2cb4ab0ecd62b8437bfb40b75fe5368c04fa6f3382c0975c4c6",
+    "SINGLE_COLLATERAL_BID_VAULT_USER_SHARE_REGISTRY": "0x0a0c530ffbad0ff9d9d1707dc1ea4c2e123ffdd5bd6c6c842f71cd449263202e",
+    "TOKEN_PACKAGE": "0x949572061c09bbedef3ac4ffc42e58632291616f0605117cec86d840e09bf519",
+    "BTC_TOKEN_REGISTRY": "0xcf5184b85f47cb1ffe421249e48b2cd34807534e1a4b4ad384009295bbbd3bf4",
+    "ETH_TOKEN_REGISTRY": "0x5cd3726a1d1ef32bffaaeb2ec4964f0ffac56cfb919f7d13d4672aed5059bfa1",
+    "USDC_TOKEN_REGISTRY": "0xf7df3c68a7d3ffc54065565c94a9fa3f5342957340bce78be74373846241a833",
+    "CETUS_TOKEN_REGISTRY": "0x24a7a5297a3656ebea71ed72a4974a7710943d9a598fda60fe60b44262da9f27",
+    "BUCK_TOKEN_REGISTRY": "0x445324cee50d98a949aab8e75ee44539ca9ef38ee431fed19d3eb7deb654536d",
+    "ORACLE_PACKAGE": "0x1d17058789bd1e1e79f1a92424519a88146f191f58a06cc4d9ab23d17d46ab73",
+    "ORACLE_MANAGER_CAP": "0x4e118b46fc39fd8961b8bac6a7f668e12c63ef28fbd2cb6f9b6a40cb0a41dfaf",
+    "SUI_USDC_ORACLE": "0x770f17817e809f22d3cf3ba5f452056622a31dd6a1db7c60c94c5a598aff9a29",
+    "CETUS_USDC_ORACLE": "0xe8142c490363475a4ad0b9af02ac5a543962584f3a99cdb8754d909be6ec550d",
+    "BTC_USDC_ORACLE": "0xaa72a2b370cf45a7b1363a2b9e3f0c57c05863375b984e2ca0928973574404f2",
+    "ETH_USDC_ORACLE": "0x0ac9f9275eb0ac33b7f59741b1df67a6783af2db6d2a4e5aba8ce350d5b6b260",
+    "SUI_BUCK_ORACLE": "0x22ef75c17468f6ed24574f26011f7fcf61a7b983009c9ba6cacc28ae24ff1782",
+    "PYTH_STATE": "0xd8afde3a48b4ff7212bd6829a150f43f59043221200d63504d981f62bff2e27a",
+    "PYTH_SUI/USDC": "0xe38dbe2ff3322f1500fff45d0046101f371eebce47c067c5e9233248c4878c28",
+    "SWITCHBOARD_SUI/USDC": "0x84d2b7e435d6e6a5b137bf6f78f34b2c5515ae61cd8591d5ff6cd121a21aa6b7",
+    "CETUS_ORACLE": "0xfa4720fa516760b2de899dc74e078d8cc1cc6af6c74805b069b31dc3935aa119",
+    "mainnet": false
+}

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

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

package/lib/utils/leader-board.js

@@ -55,74 +55,64 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBidderLeaderBoard = exports.getDepositorLeaderBoard = void 0;
 var apiUrl = "https://app.sentio.xyz/api/v1/insights/wayne/typus/query";
 var headers = {
-    "api-key": "oBOW8DsO1izVrINCy6Tmxga9YcWeOL87O",
+    "api-key": "UcELWyfhQjJcb26aSc59JvAYXU3x3eBGh",
     "Content-Type": "application/json",
 };
-var depositorRequestData = {
+var requestData = {
     timeRange: {
-        start: "-7d",
+        start: "-30d",
         end: "now",
-        step: 3600,
+        step: 86400,
+        timezone: "UTC",
     },
-    limit: 200,
+    limit: 20,
     queries: [
         {
             metricsQuery: {
-                query: "depositTvl",
-                alias: "",
+                query: "deliverySize_USD_",
                 id: "a",
                 labelSelector: {},
                 aggregate: {
                     op: "SUM",
-                    grouping: ["user", "coin_symbol"],
+                    grouping: ["coin_symbol"],
                 },
-                functions: [],
-                disabled: true,
-            },
-            dataSource: "METRICS",
-        },
-        {
-            priceQuery: {
-                id: "b",
-                alias: "",
-                coinId: [
+                functions: [
                     {
-                        symbol: "SUI",
-                    },
-                    {
-                        symbol: "USDC",
+                        name: "sum_over_time",
+                        arguments: [
+                            {
+                                durationValue: {
+                                    value: 1,
+                                    unit: "d",
+                                },
+                            },
+                        ],
                     },
                 ],
-                disabled: true,
+                disabled: false,
             },
-            dataSource: "PRICE",
-        },
-    ],
-    formulas: [
-        {
-            expression: "a*b",
-            alias: "{{user}}",
-            id: "A",
-            disabled: false,
+            dataSource: "METRICS",
+            sourceName: "",
         },
     ],
+    formulas: [],
 };
 function getDepositorLeaderBoard(start, end, step) {
     return __awaiter(this, void 0, void 0, function () {
-        var jsonData, response, data, samples, len_1, leader_board, userScoreMap, result, e_1;
+        var jsonData, response, data, samples;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     if (start) {
-                        depositorRequestData.timeRange.start = start;
+                        requestData.timeRange.start = start;
                     }
                     if (end) {
-                        depositorRequestData.timeRange.end = end;
+                        requestData.timeRange.end = end;
                     }
                     if (step) {
-                        depositorRequestData.timeRange.step = step;
+                        requestData.timeRange.step = step;
                     }
-                    jsonData = JSON.stringify(depositorRequestData);
+                    jsonData = JSON.stringify(requestData);
                     return [4 /*yield*/, fetch(apiUrl, {
                             method: "POST",
                             headers: headers,
@@ -130,45 +120,12 @@ function getDepositorLeaderBoard(start, end, step) {
                         })];
                 case 1:
                     response = _a.sent();
-                    _a.label = 2;
-                case 2:
-                    _a.trys.push([2, 4, , 5]);
                     return [4 /*yield*/, response.json()];
-                case 3:
+                case 2:
                     data = _a.sent();
                     samples = data.results[0].matrix.samples;
-                    len_1 = samples.reduce(function (acc, curr) { return (acc > curr.values.length ? acc : curr.values.length); }, 0) - 1;
-                    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);
-                        var sum = element.values.reduce(function (acc, curr) { return acc + curr.value / len_1; }, 0);
-                        return {
-                            user: element.metric.labels.user,
-                            score: sum,
-                        };
-                    })
-                        .filter(function (element) { return element.score != 0; });
-                    userScoreMap = leader_board.reduce(function (map, obj) {
-                        if (map[obj.user]) {
-                            map[obj.user] += obj.score;
-                        }
-                        else {
-                            map[obj.user] = obj.score;
-                        }
-                        return map;
-                    }, {});
-                    result = Object.entries(userScoreMap).map(function (_a) {
-                        var _b = __read(_a, 2), user = _b[0], score = _b[1];
-                        return ({ user: user, score: score });
-                    });
-                    result.sort(function (a, b) { return b.score - a.score; });
-                    // console.log(result);
-                    return [2 /*return*/, result];
-                case 4:
-                    e_1 = _a.sent();
-                    return [2 /*return*/, []];
-                case 5: return [2 /*return*/];
+                    console.log(samples[0].values);
+                    return [2 /*return*/];
             }
         });
     });
@@ -201,7 +158,7 @@ var bidderRequestData = {
 };
 function getBidderLeaderBoard(startTimestamp, end) {
     return __awaiter(this, void 0, void 0, function () {
-        var jsonData, response, data, samples, leader_board, userScoreMap, result, e_2;
+        var jsonData, response, data, samples, leader_board, userScoreMap, result, e_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -259,7 +216,7 @@ function getBidderLeaderBoard(startTimestamp, end) {
                     // console.log(result);
                     return [2 /*return*/, result];
                 case 4:
-                    e_2 = _a.sent();
+                    e_1 = _a.sent();
                     return [2 /*return*/, []];
                 case 5: return [2 /*return*/];
             }
@@ -268,7 +225,15 @@ function getBidderLeaderBoard(startTimestamp, end) {
 }
 exports.getBidderLeaderBoard = getBidderLeaderBoard;
 (function () { return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        return [2 /*return*/];
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0:
+                _b = (_a = console).log;
+                return [4 /*yield*/, getDepositorLeaderBoard("1684886400")];
+            case 1:
+                _b.apply(_a, [_c.sent()]);
+                return [2 /*return*/];
+        }
     });
 }); })();

package/lib/utils/token.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assetToDecimal = exports.typeArgsToAssets = void 0;
 var sui_js_1 = require("@mysten/sui.js");
+var config_json_1 = __importDefault(require("../config.json"));
 function typeArgsToAssets(typeArgs) {
     var assets = typeArgs.map(function (x) {
         var typeArgs = x.split("::");
@@ -16,6 +20,14 @@ function typeArgsToAssets(typeArgs) {
                 return "USDC";
             case "0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c":
                 return "USDT";
+            case config_json_1.default.TOKEN_PACKAGE:
+                if (typeArgs[2] == "BTC") {
+                    return "WBTC";
+                }
+                else if (typeArgs[2] == "ETH") {
+                    return "WETH";
+                }
+                return typeArgs[2];
             default:
                 return typeArgs[2];
         }

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

@@ -28,7 +28,7 @@ export declare function getWithdrawTx(gasBudget: number, packageId: string, type
     )
     @param typeArguments [Deposit Vault Token]
 */
-export declare function getClaimTx(gasBudget: number, packageId: string, typeArguments: string[], registry: string, index: string): Promise<TransactionBlock>;
+export declare function getClaimTx(gasBudget: number, packageId: string, typeArguments: string[], registry: string, additional_config_registry: string, index: string): Promise<TransactionBlock>;
 /**
     public(friend) entry fun harvest<TOKEN>(
         registry: &mut Registry,
@@ -37,7 +37,7 @@ export declare function getClaimTx(gasBudget: number, packageId: string, typeArg
     )
     @param typeArguments [Bid Vault Token]
 */
-export declare function getHarvestTx(gasBudget: number, packageId: string, typeArguments: string[], registry: string, index: string): Promise<TransactionBlock>;
+export declare function getHarvestTx(gasBudget: number, packageId: string, typeArguments: string[], registry: string, additional_config_registry: string, index: string): Promise<TransactionBlock>;
 /**
     public(friend) entry fun claim_and_harvest<D_TOKEN, B_TOKEN>(
         registry: &mut Registry,
@@ -46,7 +46,7 @@ export declare function getHarvestTx(gasBudget: number, packageId: string, typeA
     )
     @param typeArguments [Deposit Vault Token, Bid Vault Token]
 */
-export declare function getClaimAndHarvestTx(gasBudget: number, packageId: string, typeArguments: string[], registry: string, index: string): Promise<TransactionBlock>;
+export declare function getClaimAndHarvestTx(gasBudget: number, packageId: string, typeArguments: string[], registry: string, additional_config_registry: string, index: string): Promise<TransactionBlock>;
 /**
     public(friend) entry fun compound<TOKEN, O_TOKEN>(
         registry: &mut Registry,
@@ -55,7 +55,7 @@ export declare function getClaimAndHarvestTx(gasBudget: number, packageId: strin
     )
     @param typeArguments [Deposit Vault Token, Oracle Token]
 */
-export declare function getCompoundTx(gasBudget: number, packageId: string, typeArguments: string[], registry: string, index: string): Promise<TransactionBlock>;
+export declare function getCompoundTx(gasBudget: number, packageId: string, typeArguments: string[], registry: string, additional_config_registry: string, index: string): Promise<TransactionBlock>;
 /**
     public(friend) entry fun unsubscribe<TOKEN>(
         registry: &mut Registry,

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

@@ -71,7 +71,8 @@ function getDepositTx(gasBudget, packageId, typeArguments, registry, index, coin
         return __generator(this, function (_b) {
             tx = new sui_js_1.TransactionBlock();
             if (!usingSponsoredGasCoin &&
-                (typeArguments[0] == "0x2::sui::SUI" || typeArguments[0] == "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI")) {
+                (typeArguments[0] == "0x2::sui::SUI" ||
+                    typeArguments[0] == "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI")) {
                 _a = __read(tx.splitCoins(tx.gas, [tx.pure(amount)]), 1), coin = _a[0];
                 tx.moveCall({
                     target: "".concat(packageId, "::typus_dov_single::deposit"),
@@ -125,7 +126,7 @@ exports.getWithdrawTx = getWithdrawTx;
     )
     @param typeArguments [Deposit Vault Token]
 */
-function getClaimTx(gasBudget, packageId, typeArguments, registry, index) {
+function getClaimTx(gasBudget, packageId, typeArguments, registry, additional_config_registry, index) {
     return __awaiter(this, void 0, void 0, function () {
         var tx;
         return __generator(this, function (_a) {
@@ -133,7 +134,7 @@ function getClaimTx(gasBudget, packageId, typeArguments, registry, index) {
             tx.moveCall({
                 target: "".concat(packageId, "::typus_dov_single::claim"),
                 typeArguments: typeArguments,
-                arguments: [tx.pure(registry), tx.pure(index)],
+                arguments: [tx.pure(registry), tx.pure(additional_config_registry), tx.pure(index)],
             });
             tx.setGasBudget(gasBudget);
             return [2 /*return*/, tx];
@@ -149,7 +150,7 @@ exports.getClaimTx = getClaimTx;
     )
     @param typeArguments [Bid Vault Token]
 */
-function getHarvestTx(gasBudget, packageId, typeArguments, registry, index) {
+function getHarvestTx(gasBudget, packageId, typeArguments, registry, additional_config_registry, index) {
     return __awaiter(this, void 0, void 0, function () {
         var tx;
         return __generator(this, function (_a) {
@@ -157,7 +158,7 @@ function getHarvestTx(gasBudget, packageId, typeArguments, registry, index) {
             tx.moveCall({
                 target: "".concat(packageId, "::typus_dov_single::harvest"),
                 typeArguments: typeArguments,
-                arguments: [tx.pure(registry), tx.pure(index)],
+                arguments: [tx.pure(registry), tx.pure(additional_config_registry), tx.pure(index)],
             });
             tx.setGasBudget(gasBudget);
             return [2 /*return*/, tx];
@@ -173,7 +174,7 @@ exports.getHarvestTx = getHarvestTx;
     )
     @param typeArguments [Deposit Vault Token, Bid Vault Token]
 */
-function getClaimAndHarvestTx(gasBudget, packageId, typeArguments, registry, index) {
+function getClaimAndHarvestTx(gasBudget, packageId, typeArguments, registry, additional_config_registry, index) {
     return __awaiter(this, void 0, void 0, function () {
         var tx;
         return __generator(this, function (_a) {
@@ -181,7 +182,7 @@ function getClaimAndHarvestTx(gasBudget, packageId, typeArguments, registry, ind
             tx.moveCall({
                 target: "".concat(packageId, "::typus_dov_single::claim_and_harvest"),
                 typeArguments: typeArguments,
-                arguments: [tx.pure(registry), tx.pure(index)],
+                arguments: [tx.pure(registry), tx.pure(additional_config_registry), tx.pure(index)],
             });
             tx.setGasBudget(gasBudget);
             return [2 /*return*/, tx];
@@ -197,7 +198,7 @@ exports.getClaimAndHarvestTx = getClaimAndHarvestTx;
     )
     @param typeArguments [Deposit Vault Token, Oracle Token]
 */
-function getCompoundTx(gasBudget, packageId, typeArguments, registry, index) {
+function getCompoundTx(gasBudget, packageId, typeArguments, registry, additional_config_registry, index) {
     return __awaiter(this, void 0, void 0, function () {
         var tx;
         return __generator(this, function (_a) {
@@ -205,7 +206,7 @@ function getCompoundTx(gasBudget, packageId, typeArguments, registry, index) {
             tx.moveCall({
                 target: "".concat(packageId, "::typus_dov_single::compound"),
                 typeArguments: typeArguments,
-                arguments: [tx.pure(registry), tx.pure(index)],
+                arguments: [tx.pure(registry), tx.pure(additional_config_registry), tx.pure(index)],
             });
             tx.setGasBudget(gasBudget);
             return [2 /*return*/, tx];
@@ -258,7 +259,8 @@ usingSponsoredGasCoin) {
         return __generator(this, function (_b) {
             tx = new sui_js_1.TransactionBlock();
             if (!usingSponsoredGasCoin &&
-                (typeArguments[1] == "0x2::sui::SUI" || typeArguments[1] == "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI")) {
+                (typeArguments[1] == "0x2::sui::SUI" ||
+                    typeArguments[1] == "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI")) {
                 _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

@@ -2,7 +2,7 @@
     "name": "@typus/typus-sdk",
     "author": "Typus",
     "description": "typus sdk",
-    "version": "1.0.72",
+    "version": "1.0.74",
     "dependencies": {
         "@mysten/bcs": "^0.7.3",
         "@mysten/sui.js": "^0.37.1",