@gearbox-protocol/sdk 3.0.0-next.3 → 3.0.0-next.5

package/lib/core/creditManager.js

@@ -4,107 +4,109 @@ 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;
     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;
+    borrowRate;
+    minDebt;
+    maxDebt;
+    availableToBorrow;
+    totalDebt;
+    totalDebtLimit;
     feeInterest;
     feeLiquidation;
     liquidationDiscount;
     feeLiquidationExpired;
     liquidationDiscountExpired;
-    totalDebt;
-    isPaused = false;
+    collateralTokens = [];
+    supportedTokens = {};
+    adapters;
+    liquidationThresholds;
+    quotas;
+    interestModel;
     constructor(payload) {
         this.address = payload.addr.toLowerCase();
         this.underlyingToken = payload.underlying.toLowerCase();
         this.pool = payload.pool.toLowerCase();
-        this.isWETH = payload.isWETH;
-        this.canBorrow = payload.canBorrow;
+        this.creditFacade = payload.creditFacade.toLowerCase();
+        this.creditConfigurator = payload.creditConfigurator.toLowerCase();
+        this.degenNFT = payload.degenNFT.toLowerCase();
+        this.isDegenMode = payload.isDegenMode;
+        this.version = payload.cfVersion?.toNumber();
+        this.isPaused = payload.isPaused;
+        this.forbiddenTokenMask = (0, sdk_gov_1.toBigInt)(payload.forbiddenTokenMask);
         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.borrowRate = Number(((0, sdk_gov_1.toBigInt)(payload.baseBorrowRate) *
+            ((0, sdk_gov_1.toBigInt)(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);
+        this.minDebt = (0, sdk_gov_1.toBigInt)(payload.minDebt);
+        this.maxDebt = (0, sdk_gov_1.toBigInt)(payload.maxDebt);
+        this.availableToBorrow = (0, sdk_gov_1.toBigInt)(payload.availableToBorrow);
+        this.totalDebt = (0, sdk_gov_1.toBigInt)(payload.totalDebt);
+        this.totalDebtLimit = (0, sdk_gov_1.toBigInt)(payload.totalDebtLimit);
+        this.feeInterest = payload.feeInterest;
+        this.feeLiquidation = payload.feeLiquidation;
+        this.liquidationDiscount = payload.liquidationDiscount;
+        this.feeLiquidationExpired = payload.feeLiquidationExpired;
+        this.liquidationDiscountExpired = payload.liquidationDiscountExpired;
         payload.collateralTokens.forEach(t => {
             const tLc = t.toLowerCase();
             this.collateralTokens.push(tLc);
             this.supportedTokens[tLc] = true;
         });
-        this.adapters = payload.adapters.reduce((acc, { allowedContract, adapter }) => ({
-            ...acc,
-            [allowedContract.toLowerCase()]: adapter.toLowerCase(),
-        }), {});
+        this.adapters = Object.fromEntries(payload.adapters.map(a => [
+            a.targetContract.toLowerCase(),
+            a.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()] = (0, sdk_gov_1.toBigInt)(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.map(q => ({
+            token: q.token.toLowerCase(),
+            rate: q.rate,
+            quotaIncreaseFee: q.quotaIncreaseFee,
+            totalQuoted: (0, sdk_gov_1.toBigInt)(q.totalQuoted),
+            limit: (0, sdk_gov_1.toBigInt)(q.limit),
+            isActive: q.isActive,
+        }));
+        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: payload?.lirm?.version?.toNumber(),
+        };
         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.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);
-    }
-    contractToAdapter(contractAddress) {
-        return this.adapters[contractAddress];
-    }
     encodeAddCollateral(accountAddress, tokenAddress, amount) {
         if (this.version === 1)
             throw new Error("Multicall is eligible only for version 2");
         return {
             target: this.creditFacade,
-            callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("addCollateral", [accountAddress, tokenAddress, amount]),
+            callData: types_1.ICreditFacadeV2Extended__factory.createInterface().encodeFunctionData("addCollateral", [accountAddress, tokenAddress, amount]),
         };
     }
     encodeIncreaseDebt(amount) {
@@ -112,7 +114,7 @@ class CreditManagerData {
             throw new Error("Multicall is eligible only for version 2");
         return {
             target: this.creditFacade,
-            callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("increaseDebt", [amount]),
+            callData: types_1.ICreditFacadeV2Extended__factory.createInterface().encodeFunctionData("increaseDebt", [amount]),
         };
     }
     encodeDecreaseDebt(amount) {
@@ -120,7 +122,7 @@ class CreditManagerData {
             throw new Error("Multicall is eligible only for version 2");
         return {
             target: this.creditFacade,
-            callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("decreaseDebt", [amount]),
+            callData: types_1.ICreditFacadeV2Extended__factory.createInterface().encodeFunctionData("decreaseDebt", [amount]),
         };
     }
     encodeEnableToken(token) {
@@ -128,7 +130,7 @@ class CreditManagerData {
             throw new Error("Multicall is eligible only for version 2");
         return {
             target: this.creditFacade,
-            callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("enableToken", [token]),
+            callData: types_1.ICreditFacadeV2Extended__factory.createInterface().encodeFunctionData("enableToken", [token]),
         };
     }
     encodeDisableToken(token) {
@@ -136,7 +138,7 @@ class CreditManagerData {
             throw new Error("Multicall is eligible only for version 2");
         return {
             target: this.creditFacade,
-            callData: types_1.ICreditFacadeExtended__factory.createInterface().encodeFunctionData("disableToken", [token]),
+            callData: types_1.ICreditFacadeV2Extended__factory.createInterface().encodeFunctionData("disableToken", [token]),
         };
     }
     static withdrawAllAndUnwrap_Convex(address, claim) {
@@ -145,37 +147,6 @@ class CreditManagerData {
             callData: types_1.IConvexV1BaseRewardPoolAdapter__factory.createInterface().encodeFunctionData("withdrawAllAndUnwrap", [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;
-    }
-    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;
-    }
     get id() {
         return this.address;
     }
@@ -229,40 +200,40 @@ class ChartsCreditManagerData {
         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.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.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.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.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserCreditSessionsBuilder = exports.CreditSessionFiltered = exports.CreditSession = exports.CREDIT_SESSION_ID_BY_STATUS = exports.CREDIT_SESSION_STATUS_BY_ID = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const moment_1 = __importDefault(require("moment"));
-const formatter_1 = require("../utils/formatter");
 exports.CREDIT_SESSION_STATUS_BY_ID = {
     0: "active",
     1: "closed",
@@ -68,10 +67,10 @@ class CreditSession {
         this.account = (payload.account || "").toLowerCase();
         this.underlyingToken = (payload.underlyingToken || "").toLowerCase();
         this.version = payload.version || 2;
-        this.initialAmount = (0, formatter_1.toBigInt)(payload.initialAmount || 0);
-        this.borrowedAmount = (0, formatter_1.toBigInt)(payload.borrowedAmount || 0);
-        this.totalValue = (0, formatter_1.toBigInt)(payload.totalValue || 0);
-        this.healthFactor = Number((0, formatter_1.toBigInt)(payload.healthFactor || 0));
+        this.initialAmount = (0, sdk_gov_1.toBigInt)(payload.initialAmount || 0);
+        this.borrowedAmount = (0, sdk_gov_1.toBigInt)(payload.borrowedAmount || 0);
+        this.totalValue = (0, sdk_gov_1.toBigInt)(payload.totalValue || 0);
+        this.healthFactor = Number((0, sdk_gov_1.toBigInt)(payload.healthFactor || 0));
         this.since = payload.since || 0;
         this.closedAt = payload.closedAt || 0;
         this.sinceDate = (0, moment_1.default)((payload.sinceTimestamp || 0) * 1000).format("Do MMM YYYY");
@@ -84,11 +83,11 @@ class CreditSession {
         this.closePrice = payload.closePrice || 0;
         this.tradingToken = (payload.tradingToken || "").toLowerCase();
         this.quoteToken = (payload.quoteToken || "").toLowerCase();
-        this.borrowAPY_RAY = (0, formatter_1.toBigInt)(payload.borrowAPY_RAY || 0);
+        this.borrowAPY_RAY = (0, sdk_gov_1.toBigInt)(payload.borrowAPY_RAY || 0);
         this.borrowAPY7DAverage =
             (payload.borrowAPY7DAverage || 0) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
         this.totalValueUSD = payload.totalValueUSD || 0;
-        this.debt = (0, formatter_1.toBigInt)(payload.debt || 0);
+        this.debt = (0, sdk_gov_1.toBigInt)(payload.debt || 0);
         this.debtUSD = payload.debtUSD || 0;
         this.leverage = payload.leverage || 0;
         this.tfIndex = (payload.tfIndex || 0) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
@@ -96,13 +95,13 @@ class CreditSession {
         this.apy = (payload.apy || 0) / Number(sdk_gov_1.PERCENTAGE_DECIMALS);
         this.currentBlock = payload.currentBlock || 0;
         this.currentTimestamp = payload.currentTimestamp || 0;
-        this.spotDebt = (0, formatter_1.toBigInt)(payload.spotDebt || 0);
-        this.spotTotalValue = (0, formatter_1.toBigInt)(payload.spotTotalValue || 0);
-        this.spotUserFunds = (0, formatter_1.toBigInt)(payload.spotUserFunds || 0);
+        this.spotDebt = (0, sdk_gov_1.toBigInt)(payload.spotDebt || 0);
+        this.spotTotalValue = (0, sdk_gov_1.toBigInt)(payload.spotTotalValue || 0);
+        this.spotUserFunds = (0, sdk_gov_1.toBigInt)(payload.spotUserFunds || 0);
         this.cvxUnclaimedRewards = Object.entries(payload.cvxUnclaimedRewards || {}).map(([token, balance]) => {
             return {
                 token: token.toLowerCase(),
-                balance: (0, formatter_1.toBigInt)(balance.bi || 0),
+                balance: (0, sdk_gov_1.toBigInt)(balance.bi || 0),
                 balanceView: balance.f.toString(),
             };
         });
@@ -116,7 +115,7 @@ class CreditSession {
             }
             this.balances.push({
                 token: token.toLowerCase(),
-                balance: (0, formatter_1.toBigInt)(b.BI || 0),
+                balance: (0, sdk_gov_1.toBigInt)(b.BI || 0),
                 balanceView: b.F.toString(),
             });
         });
@@ -155,18 +154,18 @@ class CreditSessionFiltered {
         this.closedAt = payload.closedAt || 0;
         this.sinceDate = (0, moment_1.default)((payload.since || 0) * 1000).format("Do MMM YYYY");
         this.closedAtDate = (0, moment_1.default)((payload.closedAt || 0) * 1000).format("Do MMM YYYY");
-        this.healthFactor = Number((0, formatter_1.toBigInt)(payload.healthFactor || 0));
+        this.healthFactor = Number((0, sdk_gov_1.toBigInt)(payload.healthFactor || 0));
         this.leverage = payload.leverage || 0;
-        this.debt = (0, formatter_1.toBigInt)(payload.debt || 0);
+        this.debt = (0, sdk_gov_1.toBigInt)(payload.debt || 0);
         this.debtUSD = payload.debtUSD || 0;
-        this.totalValue = (0, formatter_1.toBigInt)(payload.totalValue || 0);
+        this.totalValue = (0, sdk_gov_1.toBigInt)(payload.totalValue || 0);
         this.totalValueUSD = payload.totalValueUSD || 0;
         this.profitInUSD = payload.pnlUSD || 0;
         this.profitInUnderlying = payload.pnl || 0;
         this.tfIndex = (payload.tfIndex || 0) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
         this.balances = Object.entries(payload.balances || {}).map(([token, balance]) => ({
             token: token.toLowerCase(),
-            balance: (0, formatter_1.toBigInt)(balance.BI || 0),
+            balance: (0, sdk_gov_1.toBigInt)(balance.BI || 0),
             balanceView: balance.F.toString(),
         }));
     }
@@ -191,8 +190,8 @@ class UserCreditSessionsBuilder {
             leverageChange: leverage10kBasis * Number(sdk_gov_1.PERCENTAGE_DECIMALS),
             activeAccountsChange: activeAccounts10kBasis * Number(sdk_gov_1.PERCENTAGE_DECIMALS),
             openedAccountsChange: openedAccounts10kBasis * Number(sdk_gov_1.PERCENTAGE_DECIMALS),
-            healthFactor: (0, formatter_1.toBigInt)(healthFactor || 0),
-            healthFactorOld: (0, formatter_1.toBigInt)(healthFactorOld || 0),
+            healthFactor: (0, sdk_gov_1.toBigInt)(healthFactor || 0),
+            healthFactorOld: (0, sdk_gov_1.toBigInt)(healthFactorOld || 0),
         };
     }
 }

package/lib/core/errors.d.ts

@@ -3,12 +3,3 @@ export interface MetamaskError {
     message: string;
     data: string;
 }
-export type OpenAccountErrorTypes = "insufficientDebtLimit" | "insufficientPoolLiquidity" | "leverageGreaterMax" | "wrongLeverage" | "amountGreaterMax" | "amountLessMin";
-export declare class OpenAccountError extends Error {
-    message: OpenAccountErrorTypes;
-    payload: {
-        amount: bigint;
-    };
-    constructor(errorType: OpenAccountErrorTypes, amount: bigint);
-    static isOpenAccountError(e: unknown): e is OpenAccountError;
-}

package/lib/core/errors.js

@@ -1,17 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpenAccountError = void 0;
-class OpenAccountError extends Error {
-    message;
-    payload;
-    constructor(errorType, amount) {
-        super();
-        Object.setPrototypeOf(this, OpenAccountError.prototype);
-        this.message = errorType;
-        this.payload = { amount };
-    }
-    static isOpenAccountError(e) {
-        return e instanceof OpenAccountError;
-    }
-}
-exports.OpenAccountError = OpenAccountError;

package/lib/core/events.js

@@ -118,7 +118,7 @@ class EventAddLiquidity extends eventOrTx_1.EVMEvent {
     pool;
     constructor(opts) {
         super(opts);
-        this.amount = (0, formatter_1.toBigInt)(opts.amount || 0);
+        this.amount = (0, sdk_gov_1.toBigInt)(opts.amount || 0);
         this.underlyingToken = opts.underlyingToken;
         this.pool = opts.pool;
     }
@@ -135,7 +135,7 @@ class EventRemoveLiquidity extends eventOrTx_1.EVMEvent {
     pool;
     constructor(opts) {
         super(opts);
-        this.amount = (0, formatter_1.toBigInt)(opts.amount || 0);
+        this.amount = (0, sdk_gov_1.toBigInt)(opts.amount || 0);
         this.underlyingToken = opts.underlyingToken;
         this.dieselToken = opts.dieselToken;
         this.pool = opts.pool;
@@ -152,7 +152,7 @@ class EventOpenCreditAccount extends eventOrTx_1.EVMEvent {
     creditManager;
     constructor(opts) {
         super(opts);
-        this.amount = (0, formatter_1.toBigInt)(opts.amount || 0);
+        this.amount = (0, sdk_gov_1.toBigInt)(opts.amount || 0);
         this.underlyingToken = opts.underlyingToken;
         this.creditManager = opts.creditManager;
     }
@@ -181,7 +181,7 @@ class EventLiquidateCreditAccount extends eventOrTx_1.EVMEvent {
     creditManager;
     constructor(opts) {
         super(opts);
-        this.amount = (0, formatter_1.toBigInt)(opts.amount || 0);
+        this.amount = (0, sdk_gov_1.toBigInt)(opts.amount || 0);
         this.underlyingToken = opts.underlyingToken;
         this.creditManager = opts.creditManager;
     }
@@ -210,7 +210,7 @@ class EventAddCollateral extends eventOrTx_1.EVMEvent {
     creditManager;
     constructor(opts) {
         super(opts);
-        this.amount = (0, formatter_1.toBigInt)(opts.amount || 0);
+        this.amount = (0, sdk_gov_1.toBigInt)(opts.amount || 0);
         this.addedToken = opts.addedToken;
         this.creditManager = opts.creditManager;
     }
@@ -226,7 +226,7 @@ class EventIncreaseBorrowAmount extends eventOrTx_1.EVMEvent {
     creditManager;
     constructor(opts) {
         super(opts);
-        this.amount = (0, formatter_1.toBigInt)(opts.amount || 0);
+        this.amount = (0, sdk_gov_1.toBigInt)(opts.amount || 0);
         this.underlyingToken = opts.underlyingToken;
         this.creditManager = opts.creditManager;
     }
@@ -242,7 +242,7 @@ class EventDecreaseBorrowAmount extends eventOrTx_1.EVMEvent {
     creditManager;
     constructor(opts) {
         super(opts);
-        this.amount = (0, formatter_1.toBigInt)(opts.amount || 0);
+        this.amount = (0, sdk_gov_1.toBigInt)(opts.amount || 0);
         this.underlyingToken = opts.underlyingToken;
         this.creditManager = opts.creditManager;
     }
@@ -271,14 +271,14 @@ class EventCMNewParameters extends eventOrTx_1.EVMEvent {
         super(opts);
         this.creditManager = opts.creditManager;
         this.underlyingToken = opts.underlyingToken;
-        this.minAmount = (0, formatter_1.toBigInt)(opts.minAmount || 0);
-        this.maxAmount = (0, formatter_1.toBigInt)(opts.maxAmount || 0);
+        this.minAmount = (0, sdk_gov_1.toBigInt)(opts.minAmount || 0);
+        this.maxAmount = (0, sdk_gov_1.toBigInt)(opts.maxAmount || 0);
         this.maxLeverage = opts.maxLeverage;
         this.feeInterest = opts.feeInterest;
         this.feeLiquidation = opts.feeLiquidation;
         this.liquidationDiscount = opts.liquidationDiscount;
-        this.prevMinAmount = (0, formatter_1.toBigInt)(opts.prevMinAmount || 0);
-        this.prevMaxAmount = (0, formatter_1.toBigInt)(opts.prevMaxAmount || 0);
+        this.prevMinAmount = (0, sdk_gov_1.toBigInt)(opts.prevMinAmount || 0);
+        this.prevMaxAmount = (0, sdk_gov_1.toBigInt)(opts.prevMaxAmount || 0);
         this.prevMaxLeverage = opts.prevMaxLeverage;
         this.prevFeeInterest = opts.prevFeeInterest;
         this.prevFeeLiquidation = opts.prevFeeLiquidation;
@@ -495,8 +495,8 @@ class EventNewExpectedLiquidityLimit extends eventOrTx_1.EVMEvent {
         super(opts);
         this.pool = opts.pool;
         this.underlyingToken = opts.underlyingToken;
-        this.newLimit = (0, formatter_1.toBigInt)(opts.newLimit || 0);
-        this.prevLimit = (0, formatter_1.toBigInt)(opts.oldLimit || 0);
+        this.newLimit = (0, sdk_gov_1.toBigInt)(opts.newLimit || 0);
+        this.prevLimit = (0, sdk_gov_1.toBigInt)(opts.oldLimit || 0);
     }
     toString() {
         const [symbol, decimals = 18] = (0, sdk_gov_1.extractTokenData)(this.underlyingToken);
@@ -669,10 +669,10 @@ class EventLimitsUpdated extends eventOrTx_1.EVMEvent {
     creditManager;
     constructor(opts) {
         super(opts);
-        this.minBorrowedAmount = (0, formatter_1.toBigInt)(opts.minBorrowedAmount || 0);
-        this.maxBorrowedAmount = (0, formatter_1.toBigInt)(opts.maxBorrowedAmount || 0);
-        this.prevMinBorrowedAmount = (0, formatter_1.toBigInt)(opts.prevMinBorrowedAmount || 0);
-        this.prevMaxBorrowedAmount = (0, formatter_1.toBigInt)(opts.prevMaxBorrowedAmount || 0);
+        this.minBorrowedAmount = (0, sdk_gov_1.toBigInt)(opts.minBorrowedAmount || 0);
+        this.maxBorrowedAmount = (0, sdk_gov_1.toBigInt)(opts.maxBorrowedAmount || 0);
+        this.prevMinBorrowedAmount = (0, sdk_gov_1.toBigInt)(opts.prevMinBorrowedAmount || 0);
+        this.prevMaxBorrowedAmount = (0, sdk_gov_1.toBigInt)(opts.prevMaxBorrowedAmount || 0);
         this.underlyingToken = opts.underlyingToken;
         this.creditManager = opts.creditManager;
     }
@@ -831,8 +831,8 @@ class EventLimitPerBlockUpdated extends eventOrTx_1.EVMEvent {
     creditManager;
     constructor(opts) {
         super(opts);
-        this.limit = (0, formatter_1.toBigInt)(opts.limit || 0);
-        this.prevLimit = (0, formatter_1.toBigInt)(opts.prevLimit || 0);
+        this.limit = (0, sdk_gov_1.toBigInt)(opts.limit || 0);
+        this.prevLimit = (0, sdk_gov_1.toBigInt)(opts.prevLimit || 0);
         this.token = opts.token;
         this.creditManager = opts.creditManager;
     }

package/lib/core/pool/data.d.ts

@@ -1,32 +1,37 @@
 import { providers, Signer } from "ethers";
-import { ChartsPoolDataPayload, PoolDataPayload, UserPoolPayload } from "../../payload/pool";
+import { CreditManagerDebtParams, QuotaInfo } from "../../payload/creditManager";
+import { ChartsPoolDataPayload, LinearModel, PoolDataPayload, UserPoolPayload } from "../../payload/pool";
 import { IPoolService } from "../../types";
 export declare class PoolData {
-    readonly id: string;
     readonly address: string;
     readonly underlyingToken: string;
     readonly dieselToken: string;
     readonly isWETH: boolean;
     readonly isWSTETH: boolean;
+    readonly isPaused: boolean;
+    readonly version: number;
     readonly expectedLiquidity: bigint;
     readonly expectedLiquidityLimit: bigint;
     readonly availableLiquidity: bigint;
+    readonly linearCumulativeIndex: bigint;
     readonly totalBorrowed: bigint;
+    readonly totalDebtLimit: bigint;
+    readonly creditManagerDebtParams: Array<CreditManagerDebtParams>;
+    readonly quotas: Array<QuotaInfo>;
+    readonly totalAssets: bigint;
+    readonly totalSupply: bigint;
     readonly depositAPY: number;
     readonly borrowAPY: number;
-    readonly borrowAPYRay: bigint;
+    readonly interestModel: LinearModel;
     readonly dieselRate: number;
     readonly dieselRateRay: bigint;
     readonly withdrawFee: number;
-    readonly timestampLU: bigint;
     readonly cumulativeIndex_RAY: bigint;
-    readonly isPaused: boolean;
     constructor(payload: PoolDataPayload);
     getContractETH(signer: Signer): IPoolService;
-    static calculateBorrowRate({ modelAddress, provider, expectedLiquidity, availableLiquidity, }: CalculateBorrowRateProps): Promise<import("ethers").BigNumber>;
+    calculateBorrowRate({ provider, expectedLiquidity, availableLiquidity, }: CalculateBorrowRateProps): Promise<import("ethers").BigNumber>;
 }
 interface CalculateBorrowRateProps {
-    modelAddress: string;
     provider: providers.Provider;
     expectedLiquidity: bigint;
     availableLiquidity: bigint;