@typus/typus-perp-sdk 1.1.13 → 1.1.15
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.
- package/dist/src/user/history.js +17 -9
- package/package.json +1 -1
package/dist/src/user/history.js
CHANGED
|
@@ -84,7 +84,7 @@ function parseUserHistory(raw_events) {
|
|
|
84
84
|
return __generator(this, function (_a) {
|
|
85
85
|
events = [];
|
|
86
86
|
raw_events.forEach(function (event) {
|
|
87
|
-
var _a, _b;
|
|
87
|
+
var _a, _b, _c, _d;
|
|
88
88
|
var type = event.contents.type.repr;
|
|
89
89
|
if (type.endsWith("PythPrice")) {
|
|
90
90
|
return;
|
|
@@ -96,7 +96,7 @@ function parseUserHistory(raw_events) {
|
|
|
96
96
|
// console.log(tx_digest);
|
|
97
97
|
// console.log(json);
|
|
98
98
|
// console.log(timestamp);
|
|
99
|
-
var
|
|
99
|
+
var _e = __read(type.split("::"), 3), pkg = _e[0], mod = _e[1], name = _e[2];
|
|
100
100
|
switch (name) {
|
|
101
101
|
case structs_2.CreateTradingOrderEvent.$typeName.split("::")[2]:
|
|
102
102
|
case structs_2.CreateTradingOrderWithBidReceiptsEvent.$typeName.split("::")[2]:
|
|
@@ -201,7 +201,7 @@ function parseUserHistory(raw_events) {
|
|
|
201
201
|
if (index !== -1) {
|
|
202
202
|
// true => user paid to pool
|
|
203
203
|
var remaining_collateral_amount = json.remaining_collateral_amount / Math.pow(10, (0, constants_1.assetToDecimal)(events[index].collateral_token));
|
|
204
|
-
events[index] = __assign(__assign({}, events[index]), { collateral: remaining_collateral_amount + events[index].collateral });
|
|
204
|
+
events[index] = __assign(__assign({}, events[index]), { collateral: remaining_collateral_amount + ((_b = events[index].collateral) !== null && _b !== void 0 ? _b : 0) });
|
|
205
205
|
}
|
|
206
206
|
break;
|
|
207
207
|
case structs_1.RealizeFundingEvent.$typeName.split("::")[2]:
|
|
@@ -219,9 +219,9 @@ function parseUserHistory(raw_events) {
|
|
|
219
219
|
// same tx with order filled
|
|
220
220
|
var index = events.findLastIndex(function (e) { return e.tx_digest == tx_digest && e.action == "Order Filled (Close Position)"; });
|
|
221
221
|
// console.log(index);
|
|
222
|
-
if (index !== -1
|
|
222
|
+
if (index !== -1) {
|
|
223
223
|
// true => user paid to pool
|
|
224
|
-
events[index] = __assign(__assign({}, events[index]), { collateral: (
|
|
224
|
+
events[index] = __assign(__assign({}, events[index]), { collateral: (_c = events[index].collateral) !== null && _c !== void 0 ? _c : 0 - realized_funding_fee, realized_pnl: (_d = events[index].realized_pnl) !== null && _d !== void 0 ? _d : 0 - realized_funding_fee_usd });
|
|
225
225
|
}
|
|
226
226
|
var e = {
|
|
227
227
|
action: "Realize Funding",
|
|
@@ -469,6 +469,7 @@ function getRealizeFundingFromSentio(userAddress, startTimestamp, events) {
|
|
|
469
469
|
// deduplicate
|
|
470
470
|
realizeFunding = realizeFunding.filter(function (x) { return events.findIndex(function (y) { return y.tx_digest == x.tx_digest && y.action == "Realize Funding"; }) == -1; });
|
|
471
471
|
realizeFunding = realizeFunding.map(function (x) {
|
|
472
|
+
var _a, _b, _c, _d;
|
|
472
473
|
// find related position
|
|
473
474
|
var related = events.find(function (e) { return e.position_id === x.position_id && e.market === x.market; });
|
|
474
475
|
// console.log(x, related);
|
|
@@ -478,6 +479,13 @@ function getRealizeFundingFromSentio(userAddress, startTimestamp, events) {
|
|
|
478
479
|
x.size = related.size;
|
|
479
480
|
x.dov_index = related.dov_index;
|
|
480
481
|
}
|
|
482
|
+
// same tx with order filled
|
|
483
|
+
var index = events.findLastIndex(function (e) { return e.tx_digest == x.tx_digest && e.action == "Order Filled (Close Position)"; });
|
|
484
|
+
// console.log(index);
|
|
485
|
+
if (index !== -1) {
|
|
486
|
+
// true => user paid to pool
|
|
487
|
+
events[index] = __assign(__assign({}, events[index]), { collateral: ((_a = events[index].collateral) !== null && _a !== void 0 ? _a : 0) - ((_b = x.collateral) !== null && _b !== void 0 ? _b : 0), realized_pnl: ((_c = events[index].realized_pnl) !== null && _c !== void 0 ? _c : 0) - ((_d = x.realized_pnl) !== null && _d !== void 0 ? _d : 0) });
|
|
488
|
+
}
|
|
481
489
|
return x;
|
|
482
490
|
});
|
|
483
491
|
// console.log(realizeFunding);
|
|
@@ -593,7 +601,7 @@ function getOrderMatchFromSentio(userAddress, startTimestamp, events) {
|
|
|
593
601
|
status: "Filled",
|
|
594
602
|
size: Number(x.filled_size),
|
|
595
603
|
base_token: base_token,
|
|
596
|
-
collateral: Number(x.realized_amount),
|
|
604
|
+
collateral: Number(x.realized_amount) - Number(x.realized_fee),
|
|
597
605
|
collateral_token: x.collateral_token,
|
|
598
606
|
price: Number(x.filled_price),
|
|
599
607
|
realized_pnl: Number(x.realized_pnl),
|
|
@@ -664,7 +672,7 @@ function getRealizeOptionFromSentio(userAddress, startTimestamp, events) {
|
|
|
664
672
|
return txHistory;
|
|
665
673
|
});
|
|
666
674
|
filter_exercise = exercise.reduce(function (acc, x) {
|
|
667
|
-
var _a, _b;
|
|
675
|
+
var _a, _b, _c, _d;
|
|
668
676
|
var related_index = events.findLastIndex(function (e) { return e.position_id == x.position_id && e.market == x.market && e.tx_digest == x.tx_digest; });
|
|
669
677
|
// console.log(x);
|
|
670
678
|
// console.log(related_index);
|
|
@@ -675,8 +683,8 @@ function getRealizeOptionFromSentio(userAddress, startTimestamp, events) {
|
|
|
675
683
|
x.size = related.size;
|
|
676
684
|
x.dov_index = related.dov_index;
|
|
677
685
|
// add to close event
|
|
678
|
-
related.collateral = x.collateral;
|
|
679
|
-
related.realized_pnl = Number((
|
|
686
|
+
related.collateral = Number((_a = related.collateral) !== null && _a !== void 0 ? _a : 0) + Number((_b = x.collateral) !== null && _b !== void 0 ? _b : 0);
|
|
687
|
+
related.realized_pnl = Number((_c = related.realized_pnl) !== null && _c !== void 0 ? _c : 0) + Number((_d = x.realized_pnl) !== null && _d !== void 0 ? _d : 0);
|
|
680
688
|
x.collateral = undefined;
|
|
681
689
|
x.realized_pnl = undefined;
|
|
682
690
|
acc.push(x);
|