@typus/typus-sdk 1.1.33 → 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.
@@ -31,6 +31,7 @@ export interface Game {
31
31
  }
32
32
  export declare function getHistory(provider: JsonRpcProvider, dicePackage: string, playgrounds: Playground[]): Promise<DrawDisplay[]>;
33
33
  interface DrawDisplay {
34
+ game_id: string;
34
35
  player: string;
35
36
  guess_1: string;
36
37
  guess_2: string;
@@ -132,6 +132,7 @@ function getHistory(provider, dicePackage, playgrounds) {
132
132
  break;
133
133
  }
134
134
  var display = {
135
+ game_id: drawEvent.game_id,
135
136
  player: drawEvent.player,
136
137
  guess_1: guess_1,
137
138
  guess_2: guess_2,
@@ -14,5 +14,5 @@ export declare function getUsersBidEvents(provider: JsonRpcProvider, originPacka
14
14
  bcs?: string | undefined;
15
15
  timestampMs?: string | undefined;
16
16
  }[]>;
17
- export declare function sumUsersBidPremium(datas: any, vaultIndexes?: string[], endTs?: number): Promise<Map<string, number>>;
17
+ export declare function sumUsersBidPremium(datas: any, vaultIndexes?: string[], startTs?: number, endTs?: number): Promise<Map<string, number>>;
18
18
  export declare function getUsersHarvestCompound(provider: JsonRpcProvider, originPackage: string, startTs?: number, endTs?: number): Promise<Map<string, number>>;
@@ -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)) {
@@ -135,15 +135,16 @@ function getUsersBidEvents(provider, originPackage, startTs) {
135
135
  });
136
136
  }
137
137
  exports.getUsersBidEvents = getUsersBidEvents;
138
- function sumUsersBidPremium(datas, vaultIndexes, endTs) {
138
+ function sumUsersBidPremium(datas, vaultIndexes, startTs, endTs) {
139
139
  if (vaultIndexes === void 0) { vaultIndexes = []; }
140
+ if (startTs === void 0) { startTs = 0; }
140
141
  if (endTs === void 0) { endTs = Math.floor(new Date().getTime() / 1000); }
141
142
  return __awaiter(this, void 0, void 0, function () {
142
143
  var usersPremium, mapEntries;
143
144
  return __generator(this, function (_a) {
144
145
  usersPremium = new Map();
145
146
  datas.forEach(function (data) {
146
- if (Number(data.timestampMs) / 1000 < endTs) {
147
+ if (Number(data.timestampMs) / 1000 < endTs && Number(data.timestampMs) / 1000 > startTs) {
147
148
  var parsedJson = data.parsedJson;
148
149
  if (vaultIndexes.length > 0) {
149
150
  if (!vaultIndexes.includes(parsedJson.index)) {
@@ -151,9 +152,10 @@ function sumUsersBidPremium(datas, vaultIndexes, endTs) {
151
152
  }
152
153
  }
153
154
  var bidder_balance = Number(parsedJson.bidder_balance) / Math.pow(10, Number(parsedJson.decimal));
154
- var price = 1;
155
- if (parsedJson.b_token == parsedJson.o_token) {
156
- price = Number(parsedJson.oracle_info.price) / Math.pow(10, Number(parsedJson.oracle_info.decimal));
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;
157
159
  }
158
160
  var acc = 0;
159
161
  if (usersPremium.has(parsedJson.signer)) {
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.1.33",
5
+ "version": "1.1.35",
6
6
  "dependencies": {
7
7
  "@mysten/bcs": "^0.7.3",
8
8
  "@mysten/kiosk": "^0.3.3",