npm - @gearbox-protocol/sdk - Versions diffs - 1.15.25 → 1.16.1 - Mend

@gearbox-protocol/sdk 1.15.25 → 1.16.1

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 (9) hide show

package/lib/contracts/contractsRegister.d.ts +11 -0
package/lib/contracts/contractsRegister.js +42 -29
package/lib/rewards/creditRewardParams.d.ts +7 -0
package/lib/rewards/creditRewardParams.js +39 -0
package/lib/rewards/creditRewards.d.ts +15 -0
package/lib/rewards/creditRewards.js +206 -0
package/lib/rewards/creditRewards.spec.d.ts +1 -0
package/lib/rewards/creditRewards.spec.js +57 -0
package/package.json +1 -1

package/lib/contracts/contractsRegister.d.ts CHANGED Viewed

@@ -1,4 +1,15 @@
 import { NetworkType } from "../core/constants";
 export declare const stEthPoolWrapper: Record<NetworkType, string>;
+export declare const CREDIT_MANAGER_DAI_V2_MAINNET = "0x672461bfc20dd783444a830ad4c38b345ab6e2f7";
+export declare const CREDIT_MANAGER_USDC_V2_MAINNET = "0x95357303f995e184A7998dA6C6eA35cC728A1900";
+export declare const CREDIT_MANAGER_WETH_V2_MAINNET = "0x5887ad4cb2352e7f01527035faa3ae0ef2ce2b9b";
+export declare const CREDIT_MANAGER_WSTETH_V2_MAINNET = "0xe0bce4460795281d39c91da9b0275bca968293de";
+export declare const CREDIT_MANAGER_WBTC_V2_MAINNET = "0xc62bf8a7889adf1c5dc4665486c7683ae6e74e0f";
+export declare const CREDIT_MANAGER_DAI_V2_GOERLI = "0xf7ba434952acaa2e12035a2c3643ca327914a470";
+export declare const CREDIT_MANAGER_USDC_V2_GOERLI = "0x2144a7785baecbab32295188285717cad6c1a11c";
+export declare const CREDIT_MANAGER_WETH_V2_GOERLI = "0x2ad4a2f1bdd815e285a22cdcc072fbb43818b09b";
+export declare const CREDIT_MANAGER_WSTETH_V2_GOERLI = "0x40d542a5c15b2c0c65af047984c285c2c30847af";
+export declare const CREDIT_MANAGER_WBTC_V2_GOERLI = "0x6546dd4e8d507e3e45bb924818c0bad2a3aa2c5f";
+export declare type CreditManagersV2 = typeof CREDIT_MANAGER_DAI_V2_MAINNET | typeof CREDIT_MANAGER_USDC_V2_MAINNET | typeof CREDIT_MANAGER_WETH_V2_MAINNET | typeof CREDIT_MANAGER_WSTETH_V2_MAINNET | typeof CREDIT_MANAGER_WBTC_V2_MAINNET | typeof CREDIT_MANAGER_DAI_V2_GOERLI | typeof CREDIT_MANAGER_USDC_V2_GOERLI | typeof CREDIT_MANAGER_WETH_V2_GOERLI | typeof CREDIT_MANAGER_WSTETH_V2_GOERLI | typeof CREDIT_MANAGER_WBTC_V2_GOERLI;
 export declare const deployedContracts: Record<string, string>;
 export declare function getContractName(address: string): string;

package/lib/contracts/contractsRegister.js CHANGED Viewed

@@ -10,8 +10,9 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getContractName = exports.deployedContracts = exports.stEthPoolWrapper = void 0;
+exports.getContractName = exports.deployedContracts = exports.CREDIT_MANAGER_WBTC_V2_GOERLI = exports.CREDIT_MANAGER_WSTETH_V2_GOERLI = exports.CREDIT_MANAGER_WETH_V2_GOERLI = exports.CREDIT_MANAGER_USDC_V2_GOERLI = exports.CREDIT_MANAGER_DAI_V2_GOERLI = exports.CREDIT_MANAGER_WBTC_V2_MAINNET = exports.CREDIT_MANAGER_WSTETH_V2_MAINNET = exports.CREDIT_MANAGER_WETH_V2_MAINNET = exports.CREDIT_MANAGER_USDC_V2_MAINNET = exports.CREDIT_MANAGER_DAI_V2_MAINNET = exports.stEthPoolWrapper = void 0;
 var formatter_1 = require("../utils/formatter");
 var mappers_1 = require("../utils/mappers");
 var contracts_1 = require("./contracts");
