@gearbox-protocol/sdk 3.0.0-next.104 → 3.0.0-next.106

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",

package/lib/apy/maker.d.ts

@@ -1,5 +1,5 @@
 import { ERC4626Params, ERC4626VaultContract, NetworkType } from "@gearbox-protocol/sdk-gov";
-import { BigNumber } from "ethers";
+import { BigNumberish } from "ethers";
 import { Interface } from "ethers/lib/utils";
 export declare const MAKER_VAULT_ABI: {
     inputs: never[];
@@ -33,7 +33,7 @@ export declare function getMakerAPYBulkCalls({ pools, networkType, }: GetMakerAP
 type GetMakerAPYBulkCallsReturns = ReturnType<typeof getMakerAPYBulkCalls>;
 export interface GetMakerAPYBulkProps {
     generated: GetMakerAPYBulkCallsReturns;
-    response: Array<BigNumber>;
+    response: Array<BigNumberish>;
 }
 export declare function getMakerAPYBulk(props: GetMakerAPYBulkProps): bigint[];
 export {};

package/lib/apy/maker.js

@@ -27,6 +27,9 @@ const MAKER_BY_NETWORK = {
     Arbitrum: {
         MAKER_DSR_VAULT: "",
     },
+    Optimism: {
+        MAKER_DSR_VAULT: "",
+    },
 };
 function getMakerAPYBulkCalls({ pools, networkType, }) {
     const poolsInfo = pools.map((pool) => {

package/lib/apy/yearnAPY.js

@@ -19,7 +19,7 @@ async function getYearnAPY() {
         }, {});
         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 { net_apy: netApy = 0 } = apy || {};
             acc[yearnSymbol] = (0, formatter_1.toBN)((netApy / RESPONSE_DECIMALS).toString(), sdk_gov_1.WAD_DECIMALS_POW);
             return acc;
         }, {});

package/lib/contracts/contractsRegister.d.ts

@@ -6,8 +6,9 @@ type MainnetCreditManagersV2_1 = "WETH_V2_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;
@@ -16,8 +17,9 @@ export type MainnetPoolsV1 = "DAI_V1" | "USDC_V1" | "WETH_V1" | "WBTC_V1" | "WST
 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: {
@@ -30,6 +31,7 @@ exports.creditManagerByNetwork = {
         WETH_V3_TRADE_TIER_3: "0x0b2486355e987586c32fc0feefe2943e396c484e".toLowerCase(),
     },
     Arbitrum: {},
+    Optimism: {},
 };
 exports.creditManagerByAddress = sdk_gov_1.TypedObjectUtils.entries(exports.creditManagerByNetwork).reduce((acc, [, cms]) => ({
     ...acc,
@@ -50,6 +52,7 @@ exports.poolByNetwork = {
         WETH_V3_TRADE: "0xda0002859b2d05f66a753d8241fcde8623f26f4f".toLowerCase(),
     },
     Arbitrum: {},
+    Optimism: {},
 };
 const deployedContractNames = {
     // MAINNET V1 CM

package/lib/core/creditAccount.js

@@ -5,6 +5,7 @@ const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const formatter_1 = require("../utils/formatter");
 const math_1 = require("../utils/math");
 const price_1 = require("../utils/price");
+const MAX_UINT16 = 65535;
 class CreditAccountData {
     isSuccessful;
     addr;
@@ -180,6 +181,8 @@ class CreditAccountData {
         return `${creditManager.toLowerCase()}:${borrower.toLowerCase()}`;
     }
     static calcHealthFactor({ assets, quotas, quotasInfo, liquidationThresholds, underlyingToken, debt, prices, }) {
+        if (debt === 0n)
+            return MAX_UINT16;
         const [, underlyingDecimals] = (0, sdk_gov_1.extractTokenData)(underlyingToken);
         const underlyingPrice = prices[underlyingToken] || 0n;
         const assetMoney = assets.reduce((acc, { token: tokenAddress, balance: amount }) => {

package/lib/core/creditAccount.spec.js

@@ -264,7 +264,7 @@ describe("CreditAccount calcHealthFactor test", () => {
             underlyingToken: "",
             debt: 0n,
         });
-        (0, chai_1.expect)(result).to.be.eq(0);
+        (0, chai_1.expect)(result).to.be.eq(65535);
     });
     it("health factor after add collateral is calculated  correctly", () => {
         const collateral = {

package/lib/pathfinder/utils.js

@@ -151,7 +151,7 @@ class PathFinderUtils {
             case "swapDiff":
             case "swap": {
                 const { poolId = "" } = callObject.args?.[0] || {};
-                // !&
+                // !& implement address getting
                 const [contract] = ethers_1.utils.defaultAbiCoder.decode(["address", "unit16"], poolId);
                 return contract
                     ? {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.0.0-next.104",
+  "version": "3.0.0-next.106",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -30,7 +30,7 @@
     "test": "npx mocha -r ts-node/register -r dotenv/config 'src/**/*.spec.ts'"
   },
   "dependencies": {
-    "@gearbox-protocol/sdk-gov": "^1.16.0",
+    "@gearbox-protocol/sdk-gov": "^1.24.1",
     "axios": "^1.2.6",
     "decimal.js-light": "^2.5.1",
     "deep-eql": "^4.1.0",