@typus/typus-sdk 1.2.12 → 1.2.14

package/lib/utils/auto-bid/user-entry.d.ts

@@ -25,3 +25,19 @@ strategy_pool: string, vault_index: string, signal_index: string, coins: string[
 */
 export declare function getCloseStrategyTx(gasBudget: number, packageId: string, typeArguments: string[], // D_TOKEN, B_TOKEN
 strategy_pool: string, vault_index: string, signal_index: string, strategy_index: string): TransactionBlock;
+/**
+    entry fun update_strategy<D_TOKEN, B_TOKEN>(
+        strategy_pool: &mut StrategyPoolV2,
+        vault_index: u64,
+        signal_index: u64,
+        strategy_index: u64,
+        size: Option<u64>,
+        price_percentage: Option<u64>,
+        max_times: Option<u64>,
+        target_rounds: vector<u64>,
+        coins: vector<Coin<B_TOKEN>>,
+        ctx: & TxContext
+    )
+*/
+export declare function getUpdateStrategyTx(gasBudget: number, packageId: string, typeArguments: string[], // D_TOKEN, B_TOKEN
+strategy_pool: string, vault_index: string, signal_index: string, strategy_index: string, coins: string[], amount: string, size: string | null, price_percentage: string | null, max_times: string | null, target_rounds: string[]): TransactionBlock;

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

@@ -16,7 +16,7 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCloseStrategyTx = exports.getNewStrategyTx = void 0;
+exports.getUpdateStrategyTx = exports.getCloseStrategyTx = exports.getNewStrategyTx = void 0;
 var transactions_1 = require("@mysten/sui.js/transactions");
 /**
     entry fun new_strategy<B_TOKEN>(
@@ -100,3 +100,67 @@ strategy_pool, vault_index, signal_index, strategy_index) {
     return tx;
 }
 exports.getCloseStrategyTx = getCloseStrategyTx;
+/**
+    entry fun update_strategy<D_TOKEN, B_TOKEN>(
+        strategy_pool: &mut StrategyPoolV2,
+        vault_index: u64,
+        signal_index: u64,
+        strategy_index: u64,
+        size: Option<u64>,
+        price_percentage: Option<u64>,
+        max_times: Option<u64>,
+        target_rounds: vector<u64>,
+        coins: vector<Coin<B_TOKEN>>,
+        ctx: & TxContext
+    )
+*/
+function getUpdateStrategyTx(gasBudget, packageId, typeArguments, // D_TOKEN, B_TOKEN
+strategy_pool, vault_index, signal_index, strategy_index, coins, amount, size, price_percentage, max_times, target_rounds) {
+    var tx = new transactions_1.TransactionBlock();
+    if (
+    // 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(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,
+            ],
+        });
+    }
+    else {
+        var coin = coins.pop();
+        if (coins.length > 0) {
+            tx.mergeCoins(tx.object(coin), coins.map(function (coin) { return tx.object(coin); }));
+        }
+        var _b = __read(tx.splitCoins(tx.object(coin), [tx.pure(amount)]), 1), input_coin = _b[0];
+        tx.moveCall({
+            target: "".concat(packageId, "::auto_bid::update_strategy"),
+            typeArguments: typeArguments,
+            arguments: [
+                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] }),
+            ],
+        });
+    }
+    tx.setGasBudget(gasBudget);
+    return tx;
+}
+exports.getUpdateStrategyTx = getUpdateStrategyTx;

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