@@ -19,37 +20,49 @@ exports.stEthPoolWrapper = {
     Mainnet: "0x5a97e3E43dCBFe620ccF7865739075f92E93F5E4",
     Goerli: "0x3fe62a62C022A069952069b32C9d56718D30B7ec",
 };
-exports.deployedContracts = {
-    // MAINNET
-    "0x777E23A2AcB2fCbB35f6ccF98272d03C722Ba6EB": "DAI",
-    "0x2664cc24CBAd28749B3Dd6fC97A6B402484De527": "USDC",
-    "0x968f9a68a98819E2e6Bb910466e191A7b6cf02F0": "WETH",
-    "0xC38478B0A4bAFE964C3526EEFF534d70E1E09017": "WBTC",
-    // MAINNET POOLS
-    "0x24946bCbBd028D5ABb62ad9B635EB1b1a67AF668": "DAI",
-    "0x86130bDD69143D8a4E5fc50bf4323D48049E98E4": "USDC",
-    "0xB03670c20F87f2169A7c4eBE35746007e9575901": "WETH",
-    "0xB8cf3Ed326bB0E51454361Fb37E9E8df6DC5C286": "wstETH",
-    "0xB2A015c71c17bCAC6af36645DEad8c572bA08A08": "WBTC",
+exports.CREDIT_MANAGER_DAI_V2_MAINNET = "0x672461bfc20dd783444a830ad4c38b345ab6e2f7";
+exports.CREDIT_MANAGER_USDC_V2_MAINNET = "0x95357303f995e184A7998dA6C6eA35cC728A1900";
+exports.CREDIT_MANAGER_WETH_V2_MAINNET = "0x5887ad4cb2352e7f01527035faa3ae0ef2ce2b9b";
+exports.CREDIT_MANAGER_WSTETH_V2_MAINNET = "0xe0bce4460795281d39c91da9b0275bca968293de";
+exports.CREDIT_MANAGER_WBTC_V2_MAINNET = "0xc62bf8a7889adf1c5dc4665486c7683ae6e74e0f";
+// GOERLI
+exports.CREDIT_MANAGER_DAI_V2_GOERLI = "0xf7ba434952acaa2e12035a2c3643ca327914a470";
+exports.CREDIT_MANAGER_USDC_V2_GOERLI = "0x2144a7785baecbab32295188285717cad6c1a11c";
+exports.CREDIT_MANAGER_WETH_V2_GOERLI = "0x2ad4a2f1bdd815e285a22cdcc072fbb43818b09b";
+exports.CREDIT_MANAGER_WSTETH_V2_GOERLI = "0x40d542a5c15b2c0c65af047984c285c2c30847af";
+exports.CREDIT_MANAGER_WBTC_V2_GOERLI = "0x6546dd4e8d507e3e45bb924818c0bad2a3aa2c5f";
+exports.deployedContracts = (_a = {
+        // MAINNET
+        "0x777E23A2AcB2fCbB35f6ccF98272d03C722Ba6EB": "DAI",
+        "0x2664cc24CBAd28749B3Dd6fC97A6B402484De527": "USDC",
+        "0x968f9a68a98819E2e6Bb910466e191A7b6cf02F0": "WETH",
+        "0xC38478B0A4bAFE964C3526EEFF534d70E1E09017": "WBTC",
+        // MAINNET POOLS
+        "0x24946bCbBd028D5ABb62ad9B635EB1b1a67AF668": "DAI",
+        "0x86130bDD69143D8a4E5fc50bf4323D48049E98E4": "USDC",
+        "0xB03670c20F87f2169A7c4eBE35746007e9575901": "WETH",
+        "0xB8cf3Ed326bB0E51454361Fb37E9E8df6DC5C286": "wstETH",
+        "0xB2A015c71c17bCAC6af36645DEad8c572bA08A08": "WBTC"
+    },
     // MAINNET V2 CM
-    "0x672461bfc20dd783444a830ad4c38b345ab6e2f7": "DAI",
-    "0x95357303f995e184a7998da6c6ea35cc728a1900": "USDC",
-    "0x5887ad4cb2352e7f01527035faa3ae0ef2ce2b9b": "WETH",
-    "0xe0bce4460795281d39c91da9b0275bca968293de": "wstETH",
-    "0xc62bf8a7889adf1c5dc4665486c7683ae6e74e0f": "WBTC",
+    _a[exports.CREDIT_MANAGER_DAI_V2_MAINNET] = "DAI",
+    _a[exports.CREDIT_MANAGER_USDC_V2_MAINNET] = "USDC",
+    _a[exports.CREDIT_MANAGER_WETH_V2_MAINNET] = "WETH",
+    _a[exports.CREDIT_MANAGER_WSTETH_V2_MAINNET] = "wstETH",
+    _a[exports.CREDIT_MANAGER_WBTC_V2_MAINNET] = "WBTC",
     // GOERLI CM
-    "0xf7ba434952acaa2e12035a2c3643ca327914a470": "DAI",
-    "0x2144a7785baecbab32295188285717cad6c1a11c": "USDC",
-    "0x2ad4a2f1bdd815e285a22cdcc072fbb43818b09b": "WETH",
-    "0x40d542a5c15b2c0c65af047984c285c2c30847af": "wstETH",
-    "0x6546dd4e8d507e3e45bb924818c0bad2a3aa2c5f": "WBTC",
+    _a[exports.CREDIT_MANAGER_DAI_V2_GOERLI] = "DAI",
+    _a[exports.CREDIT_MANAGER_USDC_V2_GOERLI] = "USDC",
+    _a[exports.CREDIT_MANAGER_WETH_V2_GOERLI] = "WETH",
+    _a[exports.CREDIT_MANAGER_WSTETH_V2_GOERLI] = "wstETH",
+    _a[exports.CREDIT_MANAGER_WBTC_V2_GOERLI] = "WBTC",
     // GOERLI pools
-    "0xfb422e503f8b768184aba5e73587543d1c871a23": "DAI",
-    "0x7c14c88f672d5513c8fa640fa48815f40c781a60": "USDC",
-    "0x13376d637ded73a0df20d192f691a88c8af7dd0a": "ETH/WETH",
-    "0x3f926a46893af659c2768f118d5f189190baa15c": "WBTC",
-    "0xbdf0395fa6f134b8de35ef30c61b2b9711cbd67a": "wstETH",
-};
+    _a["0xfb422e503f8b768184aba5e73587543d1c871a23"] = "DAI",
+    _a["0x7c14c88f672d5513c8fa640fa48815f40c781a60"] = "USDC",
+    _a["0x13376d637ded73a0df20d192f691a88c8af7dd0a"] = "ETH/WETH",
+    _a["0x3f926a46893af659c2768f118d5f189190baa15c"] = "WBTC",
+    _a["0xbdf0395fa6f134b8de35ef30c61b2b9711cbd67a"] = "wstETH",
+    _a);
 var contractNames = Object.entries(contracts_1.contractsByAddress).reduce(function (acc, _a) {
     var _b;
     var addr = _a[0], cSymbol = _a[1];

package/lib/rewards/creditRewardParams.d.ts ADDED Viewed

@@ -0,0 +1,7 @@
+import { CreditManagersV2 } from "../contracts/contractsRegister";
+import { DieselTokenTypes } from "../tokens/gear";
+import { RangedValue } from "./range";
+export declare const creditRewardsPerBlock: Record<CreditManagersV2, RangedValue>;
+export declare const GEAR_PER_BLOCK: Record<DieselTokenTypes, number>;
+export declare const GOERLI_BLOCK = 7694030;
+export declare const MAINNET_BLOCK = 15724000;

package/lib/rewards/creditRewardParams.js ADDED Viewed

@@ -0,0 +1,39 @@
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MAINNET_BLOCK = exports.GOERLI_BLOCK = exports.GEAR_PER_BLOCK = exports.creditRewardsPerBlock = void 0;
+var ethers_1 = require("ethers");
+var contractsRegister_1 = require("../contracts/contractsRegister");
+var range_1 = require("./range");
+exports.creditRewardsPerBlock = (_a = {},
+    _a[contractsRegister_1.CREDIT_MANAGER_DAI_V2_MAINNET] = new range_1.RangedValue(),
+    _a[contractsRegister_1.CREDIT_MANAGER_USDC_V2_MAINNET] = new range_1.RangedValue(),
+    _a[contractsRegister_1.CREDIT_MANAGER_WETH_V2_MAINNET] = new range_1.RangedValue(),
+    _a[contractsRegister_1.CREDIT_MANAGER_WSTETH_V2_MAINNET] = new range_1.RangedValue(),
+    _a[contractsRegister_1.CREDIT_MANAGER_WBTC_V2_MAINNET] = new range_1.RangedValue(),
+    // GOERLI CM
+    _a[contractsRegister_1.CREDIT_MANAGER_DAI_V2_GOERLI] = new range_1.RangedValue(),
+    _a[contractsRegister_1.CREDIT_MANAGER_USDC_V2_GOERLI] = new range_1.RangedValue(),
+    _a[contractsRegister_1.CREDIT_MANAGER_WETH_V2_GOERLI] = new range_1.RangedValue(),
+    _a[contractsRegister_1.CREDIT_MANAGER_WSTETH_V2_GOERLI] = new range_1.RangedValue(),
+    _a[contractsRegister_1.CREDIT_MANAGER_WBTC_V2_GOERLI] = new range_1.RangedValue(),
+    _a);
+exports.GEAR_PER_BLOCK = {
+    dDAI: 166,
+    dUSDC: 166,
+    dWETH: 230,
+    dWBTC: 66,
+    dwstETH: 118,
+};
+exports.GOERLI_BLOCK = 7694030;
+exports.creditRewardsPerBlock[contractsRegister_1.CREDIT_MANAGER_DAI_V2_GOERLI].addValue(exports.GOERLI_BLOCK, ethers_1.BigNumber.from(10).pow(18).mul(exports.GEAR_PER_BLOCK.dDAI).div(100));
+exports.creditRewardsPerBlock[contractsRegister_1.CREDIT_MANAGER_USDC_V2_GOERLI].addValue(exports.GOERLI_BLOCK, ethers_1.BigNumber.from(10).pow(18).mul(exports.GEAR_PER_BLOCK.dUSDC).div(100));
+exports.creditRewardsPerBlock[contractsRegister_1.CREDIT_MANAGER_WETH_V2_GOERLI].addValue(exports.GOERLI_BLOCK, ethers_1.BigNumber.from(10).pow(18).mul(exports.GEAR_PER_BLOCK.dWETH).div(100));
+exports.creditRewardsPerBlock[contractsRegister_1.CREDIT_MANAGER_WSTETH_V2_GOERLI].addValue(exports.GOERLI_BLOCK, ethers_1.BigNumber.from(10).pow(18).mul(exports.GEAR_PER_BLOCK.dwstETH).div(100));
+exports.creditRewardsPerBlock[contractsRegister_1.CREDIT_MANAGER_WBTC_V2_GOERLI].addValue(exports.GOERLI_BLOCK, ethers_1.BigNumber.from(10).pow(18).mul(exports.GEAR_PER_BLOCK.dWBTC).div(100));
+exports.MAINNET_BLOCK = 15724000;
+exports.creditRewardsPerBlock[contractsRegister_1.CREDIT_MANAGER_DAI_V2_MAINNET].addValue(exports.MAINNET_BLOCK, ethers_1.BigNumber.from(10).pow(18).mul(exports.GEAR_PER_BLOCK.dDAI).div(100));
+exports.creditRewardsPerBlock[contractsRegister_1.CREDIT_MANAGER_USDC_V2_MAINNET].addValue(exports.MAINNET_BLOCK, ethers_1.BigNumber.from(10).pow(18).mul(exports.GEAR_PER_BLOCK.dUSDC).div(100));
+exports.creditRewardsPerBlock[contractsRegister_1.CREDIT_MANAGER_WETH_V2_MAINNET].addValue(exports.MAINNET_BLOCK, ethers_1.BigNumber.from(10).pow(18).mul(exports.GEAR_PER_BLOCK.dWETH).div(100));
+exports.creditRewardsPerBlock[contractsRegister_1.CREDIT_MANAGER_WSTETH_V2_MAINNET].addValue(exports.MAINNET_BLOCK, ethers_1.BigNumber.from(10).pow(18).mul(exports.GEAR_PER_BLOCK.dwstETH).div(100));
+exports.creditRewardsPerBlock[contractsRegister_1.CREDIT_MANAGER_WBTC_V2_MAINNET].addValue(exports.MAINNET_BLOCK, ethers_1.BigNumber.from(10).pow(18).mul(exports.GEAR_PER_BLOCK.dWBTC).div(100));

package/lib/rewards/creditRewards.d.ts ADDED Viewed

@@ -0,0 +1,15 @@
+import { BigNumber, providers } from "ethers";
+import { CreditManagerData } from "../core/creditManager";
+import { CloseCreditAccountEvent, DecreaseBorrowedAmountEvent, IncreaseBorrowedAmountEvent, LiquidateCreditAccountEvent, OpenCreditAccountEvent, TransferAccountEvent } from "../types/@gearbox-protocol/core-v2/contracts/interfaces/ICreditFacade.sol/ICreditFacade";
+import { RangedValue } from "./range";
+export interface Reward {
+    address: string;
+    amount: BigNumber;
+}
+export declare class CreditRewards {
+    static computeReward(creditManagerData: CreditManagerData, address: string, provider: providers.Provider, toBlock?: number): Promise<BigNumber>;
+    static computeAllRewards(creditManagerData: CreditManagerData, provider: providers.Provider, toBlock?: number): Promise<Array<Reward>>;
+    static computeRewardInt(toBlock: number, balance: RangedValue, totalSupply: RangedValue, rewardPerBlock: RangedValue): BigNumber;
+    protected static query(creditFacade: string, provider: providers.Provider, toBlock: number): Promise<Array<OpenCreditAccountEvent | CloseCreditAccountEvent | LiquidateCreditAccountEvent | IncreaseBorrowedAmountEvent | DecreaseBorrowedAmountEvent | TransferAccountEvent>>;
+    protected static getRewardsRange(creditManager: string): RangedValue;
+}

package/lib/rewards/creditRewards.js ADDED Viewed

@@ -0,0 +1,206 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CreditRewards = void 0;
+var ethers_1 = require("ethers");
+var types_1 = require("../types");
+var creditRewardParams_1 = require("./creditRewardParams");
+var range_1 = require("./range");
+var CreditRewards = /** @class */ (function () {
+    function CreditRewards() {
+    }
+    CreditRewards.computeReward = function (creditManagerData, address, provider, toBlock) {
+        return __awaiter(this, void 0, void 0, function () {
+            var rewards, rewardToAddress;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, CreditRewards.computeAllRewards(creditManagerData, provider, toBlock)];
+                    case 1:
+                        rewards = _a.sent();
+                        rewardToAddress = rewards.filter(function (r) { return r.address.toLowerCase() === address.toLowerCase(); });
+                        return [2 /*return*/, rewards.length === 0 ? ethers_1.BigNumber.from(0) : rewardToAddress[0].amount];
+                }
+            });
+        });
+    };
+    CreditRewards.computeAllRewards = function (creditManagerData, provider, toBlock) {
+        return __awaiter(this, void 0, void 0, function () {
+            var toBlockQuery, _a, query, borrowedRange, totalSupplyRange, rewardPerBlock, borrowed, totalBorrowed, cfi;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = toBlock;
+                        if (_a) return [3 /*break*/, 2];
+                        return [4 /*yield*/, provider.getBlockNumber()];
+                    case 1:
+                        _a = (_b.sent());
+                        _b.label = 2;
+                    case 2:
+                        toBlockQuery = _a;
+                        return [4 /*yield*/, CreditRewards.query(creditManagerData.creditFacade, provider, toBlockQuery)];
+                    case 3:
+                        query = _b.sent();
+                        borrowedRange = {};
+                        totalSupplyRange = new range_1.RangedValue();
+                        rewardPerBlock = CreditRewards.getRewardsRange(creditManagerData.creditFacade);
+                        borrowed = {};
+                        totalBorrowed = ethers_1.BigNumber.from(0);
+                        cfi = types_1.ICreditFacade__factory.connect(creditManagerData.creditFacade, provider).interface;
+                        query.forEach(function (e) {
+                            switch (e.topics[0]) {
+                                case cfi.getEventTopic("OpenCreditAccount"): {
+                                    var _a = e
+                                        .args, onBehalfOf = _a.onBehalfOf, borrowAmount = _a.borrowAmount;
+                                    totalBorrowed = totalBorrowed.add(borrowAmount);
+                                    borrowed[onBehalfOf] = borrowAmount;
+                                    if (!borrowedRange[onBehalfOf]) {
+                                        borrowedRange[onBehalfOf] = new range_1.RangedValue();
+                                    }
+                                    borrowedRange[onBehalfOf].addValue(e.blockNumber, borrowAmount);
+                                    break;
+                                }
+                                case cfi.getEventTopic("CloseCreditAccount"):
+                                case cfi.getEventTopic("LiquidateCreditAccount"):
+                                case cfi.getEventTopic("LiquidateExpiredCreditAccount"): {
+                                    // We need { borrower} only so, we can use any event to get it from args
+                                    var borrower = e.args.borrower;
+                                    totalBorrowed = totalBorrowed.sub(borrowed[borrower]);
+                                    borrowed[borrower] = ethers_1.BigNumber.from(0);
+                                    borrowedRange[borrower].addValue(e.blockNumber, ethers_1.BigNumber.from(0));
+                                    break;
+                                }
+                                case cfi.getEventTopic("IncreaseBorrowedAmount"): {
+                                    var _b = e.args, borrower = _b.borrower, amount = _b.amount;
+                                    totalBorrowed = totalBorrowed.add(amount);
+                                    borrowed[borrower] = borrowed[borrower].add(amount);
+                                    borrowedRange[borrower].addValue(e.blockNumber, borrowed[borrower]);
+                                    break;
+                                }
+                                case cfi.getEventTopic("DecreaseBorrowedAmount"): {
+                                    var _c = e.args, borrower = _c.borrower, amount = _c.amount;
+                                    totalBorrowed = totalBorrowed.sub(amount);
+                                    borrowed[borrower] = borrowed[borrower].sub(amount);
+                                    borrowedRange[borrower].addValue(e.blockNumber, borrowed[borrower]);
+                                    break;
+                                }
+                                case cfi.getEventTopic("TransferAccount"): {
+                                    var _d = e.args, newOwner = _d.newOwner, oldOwner = _d.oldOwner;
+                                    borrowed[newOwner] = borrowed[oldOwner];
+                                    if (!borrowed[newOwner]) {
+                                        borrowedRange[newOwner] = new range_1.RangedValue();
+                                    }
+                                    borrowed[oldOwner] = ethers_1.BigNumber.from(0);
+                                    borrowedRange[newOwner].addValue(e.blockNumber, borrowed[newOwner]);
+                                    borrowedRange[oldOwner].addValue(e.blockNumber, ethers_1.BigNumber.from(0));
+                                    break;
+                                }
+                            }
+                        });
+                        return [2 /*return*/, Object.keys(borrowed).map(function (address) { return ({
+                                address: address,
+                                amount: CreditRewards.computeRewardInt(toBlockQuery, borrowedRange[address], totalSupplyRange, rewardPerBlock),
+                            }); })];
+                }
+            });
+        });
+    };
+    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), [
+            toBlock,
+        ], false))).sort(function (a, b) { return (a > b ? 1 : -1); });
+        var total = ethers_1.BigNumber.from(0);
+        var balancesArr = balance.getValues(keys);
+        var totalSupplyArr = totalSupply.getValues(keys);
+        var rewardsArr = rewardPerBlock.getValues(keys);
+        for (var i = 0; i < keys.length; i++) {
+            var curBlock = keys[i];
+            var nextBlock = i === keys.length - 1 ? toBlock : keys[i + 1];
+            if (!totalSupplyArr[i].isZero()) {
+                total = total.add(balancesArr[i]
+                    .mul(nextBlock - curBlock)
+                    .mul(rewardsArr[i])
+                    .div(totalSupplyArr[i]));
+            }
+        }
+        return total;
+    };
+    CreditRewards.query = function (creditFacade, provider, toBlock) {
+        return __awaiter(this, void 0, void 0, function () {
+            var cf, topics, logs;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        cf = types_1.ICreditFacade__factory.connect(creditFacade, provider);
+                        topics = {
+                            OpenCreditAccount: cf.interface.getEventTopic("OpenCreditAccount"),
+                            CloseCreditAccount: cf.interface.getEventTopic("CloseCreditAccount"),
+                            LiquidateCreditAccount: cf.interface.getEventTopic("LiquidateCreditAccount"),
+                            LiquidateExpiredCreditAccount: cf.interface.getEventTopic("LiquidateExpiredCreditAccount"),
+                            TransferAccount: cf.interface.getEventTopic("TransferAccount"),
+                            IncreaseBorrowedAmount: cf.interface.getEventTopic("IncreaseBorrowedAmount"),
+                            DecreaseBorrowedAmount: cf.interface.getEventTopic("DecreaseBorrowedAmount"),
+                        };
+                        return [4 /*yield*/, cf.queryFilter({
+                                address: cf.address,
+                                topics: [Object.values(topics)],
+                            }, undefined, toBlock)];
+                    case 1:
+                        logs = _a.sent();
+                        return [2 /*return*/, logs];
+                }
+            });
+        });
+    };
+    CreditRewards.getRewardsRange = function (creditManager) {
+        var rewardPerBlock = creditRewardParams_1.creditRewardsPerBlock[creditManager];
+        if (!rewardPerBlock)
+            throw new Error("Unknown credit manager token ".concat(creditManager));
+        return rewardPerBlock;
+    };
+    return CreditRewards;
+}());
+exports.CreditRewards = CreditRewards;

