@typus/typus-sdk 1.2.82 → 1.2.84

package/lib/config.json

@@ -15,7 +15,7 @@
             "TYPUS": "0x4b0f4ee1a40ce37ec81c987cc4e76a665419e74b863319492fc7d26f708b835a"
         },
         "PACKAGE": {
-            "DOV_SINGLE": "0x5395c48f9bd7ee96586fa1e10f22fc1cb2455f83994ca919aaef51ae4db40242",
+            "DOV_SINGLE": "0x8b65b817e7d819ab810bf50eaaa521ceea39d85cd46ab58180cfe287ce6f8ef0",
             "FRAMEWORK": "0x946d188d91cabd4fe15ef763e463a6738db1965814d3fd790085b4720cf90e28",
             "MFUD": "0xd8f04cd2a16c19c17428c3b4c22b01dd06740423b93fb7ee88fbe2676a82849d",
             "NFT": "0xba06aae31d9b7c9f651e783272c7e4f776fb5ae17e89d525b75a17b099f58202",
@@ -66,12 +66,12 @@
             "LOCKED_VAULT": "0xe79b7ba69b750d30ac7ae171483a4064d0bb34090493fef3c844a11b05818d79"
         },
         "PACKAGE": {
-            "DOV_SINGLE": "0x31d2949b6dc26a162d0400f24bdff53ed22c0c0d5ffd11dec5e243d0ab31d9df",
+            "DOV_SINGLE": "0xa4fe84c953785d9dcb388a860d30e3a1e46eeb9647f80c40359c192424f19938",
             "FRAMEWORK": "0xa304e225551b619b07c06d8965462b268138b2c5774fd22ad8853ef91fbb9771",
             "MFUD": "0x7755ff79f0f27256c73e6c197e25b407ef6d4b9bd6e1af8cdd50fef28f84712c",
             "NFT": "0x0f5162014f18686640b8d0adefd60c3fe5b377413ec4f1e77001c67d96f8501a",
             "ORACLE": "0x71fbc7acaf513561dabdeb846e7dd5288108e56edb0b6de8d4999c4dfce21f66",
-            "TYPUS": "0xc0d2e234cd1211a0f7b0bac8798d6e8fa8ab5db29d779245c4c4280eb6d16b94"
+            "TYPUS": "0x01840fac0c84618087065346acdbac28bdec4326c416fcd2dc6d2f1b7d86fe62"
         },
         "REGISTRY": {
             "AIRDROP": "0xfb2fbf261f6050d100bcd026ffa0076e088506b1bec26313947239303e2a0224",

package/lib/utils/leaderboard/authority-entry.js

@@ -56,7 +56,7 @@ function getActivateLeaderboardTx(gasBudget, packageId, version, typusLeaderboar
             tx.moveCall({
                 target: "".concat(packageId, "::leaderboard::activate_leaderboard"),
                 typeArguments: [],
-                arguments: [tx.object(version), tx.object(typusLeaderboardRegistry), tx.object(key), tx.pure(start_ts_ms), tx.pure(end_ts_ms)],
+                arguments: [tx.object(version), tx.object(typusLeaderboardRegistry), tx.pure(key), tx.pure(start_ts_ms), tx.pure(end_ts_ms)],
             });
             tx.setGasBudget(gasBudget);
             return [2 /*return*/, tx];
@@ -81,7 +81,7 @@ function getDeactivateLeaderboardTx(gasBudget, packageId, version, typusLeaderbo
             tx.moveCall({
                 target: "".concat(packageId, "::leaderboard::deactivate_leaderboard"),
                 typeArguments: [],
-                arguments: [tx.object(version), tx.object(typusLeaderboardRegistry), tx.object(key), tx.pure(id)],
+                arguments: [tx.object(version), tx.object(typusLeaderboardRegistry), tx.pure(key), tx.pure(id)],
             });
             tx.setGasBudget(gasBudget);
             return [2 /*return*/, tx];

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

@@ -1,6 +1,58 @@
 import BigNumber from "bignumber.js";
+import { PublicKey } from "@solana/web3.js";
+import { PriceData } from "@pythnetwork/client";
 import { SuiClient } from "@mysten/sui.js/dist/cjs/client";
 import { Auction, BidShare, Vault } from "../view-function";
+export declare const ASSET_INFO: {
+    BTC: {
+        product: PublicKey;
+        price: PublicKey;
+    };
+    ETH: {
+        product: PublicKey;
+        price: PublicKey;
+    };
+    SUI: {
+        product: PublicKey;
+        price: PublicKey;
+    };
+    CETUS: {
+        product: PublicKey;
+        price: PublicKey;
+    };
+    SEI: {
+        product: PublicKey;
+        price: PublicKey;
+    };
+    USDC: {
+        product: PublicKey;
+        price: PublicKey;
+    };
+    USDT: {
+        product: PublicKey;
+        price: PublicKey;
+    };
+    TURBOS: {
+        product: PublicKey;
+        price: PublicKey;
+    };
+    APT: {
+        product: PublicKey;
+        price: PublicKey;
+    };
+    SOL: {
+        product: PublicKey;
+        price: PublicKey;
+    };
+    INJ: {
+        product: PublicKey;
+        price: PublicKey;
+    };
+    JUP: {
+        product: PublicKey;
+        price: PublicKey;
+    };
+};
 export declare const tokenOrder: {
     [key: string]: number;
 };
@@ -43,7 +95,20 @@ export interface OrderBy {
     optionTypeOrder: number;
     periodOrder: number;
 }
+export interface CoinInfo {
+    price: string;
+    decimal: string;
+    quote: string;
+}
 export declare const IncentiveRateBp = 4;
+export declare const parsePythOracleData: (data: PriceData[], decimals: {
+    [key: string]: string;
+}) => {
+    [key: string]: CoinInfo;
+};
+export declare const fetchPrices: (provider: SuiClient, network: string) => Promise<{
+    [key: string]: CoinInfo;
+}>;
 export declare const calcIncentiveRate: (incentiveBp: any) => number;
 export declare const calcDeliveryPrice: (bidShare: BidShare, vaultInfo: Vault) => BigNumber;
 export declare const calcBreakEvenPrice: (optionType: string, period: string, strikes: string[], bToken: string, price: string, incentive: number) => number;
@@ -73,6 +138,6 @@ export declare const getUserBidReceipts: (provider: SuiClient, network: string,
  * @param prices - tokens prices (usd pair on Pyth)
  * @return User Bids.
  */
-export declare const fetchUserBids: (provider: SuiClient, network: string, packageAddress: string, framworkAddress: string, originFramworkAddress: string, registryAddress: string, strategyPoolAddress: string, userAddress: string, prices: {
-    [key: string]: string;
-}) => Promise<any>;
+export declare const fetchUserBids: (provider: SuiClient, network: string, packageAddress: string, framworkAddress: string, originFramworkAddress: string, registryAddress: string, strategyPoolAddress: string, userAddress: string, prices?: {
+    [key: string]: CoinInfo;
+} | undefined) => Promise<any>;

package/lib/utils/typus-dov-single-v2/function/bidding.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 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) {
@@ -75,17 +86,72 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchUserBids = exports.getUserBidReceipts = exports.parseBid = exports.parseBidReceipt = exports.parseStrikes = exports.calcEstPnl = exports.calcBreakEvenPrice = exports.calcDeliveryPrice = exports.calcIncentiveRate = exports.IncentiveRateBp = exports.periodOrder = exports.optionTypeOrder = exports.tokenOrder = void 0;
+exports.fetchUserBids = exports.getUserBidReceipts = exports.parseBid = exports.parseBidReceipt = exports.parseStrikes = exports.calcEstPnl = exports.calcBreakEvenPrice = exports.calcDeliveryPrice = exports.calcIncentiveRate = exports.fetchPrices = exports.parsePythOracleData = exports.IncentiveRateBp = exports.periodOrder = exports.optionTypeOrder = exports.tokenOrder = exports.ASSET_INFO = void 0;
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
+var web3_js_1 = require("@solana/web3.js");
+var client_1 = require("@pythnetwork/client");
 var lodash_1 = require("lodash");
 var moment_1 = __importDefault(require("moment"));
 var view_function_1 = require("../view-function");
 var vault_1 = require("./vault");
 var token_1 = require("./token");
 var tools_1 = require("../../tools");
+var config_json_1 = __importDefault(require("../../../config.json"));
 var view_function_2 = require("../../auto-bid/view-function");
 var token_2 = require("../../token");
+var token_3 = require("./token");
+var price_1 = require("../../price");
 var PriceDecimal = (0, bignumber_js_1.default)(10).pow(8);
+exports.ASSET_INFO = {
+    BTC: {
+        product: new web3_js_1.PublicKey("4aDoSXJ5o3AuvL7QFeR6h44jALQfTmUUCTVGDD6aoJTM"),
+        price: new web3_js_1.PublicKey("GVXRSBjFk6e6J3NbVPXohDJetcTjaeeuykUpbQF8UoMU"),
+    },
+    ETH: {
+        product: new web3_js_1.PublicKey("EMkxjGC1CQ7JLiutDbfYb7UKb3zm9SJcUmr1YicBsdpZ"),
+        price: new web3_js_1.PublicKey("JBu1AL4obBcCMqKBBxhpWCNUt136ijcuMZLFvTP7iWdB"),
+    },
+    SUI: {
+        product: new web3_js_1.PublicKey("2F8rfBf4z4SzNpeQstFTpLXTQQ7RNKsLFqPdbpybooCc"),
+        price: new web3_js_1.PublicKey("3Qub3HaAJaa2xNY7SUqPKd3vVwTqDfDDkEUMPjXD2c1q"),
+    },
+    CETUS: {
+        product: new web3_js_1.PublicKey("JDHPsM1zxsZ6TfDwpCVzo41DAZdRi6ZmhkzWU1iXvSQ"),
+        price: new web3_js_1.PublicKey("GTeC2JfBFrHuYkBivDQcNdLY74X5FRDLEJntnxPKRQbY"),
+    },
+    SEI: {
+        product: new web3_js_1.PublicKey("24bB1mRGsrrDVawJTCVYXrxbEz6ozztukPUKvcZCDcPz"),
+        price: new web3_js_1.PublicKey("6cUuAyAX3eXoiWkjFF77RQBEUF15AAMQ7d1hm4EPd3tv"),
+    },
+    USDC: {
+        product: new web3_js_1.PublicKey("8GWTTbNiXdmyZREXbjsZBmCRuzdPrW55dnZGDkTRjWvb"),
+        price: new web3_js_1.PublicKey("Gnt27xtC473ZT2Mw5u8wZ68Z3gULkSTb5DuxJy7eJotD"),
+    },
+    USDT: {
+        product: new web3_js_1.PublicKey("Av6XyAMJnyi68FdsKSPYgzfXGjYrrt6jcAMwtvzLCqaM"),
+        price: new web3_js_1.PublicKey("3vxLXJqLqF3JG5TCbYycbKWRBbCJQLxQmBGCkyqEEefL"),
+    },
+    TURBOS: {
+        product: new web3_js_1.PublicKey("8DZUgXNQo5Um1pqo4gzv9oWPUZpyKV9nXm51gysZFMef"),
+        price: new web3_js_1.PublicKey("HoxttzPFzcPvpZhUY8LCLkFNn9keDnBrctno4wXEhpFk"),
+    },
+    APT: {
+        product: new web3_js_1.PublicKey("6bQMDtuAmRgjvymdWk9w4tTc9YyuXcjMxF8MyPHXejsx"),
+        price: new web3_js_1.PublicKey("FNNvb1AFDnDVPkocEri8mWbJ1952HQZtFLuwPiUjSJQ"),
+    },
+    SOL: {
+        product: new web3_js_1.PublicKey("ALP8SdU9oARYVLgLR7LrqMNCYBnhtnQz1cj6bwgwQmgj"),
+        price: new web3_js_1.PublicKey("H6ARHf6YXhGYeQfUzQNGk6rDNnLBQKrenN712K4AQJEG"),
+    },
+    INJ: {
+        product: new web3_js_1.PublicKey("5Q5kyCVzssrGMd2BniSdVeRwjNWrGGrFhMrgGt4zURyA"),
+        price: new web3_js_1.PublicKey("9EdtbaivHQYA4Nh3XzGR6DwRaoorqXYnmpfsnFhvwuVj"),
+    },
+    JUP: {
+        product: new web3_js_1.PublicKey("AykbyeHZbUbEtEAPVpBLoPAMHBrUrDMtXJkPWZw4TRDX"),
+        price: new web3_js_1.PublicKey("g6eRCbboSwK4tSWngn773RCMexr1APQr4uA9bGZBYfo"),
+    },
+};
 exports.tokenOrder = {
     // Basically it's a to z but put SUI at first
     SUI: 0,
@@ -125,6 +191,116 @@ exports.periodOrder = {
     3: 0,
 };
 exports.IncentiveRateBp = 4;
+var DefaultOracleDecimal = {
+    ETH: "8",
+    SUI: "8",
+    AFSUI: "8",
+    BTC: "8",
+    DOGE: "8",
+    APT: "8",
+    SOL: "8",
+    USDC: "8",
+    USDT: "8",
+    CETUS: "8",
+    TURBOS: "8",
+    NAVX: "8",
+    JUP: "8",
+    BUCK: "8",
+    USDY: "8",
+    SEI: "8",
+    FUD: "8",
+    MFUD: "8",
+    INJ: "8",
+    SCA: "8",
+};
+var parsePythOracleData = function (data, decimals) {
+    var prices = {};
+    Object.entries(exports.ASSET_INFO).forEach(function (p) {
+        var _a, _b;
+        var asset = p[0].toUpperCase();
+        var coinData = data.find(function (s) {
+            return s.productAccountKey.equals(p[1].product);
+        });
+        var decimal = decimals[asset];
+        if (decimal && coinData) {
+            prices[asset.toLowerCase()] = {
+                price: (0, bignumber_js_1.default)((_a = coinData.price) !== null && _a !== void 0 ? _a : 0)
+                    .multipliedBy((0, bignumber_js_1.default)(10).pow(decimal))
+                    .toString(),
+                decimal: decimal,
+                quote: "usd",
+            };
+            if (token_3.WrappedToken[asset]) {
+                prices[token_3.WrappedToken[asset].toLowerCase()] = {
+                    price: (0, bignumber_js_1.default)((_b = coinData.price) !== null && _b !== void 0 ? _b : 0)
+                        .multipliedBy((0, bignumber_js_1.default)(10).pow(decimal))
+                        .toString(),
+                    decimal: decimal,
+                    quote: "usd",
+                };
+            }
+        }
+    });
+    return prices;
+};
+exports.parsePythOracleData = parsePythOracleData;
+var fetchPrices = function (provider, network) { return __awaiter(void 0, void 0, void 0, function () {
+    var coinObjects, oracleDecimal, PYTHNET_CLUSTER_NAME, connection, pythPublicKey, pythClient, priceData, prices, suiusd, suifud, fudusd, suiafsui, afsuiusd, suinavx, navxusd, suibuck, buckusd, usdyusdc, usdyusdcWithDecimal, scasui, scausd;
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0: return [4 /*yield*/, provider.multiGetObjects({
+                    ids: Object.values(config_json_1.default[network.toUpperCase()].ORACLE),
+                    options: { showContent: true },
+                })];
+            case 1:
+                coinObjects = _c.sent();
+                oracleDecimal = __assign({}, DefaultOracleDecimal);
+                coinObjects.forEach(function (c) {
+                    var _a, _b;
+                    // @ts-ignore
+                    oracleDecimal[(_a = c.data) === null || _a === void 0 ? void 0 : _a.content.fields.base_token] =
+                        // @ts-ignore
+                        (_b = c.data) === null || _b === void 0 ? void 0 : _b.content.fields.decimal;
+                });
+                PYTHNET_CLUSTER_NAME = "pythnet";
+                connection = new web3_js_1.Connection((0, client_1.getPythClusterApiUrl)(PYTHNET_CLUSTER_NAME));
+                pythPublicKey = (0, client_1.getPythProgramKeyForCluster)(PYTHNET_CLUSTER_NAME);
+                pythClient = new client_1.PythHttpClient(connection, pythPublicKey);
+                return [4 /*yield*/, pythClient.getAssetPricesFromAccounts(Object.values(exports.ASSET_INFO).map(function (a) { return a.price; }))];
+            case 2:
+                priceData = _c.sent();
+                prices = (0, exports.parsePythOracleData)(priceData, oracleDecimal);
+                suiusd = (0, bignumber_js_1.default)((_b = (_a = prices["sui"]) === null || _a === void 0 ? void 0 : _a.price) !== null && _b !== void 0 ? _b : 0);
+                return [4 /*yield*/, (0, price_1.getLatestPrice)("SUIFUD")];
+            case 3:
+                suifud = _c.sent();
+                fudusd = suifud == "0" ? (0, bignumber_js_1.default)(0) : suiusd.div(suifud);
+                return [4 /*yield*/, (0, price_1.getLatestPrice)("SUIAFSUI")];
+            case 4:
+                suiafsui = _c.sent();
+                afsuiusd = suiafsui == "0" ? (0, bignumber_js_1.default)(0) : suiusd.div(suiafsui);
+                return [4 /*yield*/, (0, price_1.getLatestPrice)("SUINAVX")];
+            case 5:
+                suinavx = _c.sent();
+                navxusd = suiusd.div(suinavx);
+                return [4 /*yield*/, (0, price_1.getLatestPrice)("SUIBUCK")];
+            case 6:
+                suibuck = _c.sent();
+                buckusd = (0, bignumber_js_1.default)(suibuck).lte(0) ? "0" : suiusd.div(suibuck);
+                return [4 /*yield*/, (0, price_1.getLatestPrice)("USDYUSDC")];
+            case 7:
+                usdyusdc = _c.sent();
+                usdyusdcWithDecimal = (0, bignumber_js_1.default)(usdyusdc).multipliedBy((0, bignumber_js_1.default)(10).pow(8));
+                return [4 /*yield*/, (0, price_1.getLatestPrice)("SCASUI")];
+            case 8:
+                scasui = _c.sent();
+                scausd = suiusd.eq(0) ? (0, bignumber_js_1.default)(0) : (0, bignumber_js_1.default)(scasui).multipliedBy(suiusd);
+                return [2 /*return*/, __assign({ fud: { price: fudusd.toString(), decimal: "8", quote: "usd" }, mfud: { price: fudusd.multipliedBy(1000000).toString(), decimal: "8", quote: "usd" }, afsui: { price: afsuiusd.toString(), decimal: "8", quote: "usd" }, navx: { price: navxusd.toString(), decimal: "8", quote: "usd" }, buck: { price: buckusd.toString(), decimal: "8", quote: "usd" }, usdy: { price: usdyusdcWithDecimal.toString(), decimal: "8", quote: "usd" }, sca: { price: scausd.toString(), decimal: "8", quote: "usd" } }, prices)];
+        }
+    });
+}); };
+exports.fetchPrices = fetchPrices;
 var calcIncentiveRate = function (incentiveBp) {
     var incentiveRateBp = (0, bignumber_js_1.default)(incentiveBp).div((0, bignumber_js_1.default)(10).pow(exports.IncentiveRateBp));
     var incentiveRate = 1;
@@ -501,9 +677,15 @@ var fetchUserBids = function (provider, network, packageAddress, framworkAddress
                 return [4 /*yield*/, (0, view_function_1.getAuctions)(provider, packageAddress, registryAddress, [])];
             case 4:
                 auctions = _f.sent();
+                if (!(typeof prices === "undefined")) return [3 /*break*/, 6];
+                return [4 /*yield*/, (0, exports.fetchPrices)(provider, "testnet")];
+            case 5:
+                prices = _f.sent();
+                _f.label = 6;
+            case 6:
                 _a = (0, exports.parseBidReceipt)(Object.values(vaultsInfo), userReceipts), sortedBidReceipts = _a.sortedBidReceipts, bidVaultsInfo = _a.bidVaultsInfo;
                 return [4 /*yield*/, (0, view_function_1.getMyBids)(provider, framworkAddress, packageAddress, registryAddress, sortedBidReceipts)];
-            case 5:
+            case 7:
                 bidShares = _f.sent();
                 bidsFromBidShares = [];
                 _loop_1 = function (bidVaultInfo) {
@@ -511,7 +693,10 @@ var fetchUserBids = function (provider, network, packageAddress, framworkAddress
                     var auction = auctions ? auctions[bidVaultInfo.vaultInfo.info.index] : null;
                     var _g = __read((0, vault_1.parseAssets)(bidVaultInfo.vaultInfo.info), 3), dToken = _g[0], bToken = _g[1], oToken = _g[2];
                     if (bidShare) {
-                        var data = (0, exports.parseBid)(bidVaultInfo, bidShare, auction, prices[oToken.toLowerCase()], false);
+                        var price = (0, bignumber_js_1.default)(prices[oToken.toLowerCase()].price)
+                            .div((0, bignumber_js_1.default)(10).pow(prices[oToken.toLowerCase()].decimal))
+                            .toString();
+                        var data = (0, exports.parseBid)(bidVaultInfo, bidShare, auction, price, false);
                         var checkExistVault = bidsFromBidShares.find(function (p) { return p.vaultIndex === bidVaultInfo.vaultInfo.info.index && p.receiptsVid.includes(bidVaultInfo.receipt.vid); });
                         if (checkExistVault) {
                             // Merge the bid receipts into the same vault
@@ -602,7 +787,10 @@ var fetchUserBids = function (provider, network, packageAddress, framworkAddress
                     var auction = auctions ? auctions[autoBidVaultInfo.vaultInfo.info.index] : null;
                     var _h = __read((0, vault_1.parseAssets)(autoBidVaultInfo.vaultInfo.info), 3), dToken = _h[0], bToken = _h[1], oToken = _h[2];
                     if (bidShare) {
-                        var data = (0, exports.parseBid)(autoBidVaultInfo, bidShare, auction, prices[oToken.toLowerCase()], false);
+                        var price = (0, bignumber_js_1.default)(prices[oToken.toLowerCase()].price)
+                            .div((0, bignumber_js_1.default)(10).pow(prices[oToken.toLowerCase()].decimal))
+                            .toString();
+                        var data = (0, exports.parseBid)(autoBidVaultInfo, bidShare, auction, price, false);
                         var checkExistVault = bidsFromStrategies.find(function (p) { return p.vaultIndex === autoBidVaultInfo.vaultInfo.info.index && p.receiptsVid.includes(autoBidVaultInfo.receipt.vid); });
                         if (checkExistVault) {
                             // Merge the bid receipts into the same vault

package/package.json

@@ -2,11 +2,13 @@
     "name": "@typus/typus-sdk",
     "author": "Typus",
     "description": "typus sdk",
-    "version": "1.2.82",
+    "version": "1.2.84",
     "dependencies": {
         "@mysten/bcs": "^0.11.1",
         "@mysten/kiosk": "0.7.12",
         "@mysten/sui.js": "0.48.0",
+        "@pythnetwork/client": "^2.21.0",
+        "@solana/web3.js": "^1.91.8",
         "@types/node": "^20.5.7",
         "aftermath-ts-sdk": "^1.1.14",
         "bignumber.js": "^9.1.1",