@gearbox-protocol/sdk 3.0.0-next.19 → 3.0.0-next.190

package/lib/apy/defiLamaAPY.js

@@ -0,0 +1,69 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDefiLamaAPY = void 0;
+const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
+const axios_1 = __importDefault(require("axios"));
+const LAMA_URL = "https://charts-server.fly.dev/api/defillama?ids=";
+async function getDefiLamaAPY(networkType) {
+    const currentNormal = NORMAL_TO_LAMA[networkType];
+    const idList = Object.values(currentNormal);
+    if (idList.length === 0)
+        return {};
+    const res = await axios_1.default.get(`${LAMA_URL}${idList.join(",")}`);
+    const itemsRecord = res.data.data.reduce((acc, item) => {
+        acc[item.pool] = item;
+        return acc;
+    }, {});
+    const allAPY = sdk_gov_1.TypedObjectUtils.entries(currentNormal).reduce((acc, [symbol, pool]) => {
+        const { apy = 0 } = itemsRecord[pool] || {};
+        acc[symbol] = Math.round(apy * Number(sdk_gov_1.PERCENTAGE_FACTOR));
+        return acc;
+    }, {});
+    return allAPY;
+}
+exports.getDefiLamaAPY = getDefiLamaAPY;
+const NORMAL_TO_LAMA = {
+    Mainnet: {
+        sDAI: "c8a24fee-ec00-4f38-86c0-9f6daebc4225",
+        rETH: "d4b3c522-6127-4b89-bedf-83641cdcd2eb",
+        osETH: "4d01599c-69ae-41a3-bae1-5fab896f04c8",
+        auraB_rETH_STABLE_vault: "a4b5b995-99e7-4b8f-916d-8940b5627d70",
+        sUSDe: "66985a81-9c51-46ca-9977-42b4fe7bc6df",
+    },
+    Optimism: { rETH: "d4b3c522-6127-4b89-bedf-83641cdcd2eb" },
+    Arbitrum: {
+        rETH: "d4b3c522-6127-4b89-bedf-83641cdcd2eb",
+        cbETH: "0f45d730-b279-4629-8e11-ccb5cc3038b4",
+        sfrxETH: "77020688-e1f9-443c-9388-e51ace15cc32",
+    },
+    Base: {},
+};
+// const CONVEX_TO_LAMA: Record<
+//   NetworkType,
+//   Record<ConvexStakedPhantomToken, string>
+// > = {
+//   Mainnet: {
+//     stkcvx3Crv: "7394f1bc-840a-4ff0-9e87-5e0ef932943a",
+//     stkcvxFRAX3CRV: "844a8a29-4653-42e6-b675-a6b43fac3678", // !!
+//     stkcvxgusd3CRV: "dc81639c-9391-4e56-96b9-76cfbcda61d4",
+//     stkcvxLUSD3CRV: "b61ef013-6391-4cdd-b057-b344ab852088", // !!
+//     stkcvxcrvPlain3andSUSD: "45f74ed5-5832-4d6d-8f2c-2929b6ac5e9c", // !!
+//     stkcvxsteCRV: "5ce23e7e-3800-4c9c-ad30-6db3db0515a1", // !!
+//     stkcvxcrvFRAX: "bd072651-d99c-4154-aeae-51f12109c054",
+//     stkcvxOHMFRAXBP: "42de7839-da37-4a99-8992-d6352177c4db", // !!
+//     stkcvxMIM_3LP3CRV: "8a20c472-142c-4442-b724-40f2183c073e",
+//     stkcvxcrvCRVETH: "disabled",
+//     stkcvxcrvCVXETH: "25d9dc49-3182-493a-bda4-0db53b25f457",
+//     stkcvxcrvUSDTWBTCWETH: "3be97c90-d4a8-42b3-a0d0-2906ae4e9d27",
+//     stkcvxLDOETH: "69361f05-1a95-4323-9b6f-44338ad22e98",
+//     stkcvxcrvUSDUSDC: "755fcec6-f4fd-4150-9184-60f099206694",
+//     stkcvxcrvUSDUSDT: "a3ffd3fe-b21c-44eb-94d5-22c80057a600",
+//     stkcvxcrvUSDFRAX: "411af006-56b0-480a-9586-1071bccbd178",
+//     stkcvxcrvUSDETHCRV: "654ac683-141b-42d3-b28d-b2f77eedd595",
+//   },
+//   Optimism: {} as any,
+//   Arbitrum: {} as any,
+// };

