@gearbox-protocol/sdk 3.0.0-next.13 → 3.0.0-next.130

package/lib/apy/lidoAPY.js

@@ -6,17 +6,20 @@ 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;
+        const r = Math.round(smaApr * Number(sdk_gov_1.PERCENTAGE_FACTOR));
+        return {
+            STETH: r,
+            wstETH: r,
+        };
     }
     catch (e) {
         console.error(e);
-        return 0n;
+        return {};
     }
 }
 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,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" | "USDC_V3_FARM" | "WETH_V3_FARM" | "WETH_V3_RESTAKING";
+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,21 @@ 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(),
     },
     Arbitrum: {},
+    Optimism: {},
 };
 exports.creditManagerByAddress = sdk_gov_1.TypedObjectUtils.entries(exports.creditManagerByNetwork).reduce((acc, [, cms]) => ({
     ...acc,
@@ -36,8 +50,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,80 @@
 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>;
+    maxDebt: bigint;
+    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 priceFeedsNeeded: string[];
     readonly addr: string;
     readonly borrower: string;
     readonly creditManager: string;
@@ -27,12 +83,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;
@@ -41,30 +97,34 @@ 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 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, 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(props: CalcQuotaUpdateProps): CalcQuotaUpdateReturnType;
+    private static getSingleQuotaChange;
+    static calcQuotaBorrowRate({ quotas, quotaRates }: CalcQuotaBorrowRateProps): bigint;
+    static calcRelativeBaseBorrowRate({ debt, baseRateWithFee, assetAmountInUnderlying, totalValue, }: CalcRelativeBaseBorrowRateProps): bigint;
+    static liquidationPrice({ liquidationThresholds, debt, underlyingToken, targetToken, assets, }: LiquidationPriceProps): bigint;
 }
+export {};