@gearbox-protocol/sdk 3.0.0-next.2 → 3.0.0-next.21

package/lib/core/events.js

@@ -118,13 +118,13 @@ class EventAddLiquidity extends eventOrTx_1.EVMEvent {
     pool;
     constructor(opts) {
         super(opts);
-        this.amount = (0, formatter_1.toBigInt)(opts.amount || 0);
+        this.amount = (0, sdk_gov_1.toBigInt)(opts.amount || 0);
         this.underlyingToken = opts.underlyingToken;
         this.pool = opts.pool;
     }
     toString() {
         const [symbol, decimals = 18] = (0, sdk_gov_1.extractTokenData)(this.underlyingToken);
-        return `Pool ${(0, contractsRegister_1.getContractName)(this.pool)}: Deposit ${(0, formatter_1.formatBN)(this.amount, decimals)} ${symbol}`;
+        return `Pool ${(0, contractsRegister_1.getContractName)(this.pool)}: Deposit ${(0, sdk_gov_1.formatBN)(this.amount, decimals)} ${symbol}`;
     }
 }
 exports.EventAddLiquidity = EventAddLiquidity;
@@ -135,14 +135,14 @@ class EventRemoveLiquidity extends eventOrTx_1.EVMEvent {
     pool;
     constructor(opts) {
         super(opts);
-        this.amount = (0, formatter_1.toBigInt)(opts.amount || 0);
+        this.amount = (0, sdk_gov_1.toBigInt)(opts.amount || 0);
         this.underlyingToken = opts.underlyingToken;
         this.dieselToken = opts.dieselToken;
         this.pool = opts.pool;
     }
     toString() {
         const [symbol, decimals = 18] = (0, sdk_gov_1.extractTokenData)(this.dieselToken);
-        return `Pool ${(0, contractsRegister_1.getContractName)(this.pool)}: withdraw ${(0, formatter_1.formatBN)(this.amount, decimals)} ${symbol}`;
+        return `Pool ${(0, contractsRegister_1.getContractName)(this.pool)}: withdraw ${(0, sdk_gov_1.formatBN)(this.amount, decimals)} ${symbol}`;
     }
 }
 exports.EventRemoveLiquidity = EventRemoveLiquidity;
@@ -152,13 +152,13 @@ class EventOpenCreditAccount extends eventOrTx_1.EVMEvent {
     creditManager;
     constructor(opts) {
         super(opts);
-        this.amount = (0, formatter_1.toBigInt)(opts.amount || 0);
+        this.amount = (0, sdk_gov_1.toBigInt)(opts.amount || 0);
         this.underlyingToken = opts.underlyingToken;
         this.creditManager = opts.creditManager;
     }
     toString() {
         const [symbol, decimals = 18] = (0, sdk_gov_1.extractTokenData)(this.underlyingToken);
-        return `Credit account ${(0, contractsRegister_1.getContractName)(this.creditManager)}: opened with debt ${(0, formatter_1.formatBN)(this.amount, decimals)} ${symbol}`;
+        return `Credit account ${(0, contractsRegister_1.getContractName)(this.creditManager)}: opened with debt ${(0, sdk_gov_1.formatBN)(this.amount, decimals)} ${symbol}`;
     }
 }
 exports.EventOpenCreditAccount = EventOpenCreditAccount;
@@ -181,13 +181,13 @@ class EventLiquidateCreditAccount extends eventOrTx_1.EVMEvent {
     creditManager;
     constructor(opts) {
         super(opts);
-        this.amount = (0, formatter_1.toBigInt)(opts.amount || 0);
+        this.amount = (0, sdk_gov_1.toBigInt)(opts.amount || 0);
         this.underlyingToken = opts.underlyingToken;
         this.creditManager = opts.creditManager;
     }
     toString() {
         const [symbol, decimals = 18] = (0, sdk_gov_1.extractTokenData)(this.underlyingToken);
-        return `Credit account ${(0, contractsRegister_1.getContractName)(this.creditManager)}: was liquidated. ${(0, formatter_1.formatBN)(this.amount, decimals)} ${symbol} were paid back as remaining funds`;
+        return `Credit account ${(0, contractsRegister_1.getContractName)(this.creditManager)}: was liquidated. ${(0, sdk_gov_1.formatBN)(this.amount, decimals)} ${symbol} were paid back as remaining funds`;
     }
 }
 exports.EventLiquidateCreditAccount = EventLiquidateCreditAccount;
