@gearbox-protocol/sdk 1.16.7 → 1.16.8

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/rewards/creditRewards.d.ts +2 -3
  2. package/lib/rewards/creditRewards.js +32 -12
  3. package/package.json +1 -1
package/lib/rewards/creditRewards.d.ts CHANGED
@@ -1,11 +1,10 @@
1
1
  import { BigNumber, providers } from "ethers";
2
- import { CreditManagerData } from "../core/creditManager";
3
2
  import { TypedEvent } from "../types/common";
4
3
  import { Reward } from "./poolRewards";
5
4
  import { RangedValue } from "./range";
6
5
  export declare class CreditRewards {
7
- static computeReward(creditManagerData: CreditManagerData, address: string, provider: providers.Provider, toBlock?: number): Promise<BigNumber>;
8
- static computeAllRewards(creditManagerData: CreditManagerData, provider: providers.Provider, toBlock?: number): Promise<Array<Reward>>;
6
+ static computeReward(creditManager: string, address: string, provider: providers.Provider, toBlock?: number): Promise<BigNumber>;
7
+ static computeAllRewards(creditManager: string, provider: providers.Provider, toBlock?: number): Promise<Array<Reward>>;
9
8
  static parseEvents(events: Array<TypedEvent>, rewardPerBlock: RangedValue, toBlock: number): Array<Reward>;
10
9
  static computeRewardInt(toBlock: number, balance: RangedValue, totalSupply: RangedValue, rewardPerBlock: RangedValue): BigNumber;
11
10
  protected static query(creditFacade: string, provider: providers.Provider, toBlock: number): Promise<Array<TypedEvent>>;
package/lib/rewards/creditRewards.js CHANGED
@@ -53,12 +53,12 @@ var range_1 = require("./range");
53
53
  var CreditRewards = /** @class */ (function () {
54
54
  function CreditRewards() {
55
55
  }
56
- CreditRewards.computeReward = function (creditManagerData, address, provider, toBlock) {
56
+ CreditRewards.computeReward = function (creditManager, address, provider, toBlock) {
57
57
  return __awaiter(this, void 0, void 0, function () {
58
58
  var rewards, rewardToAddress;
59
59
  return __generator(this, function (_a) {
60
60
  switch (_a.label) {
61
- case 0: return [4 /*yield*/, CreditRewards.computeAllRewards(creditManagerData, provider, toBlock)];
61
+ case 0: return [4 /*yield*/, CreditRewards.computeAllRewards(creditManager, provider, toBlock)];
62
62
  case 1:
63
63
  rewards = _a.sent();
64
64
  rewardToAddress = rewards.filter(function (r) { return r.address === address.toLowerCase(); });
@@ -67,25 +67,45 @@ var CreditRewards = /** @class */ (function () {
67
67
  });
68
68
  });
69
69
  };
70
- CreditRewards.computeAllRewards = function (creditManagerData, provider, toBlock) {
70
+ CreditRewards.computeAllRewards = function (creditManager, provider, toBlock) {
71
71
  return __awaiter(this, void 0, void 0, function () {
72
- var toBlockQuery, _a, query, rewardPerBlock;
73
- return __generator(this, function (_b) {
74
- switch (_b.label) {
72
+ var toBlockQuery, _a, cm, cc, _b, _c, creditFacadesEvents, events, _i, creditFacadesEvents_1, cfe, query, rewardPerBlock;
73
+ return __generator(this, function (_d) {
74
+ switch (_d.label) {
75
75
  case 0:
76
76
  _a = toBlock;
77
77
  if (_a) return [3 /*break*/, 2];
78
78
  return [4 /*yield*/, provider.getBlockNumber()];
79
79
  case 1:
80
- _a = (_b.sent());
81
- _b.label = 2;
80
+ _a = (_d.sent());
81
+ _d.label = 2;
82
82
  case 2:
83
83
  toBlockQuery = _a;
84
- return [4 /*yield*/, CreditRewards.query(creditManagerData.creditFacade, provider, toBlockQuery)];
84
+ cm = types_1.ICreditManagerV2__factory.connect(creditManager, provider);
85
+ _c = (_b = types_1.ICreditConfigurator__factory).connect;
86
+ return [4 /*yield*/, cm.creditConfigurator()];
85
87
  case 3:
86
- query = _b.sent();
87
- rewardPerBlock = CreditRewards.getRewardsRange(creditManagerData.address);
88
- return [2 /*return*/, CreditRewards.parseEvents(query, rewardPerBlock, toBlockQuery)];
88
+ cc = _c.apply(_b, [_d.sent(), provider]);
89
+ return [4 /*yield*/, cc.queryFilter(cc.filters.CreditFacadeUpgraded())];
90
+ case 4:
91
+ creditFacadesEvents = _d.sent();
92
+ events = [];
93
+ _i = 0, creditFacadesEvents_1 = creditFacadesEvents;
94
+ _d.label = 5;
95
+ case 5:
96
+ if (!(_i < creditFacadesEvents_1.length)) return [3 /*break*/, 8];
97
+ cfe = creditFacadesEvents_1[_i];
98
+ return [4 /*yield*/, CreditRewards.query(cfe.args.newCreditFacade, provider, toBlockQuery)];
99
+ case 6:
100
+ query = _d.sent();
101
+ events.push.apply(events, query);
102
+ _d.label = 7;
103
+ case 7:
104
+ _i++;
105
+ return [3 /*break*/, 5];
106
+ case 8:
107
+ rewardPerBlock = CreditRewards.getRewardsRange(creditManager.toLowerCase());
108
+ return [2 /*return*/, CreditRewards.parseEvents(events, rewardPerBlock, toBlockQuery)];
89
109
  }
90
110
  });
91
111
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gearbox-protocol/sdk",
3
- "version": "1.16.7",
3
+ "version": "1.16.8",
4
4
  "description": "Gearbox SDK",
5
5
  "main": "./lib/index.js",
6
6
  "types": "./lib/index.d.ts",