@gearbox-protocol/sdk 1.16.10 → 1.16.12

package/lib/oracles/oracles.d.ts

@@ -1,3 +1,4 @@
+import { BigNumber } from "ethers";
 import { NetworkType } from "../core/constants";
 import { SupportedToken } from "../tokens/token";
 export interface PriceFeed {
@@ -11,7 +12,9 @@ export declare enum OracleType {
     YEARN_CURVE_LP_TOKEN_ORACLE = 3,
     ZERO_ORACLE = 4,
     LIKE_CURVE_LP_TOKEN_ORACLE = 5,
-    WSTETH_ORACLE = 6
+    WSTETH_ORACLE = 6,
+    BOUNDED_ORACLE = 7,
+    COMPOSITE_ORACLE = 8
 }
 export declare type PriceFeedData = {
     type: OracleType.CHAINLINK_ORACLE;
@@ -33,6 +36,14 @@ export declare type PriceFeedData = {
 } | {
     type: OracleType.WSTETH_ORACLE;
     token: SupportedToken;
+} | {
+    type: OracleType.BOUNDED_ORACLE;
+    targetPriceFeed: Record<NetworkType, string>;
+    upperBound: BigNumber;
+} | {
+    type: OracleType.COMPOSITE_ORACLE;
+    ethPriceFeed: Record<NetworkType, string>;
+    usdPriceFeed: Record<NetworkType, string>;
 };
 export interface TokenPriceFeedData {
     priceFeedETH?: PriceFeedData;

package/lib/oracles/oracles.js

@@ -10,4 +10,6 @@ var OracleType;
     OracleType[OracleType["ZERO_ORACLE"] = 4] = "ZERO_ORACLE";
     OracleType[OracleType["LIKE_CURVE_LP_TOKEN_ORACLE"] = 5] = "LIKE_CURVE_LP_TOKEN_ORACLE";
     OracleType[OracleType["WSTETH_ORACLE"] = 6] = "WSTETH_ORACLE";
+    OracleType[OracleType["BOUNDED_ORACLE"] = 7] = "BOUNDED_ORACLE";
+    OracleType[OracleType["COMPOSITE_ORACLE"] = 8] = "COMPOSITE_ORACLE";
 })(OracleType = exports.OracleType || (exports.OracleType = {}));

package/lib/oracles/priceFeeds.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.priceFeedsByNetwork = exports.GAS_PRICE_FEED = void 0;
+var ethers_1 = require("ethers");
 var oracles_1 = require("./oracles");
 exports.GAS_PRICE_FEED = "0x169e633a2d1e6c10dd91238ba11c4a708dfef37c";
 exports.priceFeedsByNetwork = {
@@ -252,15 +253,19 @@ exports.priceFeedsByNetwork = {
             type: oracles_1.OracleType.CHAINLINK_ORACLE,
             address: {
                 Mainnet: "0x86392dC19c0b719886221c78AB11eb8Cf5c52812",
-                Goerli: "0x0C539D95F202eF8b3981521782ABd3a12c5C4F95",
+                Goerli: "",
             },
         },
         priceFeedUSD: {
-            type: oracles_1.OracleType.CHAINLINK_ORACLE,
-            address: {
+            type: oracles_1.OracleType.COMPOSITE_ORACLE,
+            usdPriceFeed: {
                 Mainnet: "0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8",
                 Goerli: "0xf4f054C2E3269730c781dc7e1Fe2a3ca745784bd",
             },
+            ethPriceFeed: {
+                Mainnet: "0x86392dC19c0b719886221c78AB11eb8Cf5c52812",
+                Goerli: "",
+            },
         },
     },
     wstETH: {
@@ -289,11 +294,12 @@ exports.priceFeedsByNetwork = {
     },
     LUSD: {
         priceFeedUSD: {
-            type: oracles_1.OracleType.CHAINLINK_ORACLE,
-            address: {
+            type: oracles_1.OracleType.BOUNDED_ORACLE,
+            targetPriceFeed: {
                 Mainnet: "0x3D7aE7E594f2f2091Ad8798313450130d0Aba3a0",
                 Goerli: "0xd6852347062aB885B6Fb9F7220BedCc5A39CE862",
             },
+            upperBound: ethers_1.BigNumber.from(1e8).mul(11).div(10),
         },
     },
     sUSD: {

package/lib/rewards/creditRewards.d.ts

@@ -6,6 +6,18 @@ export declare class CreditRewards {
     static computeReward(creditManager: string, address: string, provider: providers.Provider, toBlock?: number): Promise<BigNumber>;
     static computeAllRewards(creditManager: string, provider: providers.Provider, toBlock?: number): Promise<Array<Reward>>;
     static parseEvents(events: Array<TypedEvent>, rewardPerBlock: RangedValue, toBlock: number): Array<Reward>;
+    static parseCMEvents(events: Array<TypedEvent>): {
+        borrowedRange: Record<string, RangedValue>;
+        totalBorrowedRange: RangedValue;
+        borrowed: Record<string, BigNumber>;
+        totalBorrowed: BigNumber;
+    };
+    static computeCMStats(creditManager: string, provider: providers.Provider, toBlock?: number): Promise<{
+        borrowedRange: Record<string, RangedValue>;
+        totalBorrowedRange: RangedValue;
+        borrowed: Record<string, BigNumber>;
+        totalBorrowed: BigNumber;
+    }>;
     static computeRewardInt(toBlock: number, balance: RangedValue, totalSupply: RangedValue, rewardPerBlock: RangedValue): BigNumber;
     protected static query(creditFacade: string, provider: providers.Provider, toBlock: number): Promise<Array<TypedEvent>>;
     protected static getRewardsRange(creditManager: string): RangedValue;

package/lib/rewards/creditRewards.js

@@ -113,6 +113,13 @@ var CreditRewards = /** @class */ (function () {
         });
     };
     CreditRewards.parseEvents = function (events, rewardPerBlock, toBlock) {
+        var _a = CreditRewards.parseCMEvents(events), borrowedRange = _a.borrowedRange, totalBorrowedRange = _a.totalBorrowedRange, borrowed = _a.borrowed;
+        return Object.keys(borrowed).map(function (address) { return ({
+            address: address.toLowerCase(),
+            amount: CreditRewards.computeRewardInt(toBlock, borrowedRange[address], totalBorrowedRange, rewardPerBlock),
+        }); });
+    };
+    CreditRewards.parseCMEvents = function (events) {
         var borrowedRange = {};
         var totalBorrowedRange = new range_1.RangedValue();
         var borrowed = {};
@@ -173,10 +180,53 @@ var CreditRewards = /** @class */ (function () {
                 }
             }
         });
-        return Object.keys(borrowed).map(function (address) { return ({
-            address: address.toLowerCase(),
-            amount: CreditRewards.computeRewardInt(toBlock, borrowedRange[address], totalBorrowedRange, rewardPerBlock),
-        }); });
+        return {
+            borrowedRange: borrowedRange,
+            totalBorrowedRange: totalBorrowedRange,
+            borrowed: borrowed,
+            totalBorrowed: totalBorrowed,
+        };
+    };
+    CreditRewards.computeCMStats = function (creditManager, provider, toBlock) {
+        return __awaiter(this, void 0, void 0, function () {
+            var toBlockQuery, _a, cm, cc, _b, _c, creditFacadesEvents, events, _i, creditFacadesEvents_2, cfe, query;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        _a = toBlock;
+                        if (_a) return [3 /*break*/, 2];
+                        return [4 /*yield*/, provider.getBlockNumber()];
+                    case 1:
+                        _a = (_d.sent());
+                        _d.label = 2;
+                    case 2:
+                        toBlockQuery = _a;
+                        cm = types_1.ICreditManagerV2__factory.connect(creditManager, provider);
+                        _c = (_b = types_1.ICreditConfigurator__factory).connect;
+                        return [4 /*yield*/, cm.creditConfigurator()];
+                    case 3:
+                        cc = _c.apply(_b, [_d.sent(), provider]);
+                        return [4 /*yield*/, cc.queryFilter(cc.filters.CreditFacadeUpgraded())];
+                    case 4:
+                        creditFacadesEvents = _d.sent();
+                        events = [];
+                        _i = 0, creditFacadesEvents_2 = creditFacadesEvents;
+                        _d.label = 5;
+                    case 5:
+                        if (!(_i < creditFacadesEvents_2.length)) return [3 /*break*/, 8];
+                        cfe = creditFacadesEvents_2[_i];
+                        return [4 /*yield*/, CreditRewards.query(cfe.args.newCreditFacade, provider, toBlockQuery)];
+                    case 6:
+                        query = _d.sent();
+                        events.push.apply(events, query);
+                        _d.label = 7;
+                    case 7:
+                        _i++;
+                        return [3 /*break*/, 5];
+                    case 8: return [2 /*return*/, CreditRewards.parseCMEvents(events)];
+                }
+            });
+        });
     };
     CreditRewards.computeRewardInt = function (toBlock, balance, totalSupply, rewardPerBlock) {
         var keys = Array.from(new Set(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], balance.keys, true), totalSupply.keys, true), rewardPerBlock.keys, true), [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "1.16.10",
+  "version": "1.16.12",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",