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

package/lib/core/trade.js

@@ -4,19 +4,10 @@ exports.Trade = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const txParser_1 = require("../parsers/txParser");
 const core_1 = require("../pathfinder/core");
-const types_1 = require("../types");
 const formatter_1 = require("../utils/formatter");
-const transactions_1 = require("./transactions");
-const OPERATION_NAMES = {
-    farmWithdraw: "Farm withdraw",
-    farmDeposit: "Farm deposit",
-    swap: "Swap",
-    unknownOperation: "Unknown operation",
-};
 class Trade {
     helper;
     tradePath;
-    creditFacade;
     swapType;
     sourceAmount;
     expectedAmount;
@@ -27,7 +18,6 @@ class Trade {
     constructor(props) {
         this.helper = props.adapter;
         this.tradePath = props.tradePath;
-        this.creditFacade = props.creditFacade;
         this.swapType = props.swapType;
         this.sourceAmount = props.sourceAmount;
         this.expectedAmount = props.expectedAmount;
@@ -39,20 +29,6 @@ class Trade {
     getName() {
         return this.helper.name;
     }
-    async execute(signer) {
-        const receipt = await Trade.executeMulticallPath(this.creditFacade, signer, this.tradePath.calls);
-        return new transactions_1.TXSwap({
-            txHash: receipt.hash,
-            protocol: this.helper.contractAddress,
-            operation: OPERATION_NAMES[this.operationName],
-            amountFrom: this.sourceAmount,
-            amountTo: this.expectedAmount,
-            tokenFrom: this.tokenFrom,
-            tokenTo: this.tokenTo,
-            creditManager: this.helper.creditManager,
-            timestamp: 0,
-        });
-    }
     toString() {
         const symbolFrom = sdk_gov_1.tokenSymbolByAddress[this.tokenFrom.toLowerCase()];
         const symbolTo = sdk_gov_1.tokenSymbolByAddress[this.tokenTo.toLowerCase()];
@@ -64,43 +40,25 @@ class Trade {
         const decimalsTo = sdk_gov_1.decimals[symbolTo];
         return `${this.operationName} ${(0, formatter_1.formatBN)(this.sourceAmount, decimalsFrom)} ${symbolFrom} ⇒ ${(0, formatter_1.formatBN)(this.expectedAmount, decimalsTo)} ${symbolTo} on ${this.helper.name}`;
     }
-    static getTrades({ from, to, amount, results, creditManager, currentContracts, }) {
+    static getTrades({ from, to, amount, results, creditManager, currentContracts, swapType, swapName, }) {
         const trades = results.reduce((acc, tradePath) => {
             const { calls } = tradePath;
             const callInfo = Trade.getCallInfo(calls, creditManager.address, currentContracts);
             const trade = new Trade({
                 tradePath,
-                creditFacade: creditManager.creditFacade,
                 adapter: callInfo[0],
-                swapType: core_1.SwapOperation.EXACT_INPUT,
+                swapType,
                 sourceAmount: amount,
                 expectedAmount: tradePath.amount,
                 tokenFrom: from,
                 tokenTo: to,
-                swapName: Trade.getOperationName(from, to),
+                swapName,
             });
             acc.push(trade);
             return acc;
         }, []);
         return trades;
     }
-    static getOperationName(tokenInAddress, tokenOutAddress) {
-        const tokenInSymbol = sdk_gov_1.tokenSymbolByAddress[tokenInAddress];
-        const tokenOutSymbol = sdk_gov_1.tokenSymbolByAddress[tokenOutAddress];
-        const tokenInIsLp = (0, sdk_gov_1.isLPToken)(tokenInSymbol);
-        const tokenOutIsLp = (0, sdk_gov_1.isLPToken)(tokenOutSymbol);
-        if (!tokenInSymbol)
-            throw new Error(`Unknown token: ${tokenInAddress}`);
-        if (!tokenOutSymbol)
-            throw new Error(`Unknown token: ${tokenOutAddress}`);
-        if (tokenInIsLp && !tokenOutIsLp)
-            return "farmWithdraw";
-        if (!tokenInIsLp && tokenOutIsLp)
-            return "farmDeposit";
-        if (!tokenInIsLp && !tokenOutIsLp)
-            return "swap";
-        return "unknownOperation";
-    }
     static getCallInfo(calls, creditManager, currentContracts) {
         const callAdapters = calls.reduce((acc, call) => {
             const contractSymbol = this.getContractSymbol(call.target.toLowerCase());
@@ -126,9 +84,6 @@ class Trade {
             return undefined;
         }
     }
-    static getTradeId(trade) {
-        return `${trade.getName()}:${trade.expectedAmount.toString()}`;
-    }
     static sortTrades(trades, swapStrategy) {
         if (trades.length === 0)
             return [];
@@ -144,16 +99,5 @@ class Trade {
         });
         return sorted;
     }
-    static async executeMulticallPath(creditFacade, signer, calls) {
-        if (calls.length < 1)
-            throw new Error("No path to execute");
-        const safeCreditFacade = typeof creditFacade === "string"
-            ? types_1.ICreditFacade__factory.connect(creditFacade, signer)
-            : creditFacade;
-        return this.executeOnCreditFacade(calls, safeCreditFacade);
-    }
-    static async executeOnCreditFacade(calls, creditFacade) {
-        return creditFacade.multicall(calls);
-    }
 }
 exports.Trade = Trade;

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,23 +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 * from "@gearbox-protocol/sdk-gov";

package/lib/index.js

@@ -15,6 +15,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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,25 +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);
+__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 { 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 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,10 +59,6 @@ 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) {
@@ -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/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;