@@ -177,12 +177,12 @@ function getVaults(provider, strategyPool) {
                     pool = (_a = (_d.sent()).data) === null || _a === void 0 ? void 0 : _a.content.fields;
                     console.log(pool);
                     vaults = pool.strategies.fields.contents;
-                    console.log(vaults);
                     try {
                         for (vaults_1 = __values(vaults), vaults_1_1 = vaults_1.next(); !vaults_1_1.done; vaults_1_1 = vaults_1.next()) {
                             vault = vaults_1_1.value;
                             signals = vault.fields.value.fields.contents;
-                            console.log(signals);
+                            console.log("vault: ", vault);
+                            console.log("signals: ", signals);
                             try {
                                 for (signals_1 = (e_2 = void 0, __values(signals)), signals_1_1 = signals_1.next(); !signals_1_1.done; signals_1_1 = signals_1.next()) {
                                     signal = signals_1_1.value;

package/lib/utils/token.js

@@ -71,7 +71,7 @@ function assetToDecimal(asset) {
         case "FUD":
             return 5;
         case "MFUD":
-            return 3;
+            return 6;
         case "INJ":
             return 8;
         case "SEI":

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

@@ -173,6 +173,7 @@ export declare function getWithdrawHarvestClaimTx(input: {
 */
 export declare function getNewBidTx(input: {
     tx: TransactionBlock;
+    typusFrameworkPackageId: string;
     typusDovSinglePackageId: string;
     typusDovSingleRegistry: string;
     typeArguments: string[];

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

@@ -455,13 +455,26 @@ function getNewBidTx(input) {
         input.tx.transferObjects([input.tx.object(result[0])], input.user);
     }
     else {
+        var balance = input.tx.moveCall({
+            target: "".concat(input.typusFrameworkPackageId, "::utils::extract_balance"),
+            typeArguments: [input.typeArguments[1]],
+            arguments: [
+                input.tx.makeMoveVec({ objects: input.coins.map(function (coin) { return input.tx.object(coin); }) }),
+                input.tx.pure(input.premium_required),
+            ],
+        });
+        var coin = input.tx.moveCall({
+            target: "0x2::coin::from_balance",
+            typeArguments: [input.typeArguments[1]],
+            arguments: [input.tx.object(balance)],
+        });
         var result = input.tx.moveCall({
             target: "".concat(input.typusDovSinglePackageId, "::tails_staking::new_bid"),
             typeArguments: input.typeArguments,
             arguments: [
                 input.tx.object(input.typusDovSingleRegistry),
                 input.tx.pure(input.index),
-                input.tx.makeMoveVec({ objects: input.coins.map(function (coin) { return input.tx.object(coin); }) }),
+                input.tx.makeMoveVec({ objects: [coin] }),
                 input.tx.pure(input.size),
                 input.tx.pure("0x6"),
             ],

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

@@ -67,10 +67,7 @@ function getUserHistory(provider, originPackage, vaults, sender, startTimeMs) {
                 case 5:
                     nextPage = _a.sent();
                     txHistory = txHistory.concat(nextPage);
-                    if (result.hasNextPage && Number(result.data[24].timestampMs) < startTimeMs) {
-                        return [3 /*break*/, 6];
-                    }
-                    return [3 /*break*/, 3];
+                    return [3 /*break*/, 6];
                 case 6: return [2 /*return*/, txHistory];
             }
         });
@@ -86,10 +83,10 @@ function parseTxHistory(datas, originPackage, vaults) {
                 case 0: return [4 /*yield*/, datas
                         .filter(function (event) {
                         var type = event.type;
-                        return type.startsWith(originPackage) || type.includes("typus_nft::First") || type.includes("typus_nft::ExpUpEvent");
+                        return event.packageId == originPackage || type.includes("typus_nft::First") || type.includes("typus_nft::ExpUpEvent");
                     })
                         .reduce(function (promise, event) { return __awaiter(_this, void 0, void 0, function () {
-                        var txHistory, functionType, action, Action, Amount, Index, Period, Vault, RiskLevel, Tails, Exp, o_token, v, period, optionType, i, i, token, amount, amount, token, amount, size, token, amount, token, amount, i, b_token, size, bidder_balance;
+                        var txHistory, functionType, action, Action, Amount, Index, Period, Vault, RiskLevel, Tails, Exp, o_token, v, period, optionType, i, i, token, amount, token, amount, amount, token, amount, size, token, amount, token, amount, i, b_token, size, bidder_balance;
                         var _a;
                         return __generator(this, function (_b) {
                             switch (_b.label) {
@@ -134,6 +131,7 @@ function parseTxHistory(datas, originPackage, vaults) {
                                                         case "ClaimEvent":
                                                         case "CompoundEvent":
                                                         case "HarvestEvent":
+                                                        case "RedeemEvent":
                                                             optionType = "Covered Call";
                                                             break;
                                                         default:
@@ -149,6 +147,7 @@ function parseTxHistory(datas, originPackage, vaults) {
                                                         case "ClaimEvent":
                                                         case "CompoundEvent":
                                                         case "HarvestEvent":
+                                                        case "RedeemEvent":
                                                             optionType = "Put Selling";
                                                             break;
                                                         default:
@@ -261,6 +260,13 @@ function parseTxHistory(datas, originPackage, vaults) {
                                                 return [2 /*return*/, txHistory];
                                             }
                                             break;
+                                        case "RedeemEvent":
+                                            token = (0, token_1.typeArgToAsset)("0x" + event.parsedJson.token.name);
+                                            amount = Number(event.parsedJson.amount) / Math.pow(10, (0, token_1.assetToDecimal)(token));
+                                            Action = "Harvest";
+                                            Amount = "".concat((0, bignumber_js_1.default)(amount).toFixed(), " ").concat(token);
+                                            Index = event.parsedJson.index;
+                                            break;
                                         case "TransferBidReceiptEvent":
                                             amount = Number(event.parsedJson.amount) / Math.pow(10, Number(event.parsedJson.decimal));
                                             Action = "Transfer Receipt";

package/package.json

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