@gearbox-protocol/sdk 1.15.15 → 1.15.17

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 (3) hide show
  1. package/lib/watchers/creditAccountWatcher.d.ts +1 -1
  2. package/lib/watchers/creditAccountWatcher.js +48 -21
  3. package/package.json +1 -1
package/lib/watchers/creditAccountWatcher.d.ts CHANGED
@@ -21,7 +21,7 @@ export declare class CreditAccountWatcher {
21
21
  * @param toBlock Optional. Set the last block you;d like to get opened accounts
22
22
  * @returns Arrays of hashes for opened accounts
23
23
  */
24
- static getOpenAccounts(creditManager: CreditManagerData, provider: providers.Provider | Signer, toBlock?: number): Promise<Array<CreditAccountHash>>;
24
+ static getOpenAccounts(creditManager: CreditManagerData, provider: providers.Provider, toBlock?: number): Promise<Array<CreditAccountHash>>;
25
25
  static batchCreditAccountLoad(accs: Array<CreditAccountHash>, dataCompressor: string, signer: Signer | providers.Provider, options?: BatchCreditAccountLoadOptions | number): Promise<Array<CreditAccountData>>;
26
26
  /**
27
27
  * Tracks block logs and detects whichj acccounts were changed (created / modified) and which were deleted
package/lib/watchers/creditAccountWatcher.js CHANGED
@@ -52,9 +52,9 @@ var CreditAccountWatcher = /** @class */ (function () {
52
52
  */
53
53
  CreditAccountWatcher.getOpenAccounts = function (creditManager, provider, toBlock) {
54
54
  return __awaiter(this, void 0, void 0, function () {
55
- var eventsByDate, addToEvents, accounts, creditConfigurator, cc, cfUpgraded, _i, cfUpgraded_1, creditFacade, cf, _a, openEvents, closeEvents, liquidateEvents, liquidateExpiredEvents, transferEvents;
56
- return __generator(this, function (_b) {
57
- switch (_b.label) {
55
+ var eventsByDate, addToEvents, accounts, creditConfigurator, cc, cfUpgraded, _i, cfUpgraded_1, creditFacade, cf, _a, openEvents, closeEvents, liquidateEvents, liquidateExpiredEvents, transferEvents, _b;
56
+ return __generator(this, function (_c) {
57
+ switch (_c.label) {
58
58
  case 0:
59
59
  if (creditManager.version !== 2)
60
60
  throw new Error("Works for V2 only");
@@ -71,22 +71,38 @@ var CreditAccountWatcher = /** @class */ (function () {
71
71
  cc = types_1.ICreditConfigurator__factory.connect(creditConfigurator, provider);
72
72
  return [4 /*yield*/, cc.queryFilter(cc.filters.CreditFacadeUpgraded(), undefined, toBlock)];
73
73
  case 1:
74
- cfUpgraded = (_b.sent()).map(function (e) { return e.args.newCreditFacade; });
74
+ cfUpgraded = (_c.sent()).map(function (e) { return e.args.newCreditFacade; });
75
75
  _i = 0, cfUpgraded_1 = cfUpgraded;
76
- _b.label = 2;
76
+ _c.label = 2;
77
77
  case 2:
78
- if (!(_i < cfUpgraded_1.length)) return [3 /*break*/, 5];
78
+ if (!(_i < cfUpgraded_1.length)) return [3 /*break*/, 9];
79
79
  creditFacade = cfUpgraded_1[_i];
80
80
  cf = types_1.ICreditFacade__factory.connect(creditFacade, provider);
81
- return [4 /*yield*/, Promise.all([
82
- cf.queryFilter(cf.filters.OpenCreditAccount(), undefined, toBlock),
83
- cf.queryFilter(cf.filters.CloseCreditAccount(), undefined, toBlock),
84
- cf.queryFilter(cf.filters.LiquidateCreditAccount(), undefined, toBlock),
85
- cf.queryFilter(cf.filters.LiquidateExpiredCreditAccount(), undefined, toBlock),
86
- cf.queryFilter(cf.filters.TransferAccount(), undefined, toBlock),
87
- ])];
81
+ return [4 /*yield*/, cf.queryFilter(cf.filters.OpenCreditAccount(), undefined, toBlock)];
88
82
  case 3:
89
- _a = _b.sent(), openEvents = _a[0], closeEvents = _a[1], liquidateEvents = _a[2], liquidateExpiredEvents = _a[3], transferEvents = _a[4];
83
+ _b = [
84
+ _c.sent()
85
+ ];
86
+ return [4 /*yield*/, cf.queryFilter(cf.filters.CloseCreditAccount(), undefined, toBlock)];
87
+ case 4:
88
+ _b = _b.concat([
89
+ _c.sent()
90
+ ]);
91
+ return [4 /*yield*/, cf.queryFilter(cf.filters.LiquidateCreditAccount(), undefined, toBlock)];
92
+ case 5:
93
+ _b = _b.concat([
94
+ _c.sent()
95
+ ]);
96
+ return [4 /*yield*/, cf.queryFilter(cf.filters.LiquidateExpiredCreditAccount(), undefined, toBlock)];
97
+ case 6:
98
+ _b = _b.concat([
99
+ _c.sent()
100
+ ]);
101
+ return [4 /*yield*/, cf.queryFilter(cf.filters.TransferAccount(), undefined, toBlock)];
102
+ case 7:
103
+ _a = _b.concat([
104
+ _c.sent()
105
+ ]), openEvents = _a[0], closeEvents = _a[1], liquidateEvents = _a[2], liquidateExpiredEvents = _a[3], transferEvents = _a[4];
90
106
  openEvents.forEach(function (e) {
91
107
  addToEvents(e, e.args.onBehalfOf, "add");
92
108
  });
@@ -103,11 +119,11 @@ var CreditAccountWatcher = /** @class */ (function () {
103
119
  addToEvents(e, e.args.oldOwner, "delete");
104
120
  addToEvents(e, e.args.newOwner, "add");
105
121
  });
106
- _b.label = 4;
107
- case 4:
122
+ _c.label = 8;
123
+ case 8:
108
124
  _i++;
109
125
  return [3 /*break*/, 2];
110
- case 5:
126
+ case 9:
111
127
  eventsByDate
112
128
  .sort(function (a, b) {
113
129
  return a.time > b.time ? 1 : -1;
@@ -130,7 +146,7 @@ var CreditAccountWatcher = /** @class */ (function () {
130
146
  CreditAccountWatcher.batchCreditAccountLoad = function (accs, dataCompressor, signer, options) {
131
147
  var _a;
132
148
  return __awaiter(this, void 0, void 0, function () {
133
- var chunkSize, atBlock, dcmc, calls, i, chunk, data;
149
+ var chunkSize, atBlock, dcmc, calls, i, chunk, data, _i, calls_1, c, result;
134
150
  return __generator(this, function (_b) {
135
151
  switch (_b.label) {
136
152
  case 0:
@@ -153,10 +169,21 @@ var CreditAccountWatcher = /** @class */ (function () {
153
169
  };
154
170
  });
155
171
  }
156
- return [4 /*yield*/, Promise.all(calls.map(function (c) { return dcmc.call(c, { blockTag: atBlock, gasLimit: 200e6 }); }))];
172
+ data = [];
173
+ _i = 0, calls_1 = calls;
174
+ _b.label = 1;
157
175
  case 1:
158
- data = _b.sent();
159
- return [2 /*return*/, data.flat().map(function (c) { return new creditAccount_1.CreditAccountData(c); })];
176
+ if (!(_i < calls_1.length)) return [3 /*break*/, 4];
177
+ c = calls_1[_i];
178
+ return [4 /*yield*/, dcmc.call(c, { blockTag: atBlock, gasLimit: 300e6 })];
179
+ case 2:
180
+ result = _b.sent();
181
+ data.push(result);
182
+ _b.label = 3;
183
+ case 3:
184
+ _i++;
185
+ return [3 /*break*/, 1];
186
+ case 4: return [2 /*return*/, data.flat().map(function (c) { return new creditAccount_1.CreditAccountData(c); })];
160
187
  }
161
188
  });
162
189
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gearbox-protocol/sdk",
3
- "version": "1.15.15",
3
+ "version": "1.15.17",
4
4
  "description": "Gearbox SDK",
5
5
  "main": "./lib/index.js",
6
6
  "types": "./lib/index.d.ts",