@gearbox-protocol/sdk 3.0.0-next.11 → 3.0.0-next.110

package/contracts/index.sol

@@ -7,15 +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 {IWERC20Zapper} from "@gearbox-protocol/integrations-v3/contracts/interfaces/zappers/IWERC20Zapper.sol";
-import {IWETHZapper} from "@gearbox-protocol/integrations-v3/contracts/interfaces/zappers/IWETHZapper.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";
@@ -24,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";
@@ -35,6 +56,11 @@ import {IwstETHV1Adapter} from "@gearbox-protocol/integrations-v3/contracts/inte
 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/convexAPY.d.ts

@@ -1,14 +1,14 @@
 import { ConvexPoolContract, ConvexPoolParams, CurveGEARPoolParams, CurveParams, CurveSteCRVPoolParams, MCall, NetworkType } from "@gearbox-protocol/sdk-gov";
 import { CurveLPToken } from "@gearbox-protocol/sdk-gov/lib/tokens/curveLP";
 import { SupportedToken } from "@gearbox-protocol/sdk-gov/lib/tokens/token";
-import { BigNumber } from "ethers";
+import { BigNumberish } from "ethers";
 import { CurveAPYResult } from "./curveAPY";
 type GetTokenPriceCallback = (tokenAddress: string, currency?: string) => bigint;
 export interface GetConvexAPYBulkProps {
     getTokenPrice: GetTokenPriceCallback;
     curveAPY: CurveAPYResult;
     generated: GetConvexAPYBulkCallsReturns;
-    response: Array<BigNumber>;
+    response: Array<BigNumberish>;
 }
 export declare function getConvexAPYBulk(props: GetConvexAPYBulkProps): bigint[];
 interface PoolInfo {

package/lib/apy/convexAPY.js

@@ -142,6 +142,8 @@ function calculateConvexAPY(props) {
     const crvPerSecond = props.cvxPoolRate;
     const vPrice = getVirtualPrice(props);
     const virtualSupply = (props.cvxPoolSupply * vPrice) / sdk_gov_1.WAD;
+    if (!virtualSupply)
+        return 0n;
     const crvPerUnderlying = (crvPerSecond * sdk_gov_1.WAD) / virtualSupply;
     const crvPerYear = crvPerUnderlying * BigInt(sdk_gov_1.SECONDS_PER_YEAR);
     const cvxPerYear = getCVXMintAmount(crvPerYear, props.cvxTokenSupply);

package/lib/apy/curveAPY.js

@@ -7,6 +7,7 @@ exports.getCurveAPY = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const axios_1 = __importDefault(require("axios"));
 const formatter_1 = require("../utils/formatter");
+// !& wstETHCRV
 const APY_DICTIONARY = {
     "3Crv": "0",
     FRAX3CRV: "34",
@@ -25,7 +26,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,10 +1,11 @@
-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";
 export * from "./lidoAPY";
+export * from "./maker";
 export * from "./yearnAPY";

package/lib/apy/index.js

@@ -26,4 +26,5 @@ exports.isTokenWithAPY = isTokenWithAPY;
 __exportStar(require("./convexAPY"), exports);
 __exportStar(require("./curveAPY"), exports);
 __exportStar(require("./lidoAPY"), exports);
+__exportStar(require("./maker"), exports);
 __exportStar(require("./yearnAPY"), exports);

package/lib/apy/maker.d.ts

@@ -0,0 +1,39 @@
+import { ERC4626Params, ERC4626VaultContract, NetworkType } from "@gearbox-protocol/sdk-gov";
+import { BigNumberish } from "ethers";
+import { Interface } from "ethers/lib/utils";
+export declare const MAKER_VAULT_ABI: {
+    inputs: never[];
+    name: string;
+    outputs: {
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
+    stateMutability: string;
+    type: string;
+}[];
+export declare const MAKER_VAULT_INTERFACE: Interface;
+export type MakerPoolContract = Extract<ERC4626VaultContract, "MAKER_DSR_VAULT">;
+interface PoolInfo {
+    pool: ERC4626Params;
+    poolAddress: string;
+}
+export interface GetMakerAPYBulkCallsProps {
+    pools: Array<MakerPoolContract>;
+    networkType: NetworkType;
+}
+export declare function getMakerAPYBulkCalls({ pools, networkType, }: GetMakerAPYBulkCallsProps): {
+    poolsInfo: PoolInfo[];
+    calls: {
+        address: string;
+        interface: Interface;
+        method: string;
+    }[];
+};
+type GetMakerAPYBulkCallsReturns = ReturnType<typeof getMakerAPYBulkCalls>;
+export interface GetMakerAPYBulkProps {
+    generated: GetMakerAPYBulkCallsReturns;
+    response: Array<BigNumberish>;
+}
+export declare function getMakerAPYBulk(props: GetMakerAPYBulkProps): bigint[];
+export {};

package/lib/apy/maker.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMakerAPYBulk = exports.getMakerAPYBulkCalls = exports.MAKER_VAULT_INTERFACE = exports.MAKER_VAULT_ABI = void 0;
+const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
+const utils_1 = require("ethers/lib/utils");
+const formatter_1 = require("../utils/formatter");
+exports.MAKER_VAULT_ABI = [
+    {
+        inputs: [],
+        name: "dsr",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+];
+exports.MAKER_VAULT_INTERFACE = new utils_1.Interface(exports.MAKER_VAULT_ABI);
+const MAKER_BY_NETWORK = {
+    Mainnet: {
+        MAKER_DSR_VAULT: "0x197E90f9FAD81970bA7976f33CbD77088E5D7cf7",
+    },
+    Arbitrum: {
+        MAKER_DSR_VAULT: "",
+    },
+    Optimism: {
+        MAKER_DSR_VAULT: "",
+    },
+};
+function getMakerAPYBulkCalls({ pools, networkType, }) {
+    const poolsInfo = pools.map((pool) => {
+        const poolParams = sdk_gov_1.contractParams[pool];
+        const basePoolAddress = MAKER_BY_NETWORK[networkType][pool];
+        return {
+            pool: poolParams,
+            poolAddress: basePoolAddress,
+        };
+    });
+    const calls = poolsInfo.map(info => ({
+        address: info.poolAddress,
+        interface: exports.MAKER_VAULT_INTERFACE,
+        method: "dsr()",
+    }));
+    return { poolsInfo, calls };
+}
+exports.getMakerAPYBulkCalls = getMakerAPYBulkCalls;
+function getMakerAPYBulk(props) {
+    const { poolsInfo } = props.generated;
+    const apyList = props.response.map((baseApy, i) => {
+        const apy = calculateMakerAPY({
+            baseApy: (0, sdk_gov_1.toBigInt)(baseApy),
+            poolInfo: poolsInfo[i],
+        });
+        return apy;
+    });
+    return apyList;
+}
+exports.getMakerAPYBulk = getMakerAPYBulk;
+const POW = 3600 * 24 * 365;
+function calculateMakerAPY(props) {
+    const rateFloat = Number((0, formatter_1.toSignificant)(props.baseApy, 27, 27));
+    const rate = Math.max(0, rateFloat ** POW - 1);
+    return (0, formatter_1.toBN)(rate.toString(), sdk_gov_1.WAD_DECIMALS_POW);
+}

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.yexporter.io/v1/chains/1/vaults/all";
+const URL = "https://ydaemon.yearn.finance/vaults/all?chainids=1&limit=2500";
 const transformSymbol = (s) => s.replaceAll("_", "-").toLowerCase();
 async function getYearnAPY() {
     try {
@@ -18,8 +18,11 @@ async function getYearnAPY() {
             return acc;
         }, {});
         const yearnAPY = sdk_gov_1.TypedObjectUtils.entries(sdk_gov_1.yearnTokens).reduce((acc, [yearnSymbol]) => {
-            const { apy } = dataBySymbol[transformSymbol(yearnSymbol)] || {};
-            const { net_apy: netApy } = apy || {};
+            const symbol = transformSymbol(yearnSymbol);
+            const data = dataBySymbol[symbol];
+            const { apr: apy } = data || {};
+            const { netAPR } = apy || {};
+            const netApy = netAPR || 0;
             acc[yearnSymbol] = (0, formatter_1.toBN)((netApy / RESPONSE_DECIMALS).toString(), sdk_gov_1.WAD_DECIMALS_POW);
             return acc;
         }, {});

package/lib/contracts/contractsRegister.d.ts

@@ -3,18 +3,23 @@ export declare const stEthPoolWrapper: Record<NetworkType, string>;
 type MainnetCreditManagersV1 = "DAI_V1" | "USDC_V1" | "WETH_V1" | "WBTC_V1";
 type MainnetCreditManagersV2 = "DAI_V2" | "USDC_V2" | "WETH_V2" | "WSTETH_V2" | "WBTC_V2" | "FRAX_V2";
 type MainnetCreditManagersV2_1 = "WETH_V2_1";
-export type MainnetCreditManagers = MainnetCreditManagersV1 | MainnetCreditManagersV2 | MainnetCreditManagersV2_1;
+type MainnetCreditManagersV3 = "USDC_V3_TRADE_TIER_1" | "USDC_V3_TRADE_TIER_2" | "USDC_V3_TRADE_TIER_3" | "WBTC_V3_TRADE_TIER_1" | "WBTC_V3_TRADE_TIER_2" | "WBTC_V3_TRADE_TIER_3" | "WETH_V3_TRADE_TIER_1" | "WETH_V3_TRADE_TIER_2" | "WETH_V3_TRADE_TIER_3";
+export type MainnetCreditManagers = MainnetCreditManagersV1 | MainnetCreditManagersV2 | MainnetCreditManagersV2_1 | MainnetCreditManagersV3;
 export type ArbitrumCreditManagers = never;
+export type OptimismCreditManagers = never;
 type CreditManagersListType = {
-    [key in NetworkType]: key extends "Mainnet" ? Record<MainnetCreditManagers, string> : key extends "Arbitrum" ? Record<ArbitrumCreditManagers, string> : never;
+    [key in NetworkType]: key extends "Mainnet" ? Record<MainnetCreditManagers, string> : key extends "Arbitrum" ? Record<ArbitrumCreditManagers, string> : key extends "Optimism" ? Record<OptimismCreditManagers, string> : never;
 };
 export declare const creditManagerByNetwork: CreditManagersListType;
 export type SupportedCreditManagers = MainnetCreditManagers | ArbitrumCreditManagers;
 export declare const creditManagerByAddress: Record<string, SupportedCreditManagers>;
-export type MainnetPools = "DAI_V1" | "USDC_V1" | "WETH_V1" | "WBTC_V1" | "WSTETH_V1" | "FRAX_V1";
+export type MainnetPoolsV1 = "DAI_V1" | "USDC_V1" | "WETH_V1" | "WBTC_V1" | "WSTETH_V1" | "FRAX_V1";
+export type MainnetPoolsV3 = "USDC_V3_TRADE" | "WETH_V3_TRADE" | "WBTC_V3_TRADE";
+export type MainnetPools = MainnetPoolsV1 | MainnetPoolsV3;
 export type ArbitrumPools = never;
+export type OptimismPools = never;
 type PoolsListType = {
-    [key in NetworkType]: key extends "Mainnet" ? Record<MainnetPools, string> : key extends "Arbitrum" ? Record<ArbitrumPools, string> : never;
+    [key in NetworkType]: key extends "Mainnet" ? Record<MainnetPools, string> : key extends "Arbitrum" ? Record<ArbitrumPools, string> : key extends "Optimism" ? Record<OptimismPools, string> : never;
 };
 export declare const poolByNetwork: PoolsListType;
 export type SupportedPools = MainnetPools | ArbitrumPools;

package/lib/contracts/contractsRegister.js

@@ -5,6 +5,7 @@ const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 exports.stEthPoolWrapper = {
     Mainnet: "0x5a97e3E43dCBFe620ccF7865739075f92E93F5E4",
     Arbitrum: "0x3fe62a62C022A069952069b32C9d56718D30B7ec",
+    Optimism: "",
 };
 exports.creditManagerByNetwork = {
     Mainnet: {
@@ -19,8 +20,18 @@ exports.creditManagerByNetwork = {
         WBTC_V2: "0xc62BF8a7889AdF1c5Dc4665486c7683ae6E74e0F".toLowerCase(),
         FRAX_V2: "0xA3E1e0d58FE8dD8C9dd48204699a1178f1B274D8".toLowerCase(),
         WETH_V2_1: "0x4C6309fe2085EfE7A0Cfb426C16Ef3b41198cCE3".toLowerCase(),
+        USDC_V3_TRADE_TIER_1: "0x3eb95430fdb99439a86d3c6d7d01c3c561393556".toLowerCase(),
+        USDC_V3_TRADE_TIER_2: "0xea7c28428d3916dbe2f113b8a6e6dd0f3819c050".toLowerCase(),
+        USDC_V3_TRADE_TIER_3: "0x4e94cd228ef386ebc32900ec745d1865934688a3".toLowerCase(),
+        WBTC_V3_TRADE_TIER_1: "0xefc134755aaf89fe84476946251680bece41246e".toLowerCase(),
+        WBTC_V3_TRADE_TIER_2: "0xcac3e41b9bad20e2aa35e150de96eefb2d043735".toLowerCase(),
+        WBTC_V3_TRADE_TIER_3: "0x46709ca16b1ffea5d6c6bb6b7e77dd9e3b4908ed".toLowerCase(),
+        WETH_V3_TRADE_TIER_1: "0xa30099925b14b00b76ae2efe2639cd01598fe68a".toLowerCase(),
+        WETH_V3_TRADE_TIER_2: "0x3f11758aca3f2eb7a27828c9cbcd0b347944ac14".toLowerCase(),
+        WETH_V3_TRADE_TIER_3: "0x0b2486355e987586c32fc0feefe2943e396c484e".toLowerCase(),
     },
     Arbitrum: {},
+    Optimism: {},
 };
 exports.creditManagerByAddress = sdk_gov_1.TypedObjectUtils.entries(exports.creditManagerByNetwork).reduce((acc, [, cms]) => ({
     ...acc,
@@ -36,8 +47,12 @@ exports.poolByNetwork = {
         WBTC_V1: "0xB2A015c71c17bCAC6af36645DEad8c572bA08A08".toLowerCase(),
         WSTETH_V1: "0xB8cf3Ed326bB0E51454361Fb37E9E8df6DC5C286".toLowerCase(),
         FRAX_V1: "0x79012c8d491dcf3a30db20d1f449b14caf01da6c".toLowerCase(),
+        USDC_V3_TRADE: "0xda00000035fef4082f78def6a8903bee419fbf8e".toLowerCase(),
+        WBTC_V3_TRADE: "0xda00010eda646913f273e10e7a5d1f659242757d".toLowerCase(),
+        WETH_V3_TRADE: "0xda0002859b2d05f66a753d8241fcde8623f26f4f".toLowerCase(),
     },
     Arbitrum: {},
+    Optimism: {},
 };
 const deployedContractNames = {
     // MAINNET V1 CM

package/lib/core/assets.d.ts

@@ -24,12 +24,12 @@ export declare class AssetUtils {
     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

@@ -37,11 +37,11 @@ class AssetUtils {
     static memoWrap = (unwrappedAddress, wrappedAddress, prices, tokensList) => function wrap(assets) {
         const assetsRecord = AssetUtils.constructAssetRecord(assets);
         const unwrapped = assetsRecord[unwrappedAddress];
-        const { balance: unwrappedAmount = 0n } = unwrapped || {};
         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];
@@ -61,11 +61,11 @@ class AssetUtils {
             return [Object.values(assetsRecord), unwrappedInWrapped, wrappedAmount];
         }
         // else no actions needed
-        return [Object.values(assetsRecord), unwrappedAmount, wrappedAmount];
+        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);
@@ -84,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,78 @@
 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">>;
+    feeInterest: number;
     prices: Record<string, bigint>;
     totalValue: bigint | undefined;
     debt: bigint | undefined;
-    borrowRate: number;
+    baseRateWithFee: 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;
+    debt: bigint;
+}
+export interface CalcDefaultQuotaProps {
+    amount: bigint;
+    lt: bigint;
+    quotaReserve: bigint;
+}
+export interface CalcRecommendedQuotaProps {
+    amount: bigint;
+    debt: bigint;
+    lt: bigint;
+    quotaReserve: bigint;
+}
+export interface CalcQuotaUpdateProps {
+    quotas: Record<string, Pick<QuotaInfo, "isActive" | "token">>;
+    initialQuotas: Record<string, Pick<CaTokenBalance, "quota">>;
+    liquidationThresholds: Record<string, bigint>;
+    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">>;
+}
+export interface CalcRelativeBaseBorrowRateProps {
+    debt: bigint;
+    baseRateWithFee: number;
+    assetAmountInUnderlying: bigint;
+    totalValue: bigint;
+}
+export interface CalcAvgQuotaBorrowRateProps {
+    quotas: Record<string, Asset>;
+    quotaRates: Record<string, Pick<QuotaInfo, "isActive" | "rate">>;
+    totalValue: bigint;
+}
+interface LiquidationPriceProps {
+    liquidationThresholds: Record<string, bigint>;
+    debt: bigint;
+    underlyingToken: string;
+    targetToken: string;
+    assets: Record<string, Asset>;
 }
 export declare class CreditAccountData {
+    readonly isSuccessful: boolean;
     readonly addr: string;
     readonly borrower: string;
     readonly creditManager: string;
@@ -27,11 +81,12 @@ export declare class CreditAccountData {
     readonly since: number;
     readonly expirationDate: number;
     readonly version: number;
+    readonly cmName: string;
     readonly enabledTokenMask: bigint;
     readonly healthFactor: number;
     isDeleting: boolean;
-    readonly baseBorrowRate: number;
-    readonly borrowRate: number;
+    readonly baseBorrowRateWithoutFee: number;
+    readonly borrowRateWithoutFee: number;
     readonly borrowedAmount: bigint;
     readonly accruedInterest: bigint;
     readonly accruedFees: bigint;
@@ -40,30 +95,32 @@ 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;
     isForbidden(token: string): boolean;
     isQuoted(token: string): boolean;
-    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;
+    isTokenEnabled(token: string): boolean;
+    static calcMaxDebtIncrease(healthFactor: number, debt: bigint, underlyingLT: number, minHf?: number): bigint;
+    static calcOverallAPY({ caAssets, lpAPY, prices, quotas, quotaRates, feeInterest, totalValue, debt, baseRateWithFee, 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, debt, prices, }: CalcHealthFactorProps): number;
+    static calcRecommendedQuota({ amount, debt, lt, quotaReserve, }: CalcRecommendedQuotaProps): bigint;
+    static calcDefaultQuota({ amount, lt, quotaReserve }: CalcDefaultQuotaProps): bigint;
+    static calcQuotaUpdate({ quotas, initialQuotas, assetsAfterUpdate, liquidationThresholds, allowedToSpend, allowedToObtain, quotaReserve, }: CalcQuotaUpdateProps): CalcQuotaUpdateReturnType;
+    static calcQuotaBorrowRate({ quotas, quotaRates }: CalcQuotaBorrowRateProps): bigint;
+    static calcRelativeBaseBorrowRate({ debt, baseRateWithFee, assetAmountInUnderlying, totalValue, }: CalcRelativeBaseBorrowRateProps): bigint;
+    static liquidationPrice({ liquidationThresholds, debt, underlyingToken, targetToken, assets, }: LiquidationPriceProps): bigint;
 }
+export {};