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

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 { MultiCall } from "../pathfinder/core";
 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<MultiCall>): Array<string>;
+    static parseToObjectMultiCall(calls: Array<MultiCall>): {
         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 addCreditFacade(creditFacade: string, underlying: SupportedToken, version: number): 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;

package/lib/parsers/txParser.js

@@ -3,20 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TxParser = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const addressProviderParser_1 = require("./addressProviderParser");
-const airdropDistributorParser_1 = require("./airdropDistributorParser");
 const convexBaseRewardPoolAdapterParser_1 = require("./convexBaseRewardPoolAdapterParser");
 const convexBoosterAdapterParser_1 = require("./convexBoosterAdapterParser");
 const convextRewardPoolParser_1 = require("./convextRewardPoolParser");
 const creditFacadeParser_1 = require("./creditFacadeParser");
 const creditManagerParser_1 = require("./creditManagerParser");
 const curveAdapterParser_1 = require("./curveAdapterParser");
-const dataCompressorParser_1 = require("./dataCompressorParser");
 const ERC20Parser_1 = require("./ERC20Parser");
 const lidoAdapterParser_1 = require("./lidoAdapterParser");
-const lidoOracleParser_1 = require("./lidoOracleParser");
 const lidoSTETHParser_1 = require("./lidoSTETHParser");
-const multicallParser_1 = require("./multicallParser");
-const offchainOracleParser_1 = require("./offchainOracleParser");
 const poolParser_1 = require("./poolParser");
 const priceOracleParser_1 = require("./priceOracleParser");
 const uniV2AdapterParser_1 = require("./uniV2AdapterParser");
@@ -64,14 +59,10 @@ class TxParser {
                     TxParser._addParser(extraAddress, new convextRewardPoolParser_1.ConvexRewardPoolParser(r.rewardToken));
                 });
             }
-            if (contractData.type === sdk_gov_1.AdapterInterface.LIDO_V1) {
-                const extraAddress = contractData.oracle[network];
-                TxParser._addParser(extraAddress, new lidoOracleParser_1.LidoOracleParser());
-            }
         });
     }
