@gearbox-protocol/sdk 3.0.0-next.55 → 3.0.0-next.56

package/contracts/index.sol

@@ -24,6 +24,10 @@ import {IDegenNFTV2} from "@gearbox-protocol/core-v2/contracts/interfaces/IDegen
 import {IGearStakingV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IGearStakingV3.sol";
 
 // Adapters
+import {IAaveV2_LendingPoolAdapter} from "@gearbox-protocol/integrations-v3/contracts/interfaces/aave/IAaveV2_LendingPoolAdapter.sol";
+import {IAaveV2_WrappedATokenAdapter} from "@gearbox-protocol/integrations-v3/contracts/interfaces/aave/IAaveV2_WrappedATokenAdapter.sol";
+import {IBalancerV2VaultAdapter} from "@gearbox-protocol/integrations-v3/contracts/interfaces/balancer/IBalancerV2VaultAdapter.sol";
+import {ICompoundV2_CTokenAdapter} from "@gearbox-protocol/integrations-v3/contracts/interfaces/compound/ICompoundV2_CTokenAdapter.sol";
 import {ILidoV1Adapter} from "@gearbox-protocol/integrations-v3/contracts/interfaces/lido/ILidoV1Adapter.sol";
 import {IBaseRewardPool} from "@gearbox-protocol/integrations-v3/contracts/integrations/convex/IBaseRewardPool.sol";
 import {IConvexToken} from "@gearbox-protocol/integrations-v3/contracts/integrations/convex/IConvexToken.sol";
@@ -32,6 +36,7 @@ import {IConvexV1BaseRewardPoolAdapter} from
     "@gearbox-protocol/integrations-v3/contracts/interfaces/convex/IConvexV1BaseRewardPoolAdapter.sol";
 import {IConvexV1BoosterAdapter} from
     "@gearbox-protocol/integrations-v3/contracts/interfaces/convex/IConvexV1BoosterAdapter.sol";
+import {IERC4626Adapter} from "@gearbox-protocol/integrations-v3/contracts/interfaces/erc4626/IERC4626Adapter.sol";
 
 import {IInterestRateModel} from "@gearbox-protocol/core-v2/contracts/interfaces/IInterestRateModel.sol";
 import {IUniswapV2Adapter} from "@gearbox-protocol/integrations-v3/contracts/interfaces/uniswap/IUniswapV2Adapter.sol";

package/lib/core/creditAccount.d.ts

@@ -1,5 +1,5 @@
 import { LpTokensAPY } from "../apy";
-import { CaTokenBalance, CreditAccountDataPayload, ScheduledWithdrawal } from "../payload/creditAccount";
+import { CaTokenBalance, CreditAccountDataPayload } from "../payload/creditAccount";
 import { QuotaInfo } from "../payload/creditManager";
 import { TokenData } from "../tokens/tokenData";
 import { Asset, AssetWithAmountInTarget } from "./assets";
@@ -73,7 +73,6 @@ export declare class CreditAccountData {
     readonly allBalances: Record<string, CaTokenBalance>;
     readonly forbiddenTokens: Record<string, true>;
     readonly quotedTokens: Record<string, true>;
-    readonly schedultedWithdrawals: Array<ScheduledWithdrawal>;
     constructor(payload: CreditAccountDataPayload);
     setDeleteInProgress(d: boolean): void;
     static sortBalances(balances: Record<string, bigint>, prices: Record<string, bigint>, tokens: Record<string, TokenData>): Array<[string, bigint]>;

package/lib/core/creditAccount.js

@@ -38,7 +38,6 @@ class CreditAccountData {
     allBalances = {};
     forbiddenTokens = {};
     quotedTokens = {};
-    schedultedWithdrawals;
     constructor(payload) {
         this.isSuccessful = payload.isSuccessful;
         this.addr = payload.addr.toLowerCase();
@@ -96,12 +95,6 @@ class CreditAccountData {
             }
             this.allBalances[token] = balance;
         });
-        this.schedultedWithdrawals = payload.schedultedWithdrawals.map(w => ({
-            tokenIndex: w.tokenIndex,
-            maturity: w.maturity,
-            token: w.token.toLowerCase(),
-            amount: (0, sdk_gov_1.toBigInt)(w.amount),
-        }));
     }
     setDeleteInProgress(d) {
         this.isDeleting = d;

package/lib/core/creditManager.js

@@ -203,7 +203,7 @@ class CreditManagerData {
     static withdrawAllAndUnwrap_Convex(address, claim) {
         return {
             target: address,
-            callData: types_1.IConvexV1BaseRewardPoolAdapter__factory.createInterface().encodeFunctionData("withdrawAllAndUnwrap", [claim]),
+            callData: types_1.IConvexV1BaseRewardPoolAdapter__factory.createInterface().encodeFunctionData("withdrawDiffAndUnwrap", [1, claim]),
         };
     }
 }

package/lib/core/trade.d.ts

@@ -8,29 +8,30 @@ interface Info {
 }
 export type TradeOperations = "farmWithdraw" | "farmDeposit" | "swap";
 export interface GetTradesProps {
-    from: string;
-    to: string;
+    tokenIn: string;
+    tokenOut: string;
     amount: bigint;
     results: Array<PathFinderResult>;
     creditManager: CreditManagerData;
     currentContracts: Record<SupportedContract, string>;
-    swapType: SwapOperation;
+    swapOperation: SwapOperation;
     swapName: TradeOperations;
 }
 export declare class Trade {
     readonly helper: Info;
     readonly tradePath: PathFinderResult;
-    readonly swapType: SwapOperation;
+    readonly swapOperation: SwapOperation;
     readonly sourceAmount: bigint;
-    readonly expectedAmount: bigint;
+    readonly minExpectedAmount: bigint;
+    readonly averageExpectedAmount: bigint;
     readonly rate: bigint;
-    readonly tokenFrom: string;
-    readonly tokenTo: string;
+    readonly tokenIn: string;
+    readonly tokenOut: string;
     readonly operationName: TradeOperations;
     private constructor();
     getName(): string;
     toString(): string;
-    static getTrades({ from, to, amount, results, creditManager, currentContracts, swapType, swapName, }: GetTradesProps): Trade[];
+    static getTrades({ tokenIn, tokenOut, amount, results, creditManager, currentContracts, swapOperation, swapName, }: GetTradesProps): Trade[];
     static getCallInfo(calls: Array<MultiCall>, creditManager: string, currentContracts: Record<SupportedContract, string>): Info[];
     private static getContractSymbol;
     static sortTrades(trades: Array<Trade>, swapStrategy: string): Trade[];

package/lib/core/trade.js

@@ -7,50 +7,53 @@ const core_1 = require("../pathfinder/core");
 class Trade {
     helper;
     tradePath;
-    swapType;
+    swapOperation;
     sourceAmount;
-    expectedAmount;
+    minExpectedAmount;
+    averageExpectedAmount;
     rate;
-    tokenFrom;
-    tokenTo;
+    tokenIn;
+    tokenOut;
     operationName;
     constructor(props) {
         this.helper = props.adapter;
         this.tradePath = props.tradePath;
-        this.swapType = props.swapType;
+        this.swapOperation = props.swapOperation;
         this.sourceAmount = props.sourceAmount;
-        this.expectedAmount = props.expectedAmount;
-        this.rate = (sdk_gov_1.WAD * props.expectedAmount) / props.sourceAmount;
-        this.tokenFrom = props.tokenFrom;
-        this.tokenTo = props.tokenTo;
+        this.minExpectedAmount = props.minExpectedAmount;
+        this.averageExpectedAmount = props.averageExpectedAmount;
+        this.rate = (sdk_gov_1.WAD * props.minExpectedAmount) / props.sourceAmount;
+        this.tokenIn = props.tokenIn;
+        this.tokenOut = props.tokenOut;
         this.operationName = props.swapName;
     }
     getName() {
         return this.helper.name;
     }
     toString() {
-        const symbolFrom = sdk_gov_1.tokenSymbolByAddress[this.tokenFrom.toLowerCase()];
-        const symbolTo = sdk_gov_1.tokenSymbolByAddress[this.tokenTo.toLowerCase()];
+        const symbolFrom = sdk_gov_1.tokenSymbolByAddress[this.tokenIn.toLowerCase()];
+        const symbolTo = sdk_gov_1.tokenSymbolByAddress[this.tokenOut.toLowerCase()];
         if (!symbolFrom)
-            throw new Error(`Unknown token: ${this.tokenFrom}`);
+            throw new Error(`Unknown token: ${this.tokenIn}`);
         if (!symbolTo)
-            throw new Error(`Unknown token: ${this.tokenTo}`);
+            throw new Error(`Unknown token: ${this.tokenOut}`);
         const decimalsFrom = sdk_gov_1.decimals[symbolFrom];
         const decimalsTo = sdk_gov_1.decimals[symbolTo];
-        return `${this.operationName} ${(0, sdk_gov_1.formatBN)(this.sourceAmount, decimalsFrom)} ${symbolFrom} ⇒ ${(0, sdk_gov_1.formatBN)(this.expectedAmount, decimalsTo)} ${symbolTo} on ${this.helper.name}`;
+        return `${this.operationName} ${(0, sdk_gov_1.formatBN)(this.sourceAmount, decimalsFrom)} ${symbolFrom} ⇒ ${(0, sdk_gov_1.formatBN)(this.minExpectedAmount, decimalsTo)} ${symbolTo} on ${this.helper.name}`;
     }
-    static getTrades({ from, to, amount, results, creditManager, currentContracts, swapType, swapName, }) {
+    static getTrades({ tokenIn, tokenOut, amount, results, creditManager, currentContracts, swapOperation, swapName, }) {
         const trades = results.reduce((acc, tradePath) => {
             const { calls } = tradePath;
             const callInfo = Trade.getCallInfo(calls, creditManager.address, currentContracts);
             const trade = new Trade({
                 tradePath,
                 adapter: callInfo[0],
-                swapType,
+                swapOperation,
                 sourceAmount: amount,
-                expectedAmount: tradePath.amount,
-                tokenFrom: from,
-                tokenTo: to,
+                minExpectedAmount: tradePath.minAmount,
+                averageExpectedAmount: tradePath.amount,
+                tokenIn,
+                tokenOut,
                 swapName,
             });
             acc.push(trade);
@@ -86,13 +89,13 @@ class Trade {
     static sortTrades(trades, swapStrategy) {
         if (trades.length === 0)
             return [];
-        const { swapType } = trades[0];
+        const { swapOperation } = trades[0];
         const sorted = [...trades].sort((a, b) => {
             const aSelected = a.getName().toLowerCase().search(swapStrategy.toLowerCase()) >= 0;
             const bSelected = b.getName().toLowerCase().search(swapStrategy.toLowerCase()) >= 0;
             if ((aSelected && bSelected) || (!aSelected && !bSelected)) {
-                const sign = a.expectedAmount > b.expectedAmount ? -1 : 1;
-                return swapType === core_1.SwapOperation.EXACT_INPUT ? sign : -sign;
+                const sign = a.minExpectedAmount > b.minExpectedAmount ? -1 : 1;
+                return swapOperation === core_1.SwapOperation.EXACT_INPUT ? sign : -sign;
             }
             return aSelected ? -1 : 1;
         });

package/lib/parsers/convexBaseRewardPoolAdapterParser.js

@@ -14,21 +14,23 @@ class ConvexBaseRewardPoolAdapterParser extends abstractParser_1.AbstractParser
     parse(calldata) {
         const { functionFragment, functionName } = this.parseSelector(calldata);
         switch (functionFragment.name) {
-            case "stake":
-            case "stakeAll": {
+            case "stake": {
                 const [amount] = this.decodeFunctionData(functionFragment, calldata);
-                const amountStr = amount ? `amount: ${this.formatAmount(amount)}` : "";
-                return `${functionName}(${amountStr})`;
+                return `${functionName}(amount: ${this.formatAmount(amount)})`;
+            }
+            case "stakeDiff": {
+                const [leftoverAmount] = this.decodeFunctionData(functionFragment, calldata);
+                return `${functionName}(leftoverAmount: ${this.formatAmount(leftoverAmount)})`;
             }
             case "withdraw":
             case "withdrawAndUnwrap": {
                 const [amount, claim] = this.decodeFunctionData(functionFragment, calldata);
                 return `${functionName}(amount: ${this.formatAmount(amount)}, claim: ${claim})`;
             }
-            case "withdrawAll":
-            case "withdrawAllAndUnwrap": {
-                const [claim] = this.decodeFunctionData(functionFragment, calldata);
-                return `${functionName}(claim: ${claim})`;
+            case "withdrawDiff":
+            case "withdrawDiffAndUnwrap": {
+                const [leftoverAmount, claim] = this.decodeFunctionData(functionFragment, calldata);
+                return `${functionName}(leftoverAmount: ${this.formatAmount(leftoverAmount)}, claim: ${claim})`;
             }
             case "rewardRate":
                 return `${functionName}()`;

package/lib/parsers/convexBaseRewardPoolAdapterParser.spec.js

@@ -10,15 +10,18 @@ describe("ConvexV1BaseRewardPoolAdapterParser test", () => {
         const ifc = types_1.IConvexV1BaseRewardPoolAdapter__factory.createInterface();
         let parsed = parser.parse(ifc.encodeFunctionData("stake", [(sdk_gov_1.WAD * 199n) / 10n]));
         (0, chai_1.expect)(parsed).to.be.eq("ConvexV1BaseRewardPoolAdapter[CONVEX_FRAX3CRV_POOL].stake(amount: 19.90 [19900000000000000000])", "Incorrect parse stake");
-        parsed = parser.parse(ifc.encodeFunctionData("stakeAll"));
-        (0, chai_1.expect)(parsed).to.be.eq("ConvexV1BaseRewardPoolAdapter[CONVEX_FRAX3CRV_POOL].stakeAll()", "Incorrect parse stakeAll");
+        parsed = parser.parse(ifc.encodeFunctionData("stakeDiff", [(sdk_gov_1.WAD * 199n) / 10n]));
+        (0, chai_1.expect)(parsed).to.be.eq("ConvexV1BaseRewardPoolAdapter[CONVEX_FRAX3CRV_POOL].stakeDiff(leftoverAmount: 19.90 [19900000000000000000])", "Incorrect parse stakeDiff");
         parsed = parser.parse(ifc.encodeFunctionData("withdraw", [(sdk_gov_1.WAD * 199n) / 1000n, false]));
         (0, chai_1.expect)(parsed).to.be.eq("ConvexV1BaseRewardPoolAdapter[CONVEX_FRAX3CRV_POOL].withdraw(amount: 0.19 [199000000000000000], claim: false)", "Incorrect parse withdraw");
         parsed = parser.parse(ifc.encodeFunctionData("withdrawAndUnwrap", [(sdk_gov_1.WAD * 2n) / 1000n, true]));
         (0, chai_1.expect)(parsed).to.be.eq("ConvexV1BaseRewardPoolAdapter[CONVEX_FRAX3CRV_POOL].withdrawAndUnwrap(amount: 0.002 [2000000000000000], claim: true)", "Incorrect parse withdrawAndUnwrap");
-        parsed = parser.parse(ifc.encodeFunctionData("withdrawAll", [false]));
-        (0, chai_1.expect)(parsed).to.be.eq("ConvexV1BaseRewardPoolAdapter[CONVEX_FRAX3CRV_POOL].withdrawAll(claim: false)", "Incorrect parse withdrawAll");
-        parsed = parser.parse(ifc.encodeFunctionData("withdrawAllAndUnwrap", [true]));
-        (0, chai_1.expect)(parsed).to.be.eq("ConvexV1BaseRewardPoolAdapter[CONVEX_FRAX3CRV_POOL].withdrawAllAndUnwrap(claim: true)", "Incorrect parse withdrawAllAndUnwrap");
+        parsed = parser.parse(ifc.encodeFunctionData("withdrawDiff", [(sdk_gov_1.WAD * 2n) / 1000n, false]));
+        (0, chai_1.expect)(parsed).to.be.eq("ConvexV1BaseRewardPoolAdapter[CONVEX_FRAX3CRV_POOL].withdrawDiff(leftoverAmount: 0.002 [2000000000000000], claim: false)", "Incorrect parse withdrawDiff");
+        parsed = parser.parse(ifc.encodeFunctionData("withdrawDiffAndUnwrap", [
+            (sdk_gov_1.WAD * 2n) / 1000n,
+            true,
+        ]));
+        (0, chai_1.expect)(parsed).to.be.eq("ConvexV1BaseRewardPoolAdapter[CONVEX_FRAX3CRV_POOL].withdrawDiffAndUnwrap(leftoverAmount: 0.002 [2000000000000000], claim: true)", "Incorrect parse withdrawDiffAndUnwrap");
     });
 });

package/lib/parsers/convexBoosterAdapterParser.js

@@ -18,17 +18,17 @@ class ConvexBoosterAdapterParser extends abstractParser_1.AbstractParser {
                 const [pid, amount, stake] = this.decodeFunctionData(functionFragment, calldata);
                 return `${functionName}(pid: ${this.formatPid(pid)}, amount: ${this.formatAmount(amount, pid)}, stake: ${stake})`;
             }
-            case "depositAll": {
-                const [pid, stake] = this.decodeFunctionData(functionFragment, calldata);
-                return `${functionName}(pid: ${this.formatPid(pid)}, stake: ${stake})`;
+            case "depositDiff": {
+                const [pid, leftoverAmount, stake] = this.decodeFunctionData(functionFragment, calldata);
+                return `${functionName}(pid: ${this.formatPid(pid)}, leftoverAmount: ${this.formatAmount(leftoverAmount, pid)}, stake: ${stake})`;
             }
             case "withdraw": {
                 const [pid, amount] = this.decodeFunctionData(functionFragment, calldata);
                 return `${functionName}(pid: ${this.formatPid(pid)}, amount: ${this.formatAmount(amount, pid)})`;
             }
-            case "withdrawAll": {
-                const [pid] = this.decodeFunctionData(functionFragment, calldata);
-                return `${functionName}(pid: ${this.formatPid(pid)})`;
+            case "withdrawDiff": {
+                const [pid, leftoverAmount] = this.decodeFunctionData(functionFragment, calldata);
+                return `${functionName}(pid: ${this.formatPid(pid)}, leftoverAmount: ${this.formatAmount(leftoverAmount, pid)})`;
             }
             default:
                 return `${functionName}: Unknown operation ${functionFragment.name} with calldata ${calldata}`;

package/lib/parsers/convexBoosterAdapterParser.spec.js

@@ -10,11 +10,11 @@ describe("ConvexV1BaseRewardPoolAdapterParser test", () => {
         const ifc = types_1.IConvexV1BoosterAdapter__factory.createInterface();
         let parsed = parser.parse(ifc.encodeFunctionData("deposit", [9, sdk_gov_1.WAD * 19999n, false]));
         (0, chai_1.expect)(parsed).to.be.eq("ConvexV1BoosterAdapter[CONVEX_BOOSTER].deposit(pid: 9 [CONVEX_3CRV_POOL], amount: 19.99K [19999000000000000000000], stake: false)", "Incorrect parse deposit");
-        parsed = parser.parse(ifc.encodeFunctionData("depositAll", [32, true]));
-        (0, chai_1.expect)(parsed).to.be.eq("ConvexV1BoosterAdapter[CONVEX_BOOSTER].depositAll(pid: 32 [CONVEX_FRAX3CRV_POOL], stake: true)", "Incorrect parse depositAll");
+        parsed = parser.parse(ifc.encodeFunctionData("depositDiff", [32, sdk_gov_1.WAD * 19999n, true]));
+        (0, chai_1.expect)(parsed).to.be.eq("ConvexV1BoosterAdapter[CONVEX_BOOSTER].depositDiff(pid: 32 [CONVEX_FRAX3CRV_POOL], leftoverAmount: 19.99K [19999000000000000000000], stake: true)", "Incorrect parse depositDiff");
         parsed = parser.parse(ifc.encodeFunctionData("withdraw", [9, (sdk_gov_1.WAD * 555n) / 10n]));
         (0, chai_1.expect)(parsed).to.be.eq("ConvexV1BoosterAdapter[CONVEX_BOOSTER].withdraw(pid: 9 [CONVEX_3CRV_POOL], amount: 55.50 [55500000000000000000])", "Incorrect parse withdraw");
-        parsed = parser.parse(ifc.encodeFunctionData("withdrawAll", [32]));
-        (0, chai_1.expect)(parsed).to.be.eq("ConvexV1BoosterAdapter[CONVEX_BOOSTER].withdrawAll(pid: 32 [CONVEX_FRAX3CRV_POOL])", "Incorrect parse withdrawAll");
+        parsed = parser.parse(ifc.encodeFunctionData("withdrawDiff", [32, (sdk_gov_1.WAD * 555n) / 10n]));
+        (0, chai_1.expect)(parsed).to.be.eq("ConvexV1BoosterAdapter[CONVEX_BOOSTER].withdrawDiff(pid: 32 [CONVEX_FRAX3CRV_POOL], leftoverAmount: 55.50 [55500000000000000000])", "Incorrect parse withdrawDiff");
     });
 });

package/lib/parsers/curveAdapterParser.js

@@ -44,26 +44,26 @@ class CurveAdapterParser extends abstractParser_1.AbstractParser {
                     : this.getTokenByIndex(j);
                 return `${functionName}(i ,j: ${iSym} => ${jSym}, dx: ${this.formatBN(dx, iSym)}, min_dy: ${this.formatBN(min_dy, jSym)})`;
             }
-            case "exchange_all":
-            case "exchange_all_underlying": {
-                const [i, j, rateMinRAY] = this.decodeFunctionData(functionFragment, calldata);
-                const iSym = functionFragment.name === "exchange_all_underlying"
+            case "exchange_diff":
+            case "exchange_diff_underlying": {
+                const [i, j, leftoverAmount, rateMinRAY] = this.decodeFunctionData(functionFragment, calldata);
+                const iSym = functionFragment.name === "exchange_diff_underlying"
                     ? this.getUnderlyingTokenByIndex(i)
                     : this.getTokenByIndex(i);
-                const jSym = functionFragment.name === "exchange_all_underlying"
+                const jSym = functionFragment.name === "exchange_diff_underlying"
                     ? this.getUnderlyingTokenByIndex(j)
                     : this.getTokenByIndex(j);
-                return `${functionName}(i: ${iSym}, j: ${jSym}, rateMinRAY: ${(0, sdk_gov_1.formatBN)(rateMinRAY, 27)}`;
+                return `${functionName}(i: ${iSym}, j: ${jSym}, leftoverAmount: ${this.formatBN(leftoverAmount, iSym)}, rateMinRAY: ${(0, sdk_gov_1.formatBN)(rateMinRAY, 27)}`;
             }
             case "add_liquidity_one_coin": {
                 const [amount, i, minAmount] = this.decodeFunctionData(functionFragment, calldata);
                 const iSym = this.getTokenByIndex(i);
                 return `${functionName}(amount: ${this.formatBN(amount, iSym)}, i: ${iSym}, minAmount: ${this.formatBN(minAmount, this.lpToken)})`;
             }
-            case "add_all_liquidity_one_coin":
-            case "remove_all_liquidity_one_coin": {
-                const [i, rateMinRAY] = this.decodeFunctionData(functionFragment, calldata);
-                return `${functionName}(i: ${this.getTokenByIndex(i)}, rateMinRAY: ${(0, sdk_gov_1.formatBN)(rateMinRAY, 27)})`;
+            case "add_diff_liquidity_one_coin":
+            case "remove_diff_liquidity_one_coin": {
+                const [leftoverAmount, i, rateMinRAY] = this.decodeFunctionData(functionFragment, calldata);
+                return `${functionName}(leftoverAmount: ${this.formatBN(leftoverAmount, i)}, i: ${this.getTokenByIndex(i)}, rateMinRAY: ${(0, sdk_gov_1.formatBN)(rateMinRAY, 27)})`;
             }
             case "add_liquidity": {
                 const [amounts, minAmount] = this.decodeFunctionData(functionFragment, calldata);

package/lib/parsers/curveAdapterParser.spec.js

@@ -19,8 +19,12 @@ describe("CurveAdapterParser test", () => {
         (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("add_diff_liquidity_one_coin", [
+            sdk_gov_1.WAD * 3n,
+            0,
+            sdk_gov_1.RAY * 912n,
+        ]));
+        (0, chai_1.expect)(parsed).to.be.eq("Curve2AssetsAdapter[CURVE_FRAX_POOL].add_diff_liquidity_one_coin(leftoverAmount: 3.00 [3000000000000000000], i: FRAX, rateMinRAY: 912.00)", "Curve2AssetsAdapter: Incorrect parse add_diff_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", [

package/lib/parsers/lidoAdapterParser.js

@@ -17,8 +17,9 @@ class LidoAdapterParser extends abstractParser_1.AbstractParser {
                 const [amount] = this.decodeFunctionData(functionFragment, calldata);
                 return `${functionName}(amount: ${this.formatBN(amount, "STETH")})`;
             }
-            case "submitAll": {
-                return `${functionName}()`;
+            case "submitDiff": {
+                const [leftoverAmount] = this.decodeFunctionData(functionFragment, calldata);
+                return `${functionName}(leftoverAmount: ${this.formatBN(leftoverAmount, "STETH")})`;
             }
             default:
                 return `${functionName}: Unknown operation ${functionFragment.name} with calldata ${calldata}`;

package/lib/parsers/lidoAdapterParser.spec.js

@@ -11,7 +11,7 @@ describe("LidoAdapterParser test", () => {
         let parsed = parser.parse(ifc.encodeFunctionData("submit", [sdk_gov_1.WAD * 1020n]));
         (0, chai_1.expect)(parsed).to.be.eq("LidoV1Adapter[LIDO_STETH_GATEWAY].submit(amount: 1.02K [1020000000000000000000])", "Incorrect parse submit(amount)");
         parser = new lidoAdapterParser_1.LidoAdapterParser("LIDO_STETH_GATEWAY", true);
-        parsed = parser.parse(ifc.encodeFunctionData("submitAll"));
-        (0, chai_1.expect)(parsed).to.be.eq("Contract[LIDO_STETH_GATEWAY].submitAll()", "Incorrect parse submitAll()");
+        parsed = parser.parse(ifc.encodeFunctionData("submitDiff", [sdk_gov_1.WAD * 1020n]));
+        (0, chai_1.expect)(parsed).to.be.eq("Contract[LIDO_STETH_GATEWAY].submitDiff(leftoverAmount: 1.02K [1020000000000000000000])", "Incorrect parse submitDiff(leftoverAmount)");
     });
 });

package/lib/parsers/uniV2AdapterParser.js

@@ -39,9 +39,10 @@ class UniswapV2AdapterParser extends abstractParser_1.AbstractParser {
                 const amountInMaxStr = this.formatBN(amountInMax, tokenOut);
                 return `${functionName}(amountOut: ${amountOutStr}, amountInMax: ${amountInMaxStr}, path: [${pathStr}])`;
             }
-            case "swapAllTokensForTokens": {
-                const [rateMinRAY, path] = this.decodeFunctionData(functionFragment, calldata);
-                return `${functionName}(rate: ${(0, sdk_gov_1.formatBN)(rateMinRAY, 27)}, path: [${path
+            case "swapDiffTokensForTokens": {
+                const [leftoverAmount, rateMinRAY, path] = this.decodeFunctionData(functionFragment, calldata);
+                const tokenIn = this.tokenSymbol(path[0]);
+                return `${functionName}(leftoverAmount: ${this.formatBN(leftoverAmount, tokenIn)}, rate: ${(0, sdk_gov_1.formatBN)(rateMinRAY, 27)}, path: [${path
                     .map(r => this.tokenSymbol(r))
                     .join(" => ")}])`;
             }

package/lib/parsers/uniV2AdapterParser.spec.js

@@ -32,7 +32,8 @@ describe("UniswapV2AdapterParser test", () => {
             45033,
         ]));
         (0, chai_1.expect)(parsed).to.be.eq("UniswapV2Adapter[UNISWAP_V2_ROUTER].swapTokensForExactTokens(amountOut: 234.50K [234500000000], amountInMax: 17.70K [17700000000000000000000], path: [USDC => DAI => FRAX])", "Incorrect parse swapTokensForExactTokens");
-        parsed = parser.parse(ifc.encodeFunctionData("swapAllTokensForTokens", [
+        parsed = parser.parse(ifc.encodeFunctionData("swapDiffTokensForTokens", [
+            BigInt(1e6) * 234500n,
             sdk_gov_1.RAY * 3240n,
             [
                 sdk_gov_1.tokenDataByNetwork.Mainnet.USDC,
@@ -41,6 +42,6 @@ describe("UniswapV2AdapterParser test", () => {
             ],
             45033,
         ]));
-        (0, chai_1.expect)(parsed).to.be.eq("UniswapV2Adapter[UNISWAP_V2_ROUTER].swapAllTokensForTokens(rate: 3.24K, path: [USDC => DAI => FRAX])", "Incorrect parse swapAllTokensForTokens");
+        (0, chai_1.expect)(parsed).to.be.eq("UniswapV2Adapter[UNISWAP_V2_ROUTER].swapDiffTokensForTokens(leftoverAmount: 234.50K [234500000000], rate: 3.24K, path: [USDC => DAI => FRAX])", "Incorrect parse swapDiffTokensForTokens");
     });
 });

package/lib/parsers/uniV3AdapterParser.js

@@ -22,11 +22,12 @@ class UniswapV3AdapterParser extends abstractParser_1.AbstractParser {
                 const amountOutMinimumStr = this.formatBN(amountOutMinimum, tokenOut);
                 return `${functionName}(amountIn: ${amountInStr}, amountOutMinimum: ${amountOutMinimumStr},  path: ${tokenInSym} ==(fee: ${fee})==> ${tokenOutSym})`;
             }
-            case "exactAllInputSingle": {
-                const { params: { tokenIn, tokenOut, fee, rateMinRAY }, } = this.decodeFunctionData(functionFragment, calldata);
+            case "exactDiffInputSingle": {
+                const { params: { tokenIn, tokenOut, fee, leftoverAmount, rateMinRAY }, } = this.decodeFunctionData(functionFragment, calldata);
                 const tokenInSym = this.tokenSymbol(tokenIn);
                 const tokenOutSym = this.tokenSymbol(tokenOut);
-                return `${functionName}(rate: ${(0, sdk_gov_1.formatBN)(rateMinRAY, 27)},  path: ${tokenInSym} ==(fee: ${fee})==> ${tokenOutSym})`;
+                const leftoverAmountStr = this.formatBN(leftoverAmount, tokenIn);
+                return `${functionName}(leftoverAmount: ${leftoverAmountStr}, rate: ${(0, sdk_gov_1.formatBN)(rateMinRAY, 27)},  path: ${tokenInSym} ==(fee: ${fee})==> ${tokenOutSym})`;
             }
             case "exactInput": {
                 const { params: { amountIn, amountOutMinimum, path }, } = this.decodeFunctionData(functionFragment, calldata);
@@ -35,10 +36,11 @@ class UniswapV3AdapterParser extends abstractParser_1.AbstractParser {
                 const amountOutMinimumStr = this.formatBN(amountOutMinimum, this.tokenSymbol(`0x${path.slice(-40, path.length)}`));
                 return `${functionName}(amountIn: ${amountInStr}, amountOutMinimum: ${amountOutMinimumStr},  path: ${pathStr}`;
             }
-            case "exactAllInput": {
-                const { params: { rateMinRAY, path }, } = this.decodeFunctionData(functionFragment, calldata);
+            case "exactDiffInput": {
+                const { params: { leftoverAmount, rateMinRAY, path }, } = this.decodeFunctionData(functionFragment, calldata);
+                const leftoverAmountStr = this.formatBN(leftoverAmount, this.tokenSymbol(`0x${path.replace("0x", "").slice(0, 40)}`));
                 const pathStr = this.trackInputPath(path);
-                return `${functionName}(rate: ${(0, sdk_gov_1.formatBN)(rateMinRAY, 27)},  path: ${pathStr}`;
+                return `${functionName}(leftoverAmount: ${leftoverAmountStr}, rate: ${(0, sdk_gov_1.formatBN)(rateMinRAY, 27)},  path: ${pathStr}`;
             }
             case "exactOutput": {
                 const { params: { amountInMaximum, amountOut, path }, } = this.decodeFunctionData(functionFragment, calldata);

package/lib/parsers/uniV3AdapterParser.spec.js

@@ -71,18 +71,19 @@ describe("UniswapV3AdapterParser test", () => {
             },
         ]));
         (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", [
+        parsed = parser.parse(ifc.encodeFunctionData("exactDiffInput", [
             {
                 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: 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");
+        (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", [
         //     {

package/lib/parsers/wstETHAdapterParser.js

@@ -20,15 +20,17 @@ class WstETHAdapterParser extends abstractParser_1.AbstractParser {
                 const [amount] = this.decodeFunctionData(functionFragment, calldata);
                 return `${functionName}(amount: ${this.formatBN(amount, "STETH")})`;
             }
-            case "wrapAll": {
-                return `${functionName}()`;
+            case "wrapDiff": {
+                const [leftoverAmount] = this.decodeFunctionData(functionFragment, calldata);
+                return `${functionName}(leftoverAmount: ${this.formatBN(leftoverAmount, "STETH")})`;
             }
             case "unwrap": {
                 const [amount] = this.decodeFunctionData(functionFragment, calldata);
                 return `${functionName}(amount: ${this.formatBN(amount, "wstETH")})`;
             }
-            case "unwrapAll": {
-                return `${functionName}()`;
+            case "unwrapDiff": {
+                const [leftoverAmount] = this.decodeFunctionData(functionFragment, calldata);
+                return `${functionName}(leftoverAmount: ${this.formatBN(leftoverAmount, "STETH")})`;
             }
             case "balanceOf": {
                 const [address] = this.decodeFunctionData(functionFragment, calldata);

package/lib/parsers/wstETHAdapterParser.spec.js

@@ -8,10 +8,10 @@ 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(ifc.encodeFunctionData("wrapDiff", [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(ifc.encodeFunctionData("unwrapDiff", [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]));
         (0, chai_1.expect)(parsed).to.be.eq("Contract[LIDO_WSTETH].wrap(amount: 1.02K [1020000000000000000000])", "Incorrect parse wrap(amount)");

package/lib/parsers/yearnAdapterParser.spec.js

@@ -8,8 +8,8 @@ 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()");
+        let parsed = parser.parse(ifc.encodeFunctionData("depositDiff", [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(ifc.encodeFunctionData("deposit(uint256)", [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)", [
@@ -17,8 +17,8 @@ describe("YearnV2AdapterParser test", () => {
             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("withdrawDiff", [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(ifc.encodeFunctionData("withdraw(uint256)", [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)", [

package/lib/parsers/yearnV2AdapterParser.js

@@ -7,7 +7,7 @@ const abstractParser_1 = require("./abstractParser");
 class YearnV2AdapterParser extends abstractParser_1.AbstractParser {
     constructor(contract, isContract) {
         super(contract);
-        this.ifc = types_1.IYVault__factory.createInterface();
+        this.ifc = types_1.IYearnV2Adapter__factory.createInterface();
         if (!isContract)
             this.adapterName = "YearnV2Adapter";
     }
@@ -16,8 +16,6 @@ class YearnV2AdapterParser extends abstractParser_1.AbstractParser {
         switch (functionFragment.name) {
             case "deposit":
             case "withdraw":
-            case "deposit(uint256)":
-            case "withdraw(uint256)":
             case "withdraw(uint256,address,uint256)": {
                 const [amount, address, maxLoss] = this.decodeFunctionData(functionFragment, calldata);
                 const yvSym = this.tokenSymbol(sdk_gov_1.contractsByNetwork.Mainnet[this.contract]);
@@ -28,6 +26,18 @@ class YearnV2AdapterParser extends abstractParser_1.AbstractParser {
                 const maxLossStr = maxLoss ? `, maxLoss: ${maxLoss}` : "";
                 return `${functionName}(${amountStr}${addressStr}${maxLossStr})`;
             }
+            case "depositDiff": {
+                const [leftoverAmount] = this.decodeFunctionData(functionFragment, calldata);
+                const yvSym = this.tokenSymbol(sdk_gov_1.contractsByNetwork.Mainnet[this.contract]);
+                const leftoverAmountStr = this.formatBN(leftoverAmount, yvSym);
+                return `${functionName}(leftoverAmount: ${leftoverAmountStr})`;
+            }
+            case "withdrawDiff": {
+                const [leftoverAmount] = this.decodeFunctionData(functionFragment, calldata);
+                const yvSym = this.tokenSymbol(sdk_gov_1.contractsByNetwork.Mainnet[this.contract]);
+                const leftoverAmountStr = this.formatBN(leftoverAmount, yvSym);
+                return `${functionName}(leftoverAmount: ${leftoverAmountStr})`;
+            }
             case "pricePerShare": {
                 return `${functionName}()`;
             }

package/lib/pathfinder/core.d.ts

@@ -1,21 +1,20 @@
 import { ExcludeArrayProps } from "@gearbox-protocol/sdk-gov";
-import { MultiCallStructOutput, SwapTaskStructOutput } from "../types/IRouter";
+import { MultiCallStructOutput, RouterResultStructOutput, SwapTaskStruct } from "../types/interfaces/IRouter";
+import { BigintifyProps } from "../utils/types";
 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 PathFinderResult {
-    amount: bigint;
+export type SwapTask = ExcludeArrayProps<SwapTaskStruct>;
+export type PathFinderResult = Omit<BigintifyProps<ExcludeArrayProps<RouterResultStructOutput>>, "calls"> & {
     calls: Array<MultiCall>;
-}
-export interface PathFinderOpenStrategyResult {
+};
+export interface PathFinderOpenStrategyResult extends PathFinderResult {
     balances: Record<string, bigint>;
-    calls: Array<MultiCall>;
+    minBalances: Record<string, bigint>;
 }
-export interface PathFinderCloseResult {
+export interface PathFinderCloseResult extends PathFinderResult {
     underlyingBalance: bigint;
-    calls: Array<MultiCall>;
 }