@@ -210,13 +210,13 @@ class EventAddCollateral extends eventOrTx_1.EVMEvent {
     creditManager;
     constructor(opts) {
         super(opts);
-        this.amount = (0, formatter_1.toBigInt)(opts.amount || 0);
+        this.amount = (0, sdk_gov_1.toBigInt)(opts.amount || 0);
         this.addedToken = opts.addedToken;
         this.creditManager = opts.creditManager;
     }
     toString() {
         const [symbol, decimals = 18] = (0, sdk_gov_1.extractTokenData)(this.addedToken);
-        return `Credit account ${(0, contractsRegister_1.getContractName)(this.creditManager)}: added ${(0, formatter_1.formatBN)(this.amount, decimals)} ${symbol} as collateral`;
+        return `Credit account ${(0, contractsRegister_1.getContractName)(this.creditManager)}: added ${(0, sdk_gov_1.formatBN)(this.amount, decimals)} ${symbol} as collateral`;
     }
 }
 exports.EventAddCollateral = EventAddCollateral;
@@ -226,13 +226,13 @@ class EventIncreaseBorrowAmount extends eventOrTx_1.EVMEvent {
     creditManager;
     constructor(opts) {
         super(opts);
-        this.amount = (0, formatter_1.toBigInt)(opts.amount || 0);
+        this.amount = (0, sdk_gov_1.toBigInt)(opts.amount || 0);
         this.underlyingToken = opts.underlyingToken;
         this.creditManager = opts.creditManager;
     }
     toString() {
         const [symbol, decimals = 18] = (0, sdk_gov_1.extractTokenData)(this.underlyingToken);
-        return `Credit account ${(0, contractsRegister_1.getContractName)(this.creditManager)}: borrowed amount was increased for ${(0, formatter_1.formatBN)(this.amount, decimals)} ${symbol}`;
+        return `Credit account ${(0, contractsRegister_1.getContractName)(this.creditManager)}: borrowed amount was increased for ${(0, sdk_gov_1.formatBN)(this.amount, decimals)} ${symbol}`;
     }
 }
 exports.EventIncreaseBorrowAmount = EventIncreaseBorrowAmount;
@@ -242,13 +242,13 @@ class EventDecreaseBorrowAmount extends eventOrTx_1.EVMEvent {
     creditManager;
     constructor(opts) {
         super(opts);
-        this.amount = (0, formatter_1.toBigInt)(opts.amount || 0);
+        this.amount = (0, sdk_gov_1.toBigInt)(opts.amount || 0);
         this.underlyingToken = opts.underlyingToken;
         this.creditManager = opts.creditManager;
     }
     toString() {
         const [symbol, decimals = 18] = (0, sdk_gov_1.extractTokenData)(this.underlyingToken);
-        return `Credit account ${(0, contractsRegister_1.getContractName)(this.creditManager)}: borrowed amount was decreased for ${(0, formatter_1.formatBN)(this.amount, decimals)} ${symbol}`;
+        return `Credit account ${(0, contractsRegister_1.getContractName)(this.creditManager)}: borrowed amount was decreased for ${(0, sdk_gov_1.formatBN)(this.amount, decimals)} ${symbol}`;
     }
 }
 exports.EventDecreaseBorrowAmount = EventDecreaseBorrowAmount;