-    static addCreditFacade(creditFacade, underlying) {
-        TxParser._addParser(creditFacade, new creditFacadeParser_1.CreditFacadeParser(underlying));
+    static addCreditFacade(creditFacade, underlying, version) {
+        TxParser._addParser(creditFacade, new creditFacadeParser_1.CreditFacadeParser(underlying, version));
     }
     static addTokens(network) {
         sdk_gov_1.TypedObjectUtils.entries(sdk_gov_1.tokenDataByNetwork[network]).forEach(([s, t]) => {
@@ -89,24 +80,12 @@ class TxParser {
             }
         });
     }
-    static addOffchainOracleParser(address) {
-        TxParser._addParser(address, new offchainOracleParser_1.OffchainOracleParserParser());
-    }
     static addPriceOracle(address) {
         TxParser._addParser(address, new priceOracleParser_1.PriceOracleParser());
     }
-    static addDataCompressor(address) {
-        TxParser._addParser(address, new dataCompressorParser_1.DataCompressorParser());
-    }
     static addAddressProvider(address) {
         TxParser._addParser(address, new addressProviderParser_1.AddressProviderParser());
     }
-    static addMulticall(address) {
-        TxParser._addParser(address, new multicallParser_1.MulticallParser());
-    }
-    static addAirdropDistributor(address) {
-        TxParser._addParser(address, new airdropDistributorParser_1.AirdropDistributorParser());
-    }
     static addCreditManager(address, version) {
         TxParser._addParser(address, new creditManagerParser_1.CreditManagerParser(version));
     }

package/lib/parsers/uniV2AdapterParser.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UniswapV2AdapterParser = 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 UniswapV2AdapterParser extends abstractParser_1.AbstractParser {
     constructor(contract, isContract) {
@@ -41,7 +41,7 @@ class UniswapV2AdapterParser extends abstractParser_1.AbstractParser {
             }
             case "swapAllTokensForTokens": {
                 const [rateMinRAY, path] = this.decodeFunctionData(functionFragment, calldata);
-                return `${functionName}(rate: ${(0, formatter_1.formatBN)(rateMinRAY, 27)}, path: [${path
+                return `${functionName}(rate: ${(0, sdk_gov_1.formatBN)(rateMinRAY, 27)}, path: [${path
                     .map(r => this.tokenSymbol(r))
                     .join(" => ")}])`;
             }

package/lib/parsers/uniV3AdapterParser.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UniswapV3AdapterParser = 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 UniswapV3AdapterParser extends abstractParser_1.AbstractParser {
     constructor(contract, isContract) {
@@ -26,7 +26,7 @@ class UniswapV3AdapterParser extends abstractParser_1.AbstractParser {
                 const { params: { tokenIn, tokenOut, fee, rateMinRAY }, } = this.decodeFunctionData(functionFragment, calldata);
                 const tokenInSym = this.tokenSymbol(tokenIn);
                 const tokenOutSym = this.tokenSymbol(tokenOut);
-                return `${functionName}(rate: ${(0, formatter_1.formatBN)(rateMinRAY, 27)},  path: ${tokenInSym} ==(fee: ${fee})==> ${tokenOutSym})`;
+                return `${functionName}(rate: ${(0, sdk_gov_1.formatBN)(rateMinRAY, 27)},  path: ${tokenInSym} ==(fee: ${fee})==> ${tokenOutSym})`;
             }
             case "exactInput": {
                 const { params: { amountIn, amountOutMinimum, path }, } = this.decodeFunctionData(functionFragment, calldata);
@@ -38,7 +38,7 @@ class UniswapV3AdapterParser extends abstractParser_1.AbstractParser {
             case "exactAllInput": {
                 const { params: { rateMinRAY, path }, } = this.decodeFunctionData(functionFragment, calldata);
                 const pathStr = this.trackInputPath(path);
-                return `${functionName}(rate: ${(0, formatter_1.formatBN)(rateMinRAY, 27)},  path: ${pathStr}`;
+                return `${functionName}(rate: ${(0, sdk_gov_1.formatBN)(rateMinRAY, 27)},  path: ${pathStr}`;
             }
             case "exactOutput": {
                 const { params: { amountInMaximum, amountOut, path }, } = this.decodeFunctionData(functionFragment, calldata);

package/lib/parsers/wstETHAdapterParser.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WstETHAdapterParser = 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 WstETHAdapterParser extends abstractParser_1.AbstractParser {
     constructor(contract, isContract) {
@@ -40,7 +40,7 @@ class WstETHAdapterParser 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/pathfinder/core.d.ts

@@ -1,12 +1,12 @@
+import { ExcludeArrayProps } from "@gearbox-protocol/sdk-gov";
+import { MultiCallStructOutput, SwapTaskStructOutput } from "../types/IRouter";
 export declare enum SwapOperation {
     EXACT_INPUT = 0,
     EXACT_INPUT_ALL = 1,
     EXACT_OUTPUT = 2
 }
-export interface MultiCall {
-    target: string;
-    callData: string;
-}
+export type MultiCall = ExcludeArrayProps<MultiCallStructOutput>;
+export type SwapTask = ExcludeArrayProps<SwapTaskStructOutput>;
 export interface PathFinderResult {
     amount: bigint;
     calls: Array<MultiCall>;

package/lib/pathfinder/pathOptions.d.ts

@@ -1,14 +1,15 @@
 import { CurveLPToken, NetworkType } from "@gearbox-protocol/sdk-gov";
-import { BigNumberish } from "ethers";
+import { CaTokenBalance } from "../payload/creditAccount";
 export interface PathOption {
     target: string;
     option: number;
     totalOptions: number;
 }
 export type PathOptionSerie = Array<PathOption>;
+export type BalanceInterface = Pick<CaTokenBalance, "balance">;
 export declare class PathOptionFactory {
-    static generatePathOptions(balances: Record<string, BigNumberish>, loopsInTx: number): Array<PathOptionSerie>;
-    static getCurvePools(balances: Record<string, BigNumberish>): Array<CurveLPToken>;
+    static generatePathOptions(balances: Record<string, BalanceInterface>, loopsInTx: number): Array<PathOptionSerie>;
+    static getCurvePools(balances: Record<string, BalanceInterface>): Array<CurveLPToken>;
     static next(path: PathOptionSerie): PathOptionSerie;
     static detectNetwork(underlying: string): NetworkType;
 }

package/lib/pathfinder/pathOptions.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PathOptionFactory = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
-const formatter_1 = require("../utils/formatter");
 class PathOptionFactory {
     static generatePathOptions(balances, loopsInTx) {
         const curvePools = PathOptionFactory.getCurvePools(balances);
@@ -31,14 +30,14 @@ class PathOptionFactory {
     static getCurvePools(balances) {
         const curveSymbols = Object.keys(sdk_gov_1.curveTokens);
         const curvePools = Object.entries(balances)
-            .filter(([, balance]) => (0, formatter_1.toBigInt)(balance) > 1)
+            .filter(([, balance]) => (0, sdk_gov_1.toBigInt)(balance.balance) > 1)
             .map(([token]) => sdk_gov_1.tokenSymbolByAddress[token.toLowerCase()])
             .filter(symbol => curveSymbols.includes(symbol));
         const yearnCurveTokens = Object.entries(sdk_gov_1.yearnTokens)
             .filter(([, data]) => curveSymbols.includes(data.underlying))
             .map(([token]) => token);
         const curvePoolsFromYearn = Object.entries(balances)
-            .filter(([, balance]) => (0, formatter_1.toBigInt)(balance) > 1)
+            .filter(([, balance]) => (0, sdk_gov_1.toBigInt)(balance.balance) > 1)
             .map(([token]) => sdk_gov_1.tokenSymbolByAddress[token.toLowerCase()])
             .filter(symbol => yearnCurveTokens.includes(symbol))
             .map(symbol => sdk_gov_1.yearnTokens[symbol].underlying);
@@ -46,7 +45,7 @@ class PathOptionFactory {
             .filter(([, data]) => curveSymbols.includes(data.underlying))
             .map(([token]) => token);
         const curvePoolsFromConvex = Object.entries(balances)
-            .filter(([, balance]) => (0, formatter_1.toBigInt)(balance) > 1)
+            .filter(([, balance]) => (0, sdk_gov_1.toBigInt)(balance.balance) > 1)
             .map(([token]) => sdk_gov_1.tokenSymbolByAddress[token.toLowerCase()])
             .filter(symbol => convexCurveTokens.includes(symbol))
             .map(symbol => sdk_gov_1.convexTokens[symbol].underlying);

package/lib/pathfinder/pathOptions.spec.js

@@ -57,11 +57,11 @@ describe("PathOptionFactory test", () => {
     });
     it("generatePathOptions works correctly", () => {
         const balances = {
-            [sdk_gov_1.tokenDataByNetwork.Mainnet["1INCH"]]: 100,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet["3Crv"]]: 200,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.USDC]: 200,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.FRAX3CRV]: 200,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.LUSD3CRV]: 200,
+            [sdk_gov_1.tokenDataByNetwork.Mainnet["1INCH"]]: { balance: 100n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet["3Crv"]]: { balance: 200n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.USDC]: { balance: 200n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.FRAX3CRV]: { balance: 200n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.LUSD3CRV]: { balance: 200n },
         };
         const result = pathOptions_1.PathOptionFactory.generatePathOptions(balances, 4);
         const expected = [
@@ -88,11 +88,11 @@ describe("PathOptionFactory test", () => {
     });
     it(" getCurvePools works correctly", () => {
         let balances = {
-            [sdk_gov_1.tokenDataByNetwork.Mainnet["1INCH"]]: 100,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet["3Crv"]]: 200,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.USDC]: 200,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.FRAX3CRV]: 200,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.LUSD3CRV]: 200,
+            [sdk_gov_1.tokenDataByNetwork.Mainnet["1INCH"]]: { balance: 100n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet["3Crv"]]: { balance: 200n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.USDC]: { balance: 200n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.FRAX3CRV]: { balance: 200n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.LUSD3CRV]: { balance: 200n },
         };
         let expectedCurvePools = [
             "3Crv",
@@ -101,36 +101,36 @@ describe("PathOptionFactory test", () => {
         ];
         (0, chai_1.expect)(pathOptions_1.PathOptionFactory.getCurvePools(balances)).to.be.eql(expectedCurvePools);
         balances = {
-            [sdk_gov_1.tokenDataByNetwork.Mainnet["1INCH"]]: 100,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet["3Crv"]]: 200,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.USDC]: 200,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.yvCurve_FRAX]: 200,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.yvCurve_stETH]: 200,
+            [sdk_gov_1.tokenDataByNetwork.Mainnet["1INCH"]]: { balance: 100n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet["3Crv"]]: { balance: 200n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.USDC]: { balance: 200n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.yvCurve_FRAX]: { balance: 200n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.yvCurve_stETH]: { balance: 200n },
         };
         expectedCurvePools = ["3Crv", "FRAX3CRV", "steCRV"];
         (0, chai_1.expect)(pathOptions_1.PathOptionFactory.getCurvePools(balances)).to.be.eql(expectedCurvePools);
         balances = {
-            [sdk_gov_1.tokenDataByNetwork.Mainnet["1INCH"]]: 100,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.USDC]: 200,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.cvx3Crv]: 200,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.cvxFRAX3CRV]: 200,
+            [sdk_gov_1.tokenDataByNetwork.Mainnet["1INCH"]]: { balance: 100n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.USDC]: { balance: 200n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.cvx3Crv]: { balance: 200n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.cvxFRAX3CRV]: { balance: 200n },
         };
         expectedCurvePools = ["3Crv", "FRAX3CRV"];
         (0, chai_1.expect)(pathOptions_1.PathOptionFactory.getCurvePools(balances)).to.be.eql(expectedCurvePools);
         balances = {
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.wstETH]: 100,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.USDC]: 200,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.stkcvx3Crv]: 200,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.stkcvxFRAX3CRV]: 200,
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.wstETH]: { balance: 100n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.USDC]: { balance: 200n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.stkcvx3Crv]: { balance: 200n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.stkcvxFRAX3CRV]: { balance: 200n },
         };
         expectedCurvePools = ["3Crv", "FRAX3CRV"];
         (0, chai_1.expect)(pathOptions_1.PathOptionFactory.getCurvePools(balances)).to.be.eql(expectedCurvePools);
         balances = {
-            [sdk_gov_1.tokenDataByNetwork.Mainnet["3Crv"]]: 100,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.USDC]: 200,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.stkcvx3Crv]: 200,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.cvx3Crv]: 200,
-            [sdk_gov_1.tokenDataByNetwork.Mainnet.yvCurve_stETH]: 200,
+            [sdk_gov_1.tokenDataByNetwork.Mainnet["3Crv"]]: { balance: 100n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.USDC]: { balance: 200n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.stkcvx3Crv]: { balance: 200n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.cvx3Crv]: { balance: 200n },
+            [sdk_gov_1.tokenDataByNetwork.Mainnet.yvCurve_stETH]: { balance: 200n },
         };
         expectedCurvePools = ["3Crv", "steCRV"];
         (0, chai_1.expect)(pathOptions_1.PathOptionFactory.getCurvePools(balances)).to.be.eql(expectedCurvePools);

package/lib/pathfinder/pathfinder.d.ts

@@ -2,7 +2,7 @@ import { NetworkType, SupportedToken } from "@gearbox-protocol/sdk-gov";
 import { BigNumberish, providers, Signer } from "ethers";
 import { CreditAccountData } from "../core/creditAccount";
 import { CreditManagerData } from "../core/creditManager";
-import { IRouter } from "../types/@gearbox-protocol/router/contracts/interfaces/IRouter";
+import { IRouter } from "../types";
 import { MultiCall, PathFinderCloseResult, PathFinderOpenStrategyResult, PathFinderResult, SwapOperation } from "./core";
 export interface CloseResult {
     amount: bigint;

package/lib/pathfinder/pathfinder.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PathFinder = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
+const ethers_1 = require("ethers");
 const types_1 = require("../types");
-const formatter_1 = require("../utils/formatter");
 const pathOptions_1 = require("./pathOptions");
 const MAX_GAS_PER_ROUTE = 200e6;
 const GAS_PER_BLOCK = 400e6;
@@ -33,8 +33,8 @@ class PathFinder {
             tokenOut: sdk_gov_1.tokenDataByNetwork[this.network][tokenOut] ||
                 tokenOut,
             connectors,
-            amount: amount,
-            slippage,
+            amount: ethers_1.BigNumber.from(amount),
+            slippage: ethers_1.BigNumber.from(slippage),
             externalSlippage: false,
         };
         const results = await this.pathFinder.callStatic.findAllSwaps(swapTask, {
@@ -46,7 +46,7 @@ class PathFinder {
                 .map(c => `${c.target.toLowerCase()}${c.callData}`)
                 .join("-")}`;
             unique[key] = {
-                amount: (0, formatter_1.toBigInt)(r.amount),
+                amount: (0, sdk_gov_1.toBigInt)(r.amount),
                 calls: r.calls,
             };
         });
@@ -59,7 +59,7 @@ class PathFinder {
             gasLimit: GAS_PER_BLOCK,
         });
         return {
-            amount: (0, formatter_1.toBigInt)(result.amount),
+            amount: (0, sdk_gov_1.toBigInt)(result.amount),
             calls: result.calls,
         };
     }
@@ -90,7 +90,7 @@ class PathFinder {
             gasLimit: GAS_PER_BLOCK,
         });
         const balancesAfter = result[0].reduce((acc, b) => {
-            acc[b.token.toLowerCase()] = (0, formatter_1.toBigInt)(b.balance);
+            acc[b.token.toLowerCase()] = (0, sdk_gov_1.toBigInt)(b.balance);
             return acc;
         }, {});
         return {
@@ -127,16 +127,17 @@ class PathFinder {
         }
         const bestResult = results.reduce((best, [pathFinderResult, gasPriceRAY]) => PathFinder.compare(best, {
             calls: pathFinderResult.calls,
-            amount: (0, formatter_1.toBigInt)(pathFinderResult.amount),
-            gasUsage: (0, formatter_1.toBigInt)(pathFinderResult.gasUsage),
-        }, (0, formatter_1.toBigInt)(gasPriceRAY)), {
+            amount: (0, sdk_gov_1.toBigInt)(pathFinderResult.amount),
+            gasUsage: (0, sdk_gov_1.toBigInt)(pathFinderResult.gasUsage),
+        }, (0, sdk_gov_1.toBigInt)(gasPriceRAY)), {
             amount: 0n,
             gasUsage: 0n,
             calls: [],
         });
         return {
             underlyingBalance: bestResult.amount +
-                creditAccount.allBalances[creditAccount.underlyingToken.toLowerCase()],
+                creditAccount.allBalances[creditAccount.underlyingToken.toLowerCase()]
+                    .balance,
             calls: bestResult.calls,
         };
     }