package/lib/apy/index.d.ts

@@ -1,10 +1,19 @@
 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 = PartialRecord<TokensWithAPY, number>;
+type AdditionalTokensWithAPY = Extract<SupportedToken, "STETH" | "rETH" | "osETH" | "cbETH" | "wstETH" | "sfrxETH">;
+type AdditionalLPTokens = Extract<SupportedToken, "weETH" | "ezETH" | "sfrxETH" | "USDe" | "rsETH" | "rswETH" | "pufETH">;
+type ExtraFarmTokens = AdditionalTokensWithAPY | AdditionalLPTokens;
+export type LRTAndLSDTokens = Extract<ExtraFarmTokens, "weETH" | "rsETH" | "rswETH" | "pufETH" | "ezETH" | "STETH" | "wstETH" | "sfrxETH" | "osETH" | "cbETH" | "rETH">;
+export type TokensWithAPY = LPTokens | AdditionalTokensWithAPY;
+export type TokensWithApyRecord = PartialRecord<TokensWithAPY, number>;
+export type AllLPTokens = LPTokens | ExtraFarmTokens;
+export declare const isLRT_LSDToken: (t: unknown) => t is LRTAndLSDTokens;
+export declare const isAdditionalLPToken: (t: unknown) => t is AdditionalLPTokens;
+export declare const isAdditionalTokenWithAPY: (t: unknown) => t is AdditionalTokensWithAPY;
+export declare const isExtraFarmToken: (t: unknown) => t is ExtraFarmTokens;
 export declare const isTokenWithAPY: (t: unknown) => t is TokensWithAPY;
+export declare const isFarmToken: (t: unknown) => t is AllLPTokens;
 export * from "./convexAPY";
 export * from "./curveAPY";
+export * from "./defiLamaAPY";
 export * from "./lidoAPY";
 export * from "./yearnAPY";

package/lib/apy/index.js

