@typus/typus-sdk 1.1.34 → 1.1.35
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.
|
@@ -75,14 +75,14 @@ function getUsersTvl(startTs, endTs) {
|
|
|
75
75
|
case 0: return [4 /*yield*/, getDb(startTs, endTs)];
|
|
76
76
|
case 1:
|
|
77
77
|
result = _a.sent();
|
|
78
|
-
console.log(result, "getUsersTvl result");
|
|
78
|
+
// console.log(result, "getUsersTvl result");
|
|
79
79
|
if (result.length == 0) {
|
|
80
80
|
return [2 /*return*/, new Map()];
|
|
81
81
|
}
|
|
82
82
|
result = result.sort(function (a, b) { return Number(a.timestamp) - Number(b.timestamp); });
|
|
83
83
|
firstTs = Number(result.at(0).timestamp);
|
|
84
84
|
lastTs = Number(result.at(-1).timestamp);
|
|
85
|
-
length = Math.max((lastTs - firstTs) / 3600, 1
|
|
85
|
+
length = Math.max((lastTs - firstTs) / 3600, 0) + 1;
|
|
86
86
|
usersTvl = result.reduce(function (prev, curr) {
|
|
87
87
|
var acc = 0;
|
|
88
88
|
if (prev.has(curr.address)) {
|
|
@@ -152,9 +152,10 @@ function sumUsersBidPremium(datas, vaultIndexes, startTs, endTs) {
|
|
|
152
152
|
}
|
|
153
153
|
}
|
|
154
154
|
var bidder_balance = Number(parsedJson.bidder_balance) / Math.pow(10, Number(parsedJson.decimal));
|
|
155
|
-
var price =
|
|
156
|
-
|
|
157
|
-
|
|
155
|
+
var price = Number(parsedJson.oracle_info.price) / Math.pow(10, Number(parsedJson.oracle_info.decimal));
|
|
156
|
+
var asset = (0, token_1.typeArgToAsset)("0x" + parsedJson.b_token.name);
|
|
157
|
+
if (asset.startsWith("USD")) {
|
|
158
|
+
price = 1;
|
|
158
159
|
}
|
|
159
160
|
var acc = 0;
|
|
160
161
|
if (usersPremium.has(parsedJson.signer)) {
|