@gearbox-protocol/sdk 2.1.7 → 2.1.9

package/contracts/SupportedContracts.sol

@@ -30,7 +30,7 @@ contract SupportedContracts is Test, ISupportedContracts {
 
     uint256 public override contractCount;
 
-    constructor() {
+    constructor(uint256 _chainId) {
         contractDataByNetwork[1].push(
             ContractData({
                 id: Contracts.UNISWAP_V2_ROUTER,
@@ -349,7 +349,7 @@ contract SupportedContracts is Test, ISupportedContracts {
             })
         );
 
-        ContractData[] storage cd = contractDataByNetwork[block.chainid];
+        ContractData[] storage cd = contractDataByNetwork[_chainId];
 
         uint256 len = cd.length;
         contractCount = len;

package/lib/apy/convexAPY.d.ts

@@ -1,5 +1,5 @@
 import { BigNumber } from "ethers";
-import { ConvexPoolContract, ConvexPoolParams } from "../contracts/contracts";
+import { ConvexPoolContract, ConvexPoolParams, CurveGEARPoolParams, CurveParams, CurveSteCRVPoolParams } from "../contracts/contracts";
 import { NetworkType } from "../core/chains";
 import { CurveLPToken } from "../tokens/curveLP";
 import { SupportedToken } from "../tokens/token";
@@ -12,30 +12,39 @@ export interface GetConvexAPYBulkProps {
     generated: GetConvexAPYBulkCallsReturns;
     response: Array<BigNumber>;
 }
-export declare function getConvexAPYBulk({ generated, response, getTokenPrice, curveAPY, }: GetConvexAPYBulkProps): bigint[];
+export declare function getConvexAPYBulk(props: GetConvexAPYBulkProps): bigint[];
+interface PoolInfo {
+    cvxPool: ConvexPoolParams;
+    cvxPoolAddress: string;
+    cvxExtraPools: string[];
+    crvPoolAddress: string;
+    crvToken: CurveLPToken;
+    crvPool: CrvParams;
+    crvLpPrice: Array<string>;
+    tokenList: Record<SupportedToken, string>;
+}
+type CrvParams = CurveParams | CurveSteCRVPoolParams | CurveGEARPoolParams;
 type GetConvexAPYBulkCallsReturns = ReturnType<typeof getConvexAPYBulkCalls>;
 export interface GetConvexAPYBulkCallsProps {
     pools: Array<ConvexPoolContract>;
     networkType: NetworkType;
 }
 export declare function getConvexAPYBulkCalls({ pools, networkType, }: GetConvexAPYBulkCallsProps): {
-    poolsInfo: (readonly [ConvexPoolParams, string, string, CurveLPToken, string[], Record<SupportedToken, string>])[];
-    calls: [MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/curve/ICurvePool").ICurvePoolInterface>, MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IConvexToken").IConvexTokenInterface>, ...MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IBaseRewardPool").IBaseRewardPoolInterface>[]][];
+    poolsInfo: PoolInfo[];
+    calls: [MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/curve/ICurvePool").ICurvePoolInterface>, MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IConvexToken").IConvexTokenInterface>, ...(MCall<any> | MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IBaseRewardPool").IBaseRewardPoolInterface>)[]][];
 };
-export declare function getCVXMintAmount(crvAmount: bigint, cvxSupply: bigint): bigint;
 export interface CalculateConvexAPYProps {
-    baseRewardsFinish: bigint;
-    basePoolRate: bigint;
-    basePoolSupply: bigint;
-    vPrice: bigint;
-    cvxSupply: bigint;
-    extra: Array<bigint>;
-    extraRewardsFinish: Array<bigint>;
-    extraPoolAddresses: string[];
-    poolParams: ConvexPoolParams;
-    underlying: CurveLPToken;
+    cvxPoolRate: bigint;
+    cvxPoolSupply: bigint;
+    cvxTokenSupply: bigint;
+    cvxPoolRewardsFinish: bigint;
+    cvxExtraRewards: Array<bigint>;
+    cvxExtraRewardsFinish: Array<bigint>;
+    crvVPrice: bigint;
+    crvLpPrice: Array<bigint>;
+    info: PoolInfo;
     getTokenPrice: GetTokenPriceCallback;
     curveAPY: CurveAPYResult;
-    tokenList: Record<SupportedToken, string>;
 }
+export declare function getCVXMintAmount(crvAmount: bigint, cvxTokenSupply: bigint): bigint;
 export {};

package/lib/apy/convexAPY.js

@@ -1,37 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCVXMintAmount = exports.getConvexAPYBulkCalls = exports.getConvexAPYBulk = void 0;
+const utils_1 = require("ethers/lib/utils");
 const contracts_1 = require("../contracts/contracts");
 const constants_1 = require("../core/constants");
 const token_1 = require("../tokens/token");
 const types_1 = require("../types");
 const formatter_1 = require("../utils/formatter");
-function getConvexAPYBulk({ generated, response, getTokenPrice, curveAPY, }) {
-    const { poolsInfo, calls } = generated;
+const V2_POOLS = { 20: true };
+function getConvexAPYBulk(props) {
+    const { poolsInfo, calls } = props.generated;
     const [parsedResponse] = calls.reduce(([acc, start], call) => {
         const end = start + call.length;
-        const currentResponse = response.slice(start, end);
+        const currentResponse = props.response.slice(start, end);
         acc.push(currentResponse);
         return [acc, end];
     }, [[], 0]);
-    const apyList = parsedResponse.map(([baseRewardsFinish, basePoolRate, basePoolSupply, vPrice, cvxSupply, ...rest], i) => {
-        const [poolParams, , , underlying, extraPoolAddresses, tokenList] = poolsInfo[i];
-        const extra = rest.slice(0, extraPoolAddresses.length);
-        const extraRewardsFinish = rest.slice(extraPoolAddresses.length);
+    const apyList = parsedResponse.map(([cvxPoolRewardsFinish, cvxPoolRate, cvxPoolSupply, crvVPrice, cvxTokenSupply, ...rest], i) => {
+        const { cvxExtraPools, crvLpPrice: crvLpPriceList } = poolsInfo[i];
+        const extraEnd = cvxExtraPools.length;
+        const cvxExtraRewards = rest.slice(0, extraEnd);
+        const extraFinishEnd = cvxExtraPools.length * 2;
+        const cvxExtraRewardsFinish = rest.slice(extraEnd, extraFinishEnd);
+        const lpPriceEnd = extraFinishEnd + crvLpPriceList.length;
+        const crvLpPrice = rest.slice(extraFinishEnd, lpPriceEnd);
         const apy = calculateConvexAPY({
-            baseRewardsFinish: (0, formatter_1.toBigInt)(baseRewardsFinish),
-            basePoolRate: (0, formatter_1.toBigInt)(basePoolRate),
-            basePoolSupply: (0, formatter_1.toBigInt)(basePoolSupply),
-            vPrice: (0, formatter_1.toBigInt)(vPrice),
-            cvxSupply: (0, formatter_1.toBigInt)(cvxSupply),
-            extra: extra.map(v => (0, formatter_1.toBigInt)(v)),
-            extraRewardsFinish: extraRewardsFinish.map(v => (0, formatter_1.toBigInt)(v)),
-            extraPoolAddresses,
-            poolParams,
-            underlying,
-            getTokenPrice,
-            curveAPY,
-            tokenList,
+            cvxPoolRewardsFinish: (0, formatter_1.toBigInt)(cvxPoolRewardsFinish),
+            cvxPoolRate: (0, formatter_1.toBigInt)(cvxPoolRate),
+            cvxPoolSupply: (0, formatter_1.toBigInt)(cvxPoolSupply),
+            crvVPrice: (0, formatter_1.toBigInt)(crvVPrice),
+            cvxTokenSupply: (0, formatter_1.toBigInt)(cvxTokenSupply),
+            cvxExtraRewards: cvxExtraRewards.map(v => (0, formatter_1.toBigInt)(v)),
+            cvxExtraRewardsFinish: cvxExtraRewardsFinish.map(v => (0, formatter_1.toBigInt)(v)),
+            crvLpPrice: crvLpPrice.map(v => (0, formatter_1.toBigInt)(v)),
+            info: poolsInfo[i],
+            getTokenPrice: props.getTokenPrice,
+            curveAPY: props.curveAPY,
         });
         return apy;
     });
@@ -42,118 +46,144 @@ function getPoolInfo({ pool, networkType }) {
     const tokenList = token_1.tokenDataByNetwork[networkType];
     const contractsList = contracts_1.contractsByNetwork[networkType];
     const poolParams = contracts_1.contractParams[pool];
+    const basePoolAddress = contractsList[pool];
+    const extraPoolAddresses = poolParams.extraRewards.map(d => d.poolAddress[networkType]);
     const stakedTokenParams = token_1.supportedTokens[poolParams.stakedToken];
     const { underlying } = stakedTokenParams;
-    const basePoolAddress = contractsList[pool];
     const crvParams = token_1.supportedTokens[underlying];
     const swapPoolAddress = contractsList[crvParams.pool];
-    const extraPoolAddresses = poolParams.extraRewards.map(d => d.poolAddress[networkType]);
-    return [
-        poolParams,
-        basePoolAddress,
-        swapPoolAddress,
-        underlying,
-        extraPoolAddresses,
+    const crvPoolParams = contracts_1.contractParams[crvParams.pool];
+    const crvLpPrice = V2_POOLS[crvPoolParams["version"]]
+        ? [swapPoolAddress]
+        : [];
+    return {
+        cvxPool: poolParams,
+        cvxPoolAddress: basePoolAddress,
+        cvxExtraPools: extraPoolAddresses,
+        crvPoolAddress: swapPoolAddress,
+        crvPool: crvPoolParams,
+        crvToken: underlying,
+        crvLpPrice,
         tokenList,
-    ];
+    };
 }
 function getConvexAPYBulkCalls({ pools, networkType, }) {
     const poolsInfo = pools.map(pool => getPoolInfo({ networkType, pool }));
-    const calls = poolsInfo.map(([, basePoolAddress, swapPoolAddress, , extraPoolAddresses, tokenList]) => getPoolDataCalls({
-        basePoolAddress,
-        swapPoolAddress,
-        cvxAddress: tokenList.CVX,
-        extraPoolAddresses,
-    }));
+    const calls = poolsInfo.map(info => getPoolDataCalls(info));
     return { poolsInfo, calls };
 }
 exports.getConvexAPYBulkCalls = getConvexAPYBulkCalls;
-function getPoolDataCalls({ basePoolAddress, swapPoolAddress, cvxAddress, extraPoolAddresses, }) {
+function getPoolDataCalls(props) {
     const calls = [
         {
-            address: basePoolAddress,
+            address: props.cvxPoolAddress,
             interface: types_1.IBaseRewardPool__factory.createInterface(),
             method: "periodFinish()",
         },
         {
-            address: basePoolAddress,
+            address: props.cvxPoolAddress,
             interface: types_1.IBaseRewardPool__factory.createInterface(),
             method: "rewardRate()",
         },
         {
-            address: basePoolAddress,
+            address: props.cvxPoolAddress,
             interface: types_1.IBaseRewardPool__factory.createInterface(),
             method: "totalSupply()",
         },
         {
-            address: swapPoolAddress,
+            address: props.crvPoolAddress,
             interface: types_1.ICurvePool__factory.createInterface(),
             method: "get_virtual_price()",
         },
         {
-            address: cvxAddress,
+            address: props.tokenList.CVX,
             interface: types_1.IConvexToken__factory.createInterface(),
             method: "totalSupply()",
         },
-        ...extraPoolAddresses.map((extraPoolAddress) => ({
+        ...props.cvxExtraPools.map((extraPoolAddress) => ({
             address: extraPoolAddress,
             interface: types_1.IBaseRewardPool__factory.createInterface(),
             method: "rewardRate()",
         })),
-        ...extraPoolAddresses.map((extraPoolAddress) => ({
+        ...props.cvxExtraPools.map((extraPoolAddress) => ({
             address: extraPoolAddress,
             interface: types_1.IBaseRewardPool__factory.createInterface(),
             method: "periodFinish()",
         })),
+        ...(V2_POOLS[props.crvPool["version"]]
+            ? [
+                {
+                    address: props.crvPoolAddress,
+                    interface: new utils_1.Interface([
+                        "function lp_price() view returns (uint256)",
+                    ]),
+                    method: "lp_price()",
+                },
+            ]
+            : []),
     ];
     return calls;
 }
 const CVX_MAX_SUPPLY = constants_1.WAD * 100000000n;
 const CVX_REDUCTION_PER_CLIFF = 100000n;
 const CVX_TOTAL_CLIFFS = constants_1.WAD * 1000n;
-function getCVXMintAmount(crvAmount, cvxSupply) {
-    const currentCliff = cvxSupply / CVX_REDUCTION_PER_CLIFF;
-    if (currentCliff < CVX_TOTAL_CLIFFS) {
-        const remainingCliffs = CVX_TOTAL_CLIFFS - currentCliff;
-        const mintedAmount = (crvAmount * remainingCliffs) / CVX_TOTAL_CLIFFS;
-        const amountTillMax = CVX_MAX_SUPPLY - cvxSupply;
-        return mintedAmount > amountTillMax ? amountTillMax : mintedAmount;
-    }
-    return 0n;
-}
-exports.getCVXMintAmount = getCVXMintAmount;
-function getTimestampInSeconds() {
-    return Math.floor(Date.now() / 1000);
-}
 const CURRENCY_LIST = {
     stkcvxsteCRV: "WETH",
+    stkcvxcrvCVXETH: "WETH",
+    stkcvxcrvCRVETH: "WETH",
+    stkcvxLDOETH: "WETH",
+    stkcvxcrvUSDTWBTCWETH: "USDT",
 };
-function calculateConvexAPY({ baseRewardsFinish, basePoolRate, basePoolSupply, vPrice, cvxSupply, extra, extraRewardsFinish, extraPoolAddresses, poolParams, underlying, getTokenPrice, curveAPY, tokenList, }) {
+function calculateConvexAPY(props) {
+    const { tokenList, cvxPool, crvToken, cvxExtraPools } = props.info;
     const currentTimestamp = getTimestampInSeconds();
-    const currencySymbol = CURRENCY_LIST[poolParams.stakedToken];
+    const currencySymbol = CURRENCY_LIST[cvxPool.stakedToken];
     const currency = currencySymbol && tokenList[currencySymbol || ""];
-    const cvxPrice = getTokenPrice(tokenList.CVX, currency);
-    const crvPrice = getTokenPrice(tokenList.CRV, currency);
-    const crvPerSecond = basePoolRate;
-    const virtualSupply = (basePoolSupply * vPrice) / constants_1.WAD;
+    const cvxPrice = props.getTokenPrice(tokenList.CVX, currency);
+    const crvPrice = props.getTokenPrice(tokenList.CRV, currency);
+    const crvPerSecond = props.cvxPoolRate;
+    const vPrice = getVirtualPrice(props);
+    const virtualSupply = (props.cvxPoolSupply * vPrice) / constants_1.WAD;
     const crvPerUnderlying = (crvPerSecond * constants_1.WAD) / virtualSupply;
     const crvPerYear = crvPerUnderlying * BigInt(constants_1.SECONDS_PER_YEAR);
-    const cvxPerYear = getCVXMintAmount(crvPerYear, cvxSupply);
-    const baseFinished = baseRewardsFinish <= currentTimestamp;
+    const cvxPerYear = getCVXMintAmount(crvPerYear, props.cvxTokenSupply);
+    const baseFinished = props.cvxPoolRewardsFinish <= currentTimestamp;
     const crvAPY = baseFinished ? 0n : (crvPerYear * crvPrice) / constants_1.PRICE_DECIMALS;
     const cvxAPY = baseFinished ? 0n : (cvxPerYear * cvxPrice) / constants_1.PRICE_DECIMALS;
-    const extraAPRs = extraPoolAddresses.map((_, index) => {
-        const extraRewardSymbol = poolParams.extraRewards[index].rewardToken;
-        const extraPoolRate = extra[index];
-        const extraFinished = extraRewardsFinish[index];
+    const extraAPRs = cvxExtraPools.map((_, index) => {
+        const extraRewardSymbol = cvxPool.extraRewards[index].rewardToken;
+        const extraPoolRate = props.cvxExtraRewards[index];
+        const extraFinished = props.cvxExtraRewardsFinish[index];
         const perUnderlying = (extraPoolRate * constants_1.WAD) / virtualSupply;
         const perYear = perUnderlying * BigInt(constants_1.SECONDS_PER_YEAR);
-        const extraPrice = getTokenPrice(tokenList[extraRewardSymbol], currency);
+        const extraPrice = props.getTokenPrice(tokenList[extraRewardSymbol], currency);
         const extraAPY = (perYear * extraPrice) / constants_1.PRICE_DECIMALS;
         const finished = extraFinished <= currentTimestamp;
         return finished ? 0n : extraAPY;
     });
     const extraAPYTotal = extraAPRs.reduce((acc, apy) => acc + apy, 0n);
-    const baseApyWAD = curveAPY[underlying].base;
+    const baseApyWAD = props.curveAPY[crvToken].base;
     return baseApyWAD + crvAPY + cvxAPY + extraAPYTotal;
 }
+function getTimestampInSeconds() {
+    return Math.floor(Date.now() / 1000);
+}
+function getCVXMintAmount(crvAmount, cvxTokenSupply) {
+    const currentCliff = cvxTokenSupply / CVX_REDUCTION_PER_CLIFF;
+    if (currentCliff < CVX_TOTAL_CLIFFS) {
+        const remainingCliffs = CVX_TOTAL_CLIFFS - currentCliff;
+        const mintedAmount = (crvAmount * remainingCliffs) / CVX_TOTAL_CLIFFS;
+        const amountTillMax = CVX_MAX_SUPPLY - cvxTokenSupply;
+        return mintedAmount > amountTillMax ? amountTillMax : mintedAmount;
+    }
+    return 0n;
+}
+exports.getCVXMintAmount = getCVXMintAmount;
+function getVirtualPrice(props) {
+    if (V2_POOLS[props.info.crvPool.version]) {
+        return props.crvLpPrice[0] ?? props.crvVPrice;
+    }
+    else {
+        return props.crvVPrice;
+    }
+}

package/lib/contracts/contracts.d.ts

@@ -31,6 +31,7 @@ type UniswapV3Params = {
 export type CurveParams = {
     protocol: Protocols.Curve;
     type: AdapterInterface.CURVE_V1_2ASSETS | AdapterInterface.CURVE_V1_3ASSETS | AdapterInterface.CURVE_V1_4ASSETS | AdapterInterface.CURVE_V1_WRAPPER;
+    version: number;
     lpToken: CurveLPToken;
     tokens: Array<NormalToken | CurveLPToken>;
     underlyings?: Array<NormalToken>;
@@ -39,6 +40,7 @@ export type CurveParams = {
 export type CurveSteCRVPoolParams = {
     protocol: Protocols.Curve;
     type: AdapterInterface.CURVE_V1_STECRV_POOL;
+    version: number;
     pool: Record<NetworkType, string>;
     tokens: ["WETH", "STETH"];
     lpToken: "steCRV";
@@ -46,6 +48,7 @@ export type CurveSteCRVPoolParams = {
 export type CurveGEARPoolParams = {
     protocol: Protocols.Curve;
     type: AdapterInterface.CURVE_V1_2ASSETS;
+    version: number;
     pool: Record<NetworkType, string>;
     tokens: ["GEAR", "WETH"];
     lpToken: "GEAR";

package/lib/contracts/contracts.js

@@ -167,6 +167,7 @@ exports.contractParams = {
         name: "Curve 3Pool",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_3ASSETS,
+        version: 10,
         lpToken: "3Crv",
         tokens: ["DAI", "USDC", "USDT"],
     },
@@ -174,6 +175,7 @@ exports.contractParams = {
         name: "Curve crvFRAX",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_2ASSETS,
+        version: 10,
         lpToken: "crvFRAX",
         tokens: ["FRAX", "USDC"],
     },
@@ -181,6 +183,7 @@ exports.contractParams = {
         name: "Curve stETH",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_STECRV_POOL,
+        version: 10,
         pool: {
             Mainnet: "0xDC24316b9AE028F1497c275EB9192a3Ea0f67022",
             Arbitrum: constants_1.NOT_DEPLOYED, // CURVE_STECRV_POOL
@@ -192,6 +195,7 @@ exports.contractParams = {
         name: "Curve GEAR",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_2ASSETS,
+        version: 10,
         pool: {
             Mainnet: "0x0E9B5B092caD6F1c5E6bc7f89Ffe1abb5c95F1C2",
             Arbitrum: constants_1.NOT_DEPLOYED,
@@ -203,6 +207,7 @@ exports.contractParams = {
         name: "Curve FRAX",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_2ASSETS,
+        version: 10,
         lpToken: "FRAX3CRV",
         tokens: ["FRAX", "3Crv"],
         underlyings: ["FRAX", "DAI", "USDC", "USDT"],
@@ -211,6 +216,7 @@ exports.contractParams = {
         name: "Curve LUSD",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_2ASSETS,
+        version: 10,
         lpToken: "LUSD3CRV",
         tokens: ["LUSD", "3Crv"],
         underlyings: ["LUSD", "DAI", "USDC", "USDT"],
@@ -219,6 +225,7 @@ exports.contractParams = {
         name: "Curve SUSD",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_4ASSETS,
+        version: 10,
         lpToken: "crvPlain3andSUSD",
         tokens: ["DAI", "USDC", "USDT", "sUSD"],
         wrapper: "CURVE_SUSD_DEPOSIT",
@@ -227,6 +234,7 @@ exports.contractParams = {
         name: "Curve SUSD",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_WRAPPER,
+        version: 10,
         lpToken: "crvPlain3andSUSD",
         tokens: ["DAI", "USDC", "USDT", "sUSD"],
     },
@@ -234,30 +242,34 @@ exports.contractParams = {
         name: "Curve GUSD",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_2ASSETS,
+        version: 10,
         lpToken: "gusd3CRV",
         tokens: ["GUSD", "3Crv"],
         underlyings: ["GUSD", "DAI", "USDC", "USDT"],
     },
-    CURVE_OHMFRAXBP_POOL: {
-        name: "Curve OHM_FRAXBP",
-        protocol: protocols_1.Protocols.Curve,
-        type: adapters_1.AdapterInterface.CURVE_V1_2ASSETS,
-        lpToken: "OHMFRAXBP",
-        tokens: ["OHM", "crvFRAX"],
-        underlyings: ["OHM", "FRAX", "USDC"],
-    },
     CURVE_MIM_POOL: {
         name: "Curve MIM",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_2ASSETS,
+        version: 10,
         lpToken: "MIM_3LP3CRV",
         tokens: ["MIM", "3Crv"],
         underlyings: ["MIM", "DAI", "USDC", "USDT"],
     },
+    CURVE_OHMFRAXBP_POOL: {
+        name: "Curve OHM_FRAXBP",
+        protocol: protocols_1.Protocols.Curve,
+        type: adapters_1.AdapterInterface.CURVE_V1_2ASSETS,
+        version: 20,
+        lpToken: "OHMFRAXBP",
+        tokens: ["OHM", "crvFRAX"],
+        underlyings: ["OHM", "FRAX", "USDC"],
+    },
     CURVE_CRVETH_POOL: {
         name: "Curve CRVETH",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_2ASSETS,
+        version: 20,
         lpToken: "crvCRVETH",
         tokens: ["WETH", "CRV"],
     },
@@ -265,6 +277,7 @@ exports.contractParams = {
         name: "Curve CVXETH",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_2ASSETS,
+        version: 20,
         lpToken: "crvCVXETH",
         tokens: ["WETH", "CVX"],
     },
@@ -272,6 +285,7 @@ exports.contractParams = {
         name: "Curve 3Crypto",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_3ASSETS,
+        version: 20,
         lpToken: "crvUSDTWBTCWETH",
         tokens: ["USDT", "WBTC", "WETH"],
     },
@@ -279,6 +293,7 @@ exports.contractParams = {
         name: "Curve LDOETH",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_2ASSETS,
+        version: 20,
         lpToken: "LDOETH",
         tokens: ["WETH", "LDO"],
     },
@@ -409,13 +424,6 @@ exports.contractParams = {
             },
         ],
     },
-    CONVEX_OHMFRAXBP_POOL: {
-        name: "Convex OHMFRAXBP",
-        protocol: protocols_1.Protocols.Convex,
-        type: adapters_1.AdapterInterface.CONVEX_V1_BASE_REWARD_POOL,
-        stakedToken: "stkcvxOHMFRAXBP",
-        extraRewards: [],
-    },
     CONVEX_MIM3CRV_POOL: {
         name: "Convex MIM3CRV",
         protocol: protocols_1.Protocols.Convex,
@@ -431,6 +439,13 @@ exports.contractParams = {
             },
         ],
     },
+    CONVEX_OHMFRAXBP_POOL: {
+        name: "Convex OHMFRAXBP",
+        protocol: protocols_1.Protocols.Convex,
+        type: adapters_1.AdapterInterface.CONVEX_V1_BASE_REWARD_POOL,
+        stakedToken: "stkcvxOHMFRAXBP",
+        extraRewards: [],
+    },
     CONVEX_CRVETH_POOL: {
         name: "Convex crvCRVETH",
         protocol: protocols_1.Protocols.Convex,

package/lib/contracts/contractsRegister.d.ts

@@ -1,11 +1,22 @@
 import { NetworkType } from "../core/chains";
 export declare const stEthPoolWrapper: Record<NetworkType, string>;
-export declare const CREDIT_MANAGER_DAI_V2_MAINNET: string;
-export declare const CREDIT_MANAGER_USDC_V2_MAINNET: string;
-export declare const CREDIT_MANAGER_WETH_V2_MAINNET: string;
-export declare const CREDIT_MANAGER_WSTETH_V2_MAINNET: string;
-export declare const CREDIT_MANAGER_WBTC_V2_MAINNET: string;
-export declare const CREDIT_MANAGER_FRAX_V2_MAINNET: string;
-export type CreditManagersV2 = typeof CREDIT_MANAGER_DAI_V2_MAINNET | typeof CREDIT_MANAGER_USDC_V2_MAINNET | typeof CREDIT_MANAGER_WETH_V2_MAINNET | typeof CREDIT_MANAGER_WSTETH_V2_MAINNET | typeof CREDIT_MANAGER_WBTC_V2_MAINNET | typeof CREDIT_MANAGER_FRAX_V2_MAINNET;
-export declare const deployedContracts: Record<string, 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 CreditManagersListType = {
+    [key in NetworkType]: key extends "Mainnet" ? Record<MainnetCreditManagers, string> : key extends "Arbitrum" ? Record<ArbitrumCreditManagers, 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;
+type PoolsListType = {
+    [key in NetworkType]: key extends "Mainnet" ? Record<MainnetPools, string> : key extends "Arbitrum" ? Record<ArbitrumPools, string> : never;
+};
+export declare const poolByNetwork: PoolsListType;
+export type SupportedCreditPools = MainnetPools | ArbitrumPools;
 export declare function getContractName(address: string): string;
+export {};

package/lib/contracts/contractsRegister.js

@@ -1,38 +1,67 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getContractName = exports.deployedContracts = exports.CREDIT_MANAGER_FRAX_V2_MAINNET = exports.CREDIT_MANAGER_WBTC_V2_MAINNET = exports.CREDIT_MANAGER_WSTETH_V2_MAINNET = exports.CREDIT_MANAGER_WETH_V2_MAINNET = exports.CREDIT_MANAGER_USDC_V2_MAINNET = exports.CREDIT_MANAGER_DAI_V2_MAINNET = exports.stEthPoolWrapper = void 0;
+exports.getContractName = exports.poolByNetwork = exports.creditManagerByAddress = exports.creditManagerByNetwork = exports.stEthPoolWrapper = void 0;
 const mappers_1 = require("../utils/mappers");
 const contracts_1 = require("./contracts");
 exports.stEthPoolWrapper = {
     Mainnet: "0x5a97e3E43dCBFe620ccF7865739075f92E93F5E4",
     Arbitrum: "0x3fe62a62C022A069952069b32C9d56718D30B7ec",
 };
-exports.CREDIT_MANAGER_DAI_V2_MAINNET = "0x672461Bfc20DD783444a830Ad4c38b345aB6E2f7".toLowerCase();
-exports.CREDIT_MANAGER_USDC_V2_MAINNET = "0x95357303f995e184A7998dA6C6eA35cC728A1900".toLowerCase();
-exports.CREDIT_MANAGER_WETH_V2_MAINNET = "0x5887ad4Cb2352E7F01527035fAa3AE0Ef2cE2b9B".toLowerCase();
-exports.CREDIT_MANAGER_WSTETH_V2_MAINNET = "0xe0bCE4460795281d39c91da9B0275BcA968293de".toLowerCase();
-exports.CREDIT_MANAGER_WBTC_V2_MAINNET = "0xc62BF8a7889AdF1c5Dc4665486c7683ae6E74e0F".toLowerCase();
-exports.CREDIT_MANAGER_FRAX_V2_MAINNET = "0xA3E1e0d58FE8dD8C9dd48204699a1178f1B274D8".toLowerCase();
-exports.deployedContracts = {
-    // MAINNET
-    "0x777E23A2AcB2fCbB35f6ccF98272d03C722Ba6EB": "DAI",
-    "0x2664cc24CBAd28749B3Dd6fC97A6B402484De527": "USDC",
-    "0x968f9a68a98819E2e6Bb910466e191A7b6cf02F0": "WETH",
-    "0xC38478B0A4bAFE964C3526EEFF534d70E1E09017": "WBTC",
-    "0x79012c8d491dcf3a30db20d1f449b14caf01da6c": "FRAX",
-    // MAINNET POOLS
-    "0x24946bCbBd028D5ABb62ad9B635EB1b1a67AF668": "DAI",
-    "0x86130bDD69143D8a4E5fc50bf4323D48049E98E4": "USDC",
-    "0xB03670c20F87f2169A7c4eBE35746007e9575901": "WETH",
-    "0xB8cf3Ed326bB0E51454361Fb37E9E8df6DC5C286": "wstETH",
-    "0xB2A015c71c17bCAC6af36645DEad8c572bA08A08": "WBTC",
+exports.creditManagerByNetwork = {
+    Mainnet: {
+        DAI_V1: "0x777E23A2AcB2fCbB35f6ccF98272d03C722Ba6EB".toLowerCase(),
+        USDC_V1: "0x2664cc24CBAd28749B3Dd6fC97A6B402484De527".toLowerCase(),
+        WETH_V1: "0x968f9a68a98819E2e6Bb910466e191A7b6cf02F0".toLowerCase(),
+        WBTC_V1: "0xC38478B0A4bAFE964C3526EEFF534d70E1E09017".toLowerCase(),
+        DAI_V2: "0x672461Bfc20DD783444a830Ad4c38b345aB6E2f7".toLowerCase(),
+        USDC_V2: "0x95357303f995e184A7998dA6C6eA35cC728A1900".toLowerCase(),
+        WETH_V2: "0x5887ad4Cb2352E7F01527035fAa3AE0Ef2cE2b9B".toLowerCase(),
+        WSTETH_V2: "0xe0bCE4460795281d39c91da9B0275BcA968293de".toLowerCase(),
+        WBTC_V2: "0xc62BF8a7889AdF1c5Dc4665486c7683ae6E74e0F".toLowerCase(),
+        FRAX_V2: "0xA3E1e0d58FE8dD8C9dd48204699a1178f1B274D8".toLowerCase(),
+        WETH_V2_1: "0x4C6309fe2085EfE7A0Cfb426C16Ef3b41198cCE3".toLowerCase(),
+    },
+    Arbitrum: {},
+};
+exports.creditManagerByAddress = mappers_1.TypedObjectUtils.entries(exports.creditManagerByNetwork).reduce((acc, [, cms]) => ({
+    ...acc,
+    ...mappers_1.TypedObjectUtils.fromEntries(mappers_1.TypedObjectUtils.entries(cms)
+        .map(([k, v]) => [v.toLowerCase(), k])
+        .filter(k => !!k)),
+}), {});
+exports.poolByNetwork = {
+    Mainnet: {
+        DAI_V1: "0x24946bCbBd028D5ABb62ad9B635EB1b1a67AF668".toLowerCase(),
+        USDC_V1: "0x86130bDD69143D8a4E5fc50bf4323D48049E98E4".toLowerCase(),
+        WETH_V1: "0xB03670c20F87f2169A7c4eBE35746007e9575901".toLowerCase(),
+        WBTC_V1: "0xB2A015c71c17bCAC6af36645DEad8c572bA08A08".toLowerCase(),
+        WSTETH_V1: "0xB8cf3Ed326bB0E51454361Fb37E9E8df6DC5C286".toLowerCase(),
+        FRAX_V1: "0x79012c8d491dcf3a30db20d1f449b14caf01da6c".toLowerCase(),
+    },
+    Arbitrum: {},
+};
+const deployedContractNames = {
+    // MAINNET V1 CM
+    [exports.creditManagerByNetwork.Mainnet.DAI_V1]: "DAI",
+    [exports.creditManagerByNetwork.Mainnet.USDC_V1]: "USDC",
+    [exports.creditManagerByNetwork.Mainnet.WETH_V1]: "WETH",
+    [exports.creditManagerByNetwork.Mainnet.WBTC_V1]: "WBTC",
     // MAINNET V2 CM
-    [exports.CREDIT_MANAGER_DAI_V2_MAINNET]: "DAI",
-    [exports.CREDIT_MANAGER_USDC_V2_MAINNET]: "USDC",
-    [exports.CREDIT_MANAGER_WETH_V2_MAINNET]: "WETH",
-    [exports.CREDIT_MANAGER_WSTETH_V2_MAINNET]: "wstETH",
-    [exports.CREDIT_MANAGER_WBTC_V2_MAINNET]: "WBTC",
-    [exports.CREDIT_MANAGER_FRAX_V2_MAINNET]: "FRAX",
+    [exports.creditManagerByNetwork.Mainnet.DAI_V2]: "DAI",
+    [exports.creditManagerByNetwork.Mainnet.USDC_V2]: "USDC",
+    [exports.creditManagerByNetwork.Mainnet.WETH_V2]: "WETH",
+    [exports.creditManagerByNetwork.Mainnet.WSTETH_V2]: "wstETH",
+    [exports.creditManagerByNetwork.Mainnet.WBTC_V2]: "WBTC",
+    [exports.creditManagerByNetwork.Mainnet.FRAX_V2]: "FRAX",
+    // MAINNET V2_1 CM
+    [exports.creditManagerByNetwork.Mainnet.WETH_V2_1]: "WETH-Alpha",
+    // MAINNET POOLS
+    [exports.poolByNetwork.Mainnet.DAI_V1]: "DAI",
+    [exports.poolByNetwork.Mainnet.USDC_V1]: "USDC",
+    [exports.poolByNetwork.Mainnet.WETH_V1]: "WETH",
+    [exports.poolByNetwork.Mainnet.WBTC_V1]: "WBTC",
+    [exports.poolByNetwork.Mainnet.WSTETH_V1]: "wstETH",
+    [exports.poolByNetwork.Mainnet.FRAX_V1]: "FRAX",
 };
 const contractNames = Object.entries(contracts_1.contractsByAddress).reduce((acc, [addr, cSymbol]) => {
     const params = contracts_1.contractParams[cSymbol];
@@ -41,7 +70,7 @@ const contractNames = Object.entries(contracts_1.contractsByAddress).reduce((acc
     return { ...acc, [addr]: params.name };
 }, {});
 const contractsFullList = {
-    ...mappers_1.TypedObjectUtils.keyToLowercase(exports.deployedContracts),
+    ...mappers_1.TypedObjectUtils.keyToLowercase(deployedContractNames),
     ...contractNames,
 };
 function getContractName(address) {

package/lib/core/creditManager.d.ts

@@ -14,6 +14,7 @@ export declare class CreditManagerData {
     readonly maxLeverageFactor: number;
     readonly availableLiquidity: bigint;
     readonly collateralTokens: Array<string>;
+    readonly supportedTokens: Record<string, true>;
     readonly adapters: Record<string, string>;
     readonly liquidationThresholds: Record<string, bigint>;
     readonly version: number;

package/lib/core/creditManager.js

@@ -18,7 +18,8 @@ class CreditManagerData {
     maxAmount;
     maxLeverageFactor; // for V1 only
     availableLiquidity;
-    collateralTokens;
+    collateralTokens = [];
+    supportedTokens = {};
     adapters;
     liquidationThresholds;
     version;
@@ -50,7 +51,11 @@ class CreditManagerData {
         this.maxAmount = (0, formatter_1.toBigInt)(payload.maxAmount || 0);
         this.maxLeverageFactor = Number((0, formatter_1.toBigInt)(payload.maxLeverageFactor || 0));
         this.availableLiquidity = (0, formatter_1.toBigInt)(payload.availableLiquidity || 0);
-        this.collateralTokens = payload.collateralTokens.map(t => t.toLowerCase());
+        payload.collateralTokens.forEach(t => {
+            const tLc = t.toLowerCase();
+            this.collateralTokens.push(tLc);
+            this.supportedTokens[tLc] = true;
+        });
         this.adapters = payload.adapters.reduce((acc, { allowedContract, adapter }) => ({
             ...acc,
             [allowedContract.toLowerCase()]: adapter.toLowerCase(),
@@ -89,7 +94,7 @@ class CreditManagerData {
         return this.adapters[contractAddress];
     }
     encodeAddCollateral(accountAddress, tokenAddress, amount) {
-        if (this.version !== 2)
+        if (this.version === 1)
             throw new Error("Multicall is eligible only for version 2");
         return {
             target: this.creditFacade,
@@ -97,7 +102,7 @@ class CreditManagerData {
         };
     }
     encodeIncreaseDebt(amount) {
-        if (this.version !== 2)
+        if (this.version === 1)
             throw new Error("Multicall is eligible only for version 2");
         return {
             target: this.creditFacade,
@@ -105,7 +110,7 @@ class CreditManagerData {
         };
     }
     encodeDecreaseDebt(amount) {
-        if (this.version !== 2)
+        if (this.version === 1)
             throw new Error("Multicall is eligible only for version 2");
         return {
             target: this.creditFacade,
@@ -113,9 +118,9 @@ class CreditManagerData {
         };
     }
     validateOpenAccount(collateral, debt) {
-        return this.version === 2
-            ? this.validateOpenAccountV2(debt)
-            : this.validateOpenAccountV1(collateral, debt);
+        return this.version === 1
+            ? this.validateOpenAccountV1(collateral, debt)
+            : this.validateOpenAccountV2(debt);
     }
     validateOpenAccountV1(collateral, debt) {
         if (collateral < this.minAmount)

package/lib/core/strategy.d.ts

@@ -3,10 +3,10 @@ export interface StrategyPayload {
     apy?: number;
     name: string;
     lpToken: string;
-    pools: Array<string>;
+    creditManagers: Array<string>;
+    baseAssets: Array<string>;
     unleveragableCollateral: Array<string>;
     leveragableCollateral: Array<string>;
-    baseAssets: Array<string>;
 }
 interface LiquidationPriceProps {
     prices: Record<string, bigint>;
@@ -20,18 +20,15 @@ export declare class Strategy {
     apy: number | undefined;
     name: string;
     lpToken: string;
-    pools: Array<string>;
+    baseAssets: Array<string>;
     unleveragableCollateral: Array<string>;
     leveragableCollateral: Array<string>;
-    baseAssets: Array<string>;
+    creditManagers: Array<string>;
     constructor(payload: StrategyPayload);
     static maxLeverage(lpToken: string, cms: Array<PartialCM>): number;
     maxAPY(baseAPY: number, maxLeverage: number, borrowAPY: number): number;
-    overallAPY(apy: number, leverage: number, depositCollateral: string, borrowAPY: number): number;
     static liquidationPrice({ prices, liquidationThresholds, borrowed, underlyingToken, lpAmount, lpToken, }: LiquidationPriceProps): bigint;
-    protected farmLev(leverage: number, depositCollateral: string): number;
-    protected inBaseAssets(depositCollateral: string): boolean;
-    protected inLeveragableAssets(depositCollateral: string): boolean;
+    protected static maxLeverageThreshold(lpToken: string, cms: Array<PartialCM>): readonly [bigint, string];
 }
 type PartialCM = Pick<CreditManagerData, "liquidationThresholds" | "address">;
 export {};

package/lib/core/strategy.js

@@ -9,21 +9,21 @@ class Strategy {
     apy;
     name;
     lpToken;
-    pools;
+    baseAssets;
     unleveragableCollateral;
     leveragableCollateral;
-    baseAssets;
+    creditManagers;
     constructor(payload) {
         this.apy = payload.apy;
         this.name = payload.name;
         this.lpToken = payload.lpToken.toLowerCase();
-        this.pools = payload.pools.map(addr => addr.toLowerCase());
+        this.creditManagers = payload.creditManagers.map(addr => addr.toLowerCase());
+        this.baseAssets = payload.baseAssets.map(addr => addr.toLowerCase());
         this.unleveragableCollateral = payload.unleveragableCollateral.map(addr => addr.toLowerCase());
         this.leveragableCollateral = payload.leveragableCollateral.map(addr => addr.toLowerCase());
-        this.baseAssets = payload.baseAssets.map(addr => addr.toLowerCase());
     }
     static maxLeverage(lpToken, cms) {
-        const [maxThreshold] = maxLeverageThreshold(lpToken, cms);
+        const [maxThreshold] = Strategy.maxLeverageThreshold(lpToken, cms);
         const maxLeverage = (constants_1.PERCENTAGE_FACTOR * constants_1.LEVERAGE_DECIMALS) /
             (constants_1.PERCENTAGE_FACTOR - maxThreshold);
         return Number(maxLeverage - constants_1.LEVERAGE_DECIMALS);
@@ -33,10 +33,6 @@ class Strategy {
             ((baseAPY - borrowAPY) * (maxLeverage - Number(constants_1.LEVERAGE_DECIMALS))) /
                 Number(constants_1.LEVERAGE_DECIMALS));
     }
-    overallAPY(apy, leverage, depositCollateral, borrowAPY) {
-        const farmLev = this.farmLev(leverage, depositCollateral);
-        return roi(apy, farmLev, leverage - Number(constants_1.LEVERAGE_DECIMALS), borrowAPY);
-    }
     static liquidationPrice({ prices, liquidationThresholds, borrowed, underlyingToken, lpAmount, lpToken, }) {
         const underlyingTokenAddressLC = underlyingToken.toLowerCase();
         const underlyingTokenSymbol = token_1.tokenSymbolByAddress[underlyingTokenAddressLC];
@@ -56,36 +52,21 @@ class Strategy {
         }
         return 0n;
     }
-    farmLev(leverage, depositCollateral) {
-        return this.inBaseAssets(depositCollateral) ||
-            this.inLeveragableAssets(depositCollateral)
-            ? leverage
-            : leverage - Number(constants_1.LEVERAGE_DECIMALS);
-    }
-    inBaseAssets(depositCollateral) {
-        return this.baseAssets.some(c => c === depositCollateral.toLowerCase());
-    }
-    inLeveragableAssets(depositCollateral) {
-        return this.leveragableCollateral.some(c => c === depositCollateral.toLowerCase());
+    static maxLeverageThreshold(lpToken, cms) {
+        const lpTokenLC = lpToken.toLowerCase();
+        const ltByCM = cms.map(cm => {
+            const lt = cm.liquidationThresholds[lpTokenLC] || 0n;
+            return [cm.address, lt];
+        });
+        const sorted = ltByCM.sort(([, ltA], [, ltB]) => {
+            if (ltA > ltB)
+                return 1;
+            if (ltB > ltA)
+                return -1;
+            return 0;
+        });
+        const [cm = "", lt = 0n] = sorted[0] || [];
+        return [lt, cm];
     }
 }
 exports.Strategy = Strategy;
-function roi(apy, farmLev, debtLev, borrowAPY) {
-    return (apy * farmLev - borrowAPY * debtLev) / Number(constants_1.LEVERAGE_DECIMALS);
-}
-function maxLeverageThreshold(lpToken, cms) {
-    const lpTokenLC = lpToken.toLowerCase();
-    const ltByCM = cms.map(cm => {
-        const lt = cm.liquidationThresholds[lpTokenLC] || 0n;
-        return [cm.address, lt];
-    });
-    const sorted = ltByCM.sort(([, ltA], [, ltB]) => {
-        if (ltA > ltB)
-            return 1;
-        if (ltB > ltA)
-            return -1;
-        return 0;
-    });
-    const [cm = "", lt = 0n] = sorted[0] || [];
-    return [lt, cm];
-}

package/lib/core/strategy.spec.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const chai_1 = require("chai");
+const contractsRegister_1 = require("../contracts/contractsRegister");
 const decimals_1 = require("../tokens/decimals");
 const token_1 = require("../tokens/token");
 const formatter_1 = require("../utils/formatter");
@@ -10,7 +11,7 @@ const lidoPayload = {
     name: "Lido",
     lpToken: token_1.tokenDataByNetwork.Mainnet.STETH,
     apy: 38434,
-    pools: [token_1.tokenDataByNetwork.Mainnet.WETH],
+    creditManagers: [contractsRegister_1.creditManagerByNetwork.Mainnet.WETH_V2],
     unleveragableCollateral: [
         token_1.tokenDataByNetwork.Mainnet.USDC,
         token_1.tokenDataByNetwork.Mainnet.DAI,
@@ -43,10 +44,6 @@ describe("Strategy test", () => {
         const result = lidoStrategy.maxAPY(53203, 10 * Number(constants_1.LEVERAGE_DECIMALS), pools["0x1"].borrowRate);
         (0, chai_1.expect)(result).to.be.eq(284143);
     });
-    it("overallAPY calculation is correct", () => {
-        const result = lidoStrategy.overallAPY(lidoStrategy.apy || 0, 10 * Number(constants_1.LEVERAGE_DECIMALS), token_1.tokenDataByNetwork.Mainnet.WETH, pools["0x2"].borrowRate);
-        (0, chai_1.expect)(result).to.be.eq(332716);
-    });
     it("liquidationPrice calculation is correct", () => {
         const result = strategy_1.Strategy.liquidationPrice({
             liquidationThresholds,

package/lib/pathfinder/pathfinder.d.ts

@@ -15,7 +15,7 @@ export declare class PathFinder {
     network: NetworkType;
     static connectors: Array<SupportedToken>;
     protected readonly _connectors: Array<string>;
-    constructor(address: string, provider: Signer | providers.Provider, network?: NetworkType, connectors?: Array<SupportedToken>);
+    constructor(address: string, provider: Signer | providers.Provider, network?: NetworkType, connectors?: SupportedToken[]);
     findAllSwaps(creditAccount: CreditAccountData, swapOperation: SwapOperation, tokenIn: SupportedToken | string, tokenOut: SupportedToken | string, amount: BigNumberish, slippage: number): Promise<Array<PathFinderResult>>;
     findOneTokenPath(creditAccount: CreditAccountData, tokenIn: SupportedToken | string, tokenOut: SupportedToken | string, amount: BigNumberish, slippage: number): Promise<PathFinderResult>;
     /**
@@ -41,4 +41,6 @@ export declare class PathFinder {
      */
     findBestClosePath(creditAccount: CreditAccountData, slippage: number, noConcurency?: boolean): Promise<PathFinderCloseResult>;
     static compare(r1: CloseResult, r2: CloseResult, gasPriceRAY: bigint): CloseResult;
+    getAvailableConnectors(availableList: Record<string, bigint> | Record<string, true>): string[];
+    static getAvailableConnectors(availableList: Record<string, bigint> | Record<string, true>, connectors: string[]): string[];
 }

package/lib/pathfinder/pathfinder.js

@@ -13,19 +13,22 @@ class PathFinder {
     network;
     static connectors = ["USDC", "WETH", "DAI"];
     _connectors;
-    constructor(address, provider, network = "Mainnet", connectors) {
+    constructor(address, provider, network = "Mainnet", connectors = PathFinder.connectors) {
         this.pathFinder = types_1.IRouter__factory.connect(address, provider);
         this.network = network;
-        this._connectors = (connectors || PathFinder.connectors).map(c => token_1.tokenDataByNetwork[this.network][c]);
+        this._connectors = connectors
+            .map(c => token_1.tokenDataByNetwork[this.network][c]?.toLowerCase())
+            .filter(t => !t);
     }
     async findAllSwaps(creditAccount, swapOperation, tokenIn, tokenOut, amount, slippage) {
+        const connectors = this.getAvailableConnectors(creditAccount.balances);
         const swapTask = {
             swapOperation: swapOperation,
             creditAccount: creditAccount.addr,
             tokenIn: token_1.tokenDataByNetwork[this.network][tokenIn] || tokenIn,
             tokenOut: token_1.tokenDataByNetwork[this.network][tokenOut] ||
                 tokenOut,
-            connectors: this._connectors,
+            connectors,
             amount: amount,
             slippage,
             externalSlippage: false,
@@ -47,10 +50,8 @@ class PathFinder {
     }
     async findOneTokenPath(creditAccount, tokenIn, tokenOut, amount, slippage) {
         const tokenInAddr = token_1.tokenDataByNetwork[this.network][tokenIn] || tokenIn;
-        // if (creditAccount.balances[tokenInAddr.toLowerCase()].lt(amount)) {
-        //   throw new Error(`Not enough balance for token ${tokenIn}`);
-        // }
-        const result = await this.pathFinder.callStatic.findOneTokenPath(tokenInAddr, amount, token_1.tokenDataByNetwork[this.network][tokenOut] || tokenOut, creditAccount.addr, this._connectors, slippage, {
+        const connectors = this.getAvailableConnectors(creditAccount.balances);
+        const result = await this.pathFinder.callStatic.findOneTokenPath(tokenInAddr, amount, token_1.tokenDataByNetwork[this.network][tokenOut] || tokenOut, creditAccount.addr, connectors, slippage, {
             gasLimit: GAS_PER_BLOCK,
         });
         return {
@@ -80,7 +81,8 @@ class PathFinder {
             token,
             balance: expectedBalancesAddr[token] || 0,
         }));
-        const result = await this.pathFinder.callStatic.findOpenStrategyPath(cm.address, balances, targetAddr, this._connectors, slippage, {
+        const connectors = this.getAvailableConnectors(cm.supportedTokens);
+        const result = await this.pathFinder.callStatic.findOpenStrategyPath(cm.address, balances, targetAddr, connectors, slippage, {
             gasLimit: GAS_PER_BLOCK,
         });
         const balancesAfter = result[0].reduce((acc, b) => {
@@ -104,16 +106,17 @@ class PathFinder {
     async findBestClosePath(creditAccount, slippage, noConcurency = false) {
         const loopsPerTx = Math.floor(GAS_PER_BLOCK / MAX_GAS_PER_ROUTE);
         const pathOptions = pathOptions_1.PathOptionFactory.generatePathOptions(creditAccount.allBalances, loopsPerTx);
+        const connectors = this.getAvailableConnectors(creditAccount.balances);
         let results = [];
         if (noConcurency) {
             for (const po of pathOptions) {
-                results.push(await this.pathFinder.callStatic.findBestClosePath(creditAccount.addr, this._connectors, slippage, po, loopsPerTx, false, {
+                results.push(await this.pathFinder.callStatic.findBestClosePath(creditAccount.addr, connectors, slippage, po, loopsPerTx, false, {
                     gasLimit: GAS_PER_BLOCK,
                 }));
             }
         }
         else {
-            const requests = pathOptions.map(po => this.pathFinder.callStatic.findBestClosePath(creditAccount.addr, this._connectors, slippage, po, loopsPerTx, false, {
+            const requests = pathOptions.map(po => this.pathFinder.callStatic.findBestClosePath(creditAccount.addr, connectors, slippage, po, loopsPerTx, false, {
                 gasLimit: GAS_PER_BLOCK,
             }));
             results = await Promise.all(requests);
@@ -137,5 +140,11 @@ class PathFinder {
         const comparator = ({ amount, gasUsage }, gasPrice) => amount - (gasUsage * gasPrice) / constants_1.RAY;
         return comparator(r1, gasPriceRAY) > comparator(r2, gasPriceRAY) ? r1 : r2;
     }
+    getAvailableConnectors(availableList) {
+        return PathFinder.getAvailableConnectors(availableList, this._connectors);
+    }
+    static getAvailableConnectors(availableList, connectors) {
+        return connectors.filter(t => availableList[t] !== undefined);
+    }
 }
 exports.PathFinder = PathFinder;

package/lib/tokens/gear.d.ts

@@ -13,3 +13,4 @@ export type GearboxTokenData = {
     type: TokenType.GEAR_TOKEN;
 } & TokenBase;
 export declare const gearTokens: Record<DieselTokenTypes | GearboxToken, DieselTokenData | GearboxTokenData>;
+export declare const isDieselToken: (t: unknown) => t is DieselTokenTypes;

package/lib/tokens/gear.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gearTokens = void 0;
+exports.isDieselToken = exports.gearTokens = void 0;
 const tokenType_1 = require("./tokenType");
-exports.gearTokens = {
+const dieselTokens = {
     // GEARBOX
     dDAI: {
         name: "dDAI",
@@ -34,9 +34,14 @@ exports.gearTokens = {
         symbol: "dFRAX",
         type: tokenType_1.TokenType.DIESEL_LP_TOKEN,
     },
+};
+exports.gearTokens = {
+    ...dieselTokens,
     GEAR: {
         name: "GEAR",
         symbol: "GEAR",
         type: tokenType_1.TokenType.GEAR_TOKEN,
     },
 };
+const isDieselToken = (t) => typeof t === "string" && !!dieselTokens[t];
+exports.isDieselToken = isDieselToken;

package/lib/tokens/token.js

@@ -258,12 +258,9 @@ exports.tokenDataByNetwork = {
 };
 exports.tokenSymbolByAddress = mappers_1.TypedObjectUtils.entries(exports.tokenDataByNetwork).reduce((acc, [, tokens]) => ({
     ...acc,
-    ...{
-        ...acc,
-        ...mappers_1.TypedObjectUtils.fromEntries(mappers_1.TypedObjectUtils.entries(tokens)
-            .map(([k, v]) => [v.toLowerCase(), k])
-            .filter(k => !!k)),
-    },
+    ...mappers_1.TypedObjectUtils.fromEntries(mappers_1.TypedObjectUtils.entries(tokens)
+        .map(([k, v]) => [v.toLowerCase(), k])
+        .filter(k => !!k)),
 }), {});
 const isSupportedToken = (t) => typeof t === "string" && !!exports.supportedTokens[t];
 exports.isSupportedToken = isSupportedToken;

package/lib/utils/price.d.ts

@@ -3,7 +3,7 @@ interface Target {
     decimals: number | undefined;
 }
 export declare class PriceUtils {
-    static calcTotalPrice: (price: bigint, amount: bigint, decimals?: number) => bigint;
+    static calcTotalPrice: (price: bigint, amount: bigint, decimals?: number | undefined) => bigint;
     static convertByPrice(totalMoney: bigint, { price: targetPrice, decimals: targetDecimals }: Target): bigint;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "2.1.7",
+  "version": "2.1.9",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",