@gearbox-protocol/sdk 3.0.0-next.12 → 3.0.0-next.121

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,16 +1,17 @@
 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;
+    curveAPY: CurveAPYResult | undefined;
     generated: GetConvexAPYBulkCallsReturns;
-    response: Array<BigNumber>;
+    response: Array<BigNumberish>;
+    network: NetworkType;
 }
-export declare function getConvexAPYBulk(props: GetConvexAPYBulkProps): bigint[];
+export declare function getConvexAPYBulk(props: GetConvexAPYBulkProps): number[];
 interface PoolInfo {
     cvxPool: ConvexPoolParams;
     cvxPoolAddress: string;
@@ -25,9 +26,9 @@ type CrvParams = CurveParams | CurveSteCRVPoolParams | CurveGEARPoolParams;
 type GetConvexAPYBulkCallsReturns = ReturnType<typeof getConvexAPYBulkCalls>;
 export interface GetConvexAPYBulkCallsProps {
     pools: Array<ConvexPoolContract>;
-    networkType: NetworkType;
+    network: NetworkType;
 }
-export declare function getConvexAPYBulkCalls({ pools, networkType, }: GetConvexAPYBulkCallsProps): {
+export declare function getConvexAPYBulkCalls({ pools, network, }: GetConvexAPYBulkCallsProps): {
     poolsInfo: PoolInfo[];
     calls: [MCall<import("../types/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/ICurvePool").ICurvePoolInterface>, MCall<import("../types/IConvexToken").IConvexTokenInterface>, ...(MCall<import("../types/IBaseRewardPool").IBaseRewardPoolInterface> | MCall<any>)[]][];
 };
@@ -42,7 +43,7 @@ export interface CalculateConvexAPYProps {
     crvLpPrice: Array<bigint>;
     info: PoolInfo;
     getTokenPrice: GetTokenPriceCallback;
-    curveAPY: CurveAPYResult;
+    curveAPY: CurveAPYResult | undefined;
 }
 export declare function getCVXMintAmount(crvAmount: bigint, cvxTokenSupply: bigint): bigint;
 export {};

package/lib/apy/convexAPY.js

@@ -7,6 +7,9 @@ const utils_1 = require("ethers/lib/utils");
 const types_1 = require("../types");
 const V2_POOLS = { 20: true };
 function getConvexAPYBulk(props) {
+    if (props.network !== "Mainnet") {
+        return [];
+    }
     const { poolsInfo, calls } = props.generated;
     const [parsedResponse] = calls.reduce(([acc, start], call) => {
         const end = start + call.length;
@@ -40,12 +43,12 @@ function getConvexAPYBulk(props) {
     return apyList;
 }
 exports.getConvexAPYBulk = getConvexAPYBulk;
-function getPoolInfo({ pool, networkType }) {
-    const tokenList = token_1.tokenDataByNetwork[networkType];
-    const contractsList = sdk_gov_1.contractsByNetwork[networkType];
+function getPoolInfo({ pool, network }) {
+    const tokenList = token_1.tokenDataByNetwork[network];
+    const contractsList = sdk_gov_1.contractsByNetwork[network];
     const poolParams = sdk_gov_1.contractParams[pool];
     const basePoolAddress = contractsList[pool];
-    const extraPoolAddresses = poolParams.extraRewards.map(d => d.poolAddress[networkType]);
+    const extraPoolAddresses = poolParams.extraRewards.map(d => d.poolAddress[network]);
     const stakedTokenParams = token_1.supportedTokens[poolParams.stakedToken];
     const { underlying } = stakedTokenParams;
     const crvParams = token_1.supportedTokens[underlying];
@@ -65,8 +68,11 @@ function getPoolInfo({ pool, networkType }) {
         tokenList,
     };
 }
-function getConvexAPYBulkCalls({ pools, networkType, }) {
-    const poolsInfo = pools.map(pool => getPoolInfo({ networkType, pool }));
+function getConvexAPYBulkCalls({ pools, network, }) {
+    if (network !== "Mainnet") {
+        return { poolsInfo: [], calls: [] };
+    }
+    const poolsInfo = pools.map(pool => getPoolInfo({ network, pool }));
     const calls = poolsInfo.map(info => getPoolDataCalls(info));
     return { poolsInfo, calls };
 }
@@ -142,6 +148,8 @@ function calculateConvexAPY(props) {
     const crvPerSecond = props.cvxPoolRate;
     const vPrice = getVirtualPrice(props);
     const virtualSupply = (props.cvxPoolSupply * vPrice) / sdk_gov_1.WAD;
+    if (!virtualSupply)
+        return 0;
     const crvPerUnderlying = (crvPerSecond * sdk_gov_1.WAD) / virtualSupply;
     const crvPerYear = crvPerUnderlying * BigInt(sdk_gov_1.SECONDS_PER_YEAR);
     const cvxPerYear = getCVXMintAmount(crvPerYear, props.cvxTokenSupply);
@@ -160,8 +168,11 @@ function calculateConvexAPY(props) {
         return finished ? 0n : extraAPY;
     });
     const extraAPYTotal = extraAPRs.reduce((acc, apy) => acc + apy, 0n);
-    const baseApyWAD = props.curveAPY[crvToken].base;
-    return baseApyWAD + crvAPY + cvxAPY + extraAPYTotal;
+    const baseApy = props.curveAPY?.[crvToken].base || 0;
+    const apyTotal = crvAPY + cvxAPY + extraAPYTotal;
+    const apyTotalInPercent = apyTotal * sdk_gov_1.PERCENTAGE_DECIMALS * sdk_gov_1.PERCENTAGE_FACTOR;
+    const r = baseApy + Math.round(Number((apyTotalInPercent * 10n) / sdk_gov_1.WAD) / 10);
+    return r;
 }
 function getTimestampInSeconds() {
     return Math.floor(Date.now() / 1000);

package/lib/apy/curveAPY.d.ts

@@ -1,11 +1,56 @@
 import { CurveLPToken } from "@gearbox-protocol/sdk-gov/lib/tokens/curveLP";
 import { GearboxToken } from "@gearbox-protocol/sdk-gov/lib/tokens/gear";
+interface CurvePoolData {
+    address: string;
+    amplificationCoefficient: string;
+    assetType?: string;
+    assetTypeName: string;
+    coins: Array<{
+        address: string;
+        decimals: string;
+        isBasePoolLpToken: boolean;
+        poolBalance: string;
+        symbol: string;
+        usdPrice: number;
+    }>;
+    coinsAddresses: Array<string>;
+    decimals: Array<string>;
+    gaugeAddress: string;
+    gaugeCrvApy: Array<number>;
+    gaugeRewards: Array<{
+        apy: number;
+        decimals: string;
+        gaugeAddress: string;
+        name: string;
+        symbol: string;
+        tokenAddress: string;
+        tokenPrice: number;
+    }>;
+    id: string;
+    implementation: string;
+    implementationAddress: string;
+    isMetaPool: boolean;
+    lpTokenAddress: string;
+    name: string;
+    poolUrls: {
+        deposit: Array<string>;
+        swap: Array<string>;
+        withdraw: Array<string>;
+    };
+    priceOracle: number;
+    symbol: string;
+    totalSupply: string;
+    usdTotal: number;
+    usdTotalExcludingBasePool: number;
+    virtualPrice: string;
+}
 type CurveAPYTokens = CurveLPToken | GearboxToken;
 interface CurveAPY {
-    base: bigint;
-    crv: bigint;
-    gauge: Array<[string, bigint]>;
+    base: number;
+    crv: number;
+    gauge: Array<[string, number]>;
 }
 export type CurveAPYResult = Record<CurveAPYTokens, CurveAPY>;
-export declare function getCurveAPY(): Promise<CurveAPYResult | null>;
+export declare function getCurveAPY(): Promise<CurveAPYResult>;
+export declare function getCurveGearPool(): Promise<CurvePoolData | undefined>;
 export {};

package/lib/apy/curveAPY.js

@@ -3,10 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCurveAPY = void 0;
+exports.getCurveGearPool = 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");
 const APY_DICTIONARY = {
     "3Crv": "0",
     FRAX3CRV: "34",
@@ -25,9 +24,10 @@ 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",
+    wstETHCRV: "unknown",
 };
-const CRV_APY_RESPONSE_DECIMALS = 100;
 // const CRYPTO = "https://api.curve.fi/api/getPools/ethereum/crypto";
 // const FACTORY = "https://api.curve.fi/api/getPools/ethereum/factory";
 const CURVE_APY_URL = "https://www.convexfinance.com/api/curve-apys";
@@ -55,12 +55,8 @@ async function getCurveAPY() {
             .flat(1));
         const curveAPY = sdk_gov_1.TypedObjectUtils.entries(APY_DICTIONARY).reduce((acc, [curveSymbol, poolId]) => {
             const { baseApy, crvApy } = apys[poolId] || {};
-            if (baseApy === undefined)
-                console.warn(`No base apy for: ${curveSymbol}, ${poolId}`);
             const pool = poolDataByID[poolId];
             const { gaugeRewards = [] } = pool || {};
-            if (pool === undefined)
-                console.warn(`No pool data for: ${curveSymbol}, ${poolId}`);
             const extraRewards = gaugeRewards.map(({ apy = 0, symbol }) => [
                 symbol.toLowerCase(),
                 curveAPYToBn(apy),
@@ -77,10 +73,24 @@ async function getCurveAPY() {
     }
     catch (e) {
         console.error(e);
-        return null;
+        return {};
     }
 }
 exports.getCurveAPY = getCurveAPY;
 function curveAPYToBn(baseApy) {
-    return (0, formatter_1.toBN)((baseApy / CRV_APY_RESPONSE_DECIMALS).toString(), sdk_gov_1.WAD_DECIMALS_POW);
+    return Math.round(baseApy * Number(sdk_gov_1.PERCENTAGE_FACTOR));
 }
+async function getCurveGearPool() {
+    const data = await Promise.all([
+        axios_1.default.get(CURVE_FACTORY_CRYPTO_URL),
+    ]);
+    const poolDataByID = Object.fromEntries(data
+        .map(resp => {
+        const { poolData = [] } = resp?.data?.data || {};
+        return poolData.map(p => [p.id, p]);
+    })
+        .flat(1));
+    const gearPool = poolDataByID[APY_DICTIONARY.GEAR];
+    return gearPool;
+}
+exports.getCurveGearPool = getCurveGearPool;

package/lib/apy/defiLamaAPY.d.ts

@@ -0,0 +1,3 @@
+import { NetworkType, PartialRecord } from "@gearbox-protocol/sdk-gov";
+import { TokensWithAPY } from ".";
+export declare function getDefiLamaAPY(networkType: NetworkType): Promise<PartialRecord<TokensWithAPY, number>>;

package/lib/apy/defiLamaAPY.js

@@ -0,0 +1,65 @@
+"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) {
+    try {
+        const currentNormal = NORMAL_TO_LAMA[networkType];
+        const res = await axios_1.default.get(`${LAMA_URL}${Object.values(currentNormal).join(",")}`);
+        const itemsRecord = res.data.data.reduce((acc, item) => {
+            acc[item.pool] = item;
+            return acc;
+        }, {});
+        const allAPY = sdk_gov_1.TypedObjectUtils.fromEntries(sdk_gov_1.TypedObjectUtils.entries(currentNormal).map(([symbol, pool]) => {
+            const { apy = 0 } = itemsRecord[pool] || {};
+            return [symbol, Math.round(apy * Number(sdk_gov_1.PERCENTAGE_FACTOR))];
+        }));
+        return allAPY;
+    }
+    catch (e) {
+        console.error(e);
+        return {};
+    }
+}
+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",
+    },
+    Optimism: { rETH: "d4b3c522-6127-4b89-bedf-83641cdcd2eb" },
+    Arbitrum: {},
+};
+// 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,11 @@
-import { LPTokens, SupportedToken } from "@gearbox-protocol/sdk-gov";
-export type AdditionalTokenWithAPY = Extract<SupportedToken, "STETH">;
+import { LPTokens, PartialRecord, SupportedToken } from "@gearbox-protocol/sdk-gov";
+export type AdditionalTokenWithAPY = Extract<SupportedToken, "STETH" | "weETH" | "osETH" | "rETH" | "wstETH">;
 export declare const additionalTokensWIthAPY: Record<AdditionalTokenWithAPY, true>;
-export type TokensWithAPY = LPTokens | Extract<SupportedToken, "STETH">;
-export type LpTokensAPY = Record<TokensWithAPY, number>;
+export type TokensWithAPY = LPTokens | AdditionalTokenWithAPY;
+export type LpTokensAPY = PartialRecord<TokensWithAPY, number>;
 export declare const isTokenWithAPY: (t: unknown) => t is TokensWithAPY;
 export * from "./convexAPY";
 export * from "./curveAPY";
+export * from "./defiLamaAPY";
 export * from "./lidoAPY";
 export * from "./yearnAPY";

package/lib/apy/index.js

@@ -18,6 +18,10 @@ exports.isTokenWithAPY = exports.additionalTokensWIthAPY = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 exports.additionalTokensWIthAPY = {
     STETH: true,
+    weETH: true,
+    osETH: true,
+    rETH: true,
+    wstETH: true,
 };
 const isTokenWithAPY = (t) => typeof t === "string" &&
     (!!sdk_gov_1.lpTokens[t] ||
@@ -25,5 +29,6 @@ const isTokenWithAPY = (t) => typeof t === "string" &&
 exports.isTokenWithAPY = isTokenWithAPY;
 __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,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, YearnLPToken } from "@gearbox-protocol/sdk-gov";
+export type YearnAPYResult = Record<YearnLPToken, number>;
+export declare function getYearnAPY(network: NetworkType): Promise<YearnAPYResult>;

package/lib/apy/yearnAPY.js

@@ -6,27 +6,29 @@ 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 { 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 = (sdk_gov_1.tokenDataByNetwork[network]?.[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";
+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);