@@ -271,14 +271,14 @@ class EventCMNewParameters extends eventOrTx_1.EVMEvent {
         super(opts);
         this.creditManager = opts.creditManager;
         this.underlyingToken = opts.underlyingToken;
-        this.minAmount = (0, formatter_1.toBigInt)(opts.minAmount || 0);
-        this.maxAmount = (0, formatter_1.toBigInt)(opts.maxAmount || 0);
+        this.minAmount = (0, sdk_gov_1.toBigInt)(opts.minAmount || 0);
+        this.maxAmount = (0, sdk_gov_1.toBigInt)(opts.maxAmount || 0);
         this.maxLeverage = opts.maxLeverage;
         this.feeInterest = opts.feeInterest;
         this.feeLiquidation = opts.feeLiquidation;
         this.liquidationDiscount = opts.liquidationDiscount;
-        this.prevMinAmount = (0, formatter_1.toBigInt)(opts.prevMinAmount || 0);
-        this.prevMaxAmount = (0, formatter_1.toBigInt)(opts.prevMaxAmount || 0);
+        this.prevMinAmount = (0, sdk_gov_1.toBigInt)(opts.prevMinAmount || 0);
+        this.prevMaxAmount = (0, sdk_gov_1.toBigInt)(opts.prevMaxAmount || 0);
         this.prevMaxLeverage = opts.prevMaxLeverage;
         this.prevFeeInterest = opts.prevFeeInterest;
         this.prevFeeLiquidation = opts.prevFeeLiquidation;
@@ -288,10 +288,10 @@ class EventCMNewParameters extends eventOrTx_1.EVMEvent {
         const [symbol, decimals = 18] = (0, sdk_gov_1.extractTokenData)(this.underlyingToken);
         let msg = `Credit manager ${(0, contractsRegister_1.getContractName)(this.creditManager)} updated: `;
         if (this.minAmount !== this.prevMinAmount) {
-            msg += `min amount: ${(0, formatter_1.formatBN)(this.prevMinAmount, decimals)} => ${(0, formatter_1.formatBN)(this.minAmount, decimals)} ${symbol}, `;
+            msg += `min amount: ${(0, sdk_gov_1.formatBN)(this.prevMinAmount, decimals)} => ${(0, sdk_gov_1.formatBN)(this.minAmount, decimals)} ${symbol}, `;
         }
         if (this.maxAmount !== this.prevMaxAmount) {
-            msg += `max amount: ${(0, formatter_1.formatBN)(this.prevMaxAmount, decimals)} => ${(0, formatter_1.formatBN)(this.maxAmount, decimals)} ${symbol}, `;
+            msg += `max amount: ${(0, sdk_gov_1.formatBN)(this.prevMaxAmount, decimals)} => ${(0, sdk_gov_1.formatBN)(this.maxAmount, decimals)} ${symbol}, `;
         }
         if (this.maxLeverage !== this.prevMaxLeverage) {
             msg += `max leverage: ${this.prevMaxLeverage / Number(sdk_gov_1.LEVERAGE_DECIMALS) + 1} => ${this.maxLeverage / Number(sdk_gov_1.LEVERAGE_DECIMALS) + 1}, `;
@@ -495,14 +495,14 @@ class EventNewExpectedLiquidityLimit extends eventOrTx_1.EVMEvent {
         super(opts);
         this.pool = opts.pool;
         this.underlyingToken = opts.underlyingToken;
-        this.newLimit = (0, formatter_1.toBigInt)(opts.newLimit || 0);
-        this.prevLimit = (0, formatter_1.toBigInt)(opts.oldLimit || 0);
+        this.newLimit = (0, sdk_gov_1.toBigInt)(opts.newLimit || 0);
+        this.prevLimit = (0, sdk_gov_1.toBigInt)(opts.oldLimit || 0);
     }
     toString() {
         const [symbol, decimals = 18] = (0, sdk_gov_1.extractTokenData)(this.underlyingToken);
         return this.prevLimit === 0n
-            ? `Pool ${(0, contractsRegister_1.getContractName)(this.pool)} updated: expected liquidity limit was set to ${(0, formatter_1.formatBN)(this.newLimit, decimals)} ${symbol}`
-            : `Pool ${(0, contractsRegister_1.getContractName)(this.pool)} updated: expected liquidity limit was ${this.newLimit > this.prevLimit ? "increased" : "decreased"}: ${(0, formatter_1.formatBN)(this.prevLimit, decimals)} ${symbol} => ${(0, formatter_1.formatBN)(this.newLimit, decimals)} ${symbol}`;
+            ? `Pool ${(0, contractsRegister_1.getContractName)(this.pool)} updated: expected liquidity limit was set to ${(0, sdk_gov_1.formatBN)(this.newLimit, decimals)} ${symbol}`
+            : `Pool ${(0, contractsRegister_1.getContractName)(this.pool)} updated: expected liquidity limit was ${this.newLimit > this.prevLimit ? "increased" : "decreased"}: ${(0, sdk_gov_1.formatBN)(this.prevLimit, decimals)} ${symbol} => ${(0, sdk_gov_1.formatBN)(this.newLimit, decimals)} ${symbol}`;
     }
 }
 exports.EventNewExpectedLiquidityLimit = EventNewExpectedLiquidityLimit;
@@ -669,10 +669,10 @@ class EventLimitsUpdated extends eventOrTx_1.EVMEvent {
     creditManager;
     constructor(opts) {
         super(opts);
-        this.minBorrowedAmount = (0, formatter_1.toBigInt)(opts.minBorrowedAmount || 0);
-        this.maxBorrowedAmount = (0, formatter_1.toBigInt)(opts.maxBorrowedAmount || 0);
-        this.prevMinBorrowedAmount = (0, formatter_1.toBigInt)(opts.prevMinBorrowedAmount || 0);
-        this.prevMaxBorrowedAmount = (0, formatter_1.toBigInt)(opts.prevMaxBorrowedAmount || 0);
+        this.minBorrowedAmount = (0, sdk_gov_1.toBigInt)(opts.minBorrowedAmount || 0);
+        this.maxBorrowedAmount = (0, sdk_gov_1.toBigInt)(opts.maxBorrowedAmount || 0);
+        this.prevMinBorrowedAmount = (0, sdk_gov_1.toBigInt)(opts.prevMinBorrowedAmount || 0);
+        this.prevMaxBorrowedAmount = (0, sdk_gov_1.toBigInt)(opts.prevMaxBorrowedAmount || 0);
         this.underlyingToken = opts.underlyingToken;
         this.creditManager = opts.creditManager;
     }
@@ -680,10 +680,10 @@ class EventLimitsUpdated extends eventOrTx_1.EVMEvent {
         const [symbol, decimals = 18] = (0, sdk_gov_1.extractTokenData)(this.underlyingToken);
         let msg = `Credit manager ${(0, contractsRegister_1.getContractName)(this.creditManager)} updated: `;
         if (this.minBorrowedAmount !== this.prevMinBorrowedAmount) {
-            msg += `min amount: ${(0, formatter_1.formatBN)(this.prevMinBorrowedAmount, decimals)} => ${(0, formatter_1.formatBN)(this.minBorrowedAmount, decimals)} ${symbol}, `;
+            msg += `min amount: ${(0, sdk_gov_1.formatBN)(this.prevMinBorrowedAmount, decimals)} => ${(0, sdk_gov_1.formatBN)(this.minBorrowedAmount, decimals)} ${symbol}, `;
         }
         if (this.maxBorrowedAmount !== this.prevMaxBorrowedAmount) {
-            msg += `max amount: ${(0, formatter_1.formatBN)(this.prevMaxBorrowedAmount, decimals)} => ${(0, formatter_1.formatBN)(this.maxBorrowedAmount, decimals)} ${symbol}, `;
+            msg += `max amount: ${(0, sdk_gov_1.formatBN)(this.prevMaxBorrowedAmount, decimals)} => ${(0, sdk_gov_1.formatBN)(this.maxBorrowedAmount, decimals)} ${symbol}, `;
         }
         return msg.slice(0, msg.length - 2);
     }
@@ -831,14 +831,14 @@ class EventLimitPerBlockUpdated extends eventOrTx_1.EVMEvent {
     creditManager;
     constructor(opts) {
         super(opts);
-        this.limit = (0, formatter_1.toBigInt)(opts.limit || 0);
-        this.prevLimit = (0, formatter_1.toBigInt)(opts.prevLimit || 0);
+        this.limit = (0, sdk_gov_1.toBigInt)(opts.limit || 0);
+        this.prevLimit = (0, sdk_gov_1.toBigInt)(opts.prevLimit || 0);
         this.token = opts.token;
         this.creditManager = opts.creditManager;
     }
     toString() {
         const [symbol, decimals = 18] = (0, sdk_gov_1.extractTokenData)(this.token);
-        return `Credit manager ${(0, contractsRegister_1.getContractName)(this.creditManager)}: Limit Per Block Updated ${(0, formatter_1.formatBN)(this.prevLimit, decimals)} => ${(0, formatter_1.formatBN)(this.limit, decimals)} ${symbol}`;
+        return `Credit manager ${(0, contractsRegister_1.getContractName)(this.creditManager)}: Limit Per Block Updated ${(0, sdk_gov_1.formatBN)(this.prevLimit, decimals)} => ${(0, sdk_gov_1.formatBN)(this.limit, decimals)} ${symbol}`;
     }
 }
 exports.EventLimitPerBlockUpdated = EventLimitPerBlockUpdated;

package/lib/core/pool/data.d.ts

@@ -1,32 +1,41 @@
 import { providers, Signer } from "ethers";
-import { ChartsPoolDataPayload, PoolDataPayload, UserPoolPayload } from "../../payload/pool";
-import { IPoolService } from "../../types";
+import { CreditManagerDebtParams, QuotaInfo } from "../../payload/creditManager";
+import { ChartsPoolDataPayload, LinearModel, PoolDataPayload, PoolZapper, UserPoolPayload } from "../../payload/pool";
+import { IPoolService, IPoolV3 } from "../../types";
 export declare class PoolData {
-    readonly id: string;
     readonly address: string;
     readonly underlyingToken: string;
     readonly dieselToken: string;
-    readonly isWETH: boolean;
-    readonly isWSTETH: boolean;
+    readonly isPaused: boolean;
+    readonly version: number;
+    readonly poolQuotaKeeper: string;
+    readonly gauge: string;
+    readonly name: string;
+    readonly symbol: string;
     readonly expectedLiquidity: bigint;
     readonly expectedLiquidityLimit: bigint;
     readonly availableLiquidity: bigint;
+    readonly linearCumulativeIndex: bigint;
     readonly totalBorrowed: bigint;
+    readonly totalDebtLimit: bigint;
+    readonly creditManagerDebtParams: Record<string, CreditManagerDebtParams>;
+    readonly quotas: Record<string, QuotaInfo>;
+    readonly zappers: Record<string, PoolZapper>;
+    readonly totalAssets: bigint;
+    readonly totalSupply: bigint;
     readonly depositAPY: number;
     readonly borrowAPY: number;
-    readonly borrowAPYRay: bigint;
+    readonly interestModel: LinearModel;
     readonly dieselRate: number;
     readonly dieselRateRay: bigint;
     readonly withdrawFee: number;
-    readonly timestampLU: bigint;
     readonly cumulativeIndex_RAY: bigint;
-    readonly isPaused: boolean;
     constructor(payload: PoolDataPayload);
-    getContractETH(signer: Signer): IPoolService;
-    static calculateBorrowRate({ modelAddress, provider, expectedLiquidity, availableLiquidity, }: CalculateBorrowRateProps): Promise<import("ethers").BigNumber>;
+    getPoolContractV1(signer: Signer): IPoolService;
+    getPoolContractV3(signer: Signer): IPoolV3;
+    calculateBorrowRate({ provider, expectedLiquidity, availableLiquidity, }: CalculateBorrowRateProps): Promise<import("ethers").BigNumber>;
 }
 interface CalculateBorrowRateProps {
-    modelAddress: string;
     provider: providers.Provider;
     expectedLiquidity: bigint;
     availableLiquidity: bigint;

package/lib/core/pool/data.js

@@ -5,55 +5,117 @@ const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const types_1 = require("../../types");
 const formatter_1 = require("../../utils/formatter");
 class PoolData {
-    id;
     address;
     underlyingToken;
     dieselToken;
-    isWETH;
-    isWSTETH;
+    isPaused;
+    version;
+    poolQuotaKeeper;
+    gauge;
+    name;
+    symbol;
     // Information
     expectedLiquidity;
     expectedLiquidityLimit;
     availableLiquidity;
+    linearCumulativeIndex;
     totalBorrowed;
+    totalDebtLimit;
+    creditManagerDebtParams;
+    quotas;
+    zappers;
+    totalAssets;
+    totalSupply;
     depositAPY;
     borrowAPY;
-    borrowAPYRay;
+    interestModel;
     dieselRate;
     dieselRateRay;
     withdrawFee;
-    timestampLU;
     cumulativeIndex_RAY;
-    isPaused = false;
     constructor(payload) {
-        this.id = payload.addr.toLowerCase();
         this.address = payload.addr.toLowerCase();
         this.underlyingToken = payload.underlying.toLowerCase();
         this.dieselToken = payload.dieselToken.toLowerCase();
-        this.isWETH = payload.isWETH || false;
-        this.isWSTETH =
-            sdk_gov_1.tokenSymbolByAddress[payload.underlying.toLowerCase()] === "wstETH";
-        this.expectedLiquidity = (0, formatter_1.toBigInt)(payload.expectedLiquidity || 0);
-        this.expectedLiquidityLimit = (0, formatter_1.toBigInt)(payload.expectedLiquidityLimit || 0);
-        this.availableLiquidity = (0, formatter_1.toBigInt)(payload.availableLiquidity || 0);
-        this.totalBorrowed = (0, formatter_1.toBigInt)(payload.totalBorrowed || 0);
-        this.depositAPY =
-            (0, formatter_1.rayToNumber)(payload.depositAPY_RAY) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
-        this.borrowAPY =
-            (0, formatter_1.rayToNumber)(payload.borrowAPY_RAY) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
-        this.borrowAPYRay = (0, formatter_1.toBigInt)(payload.borrowAPY_RAY || 0);
-        this.dieselRate = (0, formatter_1.rayToNumber)(payload.dieselRate_RAY || 0);
-        this.dieselRateRay = (0, formatter_1.toBigInt)(payload.dieselRate_RAY || 0);
+        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.linearCumulativeIndex = (0, sdk_gov_1.toBigInt)(payload.linearCumulativeIndex);
+        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: q.rate,
+                    quotaIncreaseFee: q.quotaIncreaseFee,
+                    totalQuoted: (0, sdk_gov_1.toBigInt)(q.totalQuoted),
+                    limit: (0, sdk_gov_1.toBigInt)(q.limit),
+                    isActive: q.isActive,
+                },
+            ];
+        }));
+        this.zappers = Object.fromEntries(payload.zappers.map(z => {
+            const tokenIn = z.tokenIn.toLowerCase();
+            return [
+                tokenIn,
+                {
+                    tokenIn,
+                    tokenOut: z.tokenOut.toLowerCase(),
+                    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.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.cumulativeIndex_RAY = (0, sdk_gov_1.toBigInt)(payload.cumulativeIndex_RAY);
         this.withdrawFee =
-            Number((0, formatter_1.toBigInt)(payload.withdrawFee || 0)) / Number(sdk_gov_1.PERCENTAGE_DECIMALS);
-        this.timestampLU = (0, formatter_1.toBigInt)(payload.timestampLU || 0);
-        this.cumulativeIndex_RAY = (0, formatter_1.toBigInt)(payload.cumulativeIndex_RAY || 0);
+            Number((0, sdk_gov_1.toBigInt)(payload.withdrawFee)) / Number(sdk_gov_1.PERCENTAGE_DECIMALS);
     }
-    getContractETH(signer) {
+    getPoolContractV1(signer) {
         return types_1.IPoolService__factory.connect(this.address, signer);
     }
-    static async calculateBorrowRate({ modelAddress, provider, expectedLiquidity, availableLiquidity, }) {
-        const model = types_1.IInterestRateModel__factory.connect(modelAddress, provider);
+    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);
     }
 }
@@ -117,20 +179,23 @@ class ChartsPoolData {
         this.isWETH = payload.isWETH || false;
         this.earned7D = payload.earned7D || 0;
         this.earned7DInUSD = payload.earned7DInUSD || 0;
+        const expected = (0, sdk_gov_1.toBigInt)(payload.expectedLiquidity || 0);
         this.utilization =
-            Number(((0, formatter_1.toBigInt)(payload.totalBorrowed || 0) * sdk_gov_1.PERCENTAGE_FACTOR) /
-                (0, formatter_1.toBigInt)(payload.expectedLiquidity || 0)) / Number(sdk_gov_1.PERCENTAGE_DECIMALS);
+            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, formatter_1.toBigInt)(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, formatter_1.toBigInt)(payload.depositAPY_RAY);
+        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, formatter_1.toBigInt)(payload.borrowAPY_RAY || 0);
+        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, formatter_1.toBigInt)(payload.availableLiquidity || 0);
-        this.oldAvailableLiquidity = (0, formatter_1.toBigInt)(payload.availableLiquidityOld || 0);
+        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;
@@ -139,21 +204,21 @@ class ChartsPoolData {
         this.caLockedValueChange =
             (payload.caLockedValue10kBasis || 0) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
         this.caLockedValueInUSD = payload.caLockedValueUSD || 0;
-        this.expectedLiquidity = (0, formatter_1.toBigInt)(payload.expectedLiquidity || 0);
-        this.oldExpectedLiquidity = (0, formatter_1.toBigInt)(payload.expectedLiquidityOld || 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, formatter_1.toBigInt)(payload.expectedLiquidityLimit || 0);
+        this.expectedLiquidityLimit = (0, sdk_gov_1.toBigInt)(payload.expectedLiquidityLimit || 0);
         this.expectedLiquidityLimitInUSD = payload.expectedLiquidityLimitInUSD || 0;
-        this.totalBorrowed = (0, formatter_1.toBigInt)(payload.totalBorrowed || 0);
-        this.oldTotalBorrowed = (0, formatter_1.toBigInt)(payload.totalBorrowedOld || 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, formatter_1.toBigInt)(payload.debtWithInterest || 0);
-        this.debtWithInterestOld = (0, formatter_1.toBigInt)(payload.debtWithInterestOld || 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;
@@ -204,13 +269,13 @@ class UserPoolData {
         this.dieselToken = (payload.dieselToken || "").toLowerCase();
         this.depositAPY =
             (0, formatter_1.rayToNumber)(payload.depositAPY_RAY || 0) * Number(sdk_gov_1.PERCENTAGE_DECIMALS);
-        this.depositAPYRay = (0, formatter_1.toBigInt)(payload.depositAPY_RAY || 0);
+        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, formatter_1.toBigInt)(payload.liqValue || 0);
+        this.providedLiquidity = (0, sdk_gov_1.toBigInt)(payload.liqValue || 0);
         this.providedLiquidityInUSD = payload.liqValueInUSD;
-        this.dieselBalance = (0, formatter_1.toBigInt)(payload.dieselBalanceBI || 0);
+        this.dieselBalance = (0, sdk_gov_1.toBigInt)(payload.dieselBalanceBI || 0);
         this.dieselBalanceInUSD = payload.dieselBalance;
-        this.lmRewards = (0, formatter_1.toBigInt)(payload.lmRewards || 0);
+        this.lmRewards = (0, sdk_gov_1.toBigInt)(payload.lmRewards || 0);
         this.lmRewardsInUSD = payload.lmRewardsInUSD;
         this.pnlInNativeToken = payload.liqPnlInNativeToken;
         this.pnlInUSD = payload.liqPnlInUSD;

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.js

@@ -58,9 +58,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,26 +1,12 @@
 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;
 }
-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;
@@ -28,11 +14,12 @@ export interface GetTradesProps {
     results: Array<PathFinderResult>;
     creditManager: CreditManagerData;
     currentContracts: Record<SupportedContract, string>;
+    swapType: SwapOperation;
+    swapName: TradeOperations;
 }
 export declare class Trade {
     readonly helper: Info;
     readonly tradePath: PathFinderResult;
-    readonly creditFacade: string;
     readonly swapType: SwapOperation;
     readonly sourceAmount: bigint;
     readonly expectedAmount: bigint;
@@ -40,17 +27,12 @@ export declare class Trade {
     readonly tokenFrom: string;
     readonly tokenTo: 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 getTrades({ from, to, amount, results, creditManager, currentContracts, swapType, swapName, }: GetTradesProps): Trade[];
     static getCallInfo(calls: Array<MultiCall>, creditManager: string, currentContracts: Record<SupportedContract, 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 {};