@gearbox-protocol/sdk 3.0.0-next.2 → 3.0.0-next.200

package/lib/core/creditManager.d.ts

@@ -1,60 +1,73 @@
-import { ethers, Signer } from "ethers";
 import { MultiCall } from "../pathfinder/core";
-import { ChartsCreditManagerPayload, CreditManagerDataPayload } from "../payload/creditManager";
-import { ICreditManager } from "../types";
+import { ChartsCreditManagerPayload, CreditManagerDataPayload, QuotaInfo } from "../payload/creditManager";
+import { LinearModel } from "../payload/pool";
+import { Asset } from "./assets";
+export type CreditManagerType = "universal" | "trade" | "farm" | "restaking";
 export declare class CreditManagerData {
     readonly address: string;
+    readonly type: CreditManagerType;
     readonly underlyingToken: string;
     readonly pool: string;
-    readonly isWETH: boolean;
-    readonly canBorrow: boolean;
-    readonly borrowRate: number;
-    readonly minAmount: bigint;
-    readonly maxAmount: bigint;
-    readonly maxLeverageFactor: number;
-    readonly availableLiquidity: bigint;
-    readonly collateralTokens: Array<string>;
-    readonly supportedTokens: Record<string, true>;
-    readonly adapters: Record<string, string>;
-    readonly liquidationThresholds: Record<string, bigint>;
-    readonly version: number;
     readonly creditFacade: string;
     readonly creditConfigurator: string;
-    readonly isDegenMode: boolean;
     readonly degenNFT: string;
-    readonly isIncreaseDebtForbidden: boolean;
+    readonly isDegenMode: boolean;
+    readonly version: number;
+    readonly isPaused: boolean;
     readonly forbiddenTokenMask: bigint;
     readonly maxEnabledTokensLength: number;
+    readonly name: string;
+    readonly tier: number;
+    readonly baseBorrowRate: number;
+    readonly minDebt: bigint;
+    readonly maxDebt: bigint;
+    readonly availableToBorrow: bigint;
+    readonly totalDebt: bigint;
+    readonly totalDebtLimit: bigint;
     readonly feeInterest: number;
     readonly feeLiquidation: number;
     readonly liquidationDiscount: number;
     readonly feeLiquidationExpired: number;
     readonly liquidationDiscountExpired: number;
-    readonly totalDebt: {
-        currentTotalDebt: bigint;
-        totalDebtLimit: bigint;
-    } | undefined;
-    readonly isPaused: boolean;
+    readonly collateralTokens: Array<string>;
+    readonly supportedTokens: Record<string, true>;
+    readonly usableTokens: Record<string, true>;
+    readonly adapters: Record<string, string>;
+    readonly contractsByAdapter: Record<string, string>;
+    readonly liquidationThresholds: Record<string, bigint>;
+    readonly quotas: Record<string, QuotaInfo>;
+    readonly interestModel: LinearModel;
     constructor(payload: CreditManagerDataPayload);
-    getContractETH(signer: Signer | ethers.providers.Provider): ICreditManager;
-    contractToAdapter(contractAddress: string): string | undefined;
-    encodeAddCollateral(accountAddress: string, tokenAddress: string, amount: bigint): MultiCall;
-    encodeIncreaseDebt(amount: bigint): MultiCall;
-    encodeDecreaseDebt(amount: bigint): MultiCall;
-    encodeEnableToken(token: string): MultiCall;
-    encodeDisableToken(token: string): MultiCall;
-    static withdrawAllAndUnwrap_Convex(address: string, claim: boolean): MultiCall;
-    validateOpenAccount(collateral: bigint, debt: bigint): true;
-    protected validateOpenAccountV1(collateral: bigint, debt: bigint): true;
-    protected validateOpenAccountV2(debt: bigint): true;
     get id(): string;
+    isQuoted(token: string): boolean;
+    encodeAddCollateralV2(tokenAddress: string, amount: bigint): MultiCall;
+    encodeAddCollateralV3(tokenAddress: string, amount: bigint): MultiCall;
+    encodeAddCollateralWithPermitV3(tokenAddress: string, amount: bigint, deadline: bigint, v: bigint | number, r: string, s: string): MultiCall;
+    encodeIncreaseDebtV2(amount: bigint): MultiCall;
+    encodeIncreaseDebtV3(amount: bigint): MultiCall;
+    encodeDecreaseDebtV2(amount: bigint): MultiCall;
+    encodeDecreaseDebtV3(amount: bigint): MultiCall;
+    encodeEnableTokenV2(token: string): MultiCall;
+    encodeEnableTokenV3(token: string): MultiCall;
+    encodeDisableTokenV2(token: string): MultiCall;
+    encodeDisableTokenV3(token: string): MultiCall;
+    encodeRevertIfReceivedLessThanV2(assets: Array<Asset>): MultiCall;
+    encodeUpdateQuotaV3(token: string, quotaChange: bigint, minQuota: bigint): MultiCall;
+    encodeWithdrawCollateralV3(token: string, amount: bigint, to: string): MultiCall;
+    static withdrawAllAndUnwrap_Convex(address: string, claim: boolean): MultiCall;
+    encodeOnDemandPriceUpdateV3(token: string, reserve: boolean, data: string): MultiCall;
+    static getTier(name: string): number;
+    static getType(name: string): CreditManagerType;
 }
 export declare class ChartsCreditManagerData {
-    readonly id: string;
     readonly address: string;
     readonly underlyingToken: string;
+    readonly configurator: string;
+    readonly creditFacade: string;
     readonly pool: string;
-    readonly isWETH: boolean;
+    readonly version: number;
+    readonly name: string;
+    readonly tier: number;
     readonly borrowRate: number;
     readonly borrowRateOld: number;
     readonly borrowRateChange: number;
@@ -62,7 +75,6 @@ export declare class ChartsCreditManagerData {
     readonly maxAmount: bigint;
     readonly maxLeverageFactor: number;
     readonly availableLiquidity: bigint;
-    readonly version: number;
     readonly feeInterest: number;
     readonly feeLiquidation: number;
     readonly feeLiquidationExpired: number;
@@ -74,6 +86,7 @@ export declare class ChartsCreditManagerData {
     readonly totalBorrowed: bigint;
     readonly totalBorrowedOld: bigint;
     readonly totalBorrowedChange: number;
+    readonly totalDebtLimit: bigint;
     readonly totalRepaid: bigint;
     readonly totalProfit: bigint;
     readonly totalProfitOld: bigint;

package/lib/core/creditManager.js

@@ -4,189 +4,256 @@ exports.ChartsCreditManagerData = exports.CreditManagerData = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const txParser_1 = require("../parsers/txParser");
 const types_1 = require("../types");
-const formatter_1 = require("../utils/formatter");
-const errors_1 = require("./errors");
 class CreditManagerData {
     address;
+    type;
     underlyingToken;
     pool;
-    isWETH;
-    canBorrow;
-    borrowRate;
-    minAmount;
-    maxAmount;
-    maxLeverageFactor; // for V1 only
-    availableLiquidity;
-    collateralTokens = [];
-    supportedTokens = {};
-    adapters;
-    liquidationThresholds;
-    version;
     creditFacade; // V2 only: address of creditFacade
     creditConfigurator; // V2 only: address of creditFacade
-    isDegenMode; // V2 only: true if contract is in Degen mode
     degenNFT; // V2 only: degenNFT, address(0) if not in degen mode
-    isIncreaseDebtForbidden; // V2 only: true if increasing debt is forbidden
+    isDegenMode;
+    version;
+    isPaused;
     forbiddenTokenMask; // V2 only: mask which forbids some particular tokens
     maxEnabledTokensLength;
+    name;
+    tier;
+    baseBorrowRate;
+    minDebt;
+    maxDebt;
+    availableToBorrow;
+    totalDebt;
+    totalDebtLimit;
     feeInterest;
     feeLiquidation;
     liquidationDiscount;
     feeLiquidationExpired;
     liquidationDiscountExpired;
-    totalDebt;
-    isPaused = false;
+    collateralTokens = [];
+    supportedTokens = {};
+    usableTokens = {};
+    adapters = {};
+    contractsByAdapter = {};
+    liquidationThresholds;
+    quotas;
+    interestModel;
     constructor(payload) {
         this.address = payload.addr.toLowerCase();
         this.underlyingToken = payload.underlying.toLowerCase();
+        this.type = CreditManagerData.getType(payload.name || "");
+        this.name = payload.name;
         this.pool = payload.pool.toLowerCase();
-        this.isWETH = payload.isWETH;
-        this.canBorrow = payload.canBorrow;
-        this.maxEnabledTokensLength = payload.maxEnabledTokensLength;
-        this.borrowRate = Number(((0, formatter_1.toBigInt)(payload.borrowRate || 0) *
-            ((0, formatter_1.toBigInt)(payload.feeInterest || 0) + sdk_gov_1.PERCENTAGE_FACTOR) *
+        this.tier = CreditManagerData.getTier(payload.name);
+        this.creditFacade = payload.creditFacade.toLowerCase();
+        this.creditConfigurator = payload.creditConfigurator.toLowerCase();
+        this.degenNFT = payload.degenNFT.toLowerCase();
+        this.isDegenMode = payload.isDegenMode;
+        this.version = Number(payload.cfVersion);
+        this.isPaused = payload.isPaused;
+        this.forbiddenTokenMask = payload.forbiddenTokenMask;
+        this.maxEnabledTokensLength = Number(payload.maxEnabledTokensLength);
+        this.baseBorrowRate = Number((payload.baseBorrowRate *
+            (payload.feeInterest + sdk_gov_1.PERCENTAGE_FACTOR) *
             sdk_gov_1.PERCENTAGE_DECIMALS) /
             sdk_gov_1.RAY);
-        this.minAmount = (0, formatter_1.toBigInt)(payload.minAmount || 0);
-        this.maxAmount = (0, formatter_1.toBigInt)(payload.maxAmount || 0);
-        this.maxLeverageFactor = Number((0, formatter_1.toBigInt)(payload.maxLeverageFactor || 0));
-        this.availableLiquidity = (0, formatter_1.toBigInt)(payload.availableLiquidity || 0);
-        payload.collateralTokens.forEach(t => {
-            const tLc = t.toLowerCase();
-            this.collateralTokens.push(tLc);
-            this.supportedTokens[tLc] = true;
+        this.minDebt = payload.minDebt;
+        this.maxDebt = payload.maxDebt;
+        this.availableToBorrow = payload.availableToBorrow;
+        this.totalDebt = payload.totalDebt;
+        this.totalDebtLimit = payload.totalDebtLimit;
+        this.feeInterest = Number(payload.feeInterest);
+        this.feeLiquidation = Number(payload.feeLiquidation);
+        this.liquidationDiscount = Number(payload.liquidationDiscount);
+        this.feeLiquidationExpired = Number(payload.feeLiquidationExpired);
+        this.liquidationDiscountExpired = Number(payload.liquidationDiscountExpired);
+        payload.adapters.forEach(a => {
+            const contractLc = a.targetContract.toLowerCase();
+            const adaptertLc = a.adapter.toLowerCase();
+            this.adapters[contractLc] = adaptertLc;
+            this.contractsByAdapter[adaptertLc] = contractLc;
         });
-        this.adapters = payload.adapters.reduce((acc, { allowedContract, adapter }) => ({
-            ...acc,
-            [allowedContract.toLowerCase()]: adapter.toLowerCase(),
-        }), {});
         this.liquidationThresholds = payload.liquidationThresholds.reduce((acc, threshold, index) => {
             const address = payload.collateralTokens[index];
             if (address)
-                acc[address.toLowerCase()] = (0, formatter_1.toBigInt)(threshold || 0);
+                acc[address.toLowerCase()] = threshold;
             return acc;
         }, {});
-        this.version = payload.version;
-        this.creditFacade = payload.creditFacade.toLowerCase();
-        this.creditConfigurator = payload.creditConfigurator.toLowerCase();
-        this.isDegenMode = payload.isDegenMode;
-        this.degenNFT = payload.degenNFT.toLowerCase();
-        this.isIncreaseDebtForbidden = payload.isIncreaseDebtForbidden;
-        this.forbiddenTokenMask = (0, formatter_1.toBigInt)(payload.forbiddenTokenMask || 0);
-        this.feeInterest = payload.feeInterest;
-        this.feeLiquidation = payload.feeLiquidation;
-        this.liquidationDiscount = payload.liquidationDiscount;
-        this.feeLiquidationExpired = payload.feeLiquidationExpired;
-        this.liquidationDiscountExpired = payload.liquidationDiscountExpired;
-        this.totalDebt = payload.totalDebt
-            ? {
-                totalDebtLimit: (0, formatter_1.toBigInt)(payload.totalDebt.totalDebtLimit),
-                currentTotalDebt: (0, formatter_1.toBigInt)(payload.totalDebt.currentTotalDebt),
-            }
-            : undefined;
+        this.quotas = payload.quotas.reduce((acc, q) => {
+            acc[q.token.toLowerCase()] = {
+                token: q.token.toLowerCase(),
+                rate: q.rate * sdk_gov_1.PERCENTAGE_DECIMALS,
+                quotaIncreaseFee: q.quotaIncreaseFee,
+                totalQuoted: q.totalQuoted,
+                limit: q.limit,
+                isActive: q.isActive,
+            };
+            return acc;
+        }, {});
+        this.interestModel = {
+            interestModel: payload.lirm.interestModel.toLowerCase(),
+            U_1: payload.lirm.U_1,
+            U_2: payload.lirm.U_2,
+            R_base: payload.lirm.R_base,
+            R_slope1: payload.lirm.R_slope1,
+            R_slope2: payload.lirm.R_slope2,
+            R_slope3: payload.lirm.R_slope3,
+            version: Number(payload?.lirm?.version),
+            isBorrowingMoreU2Forbidden: payload?.lirm?.isBorrowingMoreU2Forbidden,
+        };
+        payload.collateralTokens.forEach(t => {
+            const tLc = t.toLowerCase();
+            const zeroLt = this.liquidationThresholds[tLc] === 0n;
+            const quotaNotActive = this.quotas[tLc]?.isActive === false;
+            const allowed = !zeroLt && !quotaNotActive;
+            if (allowed)
+                this.usableTokens[tLc] = true;
+            this.collateralTokens.push(tLc);
+            this.supportedTokens[tLc] = true;
+        });
         txParser_1.TxParser.addCreditManager(this.address, this.version);
         if (this.creditFacade !== "" && this.creditFacade !== sdk_gov_1.ADDRESS_0X0) {
-            txParser_1.TxParser.addCreditFacade(this.creditFacade, sdk_gov_1.tokenSymbolByAddress[this.underlyingToken]);
+            txParser_1.TxParser.addCreditFacade(this.creditFacade, sdk_gov_1.tokenSymbolByAddress[this.underlyingToken], this.version);
             txParser_1.TxParser.addAdapters(payload.adapters.map(a => ({
                 adapter: a.adapter,
-                contract: a.allowedContract,
+                contract: a.targetContract,
             })));
         }
     }
-    getContractETH(signer) {
-        return types_1.ICreditManager__factory.connect(this.address, signer);
+    get id() {
+        return this.address;
+    }
+    isQuoted(token) {
+        return !!this.quotas[token];
     }
-    contractToAdapter(contractAddress) {
-        return this.adapters[contractAddress];
+    encodeAddCollateralV2(tokenAddress, amount) {
+        return {
+            target: this.creditFacade,
+            callData: types_1.ICreditFacadeV2Extended__factory.createInterface().encodeFunctionData("addCollateral", [tokenAddress, amount]),
+        };
     }
-    encodeAddCollateral(accountAddress, tokenAddress, amount) {
-        if (this.version === 1)
-            throw new Error("Multicall is eligible only for version 2");
+    encodeAddCollateralV3(tokenAddress, amount) {
         return {
             target: this.creditFacade,
-            callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("addCollateral", [accountAddress, tokenAddress, amount]),
+            callData: types_1.ICreditFacadeV3Multicall__factory.createInterface().encodeFunctionData("addCollateral", [tokenAddress, amount]),
         };
     }
-    encodeIncreaseDebt(amount) {
-        if (this.version === 1)
-            throw new Error("Multicall is eligible only for version 2");
+    encodeAddCollateralWithPermitV3(tokenAddress, amount, deadline, v, r, s) {
         return {
             target: this.creditFacade,
-            callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("increaseDebt", [amount]),
+            callData: types_1.ICreditFacadeV3Multicall__factory.createInterface().encodeFunctionData("addCollateralWithPermit", [tokenAddress, amount, deadline, v, r, s]),
         };
     }
-    encodeDecreaseDebt(amount) {
-        if (this.version === 1)
-            throw new Error("Multicall is eligible only for version 2");
+    encodeIncreaseDebtV2(amount) {
         return {
             target: this.creditFacade,
-            callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("decreaseDebt", [amount]),
+            callData: types_1.ICreditFacadeV2Extended__factory.createInterface().encodeFunctionData("increaseDebt", [amount]),
         };
     }
-    encodeEnableToken(token) {
-        if (this.version === 1)
-            throw new Error("Multicall is eligible only for version 2");
+    encodeIncreaseDebtV3(amount) {
         return {
             target: this.creditFacade,
-            callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("enableToken", [token]),
+            callData: types_1.ICreditFacadeV3Multicall__factory.createInterface().encodeFunctionData("increaseDebt", [amount]),
         };
     }
-    encodeDisableToken(token) {
-        if (this.version === 1)
-            throw new Error("Multicall is eligible only for version 2");
+    encodeDecreaseDebtV2(amount) {
         return {
             target: this.creditFacade,
-            callData: types_1.ICreditFacadeExtended__factory.createInterface().encodeFunctionData("disableToken", [token]),
+            callData: types_1.ICreditFacadeV2Extended__factory.createInterface().encodeFunctionData("decreaseDebt", [amount]),
+        };
+    }
+    encodeDecreaseDebtV3(amount) {
+        return {
+            target: this.creditFacade,
+            callData: types_1.ICreditFacadeV3Multicall__factory.createInterface().encodeFunctionData("decreaseDebt", [amount]),
+        };
+    }
+    encodeEnableTokenV2(token) {
+        return {
+            target: this.creditFacade,
+            callData: types_1.ICreditFacadeV2Extended__factory.createInterface().encodeFunctionData("enableToken", [token]),
+        };
+    }
+    encodeEnableTokenV3(token) {
+        return {
+            target: this.creditFacade,
+            callData: types_1.ICreditFacadeV3Multicall__factory.createInterface().encodeFunctionData("enableToken", [token]),
+        };
+    }
+    encodeDisableTokenV2(token) {
+        return {
+            target: this.creditFacade,
+            callData: types_1.ICreditFacadeV2Extended__factory.createInterface().encodeFunctionData("disableToken", [token]),
+        };
+    }
+    encodeDisableTokenV3(token) {
+        return {
+            target: this.creditFacade,
+            callData: types_1.ICreditFacadeV3Multicall__factory.createInterface().encodeFunctionData("disableToken", [token]),
+        };
+    }
+    encodeRevertIfReceivedLessThanV2(assets) {
+        return {
+            target: this.creditFacade,
+            callData: types_1.ICreditFacadeV2Extended__factory.createInterface().encodeFunctionData("revertIfReceivedLessThan", [assets]),
+        };
+    }
+    encodeUpdateQuotaV3(token, quotaChange, minQuota) {
+        return {
+            target: this.creditFacade,
+            callData: types_1.ICreditFacadeV3Multicall__factory.createInterface().encodeFunctionData("updateQuota", [token, quotaChange, minQuota]),
+        };
+    }
+    encodeWithdrawCollateralV3(token, amount, to) {
+        return {
+            target: this.creditFacade,
+            callData: types_1.ICreditFacadeV3Multicall__factory.createInterface().encodeFunctionData("withdrawCollateral", [token, amount, to]),
         };
     }
     static withdrawAllAndUnwrap_Convex(address, claim) {
         return {
             target: address,
-            callData: types_1.IConvexV1BaseRewardPoolAdapter__factory.createInterface().encodeFunctionData("withdrawAllAndUnwrap", [claim]),
+            callData: types_1.IConvexV1BaseRewardPoolAdapter__factory.createInterface().encodeFunctionData("withdrawDiffAndUnwrap", [1, claim]),
         };
     }
-    validateOpenAccount(collateral, debt) {
-        return this.version === 1
-            ? this.validateOpenAccountV1(collateral, debt)
-            : this.validateOpenAccountV2(debt);
-    }
-    validateOpenAccountV1(collateral, debt) {
-        if (collateral < this.minAmount)
-            throw new errors_1.OpenAccountError("amountLessMin", this.minAmount);
-        if (collateral > this.maxAmount)
-            throw new errors_1.OpenAccountError("amountGreaterMax", this.maxAmount);
-        const leverage = Number((debt * sdk_gov_1.LEVERAGE_DECIMALS) / collateral);
-        if (!leverage || leverage < 0)
-            throw new errors_1.OpenAccountError("wrongLeverage", 0n);
-        if (leverage > this.maxLeverageFactor)
-            throw new errors_1.OpenAccountError("leverageGreaterMax", (0, formatter_1.toBigInt)(this.maxLeverageFactor || 0));
-        if (debt > this.availableLiquidity)
-            throw new errors_1.OpenAccountError("insufficientPoolLiquidity", (0, formatter_1.toBigInt)(this.availableLiquidity || 0));
-        return true;
+    encodeOnDemandPriceUpdateV3(token, reserve, data) {
+        return {
+            target: this.creditFacade,
+            callData: types_1.ICreditFacadeV3Multicall__factory.createInterface().encodeFunctionData("onDemandPriceUpdate", [token, reserve, data]),
+        };
     }
-    validateOpenAccountV2(debt) {
-        if (debt < this.minAmount)
-            throw new errors_1.OpenAccountError("amountLessMin", this.minAmount);
-        if (debt > this.maxAmount)
-            throw new errors_1.OpenAccountError("amountGreaterMax", this.maxAmount);
-        if (debt > this.availableLiquidity)
-            throw new errors_1.OpenAccountError("insufficientPoolLiquidity", this.availableLiquidity);
-        if (this.totalDebt &&
-            debt > this.totalDebt.totalDebtLimit - this.totalDebt.currentTotalDebt)
-            throw new errors_1.OpenAccountError("insufficientDebtLimit", this.availableLiquidity);
-        return true;
+    static getTier(name) {
+        const DEFAULT_TIER = 99;
+        const l = name.split(" ") || [];
+        const index = l.findIndex(w => w.toLowerCase() === "tier");
+        if (index < 0)
+            return DEFAULT_TIER;
+        const number = l[index + 1];
+        const n = Number(number || DEFAULT_TIER);
+        return Number.isNaN(n) ? DEFAULT_TIER : n;
     }
-    get id() {
-        return this.address;
+    static getType(name) {
+        const [identity = ""] = name.split(" ") || [];
+        const lc = identity.toLowerCase();
+        if (lc === "farm")
+            return "farm";
+        if (lc === "trade")
+            return "trade";
+        if (lc === "restaking")
+            return "restaking";
+        return "universal";
     }
 }
 exports.CreditManagerData = CreditManagerData;
 class ChartsCreditManagerData {
-    id;
     address;
     underlyingToken;
+    configurator;
+    creditFacade;
     pool;
-    isWETH;
+    version;
+    name;
+    tier;
     borrowRate;
     borrowRateOld;
     borrowRateChange;
@@ -194,7 +261,6 @@ class ChartsCreditManagerData {
     maxAmount;
     maxLeverageFactor; // for V1 only
     availableLiquidity;
-    version;
     feeInterest;
     feeLiquidation;
     feeLiquidationExpired;
@@ -206,6 +272,7 @@ class ChartsCreditManagerData {
     totalBorrowed;
     totalBorrowedOld;
     totalBorrowedChange;
+    totalDebtLimit;
     totalRepaid;
     totalProfit;
     totalProfitOld;
@@ -223,46 +290,49 @@ class ChartsCreditManagerData {
     totalLiquidatedAccountsChange;
     liquidationThresholds;
     constructor(payload) {
-        this.id = (payload.addr || "").toLowerCase();
         this.address = (payload.addr || "").toLowerCase();
         this.underlyingToken = (payload.underlyingToken || "").toLowerCase();
+        this.configurator = (payload.configurator || "").toLowerCase();
+        this.creditFacade = (payload.creditFacade || "").toLowerCase();
         this.pool = (payload.poolAddress || "").toLowerCase();
         this.version = payload.version || 2;
-        this.isWETH = payload.isWeth || false;
-        this.borrowRate = Number(((0, formatter_1.toBigInt)(payload.borrowRate || 0) *
-            ((0, formatter_1.toBigInt)(payload.feeInterest || 0) + sdk_gov_1.PERCENTAGE_FACTOR) *
+        this.name = payload.name || "";
+        this.tier = CreditManagerData.getTier(payload.name || "");
+        this.borrowRate = Number(((0, sdk_gov_1.toBigInt)(payload.borrowRate || 0) *
+            ((0, sdk_gov_1.toBigInt)(payload.feeInterest || 0) + sdk_gov_1.PERCENTAGE_FACTOR) *
             sdk_gov_1.PERCENTAGE_DECIMALS) /
             sdk_gov_1.RAY);
-        this.borrowRateOld = Number(((0, formatter_1.toBigInt)(payload.borrowRateOld || 0) *
-            ((0, formatter_1.toBigInt)(payload.feeInterest || 0) + sdk_gov_1.PERCENTAGE_FACTOR) *
+        this.borrowRateOld = Number(((0, sdk_gov_1.toBigInt)(payload.borrowRateOld || 0) *
+            ((0, sdk_gov_1.toBigInt)(payload.feeInterest || 0) + sdk_gov_1.PERCENTAGE_FACTOR) *
             sdk_gov_1.PERCENTAGE_DECIMALS) /
             sdk_gov_1.RAY);
-        this.borrowRateChange = Number((0, formatter_1.toBigInt)(payload.borrowRate10kBasis || 0) * sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.borrowRateChange = Number((0, sdk_gov_1.toBigInt)(payload.borrowRate10kBasis || 0) * sdk_gov_1.PERCENTAGE_DECIMALS);
         this.maxLeverageFactor = payload.maxLeverageFactor || 0;
         this.feeInterest = payload.feeInterest || 0;
         this.feeLiquidation = payload.feeLiquidation || 0;
         this.feeLiquidationExpired = payload.feeLiquidationExpired || 0;
-        this.minAmount = (0, formatter_1.toBigInt)(payload.minAmount || 0);
-        this.maxAmount = (0, formatter_1.toBigInt)(payload.maxAmount || 0);
-        this.availableLiquidity = (0, formatter_1.toBigInt)(payload.availableLiquidity || 0);
+        this.minAmount = (0, sdk_gov_1.toBigInt)(payload.minAmount || 0);
+        this.maxAmount = (0, sdk_gov_1.toBigInt)(payload.maxAmount || 0);
+        this.availableLiquidity = (0, sdk_gov_1.toBigInt)(payload.availableLiquidity || 0);
         this.availableLiquidityInUSD = payload.availableLiquidityInUSD || 0;
-        this.liquidationThresholds = Object.fromEntries(Object.entries(payload.liquidityThresholds || {}).map(([t, tr]) => [
-            t.toLowerCase(),
-            BigInt(tr),
-        ]));
-        this.totalBorrowed = (0, formatter_1.toBigInt)(payload.totalBorrowed || 0);
-        this.totalBorrowedOld = (0, formatter_1.toBigInt)(payload.totalBorrowedBIOld || 0);
+        this.liquidationThresholds = Object.entries(payload.liquidityThresholds || {}).reduce((acc, [t, tr]) => {
+            acc[t.toLowerCase()] = BigInt(tr);
+            return acc;
+        }, {});
+        this.totalBorrowed = (0, sdk_gov_1.toBigInt)(payload.totalBorrowed || 0);
+        this.totalBorrowedOld = (0, sdk_gov_1.toBigInt)(payload.totalBorrowedBIOld || 0);
         this.totalBorrowedInUSD = payload.totalBorrowedInUSD || 0;
-        this.totalBorrowedChange = Number((0, formatter_1.toBigInt)(payload.totalBorrowedBI10kBasis || 0) * sdk_gov_1.PERCENTAGE_DECIMALS);
-        this.totalLosses = (0, formatter_1.toBigInt)(payload.totalLosses || 0);
-        this.totalLossesOld = (0, formatter_1.toBigInt)(payload.totalLossesOld || 0);
+        this.totalBorrowedChange = Number((0, sdk_gov_1.toBigInt)(payload.totalBorrowedBI10kBasis || 0) * sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.totalDebtLimit = (0, sdk_gov_1.toBigInt)(payload.totalDebtLimit || 0);
+        this.totalLosses = (0, sdk_gov_1.toBigInt)(payload.totalLosses || 0);
+        this.totalLossesOld = (0, sdk_gov_1.toBigInt)(payload.totalLossesOld || 0);
         this.totalLossesInUSD = payload.totalLossesInUSD || 0;
-        this.totalRepaid = (0, formatter_1.toBigInt)(payload.totalRepaid || 0);
+        this.totalRepaid = (0, sdk_gov_1.toBigInt)(payload.totalRepaid || 0);
         this.totalRepaidInUSD = payload.totalRepaidInUSD || 0;
-        this.totalProfit = (0, formatter_1.toBigInt)(payload.totalProfit || 0);
-        this.totalProfitOld = (0, formatter_1.toBigInt)(payload.totalProfitOld || 0);
+        this.totalProfit = (0, sdk_gov_1.toBigInt)(payload.totalProfit || 0);
+        this.totalProfitOld = (0, sdk_gov_1.toBigInt)(payload.totalProfitOld || 0);
         this.totalProfitInUSD = payload.totalProfitInUSD || 0;
-        this.pnlChange = Number((0, formatter_1.toBigInt)(payload.pnl10kBasis || 0) * sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.pnlChange = Number((0, sdk_gov_1.toBigInt)(payload.pnl10kBasis || 0) * sdk_gov_1.PERCENTAGE_DECIMALS);
         this.openedAccountsCount = payload.openedAccountsCount || 0;
         this.openedAccountsCountChange = payload.openedAccountsCountChange || 0;
         this.totalOpenedAccounts = payload.totalOpenedAccounts || 0;

package/lib/core/creditSession.d.ts

@@ -1,5 +1,16 @@
-import { CreditSessionFilteredPayload, CreditSessionPayload, CreditSessionsAggregatedStatsPayload, UserCreditSessionsAggregatedStatsPayload } from "../payload/creditSession";
+import { CreditSessionFilteredPayload, CreditSessionPayload, CreditSessionsAggregatedStatsPayload, SecondaryStatus, UserCreditSessionsAggregatedStatsPayload } from "../payload/creditSession";
 import { AssetWithView } from "./assets";
+export interface CreditSessionAsset extends AssetWithView {
+    ind: number;
+    isForbidden: boolean;
+    isEnabled: boolean;
+    quota: bigint;
+    quotaIndexLU: bigint;
+    isQuoted: boolean;
+}
+export interface CreditSessionReward extends AssetWithView {
+    pool: string;
+}
 export type CreditSessionStatus = "active" | "closed" | "repaid" | "liquidated" | "liquidateExpired" | "liquidatePaused";
 export declare const CREDIT_SESSION_STATUS_BY_ID: Record<number, CreditSessionStatus>;
 export declare const CREDIT_SESSION_ID_BY_STATUS: Record<CreditSessionStatus, number>;
@@ -27,10 +38,16 @@ export declare class CreditSession {
     readonly apy: number;
     readonly currentBlock: number;
     readonly currentTimestamp: number;
+    readonly baseBorrowAPY7DAverage: number;
+    readonly baseBorrowAPY_RAY: bigint;
+    readonly baseToken: string;
+    readonly pool: string;
     readonly entryPrice: number;
     readonly closePrice: number;
     readonly quoteToken: string;
     readonly tradingToken: string;
+    readonly sinceTimestamp: number;
+    readonly closedAtTimestamp: number;
     readonly borrowAPY_RAY: bigint;
     readonly borrowAPY7DAverage: number;
     readonly totalValueUSD: number;
@@ -41,10 +58,11 @@ export declare class CreditSession {
     readonly spotDebt: bigint;
     readonly spotTotalValue: bigint;
     readonly spotUserFunds: bigint;
-    readonly cvxUnclaimedRewards: Array<AssetWithView>;
-    readonly balances: Array<AssetWithView>;
+    readonly cvxUnclaimedRewards: Array<CreditSessionReward>;
+    readonly balances: Array<CreditSessionAsset>;
     readonly forbiddenTokens: Record<string, true>;
     readonly disabledTokens: Record<string, true>;
+    readonly teritaryStatus: SecondaryStatus;
     constructor(payload: CreditSessionPayload);
 }
 export declare class CreditSessionFiltered {
@@ -58,6 +76,8 @@ export declare class CreditSessionFiltered {
     readonly sinceDate: string;
     readonly closedAt: number;
     readonly closedAtDate: string;
+    readonly sinceTimestamp: number;
+    readonly closedAtTimestamp: number;
     readonly healthFactor: number;
     readonly leverage: number;
     readonly debt: bigint;
@@ -68,6 +88,7 @@ export declare class CreditSessionFiltered {
     readonly profitInUnderlying: number;
     readonly tfIndex: number;
     readonly balances: Array<AssetWithView>;
+    readonly teritaryStatus: SecondaryStatus;
     constructor(payload: CreditSessionFilteredPayload);
 }
 export type CreditSessionSortFields = "type" | "tvl" | "hf" | "debt" | "pnl" | "leverage" | "tfIndex";