package/lib/payload/creditAccount.d.ts

@@ -1,4 +1,6 @@
 import { ExcludeArrayProps } from "@gearbox-protocol/sdk-gov";
-import { CreditAccountDataStruct, CreditAccountDataStructOutput } from "../types/@gearbox-protocol/core-v2/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
-export type TokenBalancePayload = CreditAccountDataStruct["balances"];
-export type CreditAccountDataPayload = ExcludeArrayProps<CreditAccountDataStructOutput>;
+import { CreditAccountDataStructOutput, ScheduledWithdrawalStructOutput, TokenBalanceStructOutput } from "../types/IDataCompressorV3_00";
+import { BigintifyProps, PartialKeys } from "../utils/types";
+export type CaTokenBalance = BigintifyProps<ExcludeArrayProps<TokenBalanceStructOutput>>;
+export type ScheduledWithdrawal = BigintifyProps<ExcludeArrayProps<ScheduledWithdrawalStructOutput>>;
+export type CreditAccountDataPayload = PartialKeys<ExcludeArrayProps<CreditAccountDataStructOutput>, "accruedInterest" | "accruedFees" | "healthFactor" | "totalValue">;

package/lib/payload/creditManager.d.ts

@@ -1,15 +1,16 @@
 import { ExcludeArrayProps } from "@gearbox-protocol/sdk-gov";
 import { BigNumberish } from "ethers";
