@typus/typus-sdk 1.2.57 → 1.2.58-v1d

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/utils/recap2023.js +4 -6
  2. package/lib/utils/typus-dov-single-v2/user-entry.js +2 -12
  3. package/lib/utils/typus-dov-single-v2/user-history.js +19 -19
  4. package/package.json +1 -1
package/lib/utils/recap2023.js CHANGED
@@ -68,7 +68,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
68
68
  Object.defineProperty(exports, "__esModule", { value: true });
69
69
  exports.recap2023 = void 0;
70
70
  var mainnet_json_1 = __importDefault(require("../mainnet.json"));
71
- var user_history_1 = require("../utils/typus-dov-single-v2/user-history");
71
+ // import { getUserHistory } from "../utils/typus-dov-single-v2/user-history";
72
72
  var view_function_1 = require("../utils/typus-dov-single-v2/view-function");
73
73
  var client_1 = require("@mysten/sui.js/client");
74
74
  var price_1 = require("../utils/price");
@@ -92,9 +92,7 @@ function recap2023(user) {
92
92
  return [4 /*yield*/, (0, view_function_1.getVaults)(provider, mainnet_json_1.default.SINGLE_COLLATERAL_PACKAGE, mainnet_json_1.default.SINGLE_COLLATERAL_REGISTRY, [])];
93
93
  case 1:
94
94
  vaults = _p.sent();
95
- return [4 /*yield*/, (0, user_history_1.getUserHistory)(provider, mainnet_json_1.default.SINGLE_COLLATERAL_PACKAGE_ORIGIN, vaults, user, 0)];
96
- case 2:
97
- userHistory = _p.sent();
95
+ userHistory = [];
98
96
  console.log(userHistory);
99
97
  earn = new Map();
100
98
  try {
@@ -137,7 +135,7 @@ function recap2023(user) {
137
135
  // console.log(earn);
138
136
  earn.delete("");
139
137
  return [4 /*yield*/, (0, price_1.getLatestPriceUSD)()];
140
- case 3:
138
+ case 2:
141
139
  prices = _p.sent();
142
140
  sum = 0;
143
141
  try {
@@ -156,7 +154,7 @@ function recap2023(user) {
156
154
  finally { if (e_2) throw e_2.error; }
157
155
  }
158
156
  return [4 /*yield*/, (0, fetch_1.getUserStake)(provider, mainnet_json_1.default.NFT_TABLE, user)];
159
- case 4:
157
+ case 3:
160
158
  res_1 = _p.sent();
161
159
  // console.log(res_1!.number); // null
162
160
  return [2 /*return*/, [sum, res_1]];
package/lib/utils/typus-dov-single-v2/user-entry.js CHANGED
@@ -442,7 +442,7 @@ function getNewBidTx(input) {
442
442
  input.typeArguments[1] == "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI")) {
443
443
  var _a = __read(input.tx.splitCoins(input.tx.gas, [input.tx.pure(input.premium_required)]), 1), coin = _a[0];
444
444
  var result = input.tx.moveCall({
445
- target: "".concat(input.typusDovSinglePackageId, "::tails_staking::new_bid_v2"),
445
+ target: "".concat(input.typusDovSinglePackageId, "::tails_staking::new_bid"),
446
446
  typeArguments: input.typeArguments,
447
447
  arguments: [
448
448
  input.tx.object(input.typusDovSingleRegistry),
@@ -453,11 +453,6 @@ function getNewBidTx(input) {
453
453
  ],
454
454
  });
455
455
  input.tx.transferObjects([input.tx.object(result[0])], input.user);
456
- input.tx.moveCall({
457
- target: "".concat(input.typusFrameworkPackageId, "::utils::transfer_coins"),
458
- typeArguments: [input.typeArguments[1]],
459
- arguments: [input.tx.object(result[1]), input.tx.pure(input.user)],
460
- });
461
456
  }
462
457
  else {
463
458
  var balance = input.tx.moveCall({
@@ -474,7 +469,7 @@ function getNewBidTx(input) {
474
469
  arguments: [input.tx.object(balance)],
475
470
  });
476
471
  var result = input.tx.moveCall({
477
- target: "".concat(input.typusDovSinglePackageId, "::tails_staking::new_bid_v2"),
472
+ target: "".concat(input.typusDovSinglePackageId, "::tails_staking::new_bid"),
478
473
  typeArguments: input.typeArguments,
479
474
  arguments: [
480
475
  input.tx.object(input.typusDovSingleRegistry),
@@ -485,11 +480,6 @@ function getNewBidTx(input) {
485
480
  ],
486
481
  });
487
482
  input.tx.transferObjects([input.tx.object(result[0])], input.user);
488
- input.tx.moveCall({
489
- target: "".concat(input.typusFrameworkPackageId, "::utils::transfer_coins"),
490
- typeArguments: [input.typeArguments[1]],
491
- arguments: [input.tx.object(result[1]), input.tx.pure(input.user)],
492
- });
493
483
  }
494
484
  return input.tx;
495
485
  }
package/lib/utils/typus-dov-single-v2/user-history.js CHANGED
@@ -66,7 +66,7 @@ function getUserHistory(provider, originPackage, vaults, sender, startTimeMs) {
66
66
  return false;
67
67
  }
68
68
  }));
69
- return [4 /*yield*/, parseTxHistory(datas.sort(function (a, b) { return Number(b.timestampMs) - Number(a.timestampMs); }), originPackage, vaults)];
69
+ return [4 /*yield*/, parseTxHistory(datas, originPackage, vaults)];
70
70
  case 3:
71
71
  txHistory = _a.sent();
72
72
  return [2 /*return*/, txHistory];
@@ -159,9 +159,18 @@ function parseTxHistory(datas, originPackage, vaults) {
159
159
  .filter(function (event) {
160
160
  var type = event.type;
161
161
  return event.packageId == originPackage || type.includes("typus_nft::First") || type.includes("typus_nft::ExpUpEvent");
162
+ })
163
+ .sort(function (a, b) {
164
+ // From Old to New!
165
+ if (a.timestampMs == b.timestampMs) {
166
+ return Number(a.id.eventSeq) - Number(b.id.eventSeq);
167
+ }
168
+ else {
169
+ return Number(a.timestampMs) - Number(b.timestampMs);
170
+ }
162
171
  })
163
172
  .reduce(function (promise, event) { return __awaiter(_this, void 0, void 0, function () {
164
- var txHistory, functionType, action, Action, Amount, Index, Period, Vault, RiskLevel, Tails, Exp, d_token, b_token, o_token, v, period, optionType, i, i, token, amount, deposit_amount, deposit_amount, balance, balance, profit, token, amount, amount, token, amount, size, token, amount, token, amount, i, size, bidder_balance;
173
+ var txHistory, functionType, action, Action, Amount, Index, Period, Vault, RiskLevel, Tails, Exp, d_token, b_token, o_token, v, period, optionType, i, i, token, amount, deposit_amount, deposit_amount, balance, balance, profit, profit, token, amount, amount, token, amount, size, token, amount, token, amount, size, bidder_balance;
165
174
  var _a;
166
175
  return __generator(this, function (_b) {
167
176
  switch (_b.label) {
@@ -170,6 +179,7 @@ function parseTxHistory(datas, originPackage, vaults) {
170
179
  txHistory = _b.sent();
171
180
  functionType = (_a = new RegExp("^([^::]+)::([^::]+)::([^<]+)").exec(event.type)) === null || _a === void 0 ? void 0 : _a.slice(1, 4);
172
181
  action = functionType[2];
182
+ Tails = undefined;
173
183
  Index = event.parsedJson.index || event.parsedJson.vault_index;
174
184
  if (Index) {
175
185
  v = vaults[Index];
@@ -281,10 +291,7 @@ function parseTxHistory(datas, originPackage, vaults) {
281
291
  break;
282
292
  case "ExpUpEvent":
283
293
  i = txHistory.findIndex(function (x) { return x.txDigest == event.id.txDigest && x.Action != "First Deposit" && x.Action != "Stake"; });
284
- if (i != -1) {
285
- if (txHistory[i].Tails) {
286
- return [2 /*return*/, txHistory];
287
- }
294
+ if (i != -1 && txHistory[i].Tails == undefined) {
288
295
  txHistory[i].Tails = "#".concat(event.parsedJson.number);
289
296
  txHistory[i].Exp = event.parsedJson.exp_earn;
290
297
  return [2 /*return*/, txHistory];
@@ -295,9 +302,7 @@ function parseTxHistory(datas, originPackage, vaults) {
295
302
  Exp = event.parsedJson.exp_earn;
296
303
  }
297
304
  else {
298
- // Action = undefined;
299
- Tails = "#".concat(event.parsedJson.number);
300
- Exp = event.parsedJson.exp_earn;
305
+ return [2 /*return*/, txHistory];
301
306
  }
302
307
  break;
303
308
  case "TransferNftEvent":
@@ -376,6 +381,11 @@ function parseTxHistory(datas, originPackage, vaults) {
376
381
  Amount = "".concat((0, bignumber_js_1.default)(balance).toFixed(), " ").concat(b_token, "\n").concat((0, bignumber_js_1.default)(profit).toFixed(), " ").concat(d_token);
377
382
  }
378
383
  break;
384
+ case "WithdrawProfitEvent":
385
+ Action = "Harvest Gain";
386
+ profit = Number(event.parsedJson.profit) / Math.pow(10, (0, token_1.assetToDecimal)(d_token));
387
+ Amount = "".concat((0, bignumber_js_1.default)(profit).toFixed(), " ").concat(d_token);
388
+ break;
379
389
  case "RedeemEvent":
380
390
  token = (0, token_1.typeArgToAsset)("0x" + event.parsedJson.token.name);
381
391
  amount = Number(event.parsedJson.amount) / Math.pow(10, (0, token_1.assetToDecimal)(token));
@@ -415,7 +425,6 @@ function parseTxHistory(datas, originPackage, vaults) {
415
425
  Tails = "#".concat(event.parsedJson.number);
416
426
  break;
417
427
  case "NewBidEvent":
418
- i = txHistory.findIndex(function (x) { return x.txDigest == event.id.txDigest; });
419
428
  o_token = (0, token_1.typeArgToAsset)("0x" + event.parsedJson.o_token.name);
420
429
  b_token = (0, token_1.typeArgToAsset)("0x" + event.parsedJson.b_token.name);
421
430
  size = Number(event.parsedJson.size) / Math.pow(10, (0, token_1.assetToDecimal)(o_token));
@@ -425,15 +434,6 @@ function parseTxHistory(datas, originPackage, vaults) {
425
434
  if (event.sender != event.parsedJson.signer) {
426
435
  Action = "Auto " + Action;
427
436
  }
428
- if (i != -1) {
429
- txHistory[i].Index = Index;
430
- txHistory[i].Period = Period;
431
- txHistory[i].Action = Action;
432
- txHistory[i].Amount = Amount;
433
- txHistory[i].Vault = Vault;
434
- txHistory[i].RiskLevel = RiskLevel;
435
- return [2 /*return*/, txHistory];
436
- }
437
437
  break;
438
438
  default:
439
439
  return [2 /*return*/, txHistory];
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@typus/typus-sdk",
3
3
  "author": "Typus",
4
4
  "description": "typus sdk",
5
- "version": "1.2.57",
5
+ "version": "1.2.58-v1d",
6
6
  "dependencies": {
7
7
  "@mysten/bcs": "^0.7.3",
8
8
  "@mysten/kiosk": "0.7.12",