@gearbox-protocol/sdk 1.26.0 → 1.26.2

package/lib/apy/curveAPY.js

@@ -52,7 +52,7 @@ async function getCurveAPY() {
             ...cryptoPoolData.map(p => [p.id, p]),
             ...factoryTricryptoPoolData.map(p => [p.id, p]),
         ]);
-        const curveAPY = (0, mappers_1.objectEntries)(APY_DICTIONARY).reduce((acc, [curveSymbol, poolId]) => {
+        const curveAPY = mappers_1.TypedObjectUtils.entries(APY_DICTIONARY).reduce((acc, [curveSymbol, poolId]) => {
             const { baseApy, crvApy } = apys[poolId] || {};
             if (baseApy === undefined)
                 console.warn(`No base apy for: ${curveSymbol}, ${poolId}`);

package/lib/apy/yearnAPY.js

@@ -19,7 +19,7 @@ async function getYearnAPY() {
             acc[d.symbol.toLowerCase()] = d;
             return acc;
         }, {});
-        const yearnAPY = (0, mappers_1.objectEntries)(yearn_1.yearnTokens).reduce((acc, [yearnSymbol]) => {
+        const yearnAPY = mappers_1.TypedObjectUtils.entries(yearn_1.yearnTokens).reduce((acc, [yearnSymbol]) => {
             const { apy } = dataBySymbol[transformSymbol(yearnSymbol)] || {};
             const { net_apy: netApy } = apy || {};
             acc[yearnSymbol] = (0, formatter_1.toBN)((netApy / RESPONSE_DECIMALS).toString(), constants_1.WAD_DECIMALS_POW);

package/lib/contracts/contracts.js

@@ -483,9 +483,11 @@ exports.contractParams = {
         type: adapters_1.AdapterInterface.BALANCER_VAULT,
     },
 };
-exports.contractsByAddress = (0, mappers_1.objectEntries)(exports.contractsByNetwork).reduce((acc, [, contracts]) => ({
+exports.contractsByAddress = mappers_1.TypedObjectUtils.entries(exports.contractsByNetwork).reduce((acc, [, contracts]) => ({
     ...acc,
-    ...(0, mappers_1.filterEmptyKeys)((0, mappers_1.keyToLowercase)((0, mappers_1.swapKeyValue)(contracts))),
+    ...mappers_1.TypedObjectUtils.fromEntries(mappers_1.TypedObjectUtils.entries(contracts)
+        .map(([k, v]) => [v.toLowerCase(), k])
+        .filter(k => !!k)),
 }), {});
 const isSupportedContract = (t) => typeof t === "string" && !!exports.contractParams[t];
 exports.isSupportedContract = isSupportedContract;

package/lib/contracts/contractsRegister.js

@@ -59,7 +59,7 @@ const contractNames = Object.entries(contracts_1.contractsByAddress).reduce((acc
     return { ...acc, [addr]: params.name };
 }, {});
 const contractsFullList = {
-    ...(0, mappers_1.keyToLowercase)(exports.deployedContracts),
+    ...mappers_1.TypedObjectUtils.keyToLowercase(exports.deployedContracts),
     ...contractNames,
 };
 function getContractName(address) {

package/lib/core/creditAccount.d.ts

@@ -54,7 +54,7 @@ export declare class CreditAccountData {
     isForbidden(token: string): boolean;
     updateHealthFactor(creditManager: CreditManagerData, currentCumulativeIndex: bigint, priceOracle: PriceOracleData): void;
     static isTokenEnabled(index: number, enabledTokenMask: bigint): boolean;
-    static calcMaxIncreaseBorrow(healthFactor: number, borrowAmountPlusInterest: bigint, maxLeverageFactor: number, underlyingLT: number, minHf?: bigint): bigint;
+    static calcMaxDebtIncrease(healthFactor: number, borrowAmountPlusInterest: bigint, underlyingLT: number, minHf?: number): bigint;
     static calcOverallAPY({ caAssets, lpAPY, prices, totalValue, debt, borrowRate, underlyingToken, }: CalcOverallAPYProps): number | undefined;
     hash(): string;
     static hash(creditManager: string, borrower: string): string;

package/lib/core/creditAccount.js

@@ -117,13 +117,9 @@ class CreditAccountData {
     static isTokenEnabled(index, enabledTokenMask) {
         return ((2n ** BigInt(index)) & enabledTokenMask) !== 0n;
     }
-    static calcMaxIncreaseBorrow(healthFactor, borrowAmountPlusInterest, maxLeverageFactor, underlyingLT, minHf = constants_1.PERCENTAGE_FACTOR) {
-        const minHealthFactor = maxLeverageFactor > 0
-            ? Math.floor((underlyingLT * (maxLeverageFactor + Number(constants_1.LEVERAGE_DECIMALS))) /
-                maxLeverageFactor)
-            : Number(minHf);
-        const result = (borrowAmountPlusInterest * BigInt(healthFactor - minHealthFactor)) /
-            BigInt(minHealthFactor - underlyingLT);
+    static calcMaxDebtIncrease(healthFactor, borrowAmountPlusInterest, underlyingLT, minHf = Number(constants_1.PERCENTAGE_FACTOR)) {
+        const result = (borrowAmountPlusInterest * BigInt(healthFactor - minHf)) /
+            BigInt(minHf - underlyingLT);
         return result < 0 ? 0n : result;
     }
     static calcOverallAPY({ caAssets, lpAPY, prices, totalValue, debt, borrowRate, underlyingToken, }) {

package/lib/core/creditAccount.spec.js

@@ -122,16 +122,16 @@ describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
 });
 describe("CreditAccount calcMaxIncreaseBorrow test", () => {
     it("health max increase borrow is zero if hf < 1", () => {
-        const result = creditAccount_1.CreditAccountData.calcMaxIncreaseBorrow(9999, BigInt("156522834253690396032546"), 0, 9300);
+        const result = creditAccount_1.CreditAccountData.calcMaxDebtIncrease(9999, BigInt("156522834253690396032546"), 9300);
         (0, chai_1.expect)(result.toString()).to.be.eq("0");
     });
     it("health max increase borrow is calculated correctly", () => {
-        const result = creditAccount_1.CreditAccountData.calcMaxIncreaseBorrow(10244, BigInt("156522834253690396032546"), 0, 9300);
+        const result = creditAccount_1.CreditAccountData.calcMaxDebtIncrease(10244, BigInt("156522834253690396032546"), 9300);
         (0, chai_1.expect)(result.toString()).to.be.eq("54559387939857795188487");
     });
     it("health max increase borrow is calculated correctly (low hf, high debt)", () => {
         const loweHf = 10244;
-        const result = creditAccount_1.CreditAccountData.calcMaxIncreaseBorrow(loweHf, BigInt("54782991988791638611392"), 0, 9300);
+        const result = creditAccount_1.CreditAccountData.calcMaxDebtIncrease(loweHf, BigInt("54782991988791638611392"), 9300);
         (0, chai_1.expect)(result.toString()).to.be.eq("19095785778950228315970");
     });
 });

package/lib/core/creditSession.d.ts

@@ -43,6 +43,8 @@ export declare class CreditSession {
     readonly spotUserFunds: bigint;
     readonly cvxUnclaimedRewards: Array<AssetWithView>;
     readonly balances: Array<AssetWithView>;
+    readonly forbiddenTokens: Record<string, true>;
+    readonly disabledTokens: Record<string, true>;
     constructor(payload: CreditSessionPayload);
 }
 export declare class CreditSessionFiltered {

package/lib/core/creditSession.js

@@ -16,7 +16,7 @@ exports.CREDIT_SESSION_STATUS_BY_ID = {
     4: "liquidateExpired",
     5: "liquidatePaused",
 };
-exports.CREDIT_SESSION_ID_BY_STATUS = (0, mappers_1.swapKeyValue)(exports.CREDIT_SESSION_STATUS_BY_ID);
+exports.CREDIT_SESSION_ID_BY_STATUS = mappers_1.TypedObjectUtils.swapKeyValue(exports.CREDIT_SESSION_STATUS_BY_ID);
 class CreditSession {
     id;
     status;
@@ -58,7 +58,9 @@ class CreditSession {
     spotTotalValue;
     spotUserFunds;
     cvxUnclaimedRewards;
-    balances;
+    balances = [];
+    forbiddenTokens = {};
+    disabledTokens = {};
     constructor(payload) {
         this.id = (payload.id || "").toLowerCase();
         this.status = exports.CREDIT_SESSION_STATUS_BY_ID[payload.status || 0];
@@ -105,12 +107,19 @@ class CreditSession {
                 balanceView: balance.f.toString(),
             };
         });
-        this.balances = Object.entries(payload.balances || {}).map(([token, balance]) => {
-            return {
+        Object.entries(payload.balances || {}).forEach(([t, b]) => {
+            const token = t.toLowerCase();
+            if (!b.isEnabled) {
+                this.disabledTokens[token] = true;
+            }
+            if (!b.isAllowed) {
+                this.forbiddenTokens[token] = true;
+            }
+            this.balances.push({
                 token: token.toLowerCase(),
-                balance: (0, formatter_1.toBigInt)(balance.BI || 0),
-                balanceView: balance.F.toString(),
-            };
+                balance: (0, formatter_1.toBigInt)(b.BI || 0),
+                balanceView: b.F.toString(),
+            });
         });
     }
 }

package/lib/index.d.ts

@@ -56,7 +56,7 @@ export { TokenType } from "./tokens/tokenType";
 export * from "./tokens/yearn";
 export * from "./utils/errors";
 export { getPoolTokens, getUnderlyingToken } from "./utils/extracter";
-export { keyToLowercase, objectEntries, swapKeyValue } from "./utils/mappers";
+export * from "./utils/mappers";
 export * from "./utils/multicall";
 export * from "./utils/price";
 export { callRepeater } from "./utils/repeater";

package/lib/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.callRepeater = exports.swapKeyValue = exports.objectEntries = exports.keyToLowercase = exports.getUnderlyingToken = exports.getPoolTokens = exports.TokenType = exports.AdapterInterface = void 0;
+exports.callRepeater = exports.getUnderlyingToken = exports.getPoolTokens = exports.TokenType = exports.AdapterInterface = void 0;
 __exportStar(require("./contracts/contracts"), exports);
 __exportStar(require("./contracts/protocols"), exports);
 __exportStar(require("./core/adapter"), exports);
@@ -78,10 +78,7 @@ __exportStar(require("./utils/errors"), exports);
 var extracter_1 = require("./utils/extracter");
 Object.defineProperty(exports, "getPoolTokens", { enumerable: true, get: function () { return extracter_1.getPoolTokens; } });
 Object.defineProperty(exports, "getUnderlyingToken", { enumerable: true, get: function () { return extracter_1.getUnderlyingToken; } });
-var mappers_1 = require("./utils/mappers");
-Object.defineProperty(exports, "keyToLowercase", { enumerable: true, get: function () { return mappers_1.keyToLowercase; } });
-Object.defineProperty(exports, "objectEntries", { enumerable: true, get: function () { return mappers_1.objectEntries; } });
-Object.defineProperty(exports, "swapKeyValue", { enumerable: true, get: function () { return mappers_1.swapKeyValue; } });
+__exportStar(require("./utils/mappers"), exports);
 __exportStar(require("./utils/multicall"), exports);
 __exportStar(require("./utils/price"), exports);
 var repeater_1 = require("./utils/repeater");

package/lib/parsers/txParser.js

@@ -58,7 +58,7 @@ class TxParser {
         }
     }
     static addContracts(network) {
-        (0, mappers_1.objectEntries)(contracts_1.contractParams).forEach(([contract, contractData]) => {
+        mappers_1.TypedObjectUtils.entries(contracts_1.contractParams).forEach(([contract, contractData]) => {
             const address = contracts_1.contractsByNetwork[network][contract];
             TxParser.chooseContractParser(address, contract, contractData.type, true);
             if (contractData.type === adapters_1.AdapterInterface.CONVEX_V1_BASE_REWARD_POOL) {
@@ -77,7 +77,7 @@ class TxParser {
         TxParser._addParser(creditFacade, new creditFacadeParser_1.CreditFacadeParser(underlying));
     }
     static addTokens(network) {
-        (0, mappers_1.objectEntries)(token_1.tokenDataByNetwork[network]).forEach(([s, t]) => {
+        mappers_1.TypedObjectUtils.entries(token_1.tokenDataByNetwork[network]).forEach(([s, t]) => {
             if (s === "STETH") {
                 TxParser._addParser(t, new lidoSTETHParser_1.LidoSTETHParser(s));
             }

package/lib/tokens/token.js

@@ -222,9 +222,14 @@ exports.tokenDataByNetwork = {
         GEAR: constants_1.NOT_DEPLOYED,
     },
 };
-exports.tokenSymbolByAddress = (0, mappers_1.objectEntries)(exports.tokenDataByNetwork).reduce((acc, [, tokens]) => ({
+exports.tokenSymbolByAddress = mappers_1.TypedObjectUtils.entries(exports.tokenDataByNetwork).reduce((acc, [, tokens]) => ({
     ...acc,
-    ...(0, mappers_1.filterEmptyKeys)((0, mappers_1.keyToLowercase)((0, mappers_1.swapKeyValue)(tokens))),
+    ...{
+        ...acc,
+        ...mappers_1.TypedObjectUtils.fromEntries(mappers_1.TypedObjectUtils.entries(tokens)
+            .map(([k, v]) => [v.toLowerCase(), k])
+            .filter(k => !!k)),
+    },
 }), {});
 const isSupportedToken = (t) => typeof t === "string" && !!exports.supportedTokens[t];
 exports.isSupportedToken = isSupportedToken;

package/lib/utils/mappers.d.ts

@@ -1,7 +1,8 @@
 type SupportedValue = string | number;
-declare const objectEntries: <K extends SupportedValue, T>(o: Record<K, T>) => [K, T][];
-declare const swapKeyValue: <K extends SupportedValue, T extends SupportedValue>(o: Record<K, T>) => Record<T, K>;
-declare const keyToLowercase: <K extends SupportedValue, T>(o: Record<K, T>) => Record<K, T>;
-declare const filterEmptyKeys: <K extends SupportedValue, T>(o: Record<K, T>) => Record<K, T>;
+export declare class TypedObjectUtils {
+    static entries: <K extends SupportedValue, T>(o: Record<K, T>) => [K, T][];
+    static fromEntries: <K extends SupportedValue, T>(o: [K, T][]) => Record<K, T>;
+    static swapKeyValue: <K extends SupportedValue, T extends SupportedValue>(o: Record<K, T>) => Record<T, K>;
+    static keyToLowercase: <K extends SupportedValue, T>(o: Record<K, T>) => Record<K, T>;
+}
 export type { SupportedValue };
-export { filterEmptyKeys, keyToLowercase, objectEntries, swapKeyValue };

package/lib/utils/mappers.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.swapKeyValue = exports.objectEntries = exports.keyToLowercase = exports.filterEmptyKeys = void 0;
-const objectEntries = (o) => Object.entries(o);
-exports.objectEntries = objectEntries;
-const swapKeyValue = (o) => objectEntries(o).reduce((acc, [key, value]) => ({ ...acc, [value]: key }), {});
-exports.swapKeyValue = swapKeyValue;
-const keyToLowercase = (o) => objectEntries(o).reduce((acc, [key, value]) => {
-    const keyTransformed = typeof key === "string" ? key.toLowerCase() : key;
-    return { ...acc, [keyTransformed]: value };
-}, {});
-exports.keyToLowercase = keyToLowercase;
-const filterEmptyKeys = (o) => objectEntries(o).reduce((acc, [key, value]) => (key ? { ...acc, [key]: value } : acc), {});
-exports.filterEmptyKeys = filterEmptyKeys;
+exports.TypedObjectUtils = void 0;
+class TypedObjectUtils {
+    static entries = (o) => Object.entries(o);
+    static fromEntries = (o) => Object.fromEntries(o);
+    static swapKeyValue = (o) => TypedObjectUtils.entries(o).reduce((acc, [key, value]) => ({ ...acc, [value]: key }), {});
+    static keyToLowercase = (o) => TypedObjectUtils.entries(o).reduce((acc, [key, value]) => {
+        const keyTransformed = typeof key === "string" ? key.toLowerCase() : key;
+        return { ...acc, [keyTransformed]: value };
+    }, {});
+}
+exports.TypedObjectUtils = TypedObjectUtils;

package/package.json

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