@gearbox-protocol/sdk 3.0.0-next.9 → 3.0.0-next.90

package/contracts/index.sol

@@ -7,16 +7,35 @@ pragma solidity ^0.8.10;
 import {IDataCompressorV2_10} from "@gearbox-protocol/periphery-v3/contracts/interfaces/IDataCompressorV2_10.sol";
 import {IDataCompressorV3_00} from "@gearbox-protocol/periphery-v3/contracts/interfaces/IDataCompressorV3_00.sol";
 import {IAddressProviderV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IAddressProviderV3.sol";
+import {IContractsRegister} from "@gearbox-protocol/core-v2/contracts/interfaces/IContractsRegister.sol";
 import {IPoolV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolV3.sol";
+import {ILinearInterestRateModelV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ILinearInterestRateModelV3.sol";
+import {IPoolQuotaKeeperV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolQuotaKeeperV3.sol";
+import {IGaugeV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IGaugeV3.sol";
 import {ICreditFacadeV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditFacadeV3.sol";
 import {IPoolService} from "@gearbox-protocol/core-v2/contracts/interfaces/IPoolService.sol";
 import {ICreditFacadeV2} from "@gearbox-protocol/core-v2/contracts/interfaces/ICreditFacadeV2.sol";
 import {ICreditConfiguratorV2} from "@gearbox-protocol/core-v2/contracts/interfaces/ICreditConfiguratorV2.sol";
-import {WATokenZapper} from "@gearbox-protocol/integrations-v3/contracts/zappers/WATokenZapper.sol";
-import {WETHZapper} from "@gearbox-protocol/integrations-v3/contracts/zappers/WETHZapper.sol";
-import {WstETHZapper} from "@gearbox-protocol/integrations-v3/contracts/zappers/WstETHZapper.sol";
+import {IERC20ZapperDeposits} from
+    "@gearbox-protocol/integrations-v3/contracts/interfaces/zappers/IERC20ZapperDeposits.sol";
+import {IETHZapperDeposits} from "@gearbox-protocol/integrations-v3/contracts/interfaces/zappers/IETHZapperDeposits.sol";
+import {IZapper} from "@gearbox-protocol/integrations-v3/contracts/interfaces/zappers/IZapper.sol";
+import {IZapperRegister} from "@gearbox-protocol/periphery-v3/contracts/interfaces/IZapperRegister.sol";
+import {IDegenNFTV2} from "@gearbox-protocol/core-v2/contracts/interfaces/IDegenNFTV2.sol";
+import {IBotListV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IBotListV3.sol";
+
+import {IGearStakingV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IGearStakingV3.sol";
+import {IControllerTimelockV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IControllerTimelockV3.sol";
 
 // Adapters
+import {IAaveV2_LendingPoolAdapter} from
+    "@gearbox-protocol/integrations-v3/contracts/interfaces/aave/IAaveV2_LendingPoolAdapter.sol";
+import {IAaveV2_WrappedATokenAdapter} from
+    "@gearbox-protocol/integrations-v3/contracts/interfaces/aave/IAaveV2_WrappedATokenAdapter.sol";
+import {IBalancerV2VaultAdapter} from
+    "@gearbox-protocol/integrations-v3/contracts/interfaces/balancer/IBalancerV2VaultAdapter.sol";
+import {ICompoundV2_CTokenAdapter} from
+    "@gearbox-protocol/integrations-v3/contracts/interfaces/compound/ICompoundV2_CTokenAdapter.sol";
 import {ILidoV1Adapter} from "@gearbox-protocol/integrations-v3/contracts/interfaces/lido/ILidoV1Adapter.sol";
 import {IBaseRewardPool} from "@gearbox-protocol/integrations-v3/contracts/integrations/convex/IBaseRewardPool.sol";
 import {IConvexToken} from "@gearbox-protocol/integrations-v3/contracts/integrations/convex/IConvexToken.sol";
@@ -25,6 +44,7 @@ import {IConvexV1BaseRewardPoolAdapter} from
     "@gearbox-protocol/integrations-v3/contracts/interfaces/convex/IConvexV1BaseRewardPoolAdapter.sol";
 import {IConvexV1BoosterAdapter} from
     "@gearbox-protocol/integrations-v3/contracts/interfaces/convex/IConvexV1BoosterAdapter.sol";
+import {IERC4626Adapter} from "@gearbox-protocol/integrations-v3/contracts/interfaces/erc4626/IERC4626Adapter.sol";
 
 import {IInterestRateModel} from "@gearbox-protocol/core-v2/contracts/interfaces/IInterestRateModel.sol";
 import {IUniswapV2Adapter} from "@gearbox-protocol/integrations-v3/contracts/interfaces/uniswap/IUniswapV2Adapter.sol";
@@ -34,7 +54,13 @@ import {IYearnV2Adapter} from "@gearbox-protocol/integrations-v3/contracts/inter
 
 import {IwstETHV1Adapter} from "@gearbox-protocol/integrations-v3/contracts/interfaces/lido/IwstETHV1Adapter.sol";
 import {IstETH} from "@gearbox-protocol/integrations-v3/contracts/integrations/lido/IstETH.sol";
+import {IwstETH} from "@gearbox-protocol/integrations-v3/contracts/integrations/lido/IwstETH.sol";
 import {IPriceOracleBase} from "@gearbox-protocol/core-v2/contracts/interfaces/IPriceOracleBase.sol";
+import {IPriceOracleV2} from "@gearbox-protocol/core-v2/contracts/interfaces/IPriceOracle.sol";
+import {IPriceOracleV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPriceOracleV3.sol";
+import {IPriceFeed} from "@gearbox-protocol/core-v2/contracts/interfaces/IPriceFeed.sol";
+import {ILPPriceFeed} from "@gearbox-protocol/oracles-v3/contracts/interfaces/ILPPriceFeed.sol";
+import {RedstonePriceFeed} from "@gearbox-protocol/oracles-v3/contracts/oracles/updatable/RedstonePriceFeed.sol";
 
 import {ICurveV1_2AssetsAdapter} from
     "@gearbox-protocol/integrations-v3/contracts/interfaces/curve/ICurveV1_2AssetsAdapter.sol";
@@ -45,4 +71,7 @@ import {ICurveV1_3AssetsAdapter} from
 import {ICurveV1_4AssetsAdapter} from
     "@gearbox-protocol/integrations-v3/contracts/interfaces/curve/ICurveV1_4AssetsAdapter.sol";
 
-import {IOffchainOracle} from "./IOffchainOracle.sol";
+import {IRouterV3} from "@gearbox-protocol/router-v3/contracts/interfaces/IRouterV3.sol";
+import {IRouter} from "@gearbox-protocol/router/contracts/interfaces/IRouter.sol";
+
+import {IFarmingPool} from "@1inch/farming/contracts/interfaces/IFarmingPool.sol";

package/lib/apy/curveAPY.js

@@ -25,7 +25,8 @@ const APY_DICTIONARY = {
     crvUSDUSDC: "factory-crvusd-0",
     crvUSDUSDT: "factory-crvusd-1",
     crvUSDFRAX: "factory-crvusd-4",
-    crvUSDETHCRV: "factory-tricrypto-4", // 0x4eBdF703948ddCEA3B11f675B4D1Fba9d2414A14
+    crvUSDETHCRV: "factory-tricrypto-4",
+    rETH_f: "factory-crypto-210", // 0x0f3159811670c117c372428D4E69AC32325e4D0F
 };
 const CRV_APY_RESPONSE_DECIMALS = 100;
 // const CRYPTO = "https://api.curve.fi/api/getPools/ethereum/crypto";

package/lib/apy/index.d.ts

@@ -1,8 +1,8 @@
-import { LPTokens, SupportedToken } from "@gearbox-protocol/sdk-gov";
+import { LPTokens, PartialRecord, SupportedToken } from "@gearbox-protocol/sdk-gov";
 export type AdditionalTokenWithAPY = Extract<SupportedToken, "STETH">;
 export declare const additionalTokensWIthAPY: Record<AdditionalTokenWithAPY, true>;
 export type TokensWithAPY = LPTokens | Extract<SupportedToken, "STETH">;
-export type LpTokensAPY = Record<TokensWithAPY, number>;
+export type LpTokensAPY = PartialRecord<TokensWithAPY, number>;
 export declare const isTokenWithAPY: (t: unknown) => t is TokensWithAPY;
 export * from "./convexAPY";
 export * from "./curveAPY";

package/lib/apy/yearnAPY.js

@@ -8,7 +8,7 @@ const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const axios_1 = __importDefault(require("axios"));
 const formatter_1 = require("../utils/formatter");
 const RESPONSE_DECIMALS = 1;
-const URL = "https://api.yearn.finance/v1/chains/1/vaults/all";
+const URL = "https://api.yexporter.io/v1/chains/1/vaults/all";
 const transformSymbol = (s) => s.replaceAll("_", "-").toLowerCase();
 async function getYearnAPY() {
     try {

package/lib/core/assets.d.ts

@@ -16,20 +16,20 @@ interface NextAssetProps<T extends Asset> {
     tokensList: Record<string, TokenData>;
     prices?: Record<string, bigint>;
 }
-export type WrapResult<T> = [Array<T>, bigint, bigint];
+export type WrapResult = [Array<Asset>, bigint, bigint];
 export declare class AssetUtils {
     static nextAsset<T extends Asset>({ allowedTokens, selectedAssets, balances, tokensList, prices, }: NextAssetProps<T>): string | undefined;
     static getBalances(allowedTokens: Array<string>, externalBalances: Record<string, bigint>): Record<string, bigint>;
     static constructAssetRecord<A extends Asset>(a: Array<A>): Record<string, A>;
-    static memoWrapETH: (ethAddress: string, wethAddress: string) => <T extends Asset>(assets: T[]) => WrapResult<T>;
+    static memoWrap: (unwrappedAddress: string, wrappedAddress: string, prices: Record<string, bigint>, tokensList: Record<string, TokenData>) => (assets: Array<Asset>) => WrapResult;
     /**
      * Sums the the second assets list into the first assets list
-     * Creates new assets.
+     * Balances cant be negative; Creates new assets.
      */
     static sumAssets<A extends Asset, B extends Asset>(a: Array<A>, b: Array<B>): Array<A | B>;
     /**
      * Subtracts the the second assets list from the first assets list
-     * Balance cant be negative; doesn't create new assets.
+     * Balances cant be negative; doesn't create new assets.
      */
     static subAssets<A extends Asset, B extends Asset>(a: Array<A>, b: Array<B>): Array<A>;
 }

package/lib/core/assets.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetUtils = void 0;
 const math_1 = require("../utils/math");
+const price_1 = require("../utils/price");
 const creditAccount_1 = require("./creditAccount");
 class AssetUtils {
     static nextAsset({ allowedTokens, selectedAssets, balances, tokensList, prices = {}, }) {
@@ -33,28 +34,38 @@ class AssetUtils {
         }, {});
         return record;
     }
-    static memoWrapETH = (ethAddress, wethAddress) => function wrapETH(assets) {
+    static memoWrap = (unwrappedAddress, wrappedAddress, prices, tokensList) => function wrap(assets) {
         const assetsRecord = AssetUtils.constructAssetRecord(assets);
-        const weth = assetsRecord[wethAddress];
-        const { balance: wethAmount = 0n } = weth || {};
-        const eth = assetsRecord[ethAddress];
-        const { balance: ethAmount = 0n } = eth || {};
-        const wethOrETH = weth || eth;
-        if (wethOrETH) {
-            assetsRecord[wethAddress] = {
-                ...wethOrETH,
-                token: wethAddress,
-                balance: (0, math_1.nonNegativeBn)(ethAmount) + (0, math_1.nonNegativeBn)(wethAmount),
+        const unwrapped = assetsRecord[unwrappedAddress];
+        const wrapped = assetsRecord[wrappedAddress];
+        const { balance: wrappedAmount = 0n } = wrapped || {};
+        // if there unwrapped token
+        if (unwrapped) {
+            const { balance: unwrappedAmount = 0n } = unwrapped || {};
+            const unwrappedToken = tokensList[unwrappedAddress];
+            const unwrappedPrice = prices[unwrappedAddress] || 0n;
+            const wrappedToken = tokensList[wrappedAddress];
+            const wrappedPrice = prices[wrappedAddress] || 0n;
+            // convert unwrapped into wrapped by price
+            const unwrappedInWrapped = price_1.PriceUtils.convertByPrice(price_1.PriceUtils.calcTotalPrice(unwrappedPrice, (0, math_1.nonNegativeBn)(unwrappedAmount), unwrappedToken.decimals), {
+                price: wrappedPrice,
+                decimals: wrappedToken.decimals,
+            });
+            // sum them
+            assetsRecord[wrappedAddress] = {
+                token: wrappedAddress,
+                balance: (0, math_1.nonNegativeBn)(wrappedAmount) + unwrappedInWrapped,
             };
+            // remove unwrapped
+            delete assetsRecord[unwrappedAddress];
+            return [Object.values(assetsRecord), unwrappedInWrapped, wrappedAmount];
         }
-        if (eth) {
-            delete assetsRecord[ethAddress];
-        }
-        return [Object.values(assetsRecord), ethAmount, wethAmount];
+        // else no actions needed
+        return [Object.values(assetsRecord), 0n, wrappedAmount];
     };
     /**
      * Sums the the second assets list into the first assets list
-     * Creates new assets.
+     * Balances cant be negative; Creates new assets.
      */
     static sumAssets(a, b) {
         const aRecord = AssetUtils.constructAssetRecord(a);
@@ -73,7 +84,7 @@ class AssetUtils {
     }
     /**
      * Subtracts the the second assets list from the first assets list
-     * Balance cant be negative; doesn't create new assets.
+     * Balances cant be negative; doesn't create new assets.
      */
     static subAssets(a, b) {
         const bRecord = AssetUtils.constructAssetRecord(b);

package/lib/core/creditAccount.d.ts

@@ -1,24 +1,48 @@
 import { LpTokensAPY } from "../apy";
-import { CaTokenBalance, CreditAccountDataPayload, ScheduledWithdrawal } from "../payload/creditAccount";
+import { CaTokenBalance, CreditAccountDataPayload } from "../payload/creditAccount";
+import { QuotaInfo } from "../payload/creditManager";
 import { TokenData } from "../tokens/tokenData";
-import { Asset } from "./assets";
+import { Asset, AssetWithAmountInTarget } from "./assets";
 export interface CalcOverallAPYProps {
     caAssets: Array<Asset>;
     lpAPY: LpTokensAPY | undefined;
+    quotas: Record<string, Asset>;
+    quotaRates: Record<string, Pick<QuotaInfo, "isActive" | "rate">>;
     prices: Record<string, bigint>;
     totalValue: bigint | undefined;
     debt: bigint | undefined;
-    borrowRate: number;
+    baseBorrowRate: number;
     underlyingToken: string;
 }
 export interface CalcHealthFactorProps {
     assets: Array<Asset>;
+    quotas: Record<string, Asset>;
+    quotasInfo: Record<string, Pick<QuotaInfo, "isActive">>;
     prices: Record<string, bigint>;
     liquidationThresholds: Record<string, bigint>;
     underlyingToken: string;
     borrowed: bigint;
 }
+export interface CalcQuotaUpdateProps {
+    quotas: Record<string, Pick<QuotaInfo, "isActive" | "token">>;
+    initialQuotas: Record<string, Pick<CaTokenBalance, "quota">>;
+    assetsAfterUpdate: Record<string, AssetWithAmountInTarget>;
+    allowedToSpend: Record<string, {}>;
+    allowedToObtain: Record<string, {}>;
+    quotaReserve: bigint;
+}
+interface CalcQuotaUpdateReturnType {
+    desiredQuota: Record<string, Asset>;
+    quotaIncrease: Array<Asset>;
+    quotaDecrease: Array<Asset>;
+}
+export interface CalcQuotaBorrowRateProps {
+    quotas: Record<string, Asset>;
+    quotaRates: Record<string, Pick<QuotaInfo, "isActive" | "rate">>;
+    borrowAmount: bigint;
+}
 export declare class CreditAccountData {
+    readonly isSuccessful: boolean;
     readonly addr: string;
     readonly borrower: string;
     readonly creditManager: string;
@@ -27,6 +51,7 @@ export declare class CreditAccountData {
     readonly since: number;
     readonly expirationDate: number;
     readonly version: number;
+    readonly cmName: string;
     readonly enabledTokenMask: bigint;
     readonly healthFactor: number;
     isDeleting: boolean;
@@ -40,20 +65,16 @@ export declare class CreditAccountData {
     readonly totalValue: bigint;
     readonly totalValueUSD: bigint;
     readonly twvUSD: bigint;
-    readonly cumulativeIndexNow: bigint;
     readonly cumulativeIndexLastUpdate: bigint;
     readonly cumulativeQuotaInterest: bigint;
     readonly activeBots: string[];
-    readonly maxApprovedBots: bigint;
     readonly balances: Record<string, bigint>;
     readonly collateralTokens: Array<string>;
     readonly allBalances: Record<string, CaTokenBalance>;
     readonly forbiddenTokens: Record<string, true>;
     readonly quotedTokens: Record<string, true>;
-    readonly schedultedWithdrawals: Array<ScheduledWithdrawal>;
     constructor(payload: CreditAccountDataPayload);
     setDeleteInProgress(d: boolean): void;
-    balancesSorted(prices: Record<string, bigint>, tokens: Record<string, TokenData>): Array<Asset>;
     static sortBalances(balances: Record<string, bigint>, prices: Record<string, bigint>, tokens: Record<string, TokenData>): Array<[string, bigint]>;
     static tokensAbcComparator(t1?: TokenData, t2?: TokenData): 1 | -1;
     static amountAbcComparator(t1: bigint, t2: bigint): 1 | -1;
@@ -62,8 +83,11 @@ export declare class CreditAccountData {
     isTokenEnabled(index: number): boolean;
     static isTokenEnabled(index: number, enabledTokenMask: bigint): boolean;
     static calcMaxDebtIncrease(healthFactor: number, borrowAmountPlusInterest: bigint, underlyingLT: number, minHf?: number): bigint;
-    static calcOverallAPY({ caAssets, lpAPY, prices, totalValue, debt, borrowRate, underlyingToken, }: CalcOverallAPYProps): number | undefined;
+    static calcOverallAPY({ caAssets, lpAPY, prices, quotas, quotaRates, totalValue, debt, baseBorrowRate, underlyingToken, }: CalcOverallAPYProps): bigint | undefined;
     hash(): string;
     static hash(creditManager: string, borrower: string): string;
-    static calcHealthFactor({ assets, prices, liquidationThresholds, underlyingToken, borrowed, }: CalcHealthFactorProps): number;
+    static calcHealthFactor({ assets, quotas, quotasInfo, liquidationThresholds, underlyingToken, borrowed, prices, }: CalcHealthFactorProps): number;
+    static calcQuotaUpdate({ quotas, initialQuotas, assetsAfterUpdate, allowedToSpend, allowedToObtain, quotaReserve, }: CalcQuotaUpdateProps): CalcQuotaUpdateReturnType;
+    static calcQuotaBorrowRate({ quotas, quotaRates, borrowAmount, }: CalcQuotaBorrowRateProps): number;
 }
+export {};

package/lib/core/creditAccount.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreditAccountData = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
-const apy_1 = require("../apy");
 const formatter_1 = require("../utils/formatter");
+const math_1 = require("../utils/math");
 const price_1 = require("../utils/price");
 class CreditAccountData {
+    isSuccessful;
     addr;
     borrower;
     creditManager;
@@ -14,6 +15,7 @@ class CreditAccountData {
     since;
     expirationDate;
     version;
+    cmName;
     enabledTokenMask;
     healthFactor;
     isDeleting;
@@ -27,18 +29,16 @@ class CreditAccountData {
     totalValue;
     totalValueUSD;
     twvUSD;
-    cumulativeIndexNow;
     cumulativeIndexLastUpdate;
     cumulativeQuotaInterest;
     activeBots;
-    maxApprovedBots;
     balances = {};
     collateralTokens = [];
     allBalances = {};
     forbiddenTokens = {};
     quotedTokens = {};
-    schedultedWithdrawals;
     constructor(payload) {
+        this.isSuccessful = payload.isSuccessful;
         this.addr = payload.addr.toLowerCase();
         this.borrower = payload.borrower.toLowerCase();
         this.creditManager = payload.creditManager.toLowerCase();
@@ -47,16 +47,17 @@ class CreditAccountData {
         this.since = Number((0, sdk_gov_1.toBigInt)(payload.since));
         this.expirationDate = Number((0, sdk_gov_1.toBigInt)(payload.expirationDate));
         this.version = payload.cfVersion?.toNumber();
-        this.healthFactor = Number((0, sdk_gov_1.toBigInt)(payload.healthFactor));
+        this.cmName = payload.cmName;
+        this.healthFactor = Number((0, sdk_gov_1.toBigInt)(payload.healthFactor || 0n));
         this.enabledTokenMask = (0, sdk_gov_1.toBigInt)(payload.enabledTokensMask);
         this.isDeleting = false;
         this.borrowedAmount = (0, sdk_gov_1.toBigInt)(payload.debt);
-        this.accruedInterest = (0, sdk_gov_1.toBigInt)(payload.accruedInterest);
-        this.accruedFees = (0, sdk_gov_1.toBigInt)(payload.accruedFees);
+        this.accruedInterest = (0, sdk_gov_1.toBigInt)(payload.accruedInterest || 0n);
+        this.accruedFees = (0, sdk_gov_1.toBigInt)(payload.accruedFees || 0n);
         this.borrowedAmountPlusInterestAndFees =
             this.borrowedAmount + this.accruedInterest + this.accruedFees;
         this.totalDebtUSD = (0, sdk_gov_1.toBigInt)(payload.totalDebtUSD);
-        this.totalValue = (0, sdk_gov_1.toBigInt)(payload.totalValue);
+        this.totalValue = (0, sdk_gov_1.toBigInt)(payload.totalValue || 0n);
         this.totalValueUSD = (0, sdk_gov_1.toBigInt)(payload.totalValueUSD);
         this.twvUSD = (0, sdk_gov_1.toBigInt)(payload.twvUSD);
         this.baseBorrowRate = (0, formatter_1.rayToNumber)((0, sdk_gov_1.toBigInt)(payload.baseBorrowRate) *
@@ -65,11 +66,9 @@ class CreditAccountData {
         this.borrowRate = (0, formatter_1.rayToNumber)((0, sdk_gov_1.toBigInt)(payload.aggregatedBorrowRate) *
             sdk_gov_1.PERCENTAGE_DECIMALS *
             sdk_gov_1.PERCENTAGE_FACTOR);
-        this.cumulativeIndexNow = (0, sdk_gov_1.toBigInt)(payload.cumulativeIndexNow);
         this.cumulativeIndexLastUpdate = (0, sdk_gov_1.toBigInt)(payload.cumulativeIndexLastUpdate);
         this.cumulativeQuotaInterest = (0, sdk_gov_1.toBigInt)(payload.cumulativeQuotaInterest);
         this.activeBots = payload.activeBots.map(b => b.toLowerCase());
-        this.maxApprovedBots = (0, sdk_gov_1.toBigInt)(payload.maxApprovedBots);
         payload.balances.forEach(b => {
             const token = b.token.toLowerCase();
             const balance = {
@@ -79,7 +78,8 @@ class CreditAccountData {
                 isEnabled: b.isEnabled,
                 isQuoted: b.isQuoted,
                 quota: (0, sdk_gov_1.toBigInt)(b.quota),
-                quotaRate: b.quotaRate,
+                quotaRate: Number((0, sdk_gov_1.toBigInt)(b.quotaRate) * sdk_gov_1.PERCENTAGE_DECIMALS),
+                quotaCumulativeIndexLU: (0, sdk_gov_1.toBigInt)(b.quotaCumulativeIndexLU),
             };
             if (!b.isForbidden) {
                 this.balances[token] = balance.balance;
@@ -93,19 +93,10 @@ class CreditAccountData {
             }
             this.allBalances[token] = balance;
         });
-        this.schedultedWithdrawals = payload.schedultedWithdrawals.map(w => ({
-            tokenIndex: w.tokenIndex,
-            maturity: w.maturity,
-            token: w.token.toLowerCase(),
-            amount: (0, sdk_gov_1.toBigInt)(w.amount),
-        }));
     }
     setDeleteInProgress(d) {
         this.isDeleting = d;
     }
-    balancesSorted(prices, tokens) {
-        return CreditAccountData.sortBalances(this.balances, prices, tokens).map(([token, balance]) => ({ token, balance }));
-    }
     static sortBalances(balances, prices, tokens) {
         return Object.entries(balances).sort(([addr1, amount1], [addr2, amount2]) => {
             const addr1Lc = addr1.toLowerCase();
@@ -147,41 +138,42 @@ class CreditAccountData {
     static calcMaxDebtIncrease(healthFactor, borrowAmountPlusInterest, underlyingLT, minHf = Number(sdk_gov_1.PERCENTAGE_FACTOR)) {
         const result = (borrowAmountPlusInterest * BigInt(healthFactor - minHf)) /
             BigInt(minHf - underlyingLT);
-        return result < 0 ? 0n : result;
+        return math_1.BigIntMath.max(0n, result);
     }
-    static calcOverallAPY({ caAssets, lpAPY, prices, totalValue, debt, borrowRate, underlyingToken, }) {
+    static calcOverallAPY({ caAssets, lpAPY, prices, quotas, quotaRates, totalValue, debt, baseBorrowRate, underlyingToken, }) {
         if (!lpAPY ||
             !totalValue ||
             totalValue <= 0n ||
             !debt ||
             totalValue <= debt)
             return undefined;
+        const underlyingTokenAddressLC = underlyingToken.toLowerCase();
+        const underlyingTokenSymbol = sdk_gov_1.tokenSymbolByAddress[underlyingTokenAddressLC] || "";
+        const underlyingTokenDecimals = sdk_gov_1.decimals[underlyingTokenSymbol] || 18;
+        const underlyingPrice = prices[underlyingTokenAddressLC];
         const assetAPYMoney = caAssets.reduce((acc, { token: tokenAddress, balance: amount }) => {
             const tokenAddressLC = tokenAddress.toLowerCase();
-            const symbol = sdk_gov_1.tokenSymbolByAddress[tokenAddressLC];
-            if (!(0, apy_1.isTokenWithAPY)(symbol))
-                return acc;
+            const symbol = sdk_gov_1.tokenSymbolByAddress[tokenAddressLC] || "";
             const apy = lpAPY[symbol] || 0;
             const price = prices[tokenAddressLC] || 0n;
             const tokenDecimals = sdk_gov_1.decimals[symbol];
             const money = price_1.PriceUtils.calcTotalPrice(price, amount, tokenDecimals);
             const apyMoney = money * BigInt(apy);
-            return acc + apyMoney;
+            const { rate: quotaAPY = 0, isActive = false } = quotaRates?.[tokenAddressLC] || {};
+            const { balance: quotaBalance = 0n } = quotas[tokenAddressLC] || {};
+            const quotaAmount = isActive ? quotaBalance : 0n;
+            const quotaMoney = price_1.PriceUtils.calcTotalPrice(underlyingPrice || 0n, quotaAmount, underlyingTokenDecimals);
+            const quotaAPYMoney = quotaMoney * BigInt(quotaAPY);
+            return acc + apyMoney - quotaAPYMoney;
         }, 0n);
-        const underlyingTokenAddressLC = underlyingToken.toLowerCase();
-        const underlyingTokenSymbol = sdk_gov_1.tokenSymbolByAddress[underlyingTokenAddressLC] || "";
-        const underlyingTokenDecimals = sdk_gov_1.decimals[underlyingTokenSymbol] || 18;
-        const underlyingPrice = prices[underlyingTokenAddressLC] || sdk_gov_1.PRICE_DECIMALS;
         const assetAPYAmountInUnderlying = price_1.PriceUtils.convertByPrice(assetAPYMoney, {
-            price: underlyingPrice,
+            price: underlyingPrice || sdk_gov_1.PRICE_DECIMALS,
             decimals: underlyingTokenDecimals,
         });
-        const debtAPY = debt * BigInt(borrowRate);
+        const debtAPY = debt * BigInt(baseBorrowRate);
         const yourAssets = totalValue - debt;
-        const apyInPercent = ((assetAPYAmountInUnderlying - debtAPY) * sdk_gov_1.WAD) /
-            yourAssets /
-            sdk_gov_1.PERCENTAGE_FACTOR;
-        return Number((0, formatter_1.toSignificant)(apyInPercent, sdk_gov_1.WAD_DECIMALS_POW));
+        const apyInPercent = (assetAPYAmountInUnderlying - debtAPY) / yourAssets;
+        return apyInPercent;
     }
     hash() {
         return CreditAccountData.hash(this.creditManager, this.borrower);
@@ -189,22 +181,86 @@ class CreditAccountData {
     static hash(creditManager, borrower) {
         return `${creditManager.toLowerCase()}:${borrower.toLowerCase()}`;
     }
-    static calcHealthFactor({ assets, prices, liquidationThresholds, underlyingToken, borrowed, }) {
+    static calcHealthFactor({ assets, quotas, quotasInfo, liquidationThresholds, underlyingToken, borrowed, prices, }) {
+        const [, underlyingDecimals] = (0, sdk_gov_1.extractTokenData)(underlyingToken);
+        const underlyingPrice = prices[underlyingToken] || 0n;
         const assetLTMoney = assets.reduce((acc, { token: tokenAddress, balance: amount }) => {
-            const tokenSymbol = sdk_gov_1.tokenSymbolByAddress[tokenAddress.toLowerCase()];
-            const tokenDecimals = sdk_gov_1.decimals[tokenSymbol];
-            const lt = liquidationThresholds[tokenAddress.toLowerCase()] || 0n;
-            const price = prices[tokenAddress.toLowerCase()] || 0n;
-            const money = price_1.PriceUtils.calcTotalPrice(price, amount, tokenDecimals);
+            const [, tokenDecimals] = (0, sdk_gov_1.extractTokenData)(tokenAddress);
+            const lt = liquidationThresholds[tokenAddress] || 0n;
+            const price = prices[tokenAddress] || 0n;
+            const tokenMoney = price_1.PriceUtils.calcTotalPrice(price, amount, tokenDecimals);
+            const { isActive = false } = quotasInfo?.[tokenAddress] || {};
+            const quota = quotas[tokenAddress];
+            const quotaBalance = isActive ? quota?.balance || 0n : 0n;
+            const quotaMoney = price_1.PriceUtils.calcTotalPrice(underlyingPrice, quotaBalance, underlyingDecimals);
+            // if quota is undefined, then it is not a quoted token
+            const money = quota
+                ? math_1.BigIntMath.min(quotaMoney, tokenMoney)
+                : tokenMoney;
             const ltMoney = money * lt;
             return acc + ltMoney;
         }, 0n);
-        const underlyingSymbol = sdk_gov_1.tokenSymbolByAddress[underlyingToken.toLowerCase()];
-        const underlyingDecimals = sdk_gov_1.decimals[underlyingSymbol];
-        const underlyingPrice = prices[underlyingToken.toLowerCase()] || sdk_gov_1.PRICE_DECIMALS;
-        const borrowedMoney = price_1.PriceUtils.calcTotalPrice(underlyingPrice, borrowed, underlyingDecimals);
+        const borrowedMoney = price_1.PriceUtils.calcTotalPrice(underlyingPrice || sdk_gov_1.PRICE_DECIMALS, borrowed, underlyingDecimals);
         const hfInPercent = borrowedMoney > 0n ? assetLTMoney / borrowedMoney : 0n;
         return Number(hfInPercent);
     }
+    static calcQuotaUpdate({ quotas, initialQuotas, assetsAfterUpdate, allowedToSpend, allowedToObtain, quotaReserve, }) {
+        const r = Object.values(quotas).reduce((acc, cmQuota) => {
+            const { token, isActive } = cmQuota;
+            const { quota: initialQuota = 0n } = initialQuotas[token] || {};
+            if (!isActive) {
+                acc.desiredQuota[token] = {
+                    balance: initialQuota,
+                    token,
+                };
+                return acc;
+            }
+            const after = assetsAfterUpdate[token];
+            const { amountInTarget = 0n } = after || {};
+            const desiredQuota = (amountInTarget * (sdk_gov_1.PERCENTAGE_FACTOR + quotaReserve)) /
+                sdk_gov_1.PERCENTAGE_FACTOR;
+            const quotaChange = desiredQuota - initialQuota;
+            const correctIncrease = after && allowedToObtain[token] && quotaChange > 0;
+            const correctDecrease = after && allowedToSpend[token] && quotaChange < 0;
+            if (correctIncrease || correctDecrease) {
+                acc.desiredQuota[token] = {
+                    balance: desiredQuota,
+                    token,
+                };
+            }
+            else {
+                acc.desiredQuota[token] = {
+                    balance: initialQuota,
+                    token,
+                };
+            }
+            if (correctIncrease) {
+                acc.quotaIncrease.push({
+                    balance: quotaChange,
+                    token,
+                });
+            }
+            if (correctDecrease) {
+                acc.quotaDecrease.push({
+                    balance: quotaChange,
+                    token,
+                });
+            }
+            return acc;
+        }, { desiredQuota: {}, quotaIncrease: [], quotaDecrease: [] });
+        return r;
+    }
+    static calcQuotaBorrowRate({ quotas, quotaRates, borrowAmount, }) {
+        if (borrowAmount <= 0)
+            return 0;
+        const totalRateBalance = Object.values(quotas).reduce((acc, { token, balance }) => {
+            const { rate = 0, isActive = false } = quotaRates?.[token] || {};
+            const quotaBalance = isActive ? balance : 0n;
+            const rateBalance = quotaBalance * BigInt(rate);
+            return acc + rateBalance;
+        }, 0n);
+        const quotaBorrowRate = Number(totalRateBalance / borrowAmount);
+        return quotaBorrowRate;
+    }
 }
 exports.CreditAccountData = CreditAccountData;