@gearbox-protocol/sdk 3.0.0-next.1 → 3.0.0-next.100

package/lib/core/pool.js

@@ -0,0 +1,306 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserPoolData = exports.ChartsPoolData = exports.PoolData = void 0;
+const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
+const types_1 = require("../types");
+const formatter_1 = require("../utils/formatter");
+class PoolData {
+    address;
+    type;
+    underlyingToken;
+    dieselToken;
+    stakedDieselToken;
+    isPaused;
+    version;
+    poolQuotaKeeper;
+    gauge;
+    name;
+    symbol;
+    // Information
+    expectedLiquidity;
+    expectedLiquidityLimit;
+    availableLiquidity;
+    baseInterestIndex;
+    totalBorrowed;
+    totalDebtLimit;
+    creditManagerDebtParams;
+    quotas;
+    zappers;
+    totalAssets;
+    totalSupply;
+    supplyAPY7D;
+    depositAPY;
+    borrowAPY;
+    interestModel;
+    dieselRate;
+    dieselRateRay;
+    withdrawFee;
+    lastBaseInterestUpdate;
+    constructor(payload) {
+        this.address = payload.addr.toLowerCase();
+        this.type = PoolData.getPoolType(payload.name || "");
+        this.underlyingToken = payload.underlying.toLowerCase();
+        this.dieselToken = payload.dieselToken.toLowerCase();
+        this.stakedDieselToken = (payload.stakedDieselToken || []).map(t => t.toLowerCase());
+        this.isPaused = payload.isPaused;
+        this.version = payload.version.toNumber();
+        this.poolQuotaKeeper = payload.poolQuotaKeeper.toLowerCase();
+        this.gauge = payload.gauge.toLowerCase();
+        this.name = payload.name;
+        this.symbol = payload.symbol;
+        this.expectedLiquidity = (0, sdk_gov_1.toBigInt)(payload.expectedLiquidity);
+        this.availableLiquidity = (0, sdk_gov_1.toBigInt)(payload.availableLiquidity);
+        this.expectedLiquidityLimit =
+            this.expectedLiquidity + this.availableLiquidity;
+        this.baseInterestIndex = (0, sdk_gov_1.toBigInt)(payload.baseInterestIndex);
+        this.totalBorrowed = (0, sdk_gov_1.toBigInt)(payload.totalBorrowed);
+        this.totalDebtLimit = (0, sdk_gov_1.toBigInt)(payload.totalDebtLimit);
+        this.creditManagerDebtParams = Object.fromEntries(payload.creditManagerDebtParams.map(p => {
+            const creditManager = p.creditManager.toLowerCase();
+            return [
+                creditManager,
+                {
+                    creditManager,
+                    borrowed: (0, sdk_gov_1.toBigInt)(p.borrowed),
+                    limit: (0, sdk_gov_1.toBigInt)(p.limit),
+                    availableToBorrow: (0, sdk_gov_1.toBigInt)(p.availableToBorrow),
+                },
+            ];
+        }));
+        this.quotas = Object.fromEntries(payload.quotas.map(q => {
+            const token = q.token.toLowerCase();
+            return [
+                token,
+                {
+                    token,
+                    rate: Number((0, sdk_gov_1.toBigInt)(q.rate) * sdk_gov_1.PERCENTAGE_DECIMALS),
+                    quotaIncreaseFee: q.quotaIncreaseFee,
+                    totalQuoted: (0, sdk_gov_1.toBigInt)(q.totalQuoted),
+                    limit: (0, sdk_gov_1.toBigInt)(q.limit),
+                    isActive: q.isActive,
+                },
+            ];
+        }));
+        this.zappers = payload.zappers.reduce((acc, z) => {
+            const tokenIn = z.tokenIn.toLowerCase();
+            const tokenOut = z.tokenOut.toLowerCase();
+            const old = acc[tokenIn] || {};
+            return {
+                ...acc,
+                [tokenIn]: {
+                    ...old,
+                    [tokenOut]: { tokenIn, tokenOut, zapper: z.zapper.toLowerCase() },
+                },
+            };
+        }, {});
+        this.totalAssets = (0, sdk_gov_1.toBigInt)(payload.totalAssets);
+        this.totalSupply = (0, sdk_gov_1.toBigInt)(payload.totalSupply);
+        this.depositAPY = (0, formatter_1.rayToNumber)((0, sdk_gov_1.toBigInt)(payload.supplyRate) * sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.borrowAPY = (0, formatter_1.rayToNumber)((0, sdk_gov_1.toBigInt)(payload.baseInterestRate) * sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.supplyAPY7D = payload.supplyAPY7D;
+        this.interestModel = {
+            interestModel: payload.lirm.interestModel.toLowerCase(),
+            U_1: payload.lirm.U_1,
+            U_2: payload.lirm.U_2,
+            R_base: payload.lirm.R_base,
+            R_slope1: payload.lirm.R_slope1,
+            R_slope2: payload.lirm.R_slope2,
+            R_slope3: payload.lirm.R_slope3,
+            version: payload?.lirm?.version?.toNumber(),
+            isBorrowingMoreU2Forbidden: payload?.lirm?.isBorrowingMoreU2Forbidden,
+        };
+        this.dieselRate = (0, formatter_1.rayToNumber)(payload.dieselRate_RAY);
+        this.dieselRateRay = (0, sdk_gov_1.toBigInt)(payload.dieselRate_RAY);
+        this.lastBaseInterestUpdate = (0, sdk_gov_1.toBigInt)(payload.lastBaseInterestUpdate);
+        this.withdrawFee =
+            Number((0, sdk_gov_1.toBigInt)(payload.withdrawFee)) / Number(sdk_gov_1.PERCENTAGE_DECIMALS);
+    }
+    getPoolContractV1(signer) {
+        return types_1.IPoolService__factory.connect(this.address, signer);
+    }
+    getPoolContractV3(signer) {
+        return types_1.IPoolV3__factory.connect(this.address, signer);
+    }
+    async calculateBorrowRate({ provider, expectedLiquidity, availableLiquidity, }) {
+        const model = types_1.IInterestRateModel__factory.connect(this.interestModel.interestModel, provider);
+        return model.calcBorrowRate(expectedLiquidity, availableLiquidity);
+    }
+    static getPoolType(name) {
+        const [identity = ""] = name.split(" ") || [];
+        const lc = identity.toLowerCase();
+        if (lc === "farm")
+            return "farm";
+        if (lc === "trade")
+            return "trade";
+        return "universal";
+    }
+}
+exports.PoolData = PoolData;
+class ChartsPoolData {
+    address;
+    underlyingToken;
+    dieselToken;
+    type;
+    version;
+    name;
+    addLiqCount;
+    addedLiquidity;
+    removeLiqCount;
+    removedLiquidity;
+    earned7D;
+    earned7DInUSD;
+    utilization;
+    dieselRate;
+    dieselRateRay;
+    depositAPY;
+    depositAPYRay;
+    borrowAPY;
+    borrowAPYRay;
+    lmAPY;
+    availableLiquidity;
+    availableLiquidityChange;
+    availableLiquidityInUSD;
+    caLockedValue;
+    caLockedValueChange;
+    caLockedValueInUSD;
+    expectedLiquidity;
+    expectedLiquidityChange;
+    expectedLiquidityInUSD;
+    expectedLiqWeekAgo;
+    expectedLiquidityLimit;
+    expectedLiquidityLimitInUSD;
+    totalBorrowed;
+    totalBorrowedChange;
+    totalBorrowedInUSD;
+    debtWithInterest;
+    debtWithInterestChange;
+    debtWithInterestInUSD;
+    debtWithInterestOld;
+    oldAvailableLiquidity;
+    oldCALockedValue;
+    oldExpectedLiquidity;
+    oldTotalBorrowed;
+    withdrawFee;
+    depositAPY1DAverage;
+    depositAPY1DAverageChange;
+    depositAPY7DAverage;
+    depositAPY30DAverage;
+    oldUniqueLPs;
+    uniqueLPs;
+    uniqueLPsChange;
+    constructor(payload) {
+        this.address = (payload.addr || "").toLowerCase();
+        this.underlyingToken = (payload.underlyingToken || "").toLowerCase();
+        this.dieselToken = (payload.dieselToken || "").toLowerCase();
+        this.type = PoolData.getPoolType(payload.name || "");
+        this.version = payload.version || 1;
+        this.name = payload.name || "";
+        this.earned7D = payload.earned7D || 0;
+        this.earned7DInUSD = payload.earned7DInUSD || 0;
+        const expected = (0, sdk_gov_1.toBigInt)(payload.expectedLiquidity || 0);
+        this.utilization =
+            expected > 0
+                ? Number(((0, sdk_gov_1.toBigInt)(payload.totalBorrowed || 0) * sdk_gov_1.PERCENTAGE_FACTOR) /
+                    expected) / Number(sdk_gov_1.PERCENTAGE_DECIMALS)
+                : 0;
+        this.dieselRate = (0, formatter_1.rayToNumber)(payload.dieselRate_RAY || 0);
+        this.dieselRateRay = (0, sdk_gov_1.toBigInt)(payload.dieselRate_RAY || 0);
+        this.depositAPY =
+            (0, formatter_1.rayToNumber)(payload.depositAPY_RAY || 0) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.depositAPYRay = (0, sdk_gov_1.toBigInt)(payload.depositAPY_RAY);
+        this.borrowAPY =
+            (0, formatter_1.rayToNumber)(payload.borrowAPY_RAY || 0) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.borrowAPYRay = (0, sdk_gov_1.toBigInt)(payload.borrowAPY_RAY || 0);
+        this.lmAPY = (payload.lmAPY || 0) / Number(sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.availableLiquidity = (0, sdk_gov_1.toBigInt)(payload.availableLiquidity || 0);
+        this.oldAvailableLiquidity = (0, sdk_gov_1.toBigInt)(payload.availableLiquidityOld || 0);
+        this.availableLiquidityChange =
+            (payload.availableLiquidity10kBasis || 0) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.availableLiquidityInUSD = payload.availableLiquidityInUSD || 0;
+        this.caLockedValue = payload.caLockedValue || 0;
+        this.oldCALockedValue = payload.caLockedValueOld || 0;
+        this.caLockedValueChange =
+            (payload.caLockedValue10kBasis || 0) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.caLockedValueInUSD = payload.caLockedValueUSD || 0;
+        this.expectedLiquidity = (0, sdk_gov_1.toBigInt)(payload.expectedLiquidity || 0);
+        this.oldExpectedLiquidity = (0, sdk_gov_1.toBigInt)(payload.expectedLiquidityOld || 0);
+        this.expectedLiquidityChange =
+            (payload.expectedLiquidity10kBasis || 0) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.expectedLiquidityInUSD = payload.expectedLiquidityInUSD || 0;
+        this.expectedLiqWeekAgo = payload.expectedLiqWeekAgo || 0;
+        this.expectedLiquidityLimit = (0, sdk_gov_1.toBigInt)(payload.expectedLiquidityLimit || 0);
+        this.expectedLiquidityLimitInUSD = payload.expectedLiquidityLimitInUSD || 0;
+        this.totalBorrowed = (0, sdk_gov_1.toBigInt)(payload.totalBorrowed || 0);
+        this.oldTotalBorrowed = (0, sdk_gov_1.toBigInt)(payload.totalBorrowedOld || 0);
+        this.totalBorrowedChange =
+            (payload.totalBorrowed10kBasis || 0) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.totalBorrowedInUSD = payload.totalBorrowedInUSD || 0;
+        this.debtWithInterest = (0, sdk_gov_1.toBigInt)(payload.debtWithInterest || 0);
+        this.debtWithInterestOld = (0, sdk_gov_1.toBigInt)(payload.debtWithInterestOld || 0);
+        this.debtWithInterestChange =
+            (payload.debtWithInterest10kBasis || 0) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.debtWithInterestInUSD = payload.debtWithInterestInUSD || 0;
+        this.withdrawFee = payload.withdrawFee || 0;
+        this.addLiqCount = payload.addLiqCount || 0;
+        this.addedLiquidity = payload.addedLiquidity || 0;
+        this.removeLiqCount = payload.removeLiqCount || 0;
+        this.removedLiquidity = payload.removedLiquidity || 0;
+        this.depositAPY1DAverage =
+            (payload.depositAPY1DAverage || 0) / Number(sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.depositAPY1DAverageChange =
+            (payload.depositAPY1DAverage10kBasis || 0) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.depositAPY7DAverage =
+            (payload.depositAPY7DAverage || 0) / Number(sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.depositAPY30DAverage =
+            (payload.depositAPY30DAverage || 0) / Number(sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.uniqueLPs = payload.uniqueLPs || 0;
+        this.oldUniqueLPs = payload.uniqueLPsOld || 0;
+        this.uniqueLPsChange =
+            (payload.uniqueLPs10kBasis || 0) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
+    }
+}
+exports.ChartsPoolData = ChartsPoolData;
+class UserPoolData {
+    id;
+    address;
+    dieselToken;
+    underlyingToken;
+    depositAPY;
+    depositAPYRay;
+    lmAPY;
+    providedLiquidity;
+    providedLiquidityInUSD;
+    dieselBalance;
+    dieselBalanceInUSD;
+    lmRewards;
+    lmRewardsInUSD;
+    pnlInNativeToken;
+    pnlInUSD;
+    addedLiq;
+    addLiqCount;
+    removeLiqCount;
+    removedLiq;
+    constructor(payload) {
+        this.id = (payload.pool || "").toLowerCase();
+        this.address = payload.pool || "";
+        this.underlyingToken = (payload.underlyingToken || "").toLowerCase();
+        this.dieselToken = (payload.dieselToken || "").toLowerCase();
+        this.depositAPY =
+            (0, formatter_1.rayToNumber)(payload.depositAPY_RAY || 0) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.depositAPYRay = (0, sdk_gov_1.toBigInt)(payload.depositAPY_RAY || 0);
+        this.lmAPY = (payload.lmAPY || 0) / Number(sdk_gov_1.PERCENTAGE_DECIMALS || 0);
+        this.providedLiquidity = (0, sdk_gov_1.toBigInt)(payload.liqValue || 0);
+        this.providedLiquidityInUSD = payload.liqValueInUSD;
+        this.dieselBalance = (0, sdk_gov_1.toBigInt)(payload.dieselBalanceBI || 0);
+        this.dieselBalanceInUSD = payload.dieselBalance;
+        this.lmRewards = (0, sdk_gov_1.toBigInt)(payload.lmRewards || 0);
+        this.lmRewardsInUSD = payload.lmRewardsInUSD;
+        this.pnlInNativeToken = payload.liqPnlInNativeToken;
+        this.pnlInUSD = payload.liqPnlInUSD;
+        this.addedLiq = payload.addedLiq;
+        this.addLiqCount = payload.addLiqCount;
+        this.removeLiqCount = payload.removeLiqCount;
+        this.removedLiq = payload.removedLiq;
+    }
+}
+exports.UserPoolData = UserPoolData;

package/lib/core/priceOracle.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PriceOracleData = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
-const formatter_1 = require("../utils/formatter");
 class PriceOracleData {
     _prices = {};
     constructor(prices) {
@@ -10,7 +9,7 @@ class PriceOracleData {
     }
     updatePrices(prices) {
         prices.forEach(p => {
-            this._prices[p.token.toLowerCase()] = (0, formatter_1.toBigInt)(p.price);
+            this._prices[p.token.toLowerCase()] = (0, sdk_gov_1.toBigInt)(p.price);
         });
     }
     convert(amount, from, to) {

package/lib/core/rewardConvex.d.ts

@@ -1,6 +1,6 @@
 import { MCall, NetworkType, SupportedContract, SupportedToken } from "@gearbox-protocol/sdk-gov";
 import { BigNumber, providers } from "ethers";
-import { IConvexV1BaseRewardPoolAdapterInterface } from "../types/@gearbox-protocol/integrations-v2/contracts/interfaces/convex/IConvexV1BaseRewardPoolAdapter.sol/IConvexV1BaseRewardPoolAdapter";
+import { IBaseRewardPoolInterface } from "../types/IBaseRewardPool";
 import { CreditAccountData } from "./creditAccount";
 import { CreditManagerData } from "./creditManager";
 import { AdapterWithType, Rewards } from "./rewardClaimer";
@@ -11,11 +11,11 @@ export interface RewardDistribution {
     token: SupportedToken;
 }
 interface MCallPreparation {
-    calls: Array<MCall<IConvexV1BaseRewardPoolAdapterInterface>>;
+    calls: Array<MCall<IBaseRewardPoolInterface>>;
     distribution: Array<RewardDistribution>;
 }
 export declare class RewardConvex {
-    static poolInterface: IConvexV1BaseRewardPoolAdapterInterface;
+    static poolInterface: IBaseRewardPoolInterface;
     static findRewards(ca: CreditAccountData, cm: CreditManagerData, network: NetworkType, provider: providers.Provider): Promise<Array<Rewards>>;
     static findAdapters(cm: CreditManagerData): Array<AdapterWithType>;
     static prepareMultiCalls(creditAccount: string, cm: CreditManagerData, network: NetworkType): MCallPreparation;

package/lib/core/rewardConvex.js

@@ -4,9 +4,8 @@ exports.RewardConvex = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const apy_1 = require("../apy");
 const types_1 = require("../types");
-const formatter_1 = require("../utils/formatter");
 class RewardConvex {
-    static poolInterface = types_1.IConvexV1BaseRewardPoolAdapter__factory.createInterface();
+    static poolInterface = types_1.IBaseRewardPool__factory.createInterface();
     static async findRewards(ca, cm, network, provider) {
         const { calls, distribution } = RewardConvex.prepareMultiCalls(ca.addr, cm, network);
         const mcalls = calls;
@@ -19,7 +18,7 @@ class RewardConvex {
         const totalSupply = rewards.pop();
         const results = RewardConvex.parseResults(rewards, distribution);
         results.forEach(r => {
-            r.rewards.CVX = (0, apy_1.getCVXMintAmount)(r.rewards.CRV || 0n, (0, formatter_1.toBigInt)(totalSupply));
+            r.rewards.CVX = (0, apy_1.getCVXMintAmount)(r.rewards.CRV || 0n, (0, sdk_gov_1.toBigInt)(totalSupply));
         });
         return results;
     }

package/lib/core/strategy.d.ts

@@ -1,33 +1,33 @@
+import { Protocols } from "@gearbox-protocol/sdk-gov";
 import { CreditManagerData } from "./creditManager";
 export interface StrategyPayload {
     apy?: number;
     name: string;
     lpToken: string;
+    protocol: Protocols;
     creditManagers: Array<string>;
     baseAssets: Array<string>;
     unleveragableCollateral: Array<string>;
     leveragableCollateral: Array<string>;
 }
-interface LiquidationPriceProps {
-    prices: Record<string, bigint>;
-    liquidationThresholds: Record<string, bigint>;
-    borrowed: bigint;
-    underlyingToken: string;
-    lpAmount: bigint;
-    lpToken: string;
+interface CalculateMaxAPYProps {
+    apy: number;
+    leverage: number;
+    baseRateWithFee: number;
+    quotaRateWithFee: number;
 }
 export declare class Strategy {
     apy: number | undefined;
-    name: string;
-    lpToken: string;
-    baseAssets: Array<string>;
-    unleveragableCollateral: Array<string>;
-    leveragableCollateral: Array<string>;
-    creditManagers: Array<string>;
+    readonly name: string;
+    readonly lpToken: string;
+    readonly protocol: Protocols;
+    readonly baseAssets: Array<string>;
+    readonly unleveragableCollateral: Array<string>;
+    readonly leveragableCollateral: Array<string>;
+    readonly creditManagers: Array<string>;
     constructor(payload: StrategyPayload);
     static maxLeverage(lpToken: string, cms: Array<PartialCM>): number;
-    maxAPY(baseAPY: number, maxLeverage: number, borrowAPY: number): number;
-    static liquidationPrice({ prices, liquidationThresholds, borrowed, underlyingToken, lpAmount, lpToken, }: LiquidationPriceProps): bigint;
+    static maxAPY({ apy, leverage, baseRateWithFee, quotaRateWithFee, }: CalculateMaxAPYProps): number;
     protected static maxLeverageThreshold(lpToken: string, cms: Array<PartialCM>): readonly [bigint, string];
 }
 type PartialCM = Pick<CreditManagerData, "liquidationThresholds" | "address">;

package/lib/core/strategy.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Strategy = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
-const price_1 = require("../utils/price");
 class Strategy {
     apy;
     name;
     lpToken;
+    protocol;
     baseAssets;
     unleveragableCollateral;
     leveragableCollateral;
@@ -15,6 +15,7 @@ class Strategy {
         this.apy = payload.apy;
         this.name = payload.name;
         this.lpToken = payload.lpToken.toLowerCase();
+        this.protocol = payload.protocol;
         this.creditManagers = payload.creditManagers.map(addr => addr.toLowerCase());
         this.baseAssets = payload.baseAssets.map(addr => addr.toLowerCase());
         this.unleveragableCollateral = payload.unleveragableCollateral.map(addr => addr.toLowerCase());
@@ -26,29 +27,12 @@ class Strategy {
             (sdk_gov_1.PERCENTAGE_FACTOR - maxThreshold);
         return Number(maxLeverage - sdk_gov_1.LEVERAGE_DECIMALS);
     }
-    maxAPY(baseAPY, maxLeverage, borrowAPY) {
-        return (baseAPY +
-            ((baseAPY - borrowAPY) * (maxLeverage - Number(sdk_gov_1.LEVERAGE_DECIMALS))) /
-                Number(sdk_gov_1.LEVERAGE_DECIMALS));
-    }
-    static liquidationPrice({ prices, liquidationThresholds, borrowed, underlyingToken, lpAmount, lpToken, }) {
-        const underlyingTokenAddressLC = underlyingToken.toLowerCase();
-        const underlyingTokenSymbol = sdk_gov_1.tokenSymbolByAddress[underlyingTokenAddressLC];
-        const underlyingTokenDecimals = sdk_gov_1.decimals[underlyingTokenSymbol];
-        const underlyingPrice = prices[underlyingTokenAddressLC] || sdk_gov_1.PRICE_DECIMALS;
-        const borrowedMoney = price_1.PriceUtils.calcTotalPrice(underlyingPrice, borrowed, underlyingTokenDecimals);
-        const lpTokenAddressLC = lpToken.toLowerCase();
-        const lpTokenSymbol = sdk_gov_1.tokenSymbolByAddress[lpTokenAddressLC];
-        const lpTokenDecimals = sdk_gov_1.decimals[lpTokenSymbol];
-        const lpLT = liquidationThresholds[lpTokenAddressLC] || 0n;
-        const lpPrice = prices[lpTokenAddressLC] || sdk_gov_1.PRICE_DECIMALS;
-        const lpMoney = price_1.PriceUtils.calcTotalPrice(lpPrice, lpAmount, lpTokenDecimals);
-        const lpLTMoney = (lpMoney * lpLT) / sdk_gov_1.PERCENTAGE_FACTOR;
-        if (lpLTMoney > 0) {
-            const lqPrice = (borrowedMoney * sdk_gov_1.WAD) / lpLTMoney;
-            return lqPrice >= 0 ? lqPrice : 0n;
-        }
-        return 0n;
+    static maxAPY({ apy, leverage, baseRateWithFee, quotaRateWithFee, }) {
+        const collateralTerm = apy - quotaRateWithFee;
+        const debtTerm = ((apy - baseRateWithFee - quotaRateWithFee) *
+            (leverage - Number(sdk_gov_1.LEVERAGE_DECIMALS))) /
+            Number(sdk_gov_1.LEVERAGE_DECIMALS);
+        return collateralTerm + Math.floor(debtTerm);
     }
     static maxLeverageThreshold(lpToken, cms) {
         const lpTokenLC = lpToken.toLowerCase();
@@ -58,9 +42,9 @@ class Strategy {
         });
         const sorted = ltByCM.sort(([, ltA], [, ltB]) => {
             if (ltA > ltB)
-                return 1;
-            if (ltB > ltA)
                 return -1;
+            if (ltB > ltA)
+                return 1;
             return 0;
         });
         const [cm = "", lt = 0n] = sorted[0] || [];

package/lib/core/trade.d.ts

@@ -1,56 +1,40 @@
 import { SupportedContract } from "@gearbox-protocol/sdk-gov";
-import { Signer } from "ethers";
 import { MultiCall, PathFinderResult, SwapOperation } from "../pathfinder/core";
-import { ICreditFacade } from "../types";
 import { CreditManagerData } from "./creditManager";
-import { EVMTx } from "./eventOrTx";
 interface Info {
     name: string;
     contractAddress: string;
     creditManager: string;
+    creditManagerName: string;
 }
-export interface TradeProps {
-    adapter: Info;
-    tradePath: PathFinderResult;
-    creditFacade: string;
-    tokenFrom: string;
-    tokenTo: string;
-    sourceAmount: bigint;
-    expectedAmount: bigint;
-    swapType: SwapOperation;
-    swapName: TradeOperations;
-}
-export type TradeOperations = "farmWithdraw" | "farmDeposit" | "swap" | "unknownOperation";
+export type TradeOperations = "farmWithdraw" | "farmDeposit" | "swap";
 export interface GetTradesProps {
-    from: string;
-    to: string;
+    tokenIn: string;
+    tokenOut: string;
     amount: bigint;
     results: Array<PathFinderResult>;
     creditManager: CreditManagerData;
     currentContracts: Record<SupportedContract, string>;
+    swapOperation: SwapOperation;
+    swapName: TradeOperations;
 }
 export declare class Trade {
     readonly helper: Info;
     readonly tradePath: PathFinderResult;
-    readonly creditFacade: string;
-    readonly swapType: SwapOperation;
+    readonly swapOperation: SwapOperation;
     readonly sourceAmount: bigint;
-    readonly expectedAmount: bigint;
+    readonly minExpectedAmount: bigint;
+    readonly averageExpectedAmount: bigint;
     readonly rate: bigint;
-    readonly tokenFrom: string;
-    readonly tokenTo: string;
+    readonly tokenIn: string;
+    readonly tokenOut: string;
     readonly operationName: TradeOperations;
-    constructor(props: TradeProps);
+    private constructor();
     getName(): string;
-    execute(signer: Signer): Promise<EVMTx>;
     toString(): string;
-    static getTrades({ from, to, amount, results, creditManager, currentContracts, }: GetTradesProps): Trade[];
-    static getOperationName(tokenInAddress: string, tokenOutAddress: string): TradeOperations;
-    static getCallInfo(calls: Array<MultiCall>, creditManager: string, currentContracts: Record<SupportedContract, string>): Info[];
+    static getTrades({ tokenIn, tokenOut, amount, results, creditManager, currentContracts, swapOperation, swapName, }: GetTradesProps): Trade[];
+    static getCallInfo(calls: Array<MultiCall>, creditManager: string, currentContracts: Record<SupportedContract, string>, creditManagerName: string): Info[];
     private static getContractSymbol;
-    static getTradeId(trade: Trade): string;
     static sortTrades(trades: Array<Trade>, swapStrategy: string): Trade[];
-    static executeMulticallPath(creditFacade: string | ICreditFacade, signer: Signer, calls: Array<MultiCall>): Promise<import("ethers").ContractTransaction>;
-    private static executeOnCreditFacade;
 }
 export {};