package/lib/rewards/creditRewards.spec.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/lib/rewards/creditRewards.spec.js ADDED Viewed

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var chai_1 = require("chai");
+var ethers_1 = require("ethers");
+var poolRewards_1 = require("./poolRewards");
+var range_1 = require("./range");
+describe("CreditRewards test", function () {
+    it("computeReward works correctly", function () {
+        var balances = new range_1.RangedValue();
+        balances.addValue(1000, ethers_1.BigNumber.from(100));
+        balances.addValue(2000, ethers_1.BigNumber.from(200));
+        balances.addValue(3000, ethers_1.BigNumber.from(0));
+        var totalSupply = new range_1.RangedValue();
+        totalSupply.addValue(500, ethers_1.BigNumber.from(100));
+        totalSupply.addValue(1000, ethers_1.BigNumber.from(200));
+        totalSupply.addValue(1500, ethers_1.BigNumber.from(250));
+        totalSupply.addValue(2000, ethers_1.BigNumber.from(400));
+        totalSupply.addValue(3000, ethers_1.BigNumber.from(100));
+        var rewards = new range_1.RangedValue();
+        rewards.addValue(500, ethers_1.BigNumber.from(20));
+        // Block: ----- 500 ------ 1000 ----- 1500 ----- 2000 ------ 2500 ----- 3000
+        //
+        // Balances:     0          100 ----------------  200 ------------------ 0
+        // Total supply  100        200   --    250       400                    100
+        // Rewards:      20
+        //                           10 ------  8         10 -------------------- 0
+        // Total: 10 * 500 + 8*500 + 10 * 1000 = 19000
+        var result = poolRewards_1.PoolRewards.computeRewardInt(4000, balances, totalSupply, rewards);
+        (0, chai_1.expect)(result.toNumber()).to.be.eq(19000);
+    });
+    it("sum of rewards is equal to total distributed", function () {
+        var balances0 = new range_1.RangedValue();
+        var balances1 = new range_1.RangedValue();
+        balances0.addValue(1000, ethers_1.BigNumber.from(100));
+        balances0.addValue(2000, ethers_1.BigNumber.from(200));
+        balances0.addValue(3000, ethers_1.BigNumber.from(0));
+        balances1.addValue(500, ethers_1.BigNumber.from(100));
+        balances1.addValue(1500, ethers_1.BigNumber.from(300));
+        balances1.addValue(2500, ethers_1.BigNumber.from(200));
+        balances1.addValue(3000, ethers_1.BigNumber.from(100));
+        var totalSupply = new range_1.RangedValue();
+        totalSupply.addValue(500, ethers_1.BigNumber.from(100));
+        totalSupply.addValue(1000, ethers_1.BigNumber.from(200));
+        totalSupply.addValue(1500, ethers_1.BigNumber.from(400));
+        totalSupply.addValue(2000, ethers_1.BigNumber.from(500));
+        totalSupply.addValue(2500, ethers_1.BigNumber.from(400));
+        totalSupply.addValue(3000, ethers_1.BigNumber.from(100));
+        var rewards = new range_1.RangedValue();
+        rewards.addValue(500, ethers_1.BigNumber.from(20));
+        rewards.addValue(1500, ethers_1.BigNumber.from(10));
+        rewards.addValue(2000, ethers_1.BigNumber.from(0));
+        rewards.addValue(2500, ethers_1.BigNumber.from(5));
+        var result0 = poolRewards_1.PoolRewards.computeRewardInt(3000, balances0, totalSupply, rewards);
+        var result1 = poolRewards_1.PoolRewards.computeRewardInt(3000, balances1, totalSupply, rewards);
+        (0, chai_1.expect)(result0.toNumber() + result1.toNumber()).to.be.eq(20 * 1000 + 10 * 500 + 5 * 500);
+    });
+});

package/package.json CHANGED Viewed

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