@gearbox-protocol/sdk 3.0.0-next.4 → 3.0.0-next.6

package/lib/core/pool/data.js

@@ -5,55 +5,86 @@ 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;
     // Information
     expectedLiquidity;
     expectedLiquidityLimit;
     availableLiquidity;
+    linearCumulativeIndex;
     totalBorrowed;
+    totalDebtLimit;
+    creditManagerDebtParams;
+    quotas;
+    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();
+        const underlying = payload.underlying.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.isWETH = sdk_gov_1.tokenSymbolByAddress[underlying] === "WETH";
+        this.isWSTETH = sdk_gov_1.tokenSymbolByAddress[underlying] === "wstETH";
+        this.isPaused = payload.isPaused;
+        this.version = payload.version.toNumber();
+        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 = payload.creditManagerDebtParams.map(p => ({
+            creditManager: p.creditManager.toLowerCase(),
+            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 = payload.quotas.map(q => ({
+            token: q.token.toLowerCase(),
+            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.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(),
+        };
+        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) {
         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);
+    async calculateBorrowRate({ provider, expectedLiquidity, availableLiquidity, }) {
+        const model = types_1.IInterestRateModel__factory.connect(this.interestModel.interestModel, provider);
         return model.calcBorrowRate(expectedLiquidity, availableLiquidity);
     }
 }
@@ -117,20 +148,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 +173,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 +238,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/rewardClaimer.d.ts

@@ -1,12 +1,12 @@
 import { NetworkType, SupportedContract, SupportedToken } from "@gearbox-protocol/sdk-gov";
 import { providers } from "ethers";
-import { MultiCall } from "../pathfinder/core";
+import { MultiCallStruct } from "../types/IRouter";
 import { CreditAccountData } from "./creditAccount";
 import { CreditManagerData } from "./creditManager";
 export interface Rewards {
     contract: SupportedContract;
     rewards: Partial<Record<SupportedToken, bigint>>;
-    calls: Array<MultiCall>;
+    calls: Array<MultiCallStruct>;
 }
 export interface AdapterWithType {
     contractAddress: string;

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/trade.d.ts

@@ -1,7 +1,8 @@
 import { SupportedContract } from "@gearbox-protocol/sdk-gov";
 import { Signer } from "ethers";
-import { MultiCall, PathFinderResult, SwapOperation } from "../pathfinder/core";
-import { ICreditFacade } from "../types";
+import { PathFinderResult, SwapOperation } from "../pathfinder/core";
+import { ICreditFacadeV2 } from "../types";
+import { MultiCallStruct, MultiCallStructOutput } from "../types/IRouter";
 import { CreditManagerData } from "./creditManager";
 import { EVMTx } from "./eventOrTx";
 interface Info {
@@ -46,11 +47,11 @@ export declare class Trade {
     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 getCallInfo(calls: Array<MultiCallStructOutput>, 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>;
+    static executeMulticallPath(creditFacade: string | ICreditFacadeV2, signer: Signer, calls: Array<MultiCallStruct>): Promise<import("ethers").ContractTransaction>;
     private static executeOnCreditFacade;
 }
 export {};

package/lib/core/trade.js

@@ -148,7 +148,7 @@ class Trade {
         if (calls.length < 1)
             throw new Error("No path to execute");
         const safeCreditFacade = typeof creditFacade === "string"
-            ? types_1.ICreditFacade__factory.connect(creditFacade, signer)
+            ? types_1.ICreditFacadeV2__factory.connect(creditFacade, signer)
             : creditFacade;
         return this.executeOnCreditFacade(calls, safeCreditFacade);
     }

package/lib/index.d.ts

@@ -1,3 +1,5 @@
+export * from "./apy";
+export * from "./contracts/contractsRegister";
 export * from "./core/assets";
 export * from "./core/creditAccount";
 export * from "./core/creditManager";
@@ -11,25 +13,24 @@ export * from "./core/strategy";
 export * from "./core/tokenDistributor";
 export * from "./core/trade";
 export * from "./core/transactions";
+export * from "./parsers/txParser";
+export * from "./pathfinder/core";
+export * from "./pathfinder/pathfinder";
 export * from "./payload/creditAccount";
 export * from "./payload/creditManager";
 export * from "./payload/creditSession";
 export * from "./payload/graphPayload";
 export * from "./payload/pool";
 export * from "./payload/token";
-export * from "./types/index";
+export * from "./tokens/tokenData";
+export * from "./types";
+export * from "./utils/errors";
 export * from "./utils/formatter";
 export * from "./utils/loading";
 export * from "./utils/math";
-export * from "./utils/validate";
-export * from "./apy";
-export * from "./parsers/txParser";
-export * from "./pathfinder/core";
-export * from "./pathfinder/pathfinder";
-export * from "./utils/errors";
 export * from "./utils/price";
 export { callRepeater } from "./utils/repeater";
+export * from "./utils/validate";
 export * from "./watchers/creditAccountWatcher";
 export * from "./watchers/creditManagerWatcher";
-export type { CallData, MCall, NetworkType, NormalToken, NormalTokenData, SupportedToken, } from "@gearbox-protocol/sdk-gov";
-export { ADDRESS_PROVIDER, ARBITRUM_NETWORK, CHAINS, decimals, detectNetwork, extractTokenData, getDecimals, getNetworkType, GOERLI_NETWORK, HARDHAT_NETWORK, isLPToken, isNormalToken, isSupportedNetwork, isSupportedToken, LOCAL_NETWORK, lpTokens, MAINNET_NETWORK, MultiCallContract, normalTokens, OPTIMISM_NETWORK, POLYGON_NETWORK, safeMulticall, supportedChains, supportedTokens, TENDERLY_NETWORK, tokenDataByNetwork, tokenSymbolByAddress, WAD, } from "@gearbox-protocol/sdk-gov";
+export * from "@gearbox-protocol/sdk-gov";

package/lib/index.js

@@ -14,7 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WAD = exports.tokenSymbolByAddress = exports.tokenDataByNetwork = exports.TENDERLY_NETWORK = exports.supportedTokens = exports.supportedChains = exports.safeMulticall = exports.POLYGON_NETWORK = exports.OPTIMISM_NETWORK = exports.normalTokens = exports.MultiCallContract = exports.MAINNET_NETWORK = exports.lpTokens = exports.LOCAL_NETWORK = exports.isSupportedToken = exports.isSupportedNetwork = exports.isNormalToken = exports.isLPToken = exports.HARDHAT_NETWORK = exports.GOERLI_NETWORK = exports.getNetworkType = exports.getDecimals = exports.extractTokenData = exports.detectNetwork = exports.decimals = exports.CHAINS = exports.ARBITRUM_NETWORK = exports.ADDRESS_PROVIDER = exports.callRepeater = void 0;
+exports.callRepeater = void 0;
+__exportStar(require("./apy"), exports);
+__exportStar(require("./contracts/contractsRegister"), exports);
 __exportStar(require("./core/assets"), exports);
 __exportStar(require("./core/creditAccount"), exports);
 __exportStar(require("./core/creditManager"), exports);
@@ -28,54 +30,25 @@ __exportStar(require("./core/strategy"), exports);
 __exportStar(require("./core/tokenDistributor"), exports);
 __exportStar(require("./core/trade"), exports);
 __exportStar(require("./core/transactions"), exports);
+__exportStar(require("./parsers/txParser"), exports);
+__exportStar(require("./pathfinder/core"), exports);
+__exportStar(require("./pathfinder/pathfinder"), exports);
 __exportStar(require("./payload/creditAccount"), exports);
 __exportStar(require("./payload/creditManager"), exports);
 __exportStar(require("./payload/creditSession"), exports);
 __exportStar(require("./payload/graphPayload"), exports);
 __exportStar(require("./payload/pool"), exports);
 __exportStar(require("./payload/token"), exports);
-__exportStar(require("./types/index"), exports);
+__exportStar(require("./tokens/tokenData"), exports);
+__exportStar(require("./types"), exports);
+__exportStar(require("./utils/errors"), exports);
 __exportStar(require("./utils/formatter"), exports);
 __exportStar(require("./utils/loading"), exports);
 __exportStar(require("./utils/math"), exports);
-__exportStar(require("./utils/validate"), exports);
-// Tokens
-__exportStar(require("./apy"), exports);
-__exportStar(require("./parsers/txParser"), exports);
-__exportStar(require("./pathfinder/core"), exports);
-__exportStar(require("./pathfinder/pathfinder"), exports);
-__exportStar(require("./utils/errors"), exports);
 __exportStar(require("./utils/price"), exports);
 var repeater_1 = require("./utils/repeater");
 Object.defineProperty(exports, "callRepeater", { enumerable: true, get: function () { return repeater_1.callRepeater; } });
+__exportStar(require("./utils/validate"), exports);
 __exportStar(require("./watchers/creditAccountWatcher"), exports);
 __exportStar(require("./watchers/creditManagerWatcher"), exports);
-var sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
-Object.defineProperty(exports, "ADDRESS_PROVIDER", { enumerable: true, get: function () { return sdk_gov_1.ADDRESS_PROVIDER; } });
-Object.defineProperty(exports, "ARBITRUM_NETWORK", { enumerable: true, get: function () { return sdk_gov_1.ARBITRUM_NETWORK; } });
-Object.defineProperty(exports, "CHAINS", { enumerable: true, get: function () { return sdk_gov_1.CHAINS; } });
-Object.defineProperty(exports, "decimals", { enumerable: true, get: function () { return sdk_gov_1.decimals; } });
-Object.defineProperty(exports, "detectNetwork", { enumerable: true, get: function () { return sdk_gov_1.detectNetwork; } });
-Object.defineProperty(exports, "extractTokenData", { enumerable: true, get: function () { return sdk_gov_1.extractTokenData; } });
-Object.defineProperty(exports, "getDecimals", { enumerable: true, get: function () { return sdk_gov_1.getDecimals; } });
-Object.defineProperty(exports, "getNetworkType", { enumerable: true, get: function () { return sdk_gov_1.getNetworkType; } });
-Object.defineProperty(exports, "GOERLI_NETWORK", { enumerable: true, get: function () { return sdk_gov_1.GOERLI_NETWORK; } });
-Object.defineProperty(exports, "HARDHAT_NETWORK", { enumerable: true, get: function () { return sdk_gov_1.HARDHAT_NETWORK; } });
-Object.defineProperty(exports, "isLPToken", { enumerable: true, get: function () { return sdk_gov_1.isLPToken; } });
-Object.defineProperty(exports, "isNormalToken", { enumerable: true, get: function () { return sdk_gov_1.isNormalToken; } });
-Object.defineProperty(exports, "isSupportedNetwork", { enumerable: true, get: function () { return sdk_gov_1.isSupportedNetwork; } });
-Object.defineProperty(exports, "isSupportedToken", { enumerable: true, get: function () { return sdk_gov_1.isSupportedToken; } });
-Object.defineProperty(exports, "LOCAL_NETWORK", { enumerable: true, get: function () { return sdk_gov_1.LOCAL_NETWORK; } });
-Object.defineProperty(exports, "lpTokens", { enumerable: true, get: function () { return sdk_gov_1.lpTokens; } });
-Object.defineProperty(exports, "MAINNET_NETWORK", { enumerable: true, get: function () { return sdk_gov_1.MAINNET_NETWORK; } });
-Object.defineProperty(exports, "MultiCallContract", { enumerable: true, get: function () { return sdk_gov_1.MultiCallContract; } });
-Object.defineProperty(exports, "normalTokens", { enumerable: true, get: function () { return sdk_gov_1.normalTokens; } });
-Object.defineProperty(exports, "OPTIMISM_NETWORK", { enumerable: true, get: function () { return sdk_gov_1.OPTIMISM_NETWORK; } });
-Object.defineProperty(exports, "POLYGON_NETWORK", { enumerable: true, get: function () { return sdk_gov_1.POLYGON_NETWORK; } });
-Object.defineProperty(exports, "safeMulticall", { enumerable: true, get: function () { return sdk_gov_1.safeMulticall; } });
-Object.defineProperty(exports, "supportedChains", { enumerable: true, get: function () { return sdk_gov_1.supportedChains; } });
-Object.defineProperty(exports, "supportedTokens", { enumerable: true, get: function () { return sdk_gov_1.supportedTokens; } });
-Object.defineProperty(exports, "TENDERLY_NETWORK", { enumerable: true, get: function () { return sdk_gov_1.TENDERLY_NETWORK; } });
-Object.defineProperty(exports, "tokenDataByNetwork", { enumerable: true, get: function () { return sdk_gov_1.tokenDataByNetwork; } });
-Object.defineProperty(exports, "tokenSymbolByAddress", { enumerable: true, get: function () { return sdk_gov_1.tokenSymbolByAddress; } });
-Object.defineProperty(exports, "WAD", { enumerable: true, get: function () { return sdk_gov_1.WAD; } });
+__exportStar(require("@gearbox-protocol/sdk-gov"), exports);

package/lib/parsers/ERC20Parser.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ERC20Parser = void 0;
+const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const types_1 = require("../types");
-const formatter_1 = require("../utils/formatter");
 const abstractParser_1 = require("./abstractParser");
 class ERC20Parser extends abstractParser_1.AbstractParser {
     constructor(symbol) {
@@ -26,7 +26,7 @@ class ERC20Parser extends abstractParser_1.AbstractParser {
             }
             case "approve": {
                 const [spender, amount] = this.decodeFunctionData(functionFragment, calldata);
-                return `${functionName}(${spender}, [${(0, formatter_1.toBigInt)(amount).toString()}])`;
+                return `${functionName}(${spender}, [${(0, sdk_gov_1.toBigInt)(amount).toString()}])`;
             }
             default:
                 return `${functionName}: Unknown operation ${functionFragment.name} with calldata ${calldata}`;

package/lib/parsers/abstractParser.js

@@ -30,7 +30,7 @@ class AbstractParser {
         return symbol;
     }
     formatBN(amount, token) {
-        return `${(0, formatter_1.formatBN)(amount, sdk_gov_1.decimals[token])} [${(0, formatter_1.toBigInt)(amount).toString()}]`;
+        return `${(0, formatter_1.formatBN)(amount, sdk_gov_1.decimals[token])} [${(0, sdk_gov_1.toBigInt)(amount).toString()}]`;
     }
     parseToObject(address, calldata) {
         const { functionFragment } = this.parseSelector(calldata);

package/lib/parsers/creditFacadeParser.js

@@ -6,7 +6,7 @@ const abstractParser_1 = require("./abstractParser");
 class CreditFacadeParser extends abstractParser_1.AbstractParser {
     constructor(token) {
         super(token);
-        this.ifc = types_1.ICreditFacadeExtended__factory.createInterface();
+        this.ifc = types_1.ICreditFacadeV2Extended__factory.createInterface();
         this.adapterName = "CreditFacade";
     }
     parse(calldata) {

package/lib/parsers/creditFacadeParser.spec.js

@@ -7,7 +7,7 @@ const creditFacadeParser_1 = require("./creditFacadeParser");
 describe("CreditFacadeParser test", () => {
     it("all functions works well", () => {
         let parser = new creditFacadeParser_1.CreditFacadeParser("DAI");
-        const ifc = types_1.ICreditFacadeExtended__factory.createInterface();
+        const ifc = types_1.ICreditFacadeV2Extended__factory.createInterface();
         let parsed = parser.parse(ifc.encodeFunctionData("addCollateral", [
             sdk_gov_1.DUMB_ADDRESS,
             sdk_gov_1.tokenDataByNetwork.Mainnet.WBTC,

package/lib/parsers/creditManagerParser.js

@@ -7,9 +7,9 @@ class CreditManagerParser extends abstractParser_1.AbstractParser {
     constructor(version) {
         super(`CreditManager_V${version}`);
         this.ifc =
-            version === 1
-                ? types_1.ICreditManager__factory.createInterface()
-                : types_1.ICreditManagerV2__factory.createInterface();
+            version === 2
+                ? types_1.ICreditManagerV2__factory.createInterface()
+                : types_1.ICreditManagerV3__factory.createInterface();
     }
     parse(calldata) {
         const { functionFragment, functionName } = this.parseSelector(calldata);

package/lib/parsers/curveAdapterParser.js

@@ -78,6 +78,11 @@ class CurveAdapterParser extends abstractParser_1.AbstractParser {
                 const [amounts, maxBurnAmount] = this.decodeFunctionData(functionFragment, calldata);
                 return `${functionName}(amounts: [${this.convertAmounts(amounts)}], max_burn_amount: ${this.formatBN(maxBurnAmount, this.lpToken)})`;
             }
+            case "remove_liquidity_one_coin": {
+                const [amount, i, min_amount] = this.decodeFunctionData(functionFragment, calldata);
+                const iSym = this.getTokenByIndex(i);
+                return `${functionName}(amount: ${this.formatBN(amount, this.lpToken)},i: ${iSym}, min_amount: ${this.formatBN(min_amount, iSym)})`;
+            }
             case "totalSupply": {
                 return `${functionName}()`;
             }

package/lib/parsers/curveAdapterParser.spec.js

@@ -8,21 +8,21 @@ describe("CurveAdapterParser test", () => {
     it("stake / withdraw functions works well", () => {
         let parser = new curveAdapterParser_1.CurveAdapterParser("CURVE_FRAX_POOL", false);
         const ifc = types_1.ICurveV1_2AssetsAdapter__factory.createInterface();
-        let parsed = parser.parse(ifc.encodeFunctionData("exchange", [0, 1, sdk_gov_1.WAD * 3n, sdk_gov_1.WAD * 32n]));
-        (0, chai_1.expect)(parsed).to.be.eq("Curve2AssetsAdapter[CURVE_FRAX_POOL].exchange(i ,j: FRAX => 3Crv, dx: 3.00 [3000000000000000000], min_dy: 32.00 [32000000000000000000])", "Curve2AssetsAdapter: Incorrect parse exchange");
-        parsed = parser.parse(ifc.encodeFunctionData("exchange_underlying", [
+        let parsed = parser.parse(ifc.encodeFunctionData("exchange(uint256,uint256,uint256,uint256)", [
             0,
             1,
             sdk_gov_1.WAD * 3n,
             sdk_gov_1.WAD * 32n,
         ]));
+        (0, chai_1.expect)(parsed).to.be.eq("Curve2AssetsAdapter[CURVE_FRAX_POOL].exchange(i ,j: FRAX => 3Crv, dx: 3.00 [3000000000000000000], min_dy: 32.00 [32000000000000000000])", "Curve2AssetsAdapter: Incorrect parse exchange");
+        parsed = parser.parse(ifc.encodeFunctionData("exchange_underlying(int128,int128,uint256,uint256)", [0, 1, sdk_gov_1.WAD * 3n, sdk_gov_1.WAD * 32n]));
         (0, chai_1.expect)(parsed).to.be.eq("Curve2AssetsAdapter[CURVE_FRAX_POOL].exchange_underlying(i ,j: FRAX => DAI, dx: 3.00 [3000000000000000000], min_dy: 32.00 [32000000000000000000])", "Curve2AssetsAdapter: Incorrect parse exchange_underlying");
         parsed = parser.parse(ifc.encodeFunctionData("add_liquidity_one_coin", [sdk_gov_1.WAD * 3n, 0, sdk_gov_1.WAD * 2n]));
         (0, chai_1.expect)(parsed).to.be.eq("Curve2AssetsAdapter[CURVE_FRAX_POOL].add_liquidity_one_coin(amount: 3.00 [3000000000000000000], i: FRAX, minAmount: 2.00 [2000000000000000000])", "Curve2AssetsAdapter: Incorrect parse add_liquidity_one_coin");
         parsed = parser.parse(ifc.encodeFunctionData("add_all_liquidity_one_coin", [0, sdk_gov_1.RAY * 912n]));
         (0, chai_1.expect)(parsed).to.be.eq("Curve2AssetsAdapter[CURVE_FRAX_POOL].add_all_liquidity_one_coin(i: FRAX, rateMinRAY: 912.00)", "Curve2AssetsAdapter: Incorrect parse add_all_liquidity_one_coin");
-        parsed = parser.parse(ifc.encodeFunctionData("remove_all_liquidity_one_coin", [0, sdk_gov_1.RAY * 721n]));
-        (0, chai_1.expect)(parsed).to.be.eq("Curve2AssetsAdapter[CURVE_FRAX_POOL].remove_all_liquidity_one_coin(i: FRAX, rateMinRAY: 721.00)", "Curve2AssetsAdapter: Incorrect parse remove_all_liquidity_one_coin");
+        parsed = parser.parse(ifc.encodeFunctionData("remove_liquidity_one_coin(uint256,uint256,uint256)", [sdk_gov_1.WAD * 100n, 0, sdk_gov_1.WAD * 10n]));
+        (0, chai_1.expect)(parsed).to.be.eq("Curve2AssetsAdapter[CURVE_FRAX_POOL].remove_liquidity_one_coin(amount: 100.00 [100000000000000000000],i: FRAX, min_amount: 10.00 [10000000000000000000])", "Curve2AssetsAdapter: Incorrect parse remove_liquidity_one_coin");
         parsed = parser.parse(ifc.encodeFunctionData("add_liquidity", [
             [sdk_gov_1.WAD * 100n, sdk_gov_1.WAD * 100n],
             sdk_gov_1.WAD * 80n,

package/lib/parsers/lidoSTETHParser.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LidoSTETHParser = void 0;
+const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const types_1 = require("../types");
-const formatter_1 = require("../utils/formatter");
 const abstractParser_1 = require("./abstractParser");
 class LidoSTETHParser extends abstractParser_1.AbstractParser {
     constructor(symbol) {
@@ -26,7 +26,7 @@ class LidoSTETHParser extends abstractParser_1.AbstractParser {
             }
             case "approve": {
                 const [spender, amount] = this.decodeFunctionData(functionFragment, calldata);
-                return `${functionName}(${spender}, [${(0, formatter_1.toBigInt)(amount).toString()}])`;
+                return `${functionName}(${spender}, [${(0, sdk_gov_1.toBigInt)(amount).toString()}])`;
             }
             default:
                 return `${functionName}: Unknown operation ${functionFragment.name} with calldata ${calldata}`;

package/lib/parsers/poolParser.js

@@ -6,7 +6,7 @@ const abstractParser_1 = require("./abstractParser");
 class PoolParser extends abstractParser_1.AbstractParser {
     constructor(version) {
         super(`Pool_V${version}`);
-        this.ifc = types_1.PoolService__factory.createInterface();
+        this.ifc = types_1.IPoolService__factory.createInterface();
     }
     parse(calldata) {
         const { functionFragment, functionName } = this.parseSelector(calldata);

package/lib/parsers/priceOracleParser.js

@@ -6,7 +6,7 @@ const abstractParser_1 = require("./abstractParser");
 class PriceOracleParser extends abstractParser_1.AbstractParser {
     constructor() {
         super("PriceOracle");
-        this.ifc = types_1.IPriceOracleV2__factory.createInterface();
+        this.ifc = types_1.IPriceOracleBase__factory.createInterface();
     }
     parse(calldata) {
         const { functionFragment, functionName } = this.parseSelector(calldata);

package/lib/parsers/txParser.d.ts

@@ -1,5 +1,5 @@
 import { NetworkType, SupportedContract, SupportedToken } from "@gearbox-protocol/sdk-gov";
-import { MultiCallStruct } from "../types/@gearbox-protocol/router/contracts/interfaces/IClosePathResolver";
+import { MultiCallStructOutput } from "../types/IRouter";
 import { AbstractParser } from "./abstractParser";
 import { IParser } from "./iParser";
 export interface AdapterForParser {
@@ -15,26 +15,22 @@ export declare class TxParser {
     static parse(address: string, calldata: string): string;
     static parseToObject(address: string, calldata: string): {
         address: string;
-        functionFragment: import("@ethersproject/abi").FunctionFragment;
+        functionFragment: import("ethers/lib/utils").FunctionFragment;
         args: any;
     };
     static getParseData(address: string): ParseData;
-    static parseMultiCall(calls: Array<MultiCallStruct>): Array<string>;
-    static parseToObjectMultiCall(calls: Array<MultiCallStruct>): {
+    static parseMultiCall(calls: Array<MultiCallStructOutput>): Array<string>;
+    static parseToObjectMultiCall(calls: Array<MultiCallStructOutput>): {
         address: string;
-        functionFragment: import("@ethersproject/abi").FunctionFragment;
+        functionFragment: import("ethers/lib/utils").FunctionFragment;
         args: any;
     }[];
     static addAdapters(adapters: Array<AdapterForParser>): void;
     static addContracts(network: NetworkType): void;
     static addCreditFacade(creditFacade: string, underlying: SupportedToken): void;
     static addTokens(network: NetworkType): void;
-    static addOffchainOracleParser(address: string): void;
     static addPriceOracle(address: string): void;
-    static addDataCompressor(address: string): void;
     static addAddressProvider(address: string): void;
-    static addMulticall(address: string): void;
-    static addAirdropDistributor(address: string): void;
     static addCreditManager(address: string, version: number): void;
     static addPool(address: string, version: number): void;
     static getParser(address: string): IParser & AbstractParser;