@typus/typus-sdk 1.2.98 → 1.2.100

package/lib/config.json

@@ -15,12 +15,12 @@
             "TYPUS": "0x4b0f4ee1a40ce37ec81c987cc4e76a665419e74b863319492fc7d26f708b835a"
         },
         "PACKAGE": {
-            "DOV_SINGLE": "0x8b65b817e7d819ab810bf50eaaa521ceea39d85cd46ab58180cfe287ce6f8ef0",
-            "FRAMEWORK": "0x946d188d91cabd4fe15ef763e463a6738db1965814d3fd790085b4720cf90e28",
+            "DOV_SINGLE": "0x011840332be097b422abb8336970b0be1d7333df22134cd5c3be9d9a1cb956d0",
+            "FRAMEWORK": "0x8638b586ad122d2887d0685d1996a88adc1b7a8a81906fc7f68b25dcbac25cb5",
             "MFUD": "0xd8f04cd2a16c19c17428c3b4c22b01dd06740423b93fb7ee88fbe2676a82849d",
             "NFT": "0xba06aae31d9b7c9f651e783272c7e4f776fb5ae17e89d525b75a17b099f58202",
             "ORACLE": "0x978f65df8570a075298598a9965c18de9087f9e888eb3430fe20334f5c554cfd",
-            "TYPUS": "0x4b0f4ee1a40ce37ec81c987cc4e76a665419e74b863319492fc7d26f708b835a"
+            "TYPUS": "0x019fe3a0a4a831515a6801c51fdf0800e2428777b4e29cbc8355b7939a009893"
         },
         "REGISTRY": {
             "AIRDROP": "0x4b451f4632bd64af82d5e6fe46e20705c9468bd46d6758a0f7093fde2930d084",
@@ -52,7 +52,7 @@
         }
     },
     "TESTNET": {
-        "RPC_ENDPOINT": "https://fullnode.testnet.sui.io:443",
+        "RPC_ENDPOINT": "https://sui-testnet.blastapi.io:443/7f446a12-c4ab-4e3c-b2d8-ebb0fcbe5cdd",
         "TYPUS_VERSION": "0x2edc980f55e31ba3c660f4e2650e915fd47fb33b524b01a52a116719adac8be7",
         "TGLD_COIN_METADATA": "0xf77f8aabe64dccef0e568f2ef58a6ca74bdfb31786507cc35b7626a4df0d0ebc",
         "TGLD_TOKEN_POLICY": "0x17875c2f772053cd148bd2b8b8a40160db3f841825d8963192f8394d5c18974c",

package/lib/mainnet.json

@@ -30,12 +30,12 @@
     "SCALLOP_MARKET": "0xa757975255146dc9686aa823b7838b507f315d704f428cbadad2f4ea061939d9",
     "SCALLOP_REWARD_POOL_FOR_SUI": "0x162250ef72393a4ad3d46294c4e1bdfcb03f04c869d390e7efbfc995353a7ee9",
     "SCALLOP_REWARD_POOL_FOR_USDC": "0xf4268cc9b9413b9bfe09e8966b8de650494c9e5784bf0930759cfef4904daff8",
-    "VERSION": "2.24.0",
+    "VERSION": "2.25.0",
     "EXP_GUESS_PACKAGE": "0x32d670520a10a87b8c042d2259c2d1f7c319329bafcf6f893ad9aaf01a43db8b",
     "EXP_GUESS_PACKAGE_ORIGIN": "0x32d670520a10a87b8c042d2259c2d1f7c319329bafcf6f893ad9aaf01a43db8b",
     "EXP_GUESS_REGISTRY": "0x70c6cbe6764b315cee1b24f483a0fc8307f047f1fab2a0d4438624845e6ba3f2",
     "FRAMEWORK_PACKAGE": "0xb4f25230ba74837d8299e92951306100c4a532e8c48cc3d8828abe9b91c8b274",
-    "SINGLE_COLLATERAL_PACKAGE": "0x8b65b817e7d819ab810bf50eaaa521ceea39d85cd46ab58180cfe287ce6f8ef0",
+    "SINGLE_COLLATERAL_PACKAGE": "0x011840332be097b422abb8336970b0be1d7333df22134cd5c3be9d9a1cb956d0",
     "SINGLE_COLLATERAL_PACKAGE_ORIGIN": "0x321848bf1ae327a9e022ccb3701940191e02fa193ab160d9c0e49cd3c003de3a",
     "SINGLE_COLLATERAL_REGISTRY": "0x3d70b09359e3ca8301ae0abeda4f2fdf72ce313ba58c919ce568e5f535fd2ea8",
     "SINGLE_COLLATERAL_PORTFOLIO_VAULT_REGISTRY": "0xa1a186d050e3172ef4701c16048c99b11f785969874fa2642b9cbcf59cde7fc0",

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

@@ -29,45 +29,58 @@ var __read = (this && this.__read) || function (o, n) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDepositorCashFlows = void 0;
 function getDepositorCashFlows(userHistory) {
-    var e_1, _a, e_2, _b;
-    var _c, _d, _e, _f, _g;
+    var e_1, _a, e_2, _b, e_3, _c;
+    var _d, _e, _f, _g, _h;
     var depositorCashFlows = new Map();
     try {
         for (var userHistory_1 = __values(userHistory), userHistory_1_1 = userHistory_1.next(); !userHistory_1_1.done; userHistory_1_1 = userHistory_1.next()) {
             var history_1 = userHistory_1_1.value;
             var index = history_1.Index;
             if (history_1.Action.startsWith("Harvest Reward")) {
-                var _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)) {
-                    var depositorCashFlow = depositorCashFlows.get(index);
-                    var totalHarvest = depositorCashFlow.totalHarvest;
-                    if (totalHarvest.has(token)) {
-                        var sum = totalHarvest.get(token);
-                        totalHarvest.set(token, sum + Number(amount));
-                    }
-                    else {
-                        totalHarvest.set(token, Number(amount));
+                var historyAmounts = (_d = history_1.Amount) === null || _d === void 0 ? void 0 : _d.split("\n");
+                try {
+                    for (var historyAmounts_1 = (e_2 = void 0, __values(historyAmounts)), historyAmounts_1_1 = historyAmounts_1.next(); !historyAmounts_1_1.done; historyAmounts_1_1 = historyAmounts_1.next()) {
+                        var historyAmount = historyAmounts_1_1.value;
+                        var _j = __read(historyAmount.split(" "), 2), amount = _j[0], token = _j[1];
+                        if (depositorCashFlows.has(index)) {
+                            var depositorCashFlow = depositorCashFlows.get(index);
+                            var totalHarvest = depositorCashFlow.totalHarvest;
+                            if (totalHarvest.has(token)) {
+                                var sum = totalHarvest.get(token);
+                                totalHarvest.set(token, sum + Number(amount));
+                            }
+                            else {
+                                totalHarvest.set(token, Number(amount));
+                            }
+                            depositorCashFlow.totalHarvest = totalHarvest;
+                            depositorCashFlows.set(index, depositorCashFlow);
+                        }
+                        else {
+                            var totalHarvest = new Map();
+                            totalHarvest.set(token, Number(amount));
+                            var depositorCashFlow = {
+                                D_TOKEN: undefined,
+                                totalDeposit: 0,
+                                totalWithdraw: 0,
+                                totalClaim: 0,
+                                totalCompound: 0,
+                                netDeposit: undefined,
+                                totalHarvest: totalHarvest,
+                            };
+                            depositorCashFlows.set(index, depositorCashFlow);
+                        }
                     }
-                    depositorCashFlow.totalHarvest = totalHarvest;
-                    depositorCashFlows.set(index, depositorCashFlow);
                 }
-                else {
-                    var totalHarvest = new Map();
-                    totalHarvest.set(token, Number(amount));
-                    var depositorCashFlow = {
-                        D_TOKEN: undefined,
-                        totalDeposit: 0,
-                        totalWithdraw: 0,
-                        totalClaim: 0,
-                        totalCompound: 0,
-                        netDeposit: undefined,
-                        totalHarvest: totalHarvest,
-                    };
-                    depositorCashFlows.set(index, depositorCashFlow);
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                finally {
+                    try {
+                        if (historyAmounts_1_1 && !historyAmounts_1_1.done && (_b = historyAmounts_1.return)) _b.call(historyAmounts_1);
+                    }
+                    finally { if (e_2) throw e_2.error; }
                 }
             }
             else if (history_1.Action.startsWith("Deposit")) {
-                var _j = __read((_d = history_1.Amount) === null || _d === void 0 ? void 0 : _d.split(" "), 2), amount = _j[0], token = _j[1];
+                var _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)) {
                     var depositorCashFlow = depositorCashFlows.get(index);
                     depositorCashFlow.D_TOKEN = token;
@@ -88,7 +101,7 @@ function getDepositorCashFlows(userHistory) {
                 }
             }
             else if (history_1.Action.startsWith("Withdraw")) {
-                var _k = __read((_e = history_1.Amount) === null || _e === void 0 ? void 0 : _e.split(" "), 2), amount = _k[0], token = _k[1];
+                var _l = __read((_f = history_1.Amount) === null || _f === void 0 ? void 0 : _f.split(" "), 2), amount = _l[0], token = _l[1];
                 if (depositorCashFlows.has(index)) {
                     var depositorCashFlow = depositorCashFlows.get(index);
                     depositorCashFlow.D_TOKEN = token;
@@ -109,7 +122,7 @@ function getDepositorCashFlows(userHistory) {
                 }
             }
             else if (history_1.Action == "Claim") {
-                var _l = __read((_f = history_1.Amount) === null || _f === void 0 ? void 0 : _f.split(" "), 2), amount = _l[0], token = _l[1];
+                var _m = __read((_g = history_1.Amount) === null || _g === void 0 ? void 0 : _g.split(" "), 2), amount = _m[0], token = _m[1];
                 if (depositorCashFlows.has(index)) {
                     var depositorCashFlow = depositorCashFlows.get(index);
                     depositorCashFlow.D_TOKEN = token;
@@ -130,7 +143,7 @@ function getDepositorCashFlows(userHistory) {
                 }
             }
             else if (history_1.Action == "Compound") {
-                var _m = __read((_g = history_1.Amount) === null || _g === void 0 ? void 0 : _g.split(" "), 2), amount = _m[0], token = _m[1];
+                var _o = __read((_h = history_1.Amount) === null || _h === void 0 ? void 0 : _h.split(" "), 2), amount = _o[0], token = _o[1];
                 if (depositorCashFlows.has(index)) {
                     var depositorCashFlow = depositorCashFlows.get(index);
                     depositorCashFlow.D_TOKEN = token;
@@ -161,18 +174,18 @@ function getDepositorCashFlows(userHistory) {
     }
     try {
         // console.log(depositorCashFlows);
-        for (var _o = __values(depositorCashFlows.entries()), _p = _o.next(); !_p.done; _p = _o.next()) {
-            var _q = __read(_p.value, 2), index = _q[0], share = _q[1];
+        for (var _p = __values(depositorCashFlows.entries()), _q = _p.next(); !_q.done; _q = _p.next()) {
+            var _r = __read(_q.value, 2), index = _r[0], share = _r[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 }; }
+    catch (e_3_1) { e_3 = { error: e_3_1 }; }
     finally {
         try {
-            if (_p && !_p.done && (_b = _o.return)) _b.call(_o);
+            if (_q && !_q.done && (_c = _p.return)) _c.call(_p);
         }
-        finally { if (e_2) throw e_2.error; }
+        finally { if (e_3) throw e_3.error; }
     }
     return depositorCashFlows;
 }

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

@@ -107,3 +107,20 @@ export declare function getCloseStrategyTx(gasBudget: number, packageId: string,
 registry: string, strategy_pool: string, vault_index: string, signal_index: string, strategy_index: string, mfudPackageId: string, mfudRegistry: string, sender: string): TransactionBlock;
 export declare function getWithdrawProfitStrategyTx(gasBudget: number, packageId: string, typeArguments: string[], // D_TOKEN, B_TOKEN
 registry: string, strategy_pool: string, vault_index: string, signal_index: string, strategy_index: string, mfudPackageId: string, mfudRegistry: string, sender: string, txBlock?: TransactionBlock): TransactionBlock;
+export declare function getCompoundWithRedeemTx(input: {
+    tx: TransactionBlock;
+    typusEcosystemVersion: string;
+    typusUserRegistry: string;
+    typusLeaderboardRegistry: string;
+    typusFrameworkOriginPackageId: string;
+    typusFrameworkPackageId: string;
+    typusDovSinglePackageId: string;
+    typusDovSingleRegistry: string;
+    typeArguments: string[];
+    typusTokenPackageId: string;
+    typusTokenRegistry: string;
+    typusTokenType: string;
+    index: string;
+    receipts: string[] | TransactionObjectArgument[];
+    user: string;
+}): TransactionBlock;

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

@@ -16,7 +16,7 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWithdrawProfitStrategyTx = exports.getCloseStrategyTx = exports.getUpdateStrategyTx = exports.getNewStrategyTx = exports.getRebateTx = exports.getExerciseTx = exports.getNewBidTx = exports.getDepositTx = exports.getReduceFundTx = exports.getRaiseFundTx = void 0;
+exports.getCompoundWithRedeemTx = exports.getWithdrawProfitStrategyTx = exports.getCloseStrategyTx = exports.getUpdateStrategyTx = exports.getNewStrategyTx = exports.getRebateTx = exports.getExerciseTx = exports.getNewBidTx = exports.getDepositTx = exports.getReduceFundTx = exports.getRaiseFundTx = void 0;
 var transactions_1 = require("@mysten/sui.js/transactions");
 var constants_1 = require("../../constants");
 function getRaiseFundTx(input) {
@@ -375,3 +375,52 @@ registry, strategy_pool, vault_index, signal_index, strategy_index, mfudPackageI
     return tx;
 }
 exports.getWithdrawProfitStrategyTx = getWithdrawProfitStrategyTx;
+function getCompoundWithRedeemTx(input) {
+    var raiseBalance = input.tx.moveCall({
+        target: "0x2::balance::zero",
+        typeArguments: [input.typeArguments[0]],
+        arguments: [],
+    });
+    var result = input.tx.moveCall({
+        target: "".concat(input.typusDovSinglePackageId, "::tds_user_entry::public_raise_fund"),
+        typeArguments: [input.typeArguments[0], input.typeArguments[1]],
+        arguments: [
+            input.tx.object(input.typusEcosystemVersion),
+            input.tx.object(input.typusUserRegistry),
+            input.tx.object(input.typusLeaderboardRegistry),
+            input.tx.object(input.typusDovSingleRegistry),
+            input.tx.pure(input.index),
+            input.tx.makeMoveVec({
+                type: "".concat(input.typusFrameworkOriginPackageId, "::vault::TypusDepositReceipt"),
+                objects: input.receipts.map(function (receipt) { return input.tx.object(receipt); }),
+            }),
+            input.tx.object(raiseBalance),
+            input.tx.pure(true),
+            input.tx.pure(false),
+            input.tx.object(constants_1.CLOCK),
+        ],
+    });
+    return getReduceFundTx({
+        tx: input.tx,
+        typusEcosystemVersion: input.typusEcosystemVersion,
+        typusUserRegistry: input.typusUserRegistry,
+        typusLeaderboardRegistry: input.typusLeaderboardRegistry,
+        typusFrameworkOriginPackageId: input.typusFrameworkOriginPackageId,
+        typusFrameworkPackageId: input.typusFrameworkPackageId,
+        typusDovSinglePackageId: input.typusDovSinglePackageId,
+        typusDovSingleRegistry: input.typusDovSingleRegistry,
+        typeArguments: input.typeArguments,
+        typusTokenPackageId: input.typusTokenPackageId,
+        typusTokenRegistry: input.typusTokenRegistry,
+        typusTokenType: input.typusTokenType,
+        index: input.index,
+        receipts: [result[0]],
+        reduceFromWarmup: "0",
+        reduceFromActive: "0",
+        reduceFromPremium: false,
+        reduceFromInactive: false,
+        reduceFromIncentive: true,
+        user: input.user,
+    });
+}
+exports.getCompoundWithRedeemTx = getCompoundWithRedeemTx;

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

@@ -398,7 +398,6 @@ function getCompoundWithRedeemTx(input) {
             input.tx.object(constants_1.CLOCK),
         ],
     });
-    input.tx.transferObjects([input.tx.object(result[0])], input.user);
     return getReduceFundTx({
         tx: input.tx,
         typusEcosystemVersion: input.typusEcosystemVersion,

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

@@ -324,7 +324,7 @@ function parseTxHistory(datas, originPackage, vaults) {
                                             }
                                             if (event.parsedJson.log[6] > 0 && event.parsedJson.log[10] > 0) {
                                                 // Harvest d token and i token
-                                                Action = "Harvest";
+                                                Action = "Harvest Reward";
                                                 b_token_name = (0, token_1.typeArgToAsset)("0x" + event.parsedJson.b_token.name);
                                                 b_token_amount = Number(event.parsedJson.log[6]) / Math.pow(10, (0, token_1.assetToDecimal)(b_token_name));
                                                 i_token_name = (0, token_1.typeArgToAsset)("0x" + event.parsedJson.i_token.name);
@@ -350,7 +350,7 @@ function parseTxHistory(datas, originPackage, vaults) {
                                             else {
                                                 if (event.parsedJson.log[6] > 0) {
                                                     // harvest
-                                                    Action = "Harvest";
+                                                    Action = "Harvest Reward";
                                                     token = (0, token_1.typeArgToAsset)("0x" + event.parsedJson.b_token.name);
                                                     amount = Number(event.parsedJson.log[6]) / Math.pow(10, (0, token_1.assetToDecimal)(token));
                                                     Amount = "".concat((0, bignumber_js_1.default)(amount).toFixed(), " ").concat(token);

package/package.json

@@ -2,7 +2,7 @@
     "name": "@typus/typus-sdk",
     "author": "Typus",
     "description": "typus sdk",
-    "version": "1.2.98",
+    "version": "1.2.100",
     "dependencies": {
         "@mysten/bcs": "^0.11.1",
         "@mysten/kiosk": "0.8.10",