@gearbox-protocol/sdk 1.10.2 → 1.11.0

package/lib/contracts/contracts.js

@@ -68,7 +68,7 @@ exports.contractsByNetwork = {
         SUSHISWAP_ROUTER: "0x1b02dA8Cb0d097eB8D57A175b88c7D8b47997506",
         // CURVE
         CURVE_3CRV_POOL: "0x6491f8A62678c90C84b237791d9D7cF21b4D1418",
-        CURVE_FRAX_USDC_POOL: "DEPLOY ME",
+        CURVE_FRAX_USDC_POOL: "0x9C85E4F4061160B6177cad3f72EDfd374Dc8AD88",
         CURVE_STETH_GATEWAY: "0xcD4b22ed0E2aD95d648C6E4c45B38f83D0Cbb654",
         CURVE_FRAX_POOL: token_1.tokenDataByNetwork.Goerli.FRAX3CRV,
         CURVE_LUSD_POOL: token_1.tokenDataByNetwork.Goerli.LUSD3CRV,
@@ -85,7 +85,7 @@ exports.contractsByNetwork = {
         // CONVEX
         CONVEX_BOOSTER: "0xbd1D47bbF57F49D9a72ca7f879A096d3abDF4c40",
         CONVEX_3CRV_POOL: "0xfB9b98558c3d6851291Fbf74fa7F022a787cD795",
-        CONVEX_FRAX_USDC_POOL: "DEPLOY ME",
+        CONVEX_FRAX_USDC_POOL: "0xAc22d4495166c945cc91FDB611b7515eBbfd60c0",
         CONVEX_STECRV_POOL: "0xd9de8eA4289e7a4458Bebad8c31bb7576f1C2B72",
         CONVEX_SUSD_POOL: "0x85825316be95FBb3F6B5a2Dd9f1eb9577803e441",
         CONVEX_FRAX3CRV_POOL: "0x08513eA45fdd7A9cFC33702f722090a182e4a101",

package/lib/core/constants.d.ts

@@ -16,8 +16,6 @@ export declare const PRICE_DECIMALS: BigNumber;
 export declare const SECONDS_PER_YEAR: number;
 export declare const PERCENTAGE_DECIMALS = 100;
 export declare const PERCENTAGE_FACTOR = 10000;
-export declare const LIQUIDATION_DISCOUNTED_SUM = 9500;
-export declare const UNDERLYING_TOKEN_LIQUIDATION_THRESHOLD = 9300;
 export declare const timeRanges: Record<string, number>;
 export declare const LEVERAGE_DECIMALS = 100;
 export declare const SLIPPAGE_DECIMALS = 100;

package/lib/core/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DUMB_ADDRESS4 = exports.DUMB_ADDRESS3 = exports.DUMB_ADDRESS2 = exports.DUMB_ADDRESS = exports.ADDRESS_0X0 = exports.SLIPPAGE_DECIMALS = exports.LEVERAGE_DECIMALS = exports.timeRanges = exports.UNDERLYING_TOKEN_LIQUIDATION_THRESHOLD = exports.LIQUIDATION_DISCOUNTED_SUM = exports.PERCENTAGE_FACTOR = exports.PERCENTAGE_DECIMALS = exports.SECONDS_PER_YEAR = exports.PRICE_DECIMALS = exports.PRICE_DECIMALS_POW = exports.WAD = exports.WAD_DECIMALS_POW = exports.halfRAY = exports.RAY = exports.RAY_DECIMALS_POW = exports.getNetworkType = exports.HARDHAT_NETWORK = exports.LOCAL_NETWORK = exports.GOERLI_NETWORK = exports.MAINNET_NETWORK = exports.MAX_INT = void 0;
+exports.DUMB_ADDRESS4 = exports.DUMB_ADDRESS3 = exports.DUMB_ADDRESS2 = exports.DUMB_ADDRESS = exports.ADDRESS_0X0 = exports.SLIPPAGE_DECIMALS = exports.LEVERAGE_DECIMALS = exports.timeRanges = exports.PERCENTAGE_FACTOR = exports.PERCENTAGE_DECIMALS = exports.SECONDS_PER_YEAR = exports.PRICE_DECIMALS = exports.PRICE_DECIMALS_POW = exports.WAD = exports.WAD_DECIMALS_POW = exports.halfRAY = exports.RAY = exports.RAY_DECIMALS_POW = exports.getNetworkType = exports.HARDHAT_NETWORK = exports.LOCAL_NETWORK = exports.GOERLI_NETWORK = exports.MAINNET_NETWORK = exports.MAX_INT = void 0;
 var ethers_1 = require("ethers");
 exports.MAX_INT = ethers_1.BigNumber.from("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
 exports.MAINNET_NETWORK = 1;
@@ -29,8 +29,8 @@ exports.PRICE_DECIMALS = ethers_1.BigNumber.from(10).pow(exports.PRICE_DECIMALS_
 exports.SECONDS_PER_YEAR = 365 * 24 * 3600;
 exports.PERCENTAGE_DECIMALS = 100;
 exports.PERCENTAGE_FACTOR = 1e4;
-exports.LIQUIDATION_DISCOUNTED_SUM = 9500;
-exports.UNDERLYING_TOKEN_LIQUIDATION_THRESHOLD = 9300;
+// export const LIQUIDATION_DISCOUNTED_SUM = 9600;
+// export const UNDERLYING_TOKEN_LIQUIDATION_THRESHOLD = 9400;
 exports.timeRanges = {
     // "1H": 3600,
     "1D": 3600 * 24,

package/lib/core/creditAccount.d.ts

@@ -32,6 +32,7 @@ export declare class CreditAccountData {
     balancesSorted(prices: Record<string, BigNumber>, tokens: Record<string, TokenData>): Array<Asset>;
     calcBorrowAmountPlusInterestRate(currentCumulativeIndex: BigNumber): BigNumber;
     updateHealthFactor(creditManager: CreditManagerData, currentCumulativeIndex: BigNumber, priceOracle: PriceOracleData): void;
+    calcMaxIncreaseBorrow(cm: CreditManagerData): BigNumber;
     get id(): string;
     hash(): string;
     static hash(creditManager: string, borrower: string): string;

package/lib/core/creditAccount.js

@@ -76,6 +76,17 @@ var CreditAccountData = /** @class */ (function () {
             .div(this.calcBorrowAmountPlusInterestRate(currentCumulativeIndex))
             .toNumber();
     };
+    CreditAccountData.prototype.calcMaxIncreaseBorrow = function (cm) {
+        var underlyingTokenLT = cm.liquidationDiscount - cm.feeLiquidation;
+        var minHealthFactor = cm.maxLeverageFactor > 0
+            ? Math.floor((underlyingTokenLT * (cm.maxLeverageFactor + constants_1.LEVERAGE_DECIMALS)) /
+                cm.maxLeverageFactor)
+            : constants_1.PERCENTAGE_FACTOR;
+        var result = this.borrowedAmountPlusInterest
+            .mul(this.healthFactor - minHealthFactor)
+            .div(minHealthFactor - underlyingTokenLT);
+        return result.isNegative() ? ethers_1.BigNumber.from(0) : result;
+    };
     Object.defineProperty(CreditAccountData.prototype, "id", {
         get: function () {
             return this.creditManager;

package/lib/core/creditManager.d.ts

@@ -56,7 +56,6 @@ export declare class CreditManagerStat extends CreditManagerData {
     readonly totalLosses: BigNumber;
     constructor(payload: CreditManagerStatPayload);
 }
-export declare function calcMaxIncreaseBorrow(healthFactor: number, borrowAmountPlusInterest: BigNumber, maxLeverageFactor: number): BigNumber;
 export interface CalcHealthFactorProps {
     assets: Array<Asset>;
     prices: Record<string, BigNumber>;

package/lib/core/creditManager.js

@@ -26,7 +26,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calcHealthFactor = exports.calcMaxIncreaseBorrow = exports.CreditManagerStat = exports.CreditManagerData = void 0;
+exports.calcHealthFactor = exports.CreditManagerStat = exports.CreditManagerData = void 0;
 var ethers_1 = require("ethers");
 var txParser_1 = require("../parsers/txParser");
 var decimals_1 = require("../tokens/decimals");
@@ -173,18 +173,6 @@ var CreditManagerStat = /** @class */ (function (_super) {
     return CreditManagerStat;
 }(CreditManagerData));
 exports.CreditManagerStat = CreditManagerStat;
-function calcMaxIncreaseBorrow(healthFactor, borrowAmountPlusInterest, maxLeverageFactor) {
-    var minHealthFactor = maxLeverageFactor > 0
-        ? Math.floor((constants_1.UNDERLYING_TOKEN_LIQUIDATION_THRESHOLD *
-            (maxLeverageFactor + constants_1.LEVERAGE_DECIMALS)) /
-            maxLeverageFactor)
-        : 10000;
-    var result = borrowAmountPlusInterest
-        .mul(healthFactor - minHealthFactor)
-        .div(minHealthFactor - constants_1.UNDERLYING_TOKEN_LIQUIDATION_THRESHOLD);
-    return result.isNegative() ? ethers_1.BigNumber.from(0) : result;
-}
-exports.calcMaxIncreaseBorrow = calcMaxIncreaseBorrow;
 function calcHealthFactor(_a) {
     var assets = _a.assets, prices = _a.prices, liquidationThresholds = _a.liquidationThresholds, underlyingToken = _a.underlyingToken, borrowed = _a.borrowed;
     var assetLTMoney = assets.reduce(function (acc, _a) {

package/lib/core/creditManager.spec.js

@@ -127,18 +127,34 @@ describe("CreditManager calcHealthFactor test", function () {
         (0, chai_1.expect)(result).to.be.eq(9444);
     });
 });
-describe("CreditManager calcMaxIncreaseBorrow test", function () {
-    it("health max increase borrow is zero if hf < 1", function () {
-        var result = (0, creditManager_1.calcMaxIncreaseBorrow)(9999, ethers_1.BigNumber.from("156522834253690396032546"), 0);
-        (0, chai_1.expect)(result.toString()).to.be.eq(ethers_1.BigNumber.from(0).toString());
-    });
-    it("health max increase borrow is calculated correctly", function () {
-        var result = (0, creditManager_1.calcMaxIncreaseBorrow)(defaultCA.healthFactor, ethers_1.BigNumber.from("156522834253690396032546"), 0);
-        (0, chai_1.expect)(result.toString()).to.be.eq(ethers_1.BigNumber.from("54559387939857795188487").toString());
-    });
-    it("health max increase borrow is calculated correctly (low hf, high debt)", function () {
-        var loweHf = 10244;
-        var result = (0, creditManager_1.calcMaxIncreaseBorrow)(loweHf, ethers_1.BigNumber.from("54782991988791638611392"), 0);
-        (0, chai_1.expect)(result.toString()).to.be.eq(ethers_1.BigNumber.from("19095785778950228315970").toString());
-    });
-});
+// describe("CreditManager calcMaxIncreaseBorrow test", () => {
+//   it("health max increase borrow is zero if hf < 1", () => {
+//     const result = calcMaxIncreaseBorrow(
+//       9999,
+//       BigNumber.from("156522834253690396032546"),
+//       0,
+//     );
+//     expect(result.toString()).to.be.eq(BigNumber.from(0).toString());
+//   });
+//   it("health max increase borrow is calculated correctly", () => {
+//     const result = calcMaxIncreaseBorrow(
+//       defaultCA.healthFactor,
+//       BigNumber.from("156522834253690396032546"),
+//       0,
+//     );
+//     expect(result.toString()).to.be.eq(
+//       BigNumber.from("54559387939857795188487").toString(),
+//     );
+//   });
+// it("health max increase borrow is calculated correctly (low hf, high debt)", () => {
+//   const loweHf = 10244;
+//   const result = calcMaxIncreaseBorrow(
+//     loweHf,
+//     BigNumber.from("54782991988791638611392"),
+//     0,
+//   );
+//   expect(result.toString()).to.be.eq(
+//     BigNumber.from("19095785778950228315970").toString(),
+//   );
+// });
+// });

package/lib/tokens/token.js

@@ -130,7 +130,7 @@ exports.tokenDataByNetwork = {
         yvCurve_FRAX: "0x43d45AEf2BAb5fa79e3bBDb2dB7E4443B8123C8f",
         // CURVE LP TOKENS
         "3Crv": "0xb2f394A64966a8892a43CcfBBD48D28bC58Aeb67",
-        crvFRAX: "DEPLOY ME",
+        crvFRAX: "0xBE72A443c81Ca75B96039C68B335F1f8c6bA48E9",
         steCRV: "0xf5c5e39F56fF90C0F63a97F3c77779eF495c1faD",
         crvPlain3andSUSD: "0xC3d328CCA12347A31126d891D16fe8C5466625a5",
         gusd3CRV: "0xbD919fcC47ae2b5Cc2fe646971aCcB1e88843DC5",
@@ -138,7 +138,7 @@ exports.tokenDataByNetwork = {
         LUSD3CRV: "0x348B1846b87cA12D23A9A4E73B1CfAc2Aad49cf4",
         // CONVEX LP TOKENS
         cvx3Crv: "0xe12bFD868a81D1AD147731D0eC164d9C4A397FCd",
-        cvxcrvFRAX: "DEPLOY ME",
+        cvxcrvFRAX: "0x68345E6C192f97A7334a96ceda94e2486c08Fa0c",
         cvxsteCRV: "0xF0258e3527726f641056a2F7DA08637a1d67422E",
         cvxcrvPlain3andSUSD: "0xaB54a40e7Fd2aD82c07958BF6AA3395CEAb078b5",
         cvxFRAX3CRV: "0x17181501B6986CE1e4efD9A9Df9975aD24b0c543",

package/package.json

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