@gearbox-protocol/sdk 1.10.1 → 1.10.3

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

@@ -69,7 +69,7 @@ exports.tokenDataByNetwork = {
         cvxgusd3CRV: "0x15c2471ef46Fa721990730cfa526BcFb45574576",
         // CONVEX PHANTOM TOKEN ADDRESSES
         stkcvx3Crv: "0x2eD0f32d7C8b0f7EA7E40277C62Fb9C5DE092003",
-        stkcvxcrvFRAX: "DEPLOY ME",
+        stkcvxcrvFRAX: "0xE36cbd724F500353C23297789A5f88fe3d920523",
         stkcvxsteCRV: "0x2210aa245Bf766eE99325c607807A08e636B5173",
         stkcvxFRAX3CRV: "0x2AF29502110080081FDF726dfBf61ABE3bA9Ef3C",
         stkcvxLUSD3CRV: "0x77e6290D1779B606235407fdf37A14D94D0DFB40",

package/package.json

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