@gearbox-protocol/sdk 3.0.0-next.29 → 3.0.0-next.290

package/lib/parsers/uniV3AdapterParser.spec.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const solidity_1 = require("@ethersproject/solidity");
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const chai_1 = require("chai");
+const viem_1 = require("viem");
 const types_1 = require("../types");
 const uniV3AdapterParser_1 = require("./uniV3AdapterParser");
 const pathToUniV3Path = (path) => {
@@ -16,73 +16,46 @@ const pathToUniV3Path = (path) => {
             types.push("uint24");
         }
     });
-    return (0, solidity_1.pack)(types, pathWithFees);
+    return (0, viem_1.encodePacked)(types, pathWithFees);
 };
 describe("UniswapV3AdapterParser test", () => {
     it("swap functions works well", () => {
         let parser = new uniV3AdapterParser_1.UniswapV3AdapterParser("UNISWAP_V3_ROUTER", false);
-        const ifc = types_1.IUniswapV3Adapter__factory.createInterface();
-        let parsed;
-        // let parsed = parser.parse(
-        //   ifc.encodeFunctionData("exactInputSingle", [
-        //     {
-        //       tokenIn: tokenDataByNetwork.Arbitrum["1INCH"],
-        //       tokenOut: tokenDataByNetwork.Arbitrum["3Crv"],
-        //       fee: 3000,
-        //       recipient: DUMB_ADDRESS,
-        //       deadline: 12300,
-        //       amountIn: WAD * 1299000n,
-        //       amountOutMinimum: WAD * 10200n,
-        //       sqrtPriceLimitX96: 0,
-        //     },
-        //   ]),
-        // );
-        // expect(parsed).to.be.eq(
-        //   "UniswapV3Adapter[UNISWAP_V3_ROUTER].exactInputSingle(amountIn: 1.29M [1299000000000000000000000], amountOutMinimum: 10.20K [10200000000000000000000],  path: 1INCH ==(fee: 3000)==> 3Crv)",
-        //   "Incorrect parse swapExactTokensForTokens",
-        // );
-        // parsed = parser.parse(
-        //   ifc.encodeFunctionData("exactAllInputSingle", [
-        //     {
-        //       tokenIn: tokenDataByNetwork.Arbitrum["1INCH"],
-        //       tokenOut: tokenDataByNetwork.Arbitrum["3Crv"],
-        //       fee: 3000,
-        //       deadline: 12300,
-        //       rateMinRAY: RAY * 1200n,
-        //       sqrtPriceLimitX96: 0,
-        //     },
-        //   ]),
-        // );
-        // expect(parsed).to.be.eq(
-        //   "UniswapV3Adapter[UNISWAP_V3_ROUTER].exactAllInputSingle(rate: 1.20K,  path: 1INCH ==(fee: 3000)==> 3Crv)",
-        //   "Incorrect parse swapExactTokensForTokens",
-        // );
-        parsed = parser.parse(ifc.encodeFunctionData("exactInput", [
-            {
-                path: pathToUniV3Path([
-                    sdk_gov_1.tokenDataByNetwork.Mainnet.AAVE,
-                    sdk_gov_1.tokenDataByNetwork.Mainnet.LINK,
-                    sdk_gov_1.tokenDataByNetwork.Mainnet.USDC,
-                ]),
-                recipient: sdk_gov_1.DUMB_ADDRESS,
-                deadline: 1232131,
-                amountIn: sdk_gov_1.WAD * 12399n,
-                amountOutMinimum: BigInt(1e6) * 122n,
-            },
-        ]));
+        let parsed = parser.parse((0, viem_1.encodeFunctionData)({
+            abi: types_1.iUniswapV3AdapterAbi,
+            functionName: "exactInput",
+            args: [
+                {
+                    path: pathToUniV3Path([
+                        sdk_gov_1.tokenDataByNetwork.Mainnet.AAVE,
+                        sdk_gov_1.tokenDataByNetwork.Mainnet.LINK,
+                        sdk_gov_1.tokenDataByNetwork.Mainnet.USDC,
+                    ]),
+                    recipient: sdk_gov_1.DUMB_ADDRESS,
+                    deadline: 1232131n,
+                    amountIn: sdk_gov_1.WAD * 12399n,
+                    amountOutMinimum: BigInt(1e6) * 122n,
+                },
+            ],
+        }));
         (0, chai_1.expect)(parsed).to.be.eq("UniswapV3Adapter[UNISWAP_V3_ROUTER].exactInput(amountIn: 12.39K [12399000000000000000000], amountOutMinimum: 122.00 [122000000],  path: AAVE ==(fee: 3000)==> LINK ==(fee: 3000)==> USDC", "Incorrect parse swapExactTokensForTokens");
-        parsed = parser.parse(ifc.encodeFunctionData("exactAllInput", [
-            {
-                path: pathToUniV3Path([
-                    sdk_gov_1.tokenDataByNetwork.Mainnet.AAVE,
-                    sdk_gov_1.tokenDataByNetwork.Mainnet.LINK,
-                    sdk_gov_1.tokenDataByNetwork.Mainnet.USDC,
-                ]),
-                rateMinRAY: sdk_gov_1.RAY * 1200n,
-                deadline: 1232131,
-            },
-        ]));
-        (0, chai_1.expect)(parsed).to.be.eq("UniswapV3Adapter[UNISWAP_V3_ROUTER].exactAllInput(rate: 1.20K,  path: AAVE ==(fee: 3000)==> LINK ==(fee: 3000)==> USDC", "Incorrect parse swapExactTokensForTokens");
+        parsed = parser.parse((0, viem_1.encodeFunctionData)({
+            abi: types_1.iUniswapV3AdapterAbi,
+            functionName: "exactDiffInput",
+            args: [
+                {
+                    path: pathToUniV3Path([
+                        sdk_gov_1.tokenDataByNetwork.Mainnet.AAVE,
+                        sdk_gov_1.tokenDataByNetwork.Mainnet.LINK,
+                        sdk_gov_1.tokenDataByNetwork.Mainnet.USDC,
+                    ]),
+                    leftoverAmount: sdk_gov_1.WAD * 12399n,
+                    rateMinRAY: sdk_gov_1.RAY * 1200n,
+                    deadline: 1232131n,
+                },
+            ],
+        }));
+        (0, chai_1.expect)(parsed).to.be.eq("UniswapV3Adapter[UNISWAP_V3_ROUTER].exactDiffInput(leftoverAmount: 12.39K [12399000000000000000000], rate: 1.20K,  path: AAVE ==(fee: 3000)==> LINK ==(fee: 3000)==> USDC", "Incorrect parse swapExactTokensForTokens");
         // parsed = parser.parse(
         //   ifc.encodeFunctionData("exactOutputSingle", [
         //     {
@@ -101,19 +74,23 @@ describe("UniswapV3AdapterParser test", () => {
         //   "UniswapV3Adapter[UNISWAP_V3_ROUTER].exactOutputSingle(amountInMaximum: 0.14 [149000000000000000], amountOut: 102.00 [102000000],  path: 1INCH ==(fee: 10000)==> USDC)",
         //   "Incorrect parse swapExactTokensForTokens",
         // );
-        parsed = parser.parse(ifc.encodeFunctionData("exactOutput", [
-            {
-                path: pathToUniV3Path([
-                    sdk_gov_1.tokenDataByNetwork.Mainnet.AAVE,
-                    sdk_gov_1.tokenDataByNetwork.Mainnet.LINK,
-                    sdk_gov_1.tokenDataByNetwork.Mainnet.USDC,
-                ]),
-                recipient: sdk_gov_1.DUMB_ADDRESS,
-                deadline: 1232131,
-                amountInMaximum: 123e6,
-                amountOut: sdk_gov_1.WAD * 122n,
-            },
-        ]));
+        parsed = parser.parse((0, viem_1.encodeFunctionData)({
+            abi: types_1.iUniswapV3AdapterAbi,
+            functionName: "exactOutput",
+            args: [
+                {
+                    path: pathToUniV3Path([
+                        sdk_gov_1.tokenDataByNetwork.Mainnet.AAVE,
+                        sdk_gov_1.tokenDataByNetwork.Mainnet.LINK,
+                        sdk_gov_1.tokenDataByNetwork.Mainnet.USDC,
+                    ]),
+                    recipient: sdk_gov_1.DUMB_ADDRESS,
+                    deadline: 1232131n,
+                    amountInMaximum: 123000000n,
+                    amountOut: sdk_gov_1.WAD * 122n,
+                },
+            ],
+        }));
         (0, chai_1.expect)(parsed).to.be.eq("UniswapV3Adapter[UNISWAP_V3_ROUTER].exactOutput(amountInMaximum: 123.00 [123000000], amountOut: 122.00 [122000000000000000000],  path: USDC ==(fee: 3000)==> LINK ==(fee: 3000)==> AAVE", "Incorrect parse swapExactTokensForTokens");
     });
 });

package/lib/parsers/wstETHAdapterParser.d.ts

@@ -1,7 +1,8 @@
 import { SupportedContract } from "@gearbox-protocol/sdk-gov";
+import { Address } from "viem";
 import { AbstractParser } from "./abstractParser";
 import { IParser } from "./iParser";
 export declare class WstETHAdapterParser extends AbstractParser implements IParser {
     constructor(contract: SupportedContract, isContract: boolean);
-    parse(calldata: string): string;
+    parse(calldata: Address): string;
 }

package/lib/parsers/wstETHAdapterParser.js

@@ -7,43 +7,43 @@ const abstractParser_1 = require("./abstractParser");
 class WstETHAdapterParser extends abstractParser_1.AbstractParser {
     constructor(contract, isContract) {
         super(contract);
-        this.ifc = !isContract
-            ? types_1.IwstETHV1Adapter__factory.createInterface()
-            : types_1.IwstETH__factory.createInterface();
+        this.abi = !isContract ? types_1.iwstEthv1AdapterAbi : types_1.iwstEthAbi;
         if (!isContract)
             this.adapterName = "wstETHAdapter";
     }
     parse(calldata) {
-        const { functionFragment, functionName } = this.parseSelector(calldata);
-        switch (functionFragment.name) {
+        const { operationName, functionData } = this.parseSelector(calldata);
+        switch (functionData.functionName) {
             case "wrap": {
-                const [amount] = this.decodeFunctionData(functionFragment, calldata);
-                return `${functionName}(amount: ${this.formatBN(amount, "STETH")})`;
+                const [amount] = functionData.args || [];
+                return `${operationName}(amount: ${this.formatBN(amount, "STETH")})`;
             }
-            case "wrapAll": {
-                return `${functionName}()`;
+            case "wrapDiff": {
+                const [leftoverAmount] = functionData.args || [];
+                return `${operationName}(leftoverAmount: ${this.formatBN(leftoverAmount, "STETH")})`;
             }
             case "unwrap": {
-                const [amount] = this.decodeFunctionData(functionFragment, calldata);
-                return `${functionName}(amount: ${this.formatBN(amount, "wstETH")})`;
+                const [amount] = functionData.args || [];
+                return `${operationName}(amount: ${this.formatBN(amount, "wstETH")})`;
             }
-            case "unwrapAll": {
-                return `${functionName}()`;
+            case "unwrapDiff": {
+                const [leftoverAmount] = functionData.args || [];
+                return `${operationName}(leftoverAmount: ${this.formatBN(leftoverAmount, "STETH")})`;
             }
             case "balanceOf": {
-                const [address] = this.decodeFunctionData(functionFragment, calldata);
-                return `${functionName}(${address})`;
+                const [address] = functionData.args || [];
+                return `${operationName}(${address})`;
             }
             case "allowance": {
-                const [account, to] = this.decodeFunctionData(functionFragment, calldata);
-                return `${functionName}(account: ${account}, to: ${to})`;
+                const [account, to] = functionData.args || [];
+                return `${operationName}(account: ${account}, to: ${to})`;
             }
             case "approve": {
-                const [spender, amount] = this.decodeFunctionData(functionFragment, calldata);
-                return `${functionName}(${spender}, [${(0, sdk_gov_1.toBigInt)(amount).toString()}])`;
+                const [spender, amount] = functionData.args || [];
+                return `${operationName}(${spender}, [${(0, sdk_gov_1.toBigInt)(amount).toString()}])`;
             }
             default:
-                return `${functionName}: Unknown operation ${functionFragment.name} with calldata ${calldata}`;
+                return this.reportUnknownFragment(this.adapterName || this.contract, operationName, calldata);
         }
     }
 }

package/lib/parsers/wstETHAdapterParser.spec.js

@@ -2,20 +2,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const chai_1 = require("chai");
+const viem_1 = require("viem");
 const types_1 = require("../types");
 const wstETHAdapterParser_1 = require("./wstETHAdapterParser");
 describe("WstETHAdapterParser test", () => {
     it("wrap / unwrap function works well", () => {
         let parser = new wstETHAdapterParser_1.WstETHAdapterParser("LIDO_WSTETH", false);
-        const ifc = types_1.IwstETHV1Adapter__factory.createInterface();
-        let parsed = parser.parse(ifc.encodeFunctionData("wrapAll"));
-        (0, chai_1.expect)(parsed).to.be.eq("wstETHAdapter[LIDO_WSTETH].wrapAll()", "Incorrect parse wrapAll()");
-        parsed = parser.parse(ifc.encodeFunctionData("unwrapAll"));
-        (0, chai_1.expect)(parsed).to.be.eq("wstETHAdapter[LIDO_WSTETH].unwrapAll()", "Incorrect parse unwrapAll()");
+        let parsed = parser.parse((0, viem_1.encodeFunctionData)({
+            abi: types_1.iwstEthv1AdapterAbi,
+            functionName: "wrapDiff",
+            args: [sdk_gov_1.WAD * 1020n],
+        }));
+        (0, chai_1.expect)(parsed).to.be.eq("wstETHAdapter[LIDO_WSTETH].wrapDiff(leftoverAmount: 1.02K [1020000000000000000000])", "Incorrect parse wrapDiff()");
+        parsed = parser.parse((0, viem_1.encodeFunctionData)({
+            abi: types_1.iwstEthv1AdapterAbi,
+            functionName: "unwrapDiff",
+            args: [sdk_gov_1.WAD * 1020n],
+        }));
+        (0, chai_1.expect)(parsed).to.be.eq("wstETHAdapter[LIDO_WSTETH].unwrapDiff(leftoverAmount: 1.02K [1020000000000000000000])", "Incorrect parse unwrapDiff()");
         parser = new wstETHAdapterParser_1.WstETHAdapterParser("LIDO_WSTETH", true);
-        parsed = parser.parse(ifc.encodeFunctionData("wrap", [sdk_gov_1.WAD * 1020n]));
+        parsed = parser.parse((0, viem_1.encodeFunctionData)({
+            abi: types_1.iwstEthv1AdapterAbi,
+            functionName: "wrap",
+            args: [sdk_gov_1.WAD * 1020n],
+        }));
         (0, chai_1.expect)(parsed).to.be.eq("Contract[LIDO_WSTETH].wrap(amount: 1.02K [1020000000000000000000])", "Incorrect parse wrap(amount)");
-        parsed = parser.parse(ifc.encodeFunctionData("unwrap", [sdk_gov_1.WAD * 1020n]));
+        parsed = parser.parse((0, viem_1.encodeFunctionData)({
+            abi: types_1.iwstEthv1AdapterAbi,
+            functionName: "unwrap",
+            args: [sdk_gov_1.WAD * 1020n],
+        }));
         (0, chai_1.expect)(parsed).to.be.eq("Contract[LIDO_WSTETH].unwrap(amount: 1.02K [1020000000000000000000])", "Incorrect parse unwrap(amount)");
     });
 });

package/lib/parsers/yearnAdapterParser.spec.js

@@ -2,35 +2,53 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const chai_1 = require("chai");
+const viem_1 = require("viem");
 const types_1 = require("../types");
 const yearnV2AdapterParser_1 = require("./yearnV2AdapterParser");
 describe("YearnV2AdapterParser test", () => {
     it("deposit / withdraw functions works well", () => {
-        let parser = new yearnV2AdapterParser_1.YearnV2AdapterParser("YEARN_CURVE_STETH_VAULT", false);
-        const ifc = types_1.IYearnV2Adapter__factory.createInterface();
-        let parsed = parser.parse(ifc.encodeFunctionData("deposit()"));
-        (0, chai_1.expect)(parsed).to.be.eq("YearnV2Adapter[YEARN_CURVE_STETH_VAULT].deposit()", "Incorrect parse deposit()");
-        parsed = parser.parse(ifc.encodeFunctionData("deposit(uint256)", [sdk_gov_1.WAD * 19000n]));
+        const parser = new yearnV2AdapterParser_1.YearnV2AdapterParser("YEARN_CURVE_STETH_VAULT", false);
+        let parsed = parser.parse((0, viem_1.encodeFunctionData)({
+            abi: types_1.iYearnV2AdapterAbi,
+            functionName: "depositDiff",
+            args: [sdk_gov_1.WAD * 19000n],
+        }));
+        (0, chai_1.expect)(parsed).to.be.eq("YearnV2Adapter[YEARN_CURVE_STETH_VAULT].depositDiff(leftoverAmount: 19.00K [19000000000000000000000])", "Incorrect parse depositDiff");
+        parsed = parser.parse((0, viem_1.encodeFunctionData)({
+            abi: types_1.iYearnV2AdapterAbi,
+            functionName: "deposit",
+            args: [sdk_gov_1.WAD * 19000n],
+        }));
         (0, chai_1.expect)(parsed).to.be.eq("YearnV2Adapter[YEARN_CURVE_STETH_VAULT].deposit(amount: 19.00K [19000000000000000000000])", "Incorrect parse deposit(amount)");
-        parsed = parser.parse(ifc.encodeFunctionData("deposit(uint256,address)", [
-            sdk_gov_1.WAD * 19000n,
-            sdk_gov_1.DUMB_ADDRESS,
-        ]));
+        parsed = parser.parse((0, viem_1.encodeFunctionData)({
+            abi: types_1.iYearnV2AdapterAbi,
+            functionName: "deposit",
+            args: [sdk_gov_1.WAD * 19000n, sdk_gov_1.DUMB_ADDRESS],
+        }));
         (0, chai_1.expect)(parsed).to.be.eq(`YearnV2Adapter[YEARN_CURVE_STETH_VAULT].deposit(amount: 19.00K [19000000000000000000000], address: ${sdk_gov_1.DUMB_ADDRESS})`, "Incorrect parse deposit(amount,address)");
-        parsed = parser.parse(ifc.encodeFunctionData("withdraw()"));
-        (0, chai_1.expect)(parsed).to.be.eq("YearnV2Adapter[YEARN_CURVE_STETH_VAULT].withdraw()", "Incorrect parse withdraw()");
-        parsed = parser.parse(ifc.encodeFunctionData("withdraw(uint256)", [sdk_gov_1.WAD * 19000n]));
+        parsed = parser.parse((0, viem_1.encodeFunctionData)({
+            abi: types_1.iYearnV2AdapterAbi,
+            functionName: "withdrawDiff",
+            args: [sdk_gov_1.WAD * 19000n],
+        }));
+        (0, chai_1.expect)(parsed).to.be.eq("YearnV2Adapter[YEARN_CURVE_STETH_VAULT].withdrawDiff(leftoverAmount: 19.00K [19000000000000000000000])", "Incorrect parse withdrawDiff");
+        parsed = parser.parse((0, viem_1.encodeFunctionData)({
+            abi: types_1.iYearnV2AdapterAbi,
+            functionName: "withdraw",
+            args: [sdk_gov_1.WAD * 19000n],
+        }));
         (0, chai_1.expect)(parsed).to.be.eq("YearnV2Adapter[YEARN_CURVE_STETH_VAULT].withdraw(amount: 19.00K [19000000000000000000000])", "Incorrect parse withdraw(amount)");
-        parsed = parser.parse(ifc.encodeFunctionData("withdraw(uint256,address)", [
-            sdk_gov_1.WAD * 19000n,
-            sdk_gov_1.DUMB_ADDRESS,
-        ]));
+        parsed = parser.parse((0, viem_1.encodeFunctionData)({
+            abi: types_1.iYearnV2AdapterAbi,
+            functionName: "withdraw",
+            args: [sdk_gov_1.WAD * 19000n, sdk_gov_1.DUMB_ADDRESS],
+        }));
         (0, chai_1.expect)(parsed).to.be.eq(`YearnV2Adapter[YEARN_CURVE_STETH_VAULT].withdraw(amount: 19.00K [19000000000000000000000], address: ${sdk_gov_1.DUMB_ADDRESS})`, "Incorrect parse withdraw(amount,address)");
-        parsed = parser.parse(ifc.encodeFunctionData("withdraw(uint256,address,uint256)", [
-            sdk_gov_1.WAD * 19000n,
-            sdk_gov_1.DUMB_ADDRESS,
-            555,
-        ]));
+        parsed = parser.parse((0, viem_1.encodeFunctionData)({
+            abi: types_1.iYearnV2AdapterAbi,
+            functionName: "withdraw",
+            args: [sdk_gov_1.WAD * 19000n, sdk_gov_1.DUMB_ADDRESS, 555n],
+        }));
         (0, chai_1.expect)(parsed).to.be.eq(`YearnV2Adapter[YEARN_CURVE_STETH_VAULT].withdraw(amount: 19.00K [19000000000000000000000], address: ${sdk_gov_1.DUMB_ADDRESS}, maxLoss: 555)`, "Incorrect parse withdraw(amount,address,uint256)");
     });
 });

package/lib/parsers/yearnV2AdapterParser.d.ts

@@ -1,7 +1,8 @@
 import { SupportedContract } from "@gearbox-protocol/sdk-gov";
+import { Address } from "viem";
 import { AbstractParser } from "./abstractParser";
 import { IParser } from "./iParser";
 export declare class YearnV2AdapterParser extends AbstractParser implements IParser {
     constructor(contract: SupportedContract, isContract: boolean);
-    parse(calldata: string): string;
+    parse(calldata: Address): string;
 }

package/lib/parsers/yearnV2AdapterParser.js

@@ -7,40 +7,50 @@ const abstractParser_1 = require("./abstractParser");
 class YearnV2AdapterParser extends abstractParser_1.AbstractParser {
     constructor(contract, isContract) {
         super(contract);
-        this.ifc = types_1.IYVault__factory.createInterface();
+        this.abi = types_1.iYearnV2AdapterAbi;
         if (!isContract)
             this.adapterName = "YearnV2Adapter";
     }
     parse(calldata) {
-        const { functionFragment, functionName } = this.parseSelector(calldata);
-        switch (functionFragment.name) {
+        const { operationName, functionData } = this.parseSelector(calldata);
+        switch (functionData.functionName) {
             case "deposit":
             case "withdraw":
-            case "deposit(uint256)":
-            case "withdraw(uint256)":
             case "withdraw(uint256,address,uint256)": {
-                const [amount, address, maxLoss] = this.decodeFunctionData(functionFragment, calldata);
+                const [amount, address, maxLoss] = functionData.args || [];
                 const yvSym = this.tokenSymbol(sdk_gov_1.contractsByNetwork.Mainnet[this.contract]);
                 const amountStr = amount
                     ? `amount: ${this.formatBN(amount, yvSym)}`
                     : "";
                 const addressStr = address ? `, address: ${address}` : "";
                 const maxLossStr = maxLoss ? `, maxLoss: ${maxLoss}` : "";
-                return `${functionName}(${amountStr}${addressStr}${maxLossStr})`;
+                return `${operationName}(${amountStr}${addressStr}${maxLossStr})`;
+            }
+            case "depositDiff": {
+                const [leftoverAmount] = functionData.args || [];
+                const yvSym = this.tokenSymbol(sdk_gov_1.contractsByNetwork.Mainnet[this.contract]);
+                const leftoverAmountStr = this.formatBN(leftoverAmount, yvSym);
+                return `${operationName}(leftoverAmount: ${leftoverAmountStr})`;
+            }
+            case "withdrawDiff": {
+                const [leftoverAmount] = functionData.args || [];
+                const yvSym = this.tokenSymbol(sdk_gov_1.contractsByNetwork.Mainnet[this.contract]);
+                const leftoverAmountStr = this.formatBN(leftoverAmount, yvSym);
+                return `${operationName}(leftoverAmount: ${leftoverAmountStr})`;
             }
             case "pricePerShare": {
-                return `${functionName}()`;
+                return `${operationName}()`;
             }
             case "balanceOf": {
-                const [address] = this.decodeFunctionData(functionFragment, calldata);
-                return `${functionName}(${address})`;
+                const [address] = functionData.args || [];
+                return `${operationName}(${address})`;
             }
             case "allowance": {
-                const [account, to] = this.decodeFunctionData(functionFragment, calldata);
-                return `${functionName}(account: ${account}, to: ${to})`;
+                const [account, to] = functionData.args || [];
+                return `${operationName}(account: ${account}, to: ${to})`;
             }
             default:
-                return `${functionName}: Unknown operation ${functionFragment.name} with calldata ${calldata}`;
+                return this.reportUnknownFragment(this.adapterName || this.contract, operationName, calldata);
         }
     }
 }

package/lib/pathfinder/balancerVault.d.ts

@@ -0,0 +1,33 @@
+export declare enum PoolSpecialization {
+    GeneralPool = 0,
+    MinimalSwapInfoPool = 1,
+    TwoTokenPool = 2
+}
+/**
+ * Splits a poolId into its components, i.e. pool address, pool specialization and its nonce
+ * @param poolId - a bytes32 string of the pool's ID
+ * @returns an object with the decomposed poolId
+ */
+export declare const splitPoolId: (poolId: string) => {
+    address: string;
+    specialization: PoolSpecialization;
+    nonce: bigint;
+};
+/**
+ * Extracts a pool's address from its poolId
+ * @param poolId - a bytes32 string of the pool's ID
+ * @returns the pool's address
+ */
+export declare const getPoolAddress: (poolId: string) => string;
+/**
+ * Extracts a pool's specialization from its poolId
+ * @param poolId - a bytes32 string of the pool's ID
+ * @returns the pool's specialization
+ */
+export declare const getPoolSpecialization: (poolId: string) => PoolSpecialization;
+/**
+ * Extracts a pool's nonce from its poolId
+ * @param poolId - a bytes32 string of the pool's ID
+ * @returns the pool's nonce
+ */
+export declare const getPoolNonce: (poolId: string) => bigint;

package/lib/pathfinder/balancerVault.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPoolNonce = exports.getPoolSpecialization = exports.getPoolAddress = exports.splitPoolId = exports.PoolSpecialization = void 0;
+var PoolSpecialization;
+(function (PoolSpecialization) {
+    PoolSpecialization[PoolSpecialization["GeneralPool"] = 0] = "GeneralPool";
+    PoolSpecialization[PoolSpecialization["MinimalSwapInfoPool"] = 1] = "MinimalSwapInfoPool";
+    PoolSpecialization[PoolSpecialization["TwoTokenPool"] = 2] = "TwoTokenPool";
+})(PoolSpecialization = exports.PoolSpecialization || (exports.PoolSpecialization = {}));
+/**
+ * Splits a poolId into its components, i.e. pool address, pool specialization and its nonce
+ * @param poolId - a bytes32 string of the pool's ID
+ * @returns an object with the decomposed poolId
+ */
+const splitPoolId = (poolId) => {
+    return {
+        address: (0, exports.getPoolAddress)(poolId),
+        specialization: (0, exports.getPoolSpecialization)(poolId),
+        nonce: (0, exports.getPoolNonce)(poolId),
+    };
+};
+exports.splitPoolId = splitPoolId;
+/**
+ * Extracts a pool's address from its poolId
+ * @param poolId - a bytes32 string of the pool's ID
+ * @returns the pool's address
+ */
+const getPoolAddress = (poolId) => {
+    if (poolId.length !== 66)
+        throw new Error("Invalid poolId length");
+    return poolId.slice(0, 42);
+};
+exports.getPoolAddress = getPoolAddress;
+/**
+ * Extracts a pool's specialization from its poolId
+ * @param poolId - a bytes32 string of the pool's ID
+ * @returns the pool's specialization
+ */
+const getPoolSpecialization = (poolId) => {
+    if (poolId.length !== 66)
+        throw new Error("Invalid poolId length");
+    // Only have 3 pool specializations so we can just pull the relevant character
+    const specializationCode = parseInt(poolId[45], 10);
+    if (specializationCode >= 3)
+        throw new Error("Invalid pool specialization");
+    return specializationCode;
+};
+exports.getPoolSpecialization = getPoolSpecialization;
+/**
+ * Extracts a pool's nonce from its poolId
+ * @param poolId - a bytes32 string of the pool's ID
+ * @returns the pool's nonce
+ */
+const getPoolNonce = (poolId) => {
+    if (poolId.length !== 66)
+        throw new Error("Invalid poolId length");
+    return BigInt(`0x${poolId.slice(46)}`);
+};
+exports.getPoolNonce = getPoolNonce;

package/lib/pathfinder/core.d.ts

@@ -1,21 +1,31 @@
-import { ExcludeArrayProps } from "@gearbox-protocol/sdk-gov";
-import { MultiCallStructOutput, SwapTaskStructOutput } from "../types/IRouter";
+import { Address } from "viem";
 export declare enum SwapOperation {
     EXACT_INPUT = 0,
     EXACT_INPUT_ALL = 1,
     EXACT_OUTPUT = 2
 }
-export type MultiCall = ExcludeArrayProps<MultiCallStructOutput>;
-export type SwapTask = ExcludeArrayProps<SwapTaskStructOutput>;
+export interface MultiCall {
+    target: Address;
+    callData: Address;
+}
+export interface SwapTask {
+    swapOperation: number;
+    creditAccount: Address;
+    tokenIn: Address;
+    tokenOut: Address;
+    connectors: Address[];
+    amount: bigint;
+    leftoverAmount: bigint;
+}
 export interface PathFinderResult {
     amount: bigint;
-    calls: Array<MultiCall>;
+    minAmount: bigint;
+    calls: MultiCall[];
 }
-export interface PathFinderOpenStrategyResult {
-    balances: Record<string, bigint>;
-    calls: Array<MultiCall>;
+export interface PathFinderOpenStrategyResult extends PathFinderResult {
+    balances: Record<Address, bigint>;
+    minBalances: Record<Address, bigint>;
 }
-export interface PathFinderCloseResult {
+export interface PathFinderCloseResult extends PathFinderResult {
     underlyingBalance: bigint;
-    calls: Array<MultiCall>;
 }

package/lib/pathfinder/index.d.ts

@@ -0,0 +1,4 @@
+export * from "./core";
+export * from "./pathfinder";
+export * from "./pathOptions";
+export * from "./utils";

package/lib/pathfinder/index.js

@@ -0,0 +1,20 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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 });
+__exportStar(require("./core"), exports);
+__exportStar(require("./pathfinder"), exports);
+__exportStar(require("./pathOptions"), exports);
+__exportStar(require("./utils"), exports);

package/lib/pathfinder/pathOptions.d.ts

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