@@ -14,16 +14,70 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isTokenWithAPY = exports.additionalTokensWIthAPY = void 0;
+exports.isFarmToken = exports.isTokenWithAPY = exports.isExtraFarmToken = exports.isAdditionalTokenWithAPY = exports.isAdditionalLPToken = exports.isLRT_LSDToken = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
-exports.additionalTokensWIthAPY = {
+const ADDITIONAL_LP_TOKENS = {
+    weETH: true,
+    ezETH: true,
+    sfrxETH: true,
+    USDe: true,
+    rsETH: true,
+    rswETH: true,
+    pufETH: true,
+};
+const TOKENS_WITH_APY = {
+    STETH: true,
+    osETH: true,
+    rETH: true,
+    wstETH: true,
+    cbETH: true,
+    sfrxETH: true,
+};
+const LRT_LSD = {
+    weETH: true,
+    rsETH: true,
+    rswETH: true,
+    pufETH: true,
+    ezETH: true,
     STETH: true,
+    wstETH: true,
+    sfrxETH: true,
+    osETH: true,
+    cbETH: true,
+    rETH: true,
+};
+const isLRT_LSDToken = (t) => {
+    if (typeof t !== "string")
+        return false;
+    return !!LRT_LSD[t];
+};
+exports.isLRT_LSDToken = isLRT_LSDToken;
+const isAdditionalLPToken = (t) => {
+    if (typeof t !== "string")
+        return false;
+    return !!ADDITIONAL_LP_TOKENS[t];
+};
+exports.isAdditionalLPToken = isAdditionalLPToken;
+const isAdditionalTokenWithAPY = (t) => {
+    if (typeof t !== "string")
+        return false;
+    return !!TOKENS_WITH_APY[t];
+};
+exports.isAdditionalTokenWithAPY = isAdditionalTokenWithAPY;
+const isExtraFarmToken = (t) => (0, exports.isAdditionalLPToken)(t) || (0, exports.isAdditionalTokenWithAPY)(t);
+exports.isExtraFarmToken = isExtraFarmToken;
+const isTokenWithAPY = (t) => {
+    if (typeof t !== "string")
+        return false;
+    return (0, sdk_gov_1.isLPToken)(t) || (0, exports.isAdditionalTokenWithAPY)(t);
 };
-const isTokenWithAPY = (t) => typeof t === "string" &&
-    (!!sdk_gov_1.lpTokens[t] ||
-        !!exports.additionalTokensWIthAPY[t]);
 exports.isTokenWithAPY = isTokenWithAPY;
+const isFarmToken = (t) => {
+    return (0, sdk_gov_1.isLPToken)(t) || (0, exports.isExtraFarmToken)(t);
+};
+exports.isFarmToken = isFarmToken;
 __exportStar(require("./convexAPY"), exports);
 __exportStar(require("./curveAPY"), exports);
+__exportStar(require("./defiLamaAPY"), exports);
 __exportStar(require("./lidoAPY"), exports);
 __exportStar(require("./yearnAPY"), exports);

package/lib/apy/lidoAPY.d.ts

@@ -1 +1,4 @@
-export declare function getLidoAPY(): Promise<bigint>;
+import { PartialRecord } from "@gearbox-protocol/sdk-gov";
+import { TokensWithAPY } from ".";
+export type LidoAPYResult = PartialRecord<Extract<TokensWithAPY, "STETH" | "wstETH">, number>;
+export declare function getLidoAPY(): Promise<LidoAPYResult>;

package/lib/apy/lidoAPY.js

@@ -6,17 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLidoAPY = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const axios_1 = __importDefault(require("axios"));
-const formatter_1 = require("../utils/formatter");
 const LIDO_URL = "https://eth-api.lido.fi/v1/protocol/steth/apr/sma";
 async function getLidoAPY() {
-    try {
-        const res = await axios_1.default.get(LIDO_URL);
-        const { smaApr = 0 } = res?.data?.data || {};
-        return (0, formatter_1.toBN)(String(smaApr), sdk_gov_1.WAD_DECIMALS_POW) / sdk_gov_1.PERCENTAGE_DECIMALS;
-    }
-    catch (e) {
-        console.error(e);
-        return 0n;
-    }
+    const res = await axios_1.default.get(LIDO_URL);
+    const { smaApr = 0 } = res?.data?.data || {};
+    const r = Math.round(smaApr * Number(sdk_gov_1.PERCENTAGE_FACTOR));
+    return {
+        STETH: r,
+        wstETH: r,
+    };
 }
 exports.getLidoAPY = getLidoAPY;

package/lib/apy/yearnAPY.d.ts

@@ -1,3 +1,3 @@
-import { YearnLPToken } from "@gearbox-protocol/sdk-gov";
-export type YearnAPYResult = Record<YearnLPToken, bigint>;
-export declare function getYearnAPY(): Promise<YearnAPYResult | null>;
+import { NetworkType, PartialRecord, YearnLPToken } from "@gearbox-protocol/sdk-gov";
+export type YearnAPYResult = PartialRecord<YearnLPToken, number>;
+export declare function getYearnAPY(network: NetworkType): Promise<YearnAPYResult>;

package/lib/apy/yearnAPY.js

@@ -6,27 +6,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getYearnAPY = void 0;
 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 transformSymbol = (s) => s.replaceAll("_", "-").toLowerCase();
-async function getYearnAPY() {
+const getUrl = (chainId) => `https://ydaemon.yearn.finance/vaults/all?chainids=${chainId}&limit=2500`;
+async function getYearnAPY(network) {
     try {
-        const { data } = await axios_1.default.get(URL);
-        const dataBySymbol = data.reduce((acc, d) => {
-            acc[d.symbol.toLowerCase()] = d;
+        const chainId = sdk_gov_1.CHAINS[network];
+        const currentTokens = sdk_gov_1.tokenDataByNetwork[network];
+        const { data } = await axios_1.default.get(getUrl(chainId));
+        const dataByAddress = data.reduce((acc, d) => {
+            acc[d.address.toLowerCase()] = d;
             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 || {};
-            acc[yearnSymbol] = (0, formatter_1.toBN)((netApy / RESPONSE_DECIMALS).toString(), sdk_gov_1.WAD_DECIMALS_POW);
+            const address = (currentTokens?.[yearnSymbol] || "").toLowerCase();
+            const data = dataByAddress[address];
+            const { apr: apy } = data || {};
+            const { netAPR } = apy || {};
+            const netApy = netAPR || 0;
+            const r = Math.round(netApy * Number(sdk_gov_1.PERCENTAGE_FACTOR) * Number(sdk_gov_1.PERCENTAGE_DECIMALS));
+            acc[yearnSymbol] = r;
             return acc;
         }, {});
         return yearnAPY;
     }
     catch (e) {
-        return null;
+        return {};
     }
 }
 exports.getYearnAPY = getYearnAPY;

package/lib/contracts/contractsRegister.d.ts

@@ -3,18 +3,25 @@ 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;
-export type ArbitrumCreditManagers = never;
+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" | "USDC_V3_FARM" | "WETH_V3_FARM" | "WETH_V3_RESTAKING" | "USDT_V3_TIER_1_BROKEN" | "GHO_V3_TIER_1" | "DAI_V3_TIER_1" | "USDT_V3_TIER_1";
+export type MainnetCreditManagers = MainnetCreditManagersV1 | MainnetCreditManagersV2 | MainnetCreditManagersV2_1 | MainnetCreditManagersV3;
+export type ArbitrumCreditManagers = "USDC_E_V3_TRADE_TIER_1" | "USDC_E_V3_TRADE_TIER_2" | "WETH_V3_TRADE_TIER_1" | "WETH_V3_TRADE_TIER_2";
+export type OptimismCreditManagers = "USDC_E_V3_TIER_1" | "USDC_E_V3_TIER_2" | "WETH_V3_TIER_1" | "WETH_V3_TRADE_TIER_2";
+export type BaseCreditManagers = 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> : key extends "Base" ? Record<BaseCreditManagers, 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 ArbitrumPools = never;
+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" | "USDT_V3_BROKEN" | "GHO_V3" | "DAI_V3" | "USDT_V3";
+export type MainnetPools = MainnetPoolsV1 | MainnetPoolsV3;
+export type ArbitrumPools = "USDC_V3" | "WETH_V3";
+export type OptimismPools = "USDC_V3" | "WETH_V3";
+export type BasePools = 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> : key extends "Base" ? Record<BasePools, string> : never;
 };
 export declare const poolByNetwork: PoolsListType;
 export type SupportedPools = MainnetPools | ArbitrumPools;

package/lib/contracts/contractsRegister.js

@@ -5,6 +5,8 @@ const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 exports.stEthPoolWrapper = {
     Mainnet: "0x5a97e3E43dCBFe620ccF7865739075f92E93F5E4",
     Arbitrum: "0x3fe62a62C022A069952069b32C9d56718D30B7ec",
+    Optimism: "",
+    Base: "",
 };
 exports.creditManagerByNetwork = {
     Mainnet: {
@@ -19,8 +21,36 @@ 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(),
+        USDC_V3_FARM: "0x1d489ccd2b96908c0a80acbbdb2f1963ffed3384".toLowerCase(),
+        WETH_V3_FARM: "0x6dc0eb1980fa6b3fa89f5b29937b9baab5865b3e".toLowerCase(),
+        WETH_V3_RESTAKING: "0x50ba483272484fc5eebe8676dc87d814a11faef6".toLowerCase(),
+        USDT_V3_TIER_1_BROKEN: "0x6950f4190aa1e1339519d5d4d89796ae4165cd5c".toLowerCase(),
+        USDT_V3_TIER_1: "0xe35eb22a349baba4f1a28a9cdba641d3b72c6203".toLowerCase(),
+        GHO_V3_TIER_1: "0x58c8e983d9479b69b64970f79e8965ea347189c9".toLowerCase(),
+        DAI_V3_TIER_1: "0x4582411643f9bbe6c736ed2114eda856b1c9ed40".toLowerCase(),
     },
-    Arbitrum: {},
+    Arbitrum: {
+        USDC_E_V3_TRADE_TIER_1: "0x75bc0fef1c93723be3d73b2000b5ba139a0c680c".toLowerCase(),
+        USDC_E_V3_TRADE_TIER_2: "0xb4bc02c0859b372c61abccfa5df91b1ccaa4dd1f".toLowerCase(),
+        WETH_V3_TRADE_TIER_1: "0xcedaa4b4a42c0a771f6c24a3745c3ca3ed73f17a".toLowerCase(),
+        WETH_V3_TRADE_TIER_2: "0x3ab1d35500d2da4216f5863229a7b81e2f6ff976".toLowerCase(),
+    },
+    Optimism: {
+        USDC_E_V3_TIER_1: "0xab260a0acbee82db69e61221a57aff302a2a83d9".toLowerCase(),
+        USDC_E_V3_TIER_2: "0xbd71b3e744a0f9a6f8405479118ff2f42118463a".toLowerCase(),
+        WETH_V3_TIER_1: "0x1c1261bbccd09cb618d3fd8cd74bf7562c022ac4".toLowerCase(),
+        WETH_V3_TRADE_TIER_2: "0x6ed2150a2d4136b42adf2043d25f5834baa0f1a9".toLowerCase(),
+    },
+    Base: {},
 };
 exports.creditManagerByAddress = sdk_gov_1.TypedObjectUtils.entries(exports.creditManagerByNetwork).reduce((acc, [, cms]) => ({
     ...acc,
@@ -36,8 +66,23 @@ 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(),
+        USDT_V3_BROKEN: "0x1dc0f3359a254f876b37906cfc1000a35ce2d717".toLowerCase(),
+        GHO_V3: "0x4d56c9cba373ad39df69eb18f076b7348000ae09".toLowerCase(),
+        DAI_V3: "0xe7146f53dbcae9d6fa3555fe502648deb0b2f823".toLowerCase(),
+        USDT_V3: "0x05a811275fe9b4de503b3311f51edf6a856d936e".toLowerCase(),
+    },
+    Arbitrum: {
+        USDC_V3: "0xa76c604145d7394dec36c49af494c144ff327861".toLowerCase(),
+        WETH_V3: "0x04419d3509f13054f60d253e0c79491d9e683399".toLowerCase(),
+    },
+    Optimism: {
+        USDC_V3: "0x5520daa93a187f4ec67344e6d2c4fc9b080b6a35".toLowerCase(),
+        WETH_V3: "0x42db77b3103c71059f4b997d6441cfb299fd0d94".toLowerCase(),
     },
-    Arbitrum: {},
+    Base: {},
 };
 const deployedContractNames = {
     // MAINNET V1 CM

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,7 +61,7 @@ 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

package/lib/core/bot.d.ts

@@ -0,0 +1,11 @@
+import { BotBaseType, BotDataPayload, BotDetailedType } from "../payload/bot";
+export declare class BotData {
+    readonly address: string;
+    readonly baseType: BotBaseType;
+    readonly detailedType: BotDetailedType;
+    readonly minHealthFactor: bigint;
+    readonly maxHealthFactor: bigint;
+    readonly premiumScaleFactor: bigint;
+    readonly feeScaleFactor: bigint;
+    constructor(payload: BotDataPayload);
+}

package/lib/core/bot.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BotData = void 0;
+const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
+class BotData {
+    address;
+    baseType;
+    detailedType;
+    minHealthFactor;
+    maxHealthFactor;
+    premiumScaleFactor;
+    feeScaleFactor;
+    constructor(payload) {
+        this.address = payload.address.toLowerCase();
+        this.baseType = payload.baseType;
+        this.detailedType = payload.detailedType;
+        this.minHealthFactor = (0, sdk_gov_1.toBigInt)(payload.minHealthFactor);
+        this.maxHealthFactor = (0, sdk_gov_1.toBigInt)(payload.maxHealthFactor);
+        this.premiumScaleFactor = (0, sdk_gov_1.toBigInt)(payload.premiumScaleFactor);
+        this.feeScaleFactor = (0, sdk_gov_1.toBigInt)(payload.feeScaleFactor);
+    }
+}
+exports.BotData = BotData;

package/lib/core/creditAccount.d.ts

@@ -1,33 +1,58 @@
-import { LpTokensAPY } from "../apy";
-import { CaTokenBalance, CreditAccountDataPayload, ScheduledWithdrawal } from "../payload/creditAccount";
+import { TokensWithApyRecord } from "../apy";
+import { CaTokenBalance, CreditAccountDataPayload } from "../payload/creditAccount";
 import { QuotaInfo } from "../payload/creditManager";
 import { TokenData } from "../tokens/tokenData";
 import { Asset, AssetWithAmountInTarget } from "./assets";
+export declare const MIN_INT96 = -39614081257132168796771975168n;
+export declare const MAX_UINT256 = 115792089237316195423570985008687907853269984665640564039457584007913129639935n;
 export interface CalcOverallAPYProps {
     caAssets: Array<Asset>;
-    lpAPY: LpTokensAPY | undefined;
+    lpAPY: TokensWithApyRecord | undefined;
     quotas: Record<string, Asset>;
-    quotaRates: Record<string, Pick<QuotaInfo, "rate">>;
+    quotaRates: Record<string, Pick<QuotaInfo, "isActive" | "rate">>;
+    feeInterest: number;
     prices: Record<string, bigint>;
     totalValue: bigint | undefined;
     debt: bigint | undefined;
-    baseBorrowRate: number;
+    baseRateWithFee: number;
     underlyingToken: string;
 }
+export interface CalcMaxLendingDebtProps {
+    assets: Array<Asset>;
+    prices: Record<string, bigint>;
+    liquidationThresholds: Record<string, bigint>;
+    underlyingToken: string;
+    targetHF?: bigint;
+}
 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>;
+    maxDebt: bigint;
     allowedToSpend: Record<string, {}>;
     allowedToObtain: Record<string, {}>;
+    quotaReserve: bigint;
 }
 interface CalcQuotaUpdateReturnType {
     desiredQuota: Record<string, Asset>;
@@ -36,11 +61,27 @@ interface CalcQuotaUpdateReturnType {
 }
 export interface CalcQuotaBorrowRateProps {
     quotas: Record<string, Asset>;
-    quotaRates: Record<string, Pick<QuotaInfo, "rate">>;
-    borrowAmount: bigint;
+    quotaRates: Record<string, Pick<QuotaInfo, "isActive" | "rate">>;
+}
+export interface CalcRelativeBaseBorrowRateProps {
+    debt: bigint;
+    baseRateWithFee: number;
+    assetAmountInUnderlying: bigint;
+}
+export interface CalcAvgQuotaBorrowRateProps {
+    quotas: Record<string, Asset>;
+    quotaRates: Record<string, Pick<QuotaInfo, "isActive" | "rate">>;
+}
+interface LiquidationPriceProps {
+    liquidationThresholds: Record<string, bigint>;
+    debt: bigint;
+    underlyingToken: string;
+    targetToken: string;
+    assets: Record<string, Asset>;
 }
 export declare class CreditAccountData {
     readonly isSuccessful: boolean;
+    readonly priceFeedsNeeded: string[];
     readonly addr: string;
     readonly borrower: string;
     readonly creditManager: string;
@@ -49,12 +90,12 @@ export declare class CreditAccountData {
     readonly since: number;
     readonly expirationDate: number;
     readonly version: number;
-    readonly cmDescription: string;
+    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;
@@ -63,32 +104,36 @@ 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 activeBots: Record<string, true>;
     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;
     static sortBalances(balances: Record<string, bigint>, prices: Record<string, bigint>, tokens: Record<string, TokenData>): Array<[string, bigint]>;
+    static sortAssets(balances: Array<Asset>, prices: Record<string, bigint>, tokens: Record<string, TokenData>): Asset[];
     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, quotas, quotaRates, totalValue, debt, baseBorrowRate, underlyingToken, }: CalcOverallAPYProps): number | undefined;
+    isTokenEnabled(token: string): boolean;
+    static calcMaxDebtIncrease(healthFactor: number, debt: bigint, underlyingLT: number, minHf?: number): bigint;
+    static calcMaxLendingDebt({ assets, liquidationThresholds, underlyingToken, prices, targetHF, }: CalcMaxLendingDebtProps): 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, quotas, liquidationThresholds, underlyingToken, borrowed, prices, }: CalcHealthFactorProps): number;
-    static calcQuotaUpdate({ quotas, initialQuotas, assetsAfterUpdate, allowedToSpend, allowedToObtain, }: CalcQuotaUpdateProps): CalcQuotaUpdateReturnType;
-    static calcQuotaBorrowRate({ quotas, quotaRates, borrowAmount, }: CalcQuotaBorrowRateProps): number;
+    static calcHealthFactor({ assets, quotas, quotasInfo, liquidationThresholds, underlyingToken, debt, prices, }: CalcHealthFactorProps): number;
+    static roundUpQuota(quotaChange: bigint): bigint;
+    static calcRecommendedQuota({ amount, debt, lt, quotaReserve, }: CalcRecommendedQuotaProps): bigint;
+    static calcDefaultQuota({ amount, lt, quotaReserve }: CalcDefaultQuotaProps): bigint;
+    static calcQuotaUpdate(props: CalcQuotaUpdateProps): CalcQuotaUpdateReturnType;
+    private static getSingleQuotaChange;
+    static calcQuotaBorrowRate({ quotas, quotaRates }: CalcQuotaBorrowRateProps): bigint;
+    static calcRelativeBaseBorrowRate({ debt, baseRateWithFee, assetAmountInUnderlying, }: CalcRelativeBaseBorrowRateProps): bigint;
+    static liquidationPrice({ liquidationThresholds, debt, underlyingToken, targetToken, assets, }: LiquidationPriceProps): bigint;
 }
 export {};