-import { ICreditFacade } from "../types";
-import { CreditManagerDataStructOutput } from "../types/@gearbox-protocol/core-v2/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
+import { ICreditFacadeV2 } from "../types";
+import { CreditManagerDataStructOutput, CreditManagerDebtParamsStructOutput, QuotaInfoStructOutput } from "../types/IDataCompressorV3_00";
+import { BigintifyProps } from "../utils/types";
+export type CreditManagerDebtParams = BigintifyProps<ExcludeArrayProps<CreditManagerDebtParamsStructOutput>>;
+export type QuotaInfo = BigintifyProps<ExcludeArrayProps<QuotaInfoStructOutput>>;
 export interface AdapterPayload {
     allowedContract: string;
     adapter: string;
 }
-export type TotalDebt = ExcludeArrayProps<Awaited<ReturnType<ICreditFacade["totalDebt"]>>>;
-export type CreditManagerDataPayload = ExcludeArrayProps<CreditManagerDataStructOutput> & {
-    totalDebt?: TotalDebt;
-};
+export type TotalDebt = ExcludeArrayProps<Awaited<ReturnType<ICreditFacadeV2["totalDebt"]>>>;
+export type CreditManagerDataPayload = ExcludeArrayProps<CreditManagerDataStructOutput>;
 export interface ChartsCreditManagerPayload {
     addr: string;
     underlyingToken: string;

package/lib/payload/pool.d.ts

@@ -1,7 +1,14 @@
 import { ExcludeArrayProps } from "@gearbox-protocol/sdk-gov";
 import { BigNumberish } from "ethers";
-import { PoolDataStruct } from "../types/@gearbox-protocol/core-v2/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
-export type PoolDataPayload = ExcludeArrayProps<PoolDataStruct>;
+import { ZapperInfoStructOutput } from "../types/IDataCompressorV2_10";
+import { LinearModelStructOutput, PoolDataStructOutput } from "../types/IDataCompressorV3_00";
+export type PoolDataPayload = Omit<ExcludeArrayProps<PoolDataStructOutput>, "zappers"> & {
+    zappers: Array<PoolZapper>;
+};
+export type LinearModel = Omit<ExcludeArrayProps<LinearModelStructOutput>, "version"> & {
+    version: number;
+};
+export type PoolZapper = ExcludeArrayProps<ZapperInfoStructOutput>;
 export interface ChartsPoolDataPayload {
     addr: string;
     dieselToken: string;