@gearbox-protocol/sdk 1.3.3 → 1.5.0

package/lib/types/contracts/pathfinder/interfaces/ISwapAggregator.d.ts

@@ -66,11 +66,13 @@ export declare type BalanceStructOutput = [string, BigNumber] & {
 };
 export declare type TokenAdaptersStruct = {
     token: string;
-    adapters: string[];
+    depositAdapter: string;
+    withdrawAdapter: string;
 };
-export declare type TokenAdaptersStructOutput = [string, string[]] & {
+export declare type TokenAdaptersStructOutput = [string, string, string] & {
     token: string;
-    adapters: string[];
+    depositAdapter: string;
+    withdrawAdapter: string;
 };
 export declare type StrategyPathTaskStruct = {
     creditAccount: string;
@@ -78,11 +80,12 @@ export declare type StrategyPathTaskStruct = {
     target: string;
     connectors: string[];
     adapters: string[];
-    slippage: BigNumberish;
+    slippagePerStep: BigNumberish;
     targetType: BigNumberish;
     foundAdapters: TokenAdaptersStruct[];
     gasPriceTargetRAY: BigNumberish;
     gasUsage: BigNumberish;
+    slippageMultiplier: BigNumberish;
     initTargetBalance: BigNumberish;
     calls: MultiCallStruct[];
 };
@@ -98,6 +101,7 @@ export declare type StrategyPathTaskStructOutput = [
     BigNumber,
     BigNumber,
     BigNumber,
+    BigNumber,
     MultiCallStructOutput[]
 ] & {
     creditAccount: string;
@@ -105,33 +109,49 @@ export declare type StrategyPathTaskStructOutput = [
     target: string;
     connectors: string[];
     adapters: string[];
-    slippage: BigNumber;
+    slippagePerStep: BigNumber;
     targetType: number;
     foundAdapters: TokenAdaptersStructOutput[];
     gasPriceTargetRAY: BigNumber;
     gasUsage: BigNumber;
+    slippageMultiplier: BigNumber;
     initTargetBalance: BigNumber;
     calls: MultiCallStructOutput[];
 };
 export interface ISwapAggregatorInterface extends utils.Interface {
     functions: {
         "findAllSwaps((uint8,address,address,address,address[],uint256,uint256,bool),address[])": FunctionFragment;
-        "findBestSwap((uint8,address,address,address,address[],uint256,uint256,bool),address[])": FunctionFragment;
-        "findBestSwapOrRevert(address,uint256,address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address[])[],uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
+        "findBestAllInputSwap(address,address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address,address)[],uint256,uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
+        "findBestAllInputSwapOrRevert(address,address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address,address)[],uint256,uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
+        "findBestSwap(address,uint256,address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address,address)[],uint256,uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
+        "findBestSwapOrRevert(address,uint256,address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address,address)[],uint256,uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
+        "findBestSwapQuote((uint8,address,address,address,address[],uint256,uint256,bool),address[])": FunctionFragment;
         "getBestDirectPairSwap((uint8,address,address,address,address[],uint256,uint256,bool),address[],uint256)": FunctionFragment;
-        "swapAllNormalTokens((address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address[])[],uint256,uint256,uint256,(address,bytes)[]),address)": FunctionFragment;
+        "getComponentId()": FunctionFragment;
+        "swapAllNormalTokens((address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address,address)[],uint256,uint256,uint256,uint256,(address,bytes)[]),address)": FunctionFragment;
+        "version()": FunctionFragment;
     };
-    getFunction(nameOrSignatureOrTopic: "findAllSwaps" | "findBestSwap" | "findBestSwapOrRevert" | "getBestDirectPairSwap" | "swapAllNormalTokens"): FunctionFragment;
+    getFunction(nameOrSignatureOrTopic: "findAllSwaps" | "findBestAllInputSwap" | "findBestAllInputSwapOrRevert" | "findBestSwap" | "findBestSwapOrRevert" | "findBestSwapQuote" | "getBestDirectPairSwap" | "getComponentId" | "swapAllNormalTokens" | "version"): FunctionFragment;
     encodeFunctionData(functionFragment: "findAllSwaps", values: [SwapTaskStruct, string[]]): string;
-    encodeFunctionData(functionFragment: "findBestSwap", values: [SwapTaskStruct, string[]]): string;
+    encodeFunctionData(functionFragment: "findBestAllInputSwap", values: [string, string, StrategyPathTaskStruct]): string;
+    encodeFunctionData(functionFragment: "findBestAllInputSwapOrRevert", values: [string, string, StrategyPathTaskStruct]): string;
+    encodeFunctionData(functionFragment: "findBestSwap", values: [string, BigNumberish, string, StrategyPathTaskStruct]): string;
     encodeFunctionData(functionFragment: "findBestSwapOrRevert", values: [string, BigNumberish, string, StrategyPathTaskStruct]): string;
+    encodeFunctionData(functionFragment: "findBestSwapQuote", values: [SwapTaskStruct, string[]]): string;
     encodeFunctionData(functionFragment: "getBestDirectPairSwap", values: [SwapTaskStruct, string[], BigNumberish]): string;
+    encodeFunctionData(functionFragment: "getComponentId", values?: undefined): string;
     encodeFunctionData(functionFragment: "swapAllNormalTokens", values: [StrategyPathTaskStruct, string]): string;
+    encodeFunctionData(functionFragment: "version", values?: undefined): string;
     decodeFunctionResult(functionFragment: "findAllSwaps", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "findBestAllInputSwap", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "findBestAllInputSwapOrRevert", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "findBestSwap", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "findBestSwapOrRevert", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "findBestSwapQuote", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getBestDirectPairSwap", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getComponentId", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "swapAllNormalTokens", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "version", data: BytesLike): Result;
     events: {};
 }
 export interface ISwapAggregator extends BaseContract {
@@ -152,79 +172,143 @@ export interface ISwapAggregator extends BaseContract {
         findAllSwaps(swapTask: SwapTaskStruct, adapters: string[], overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<ContractTransaction>;
-        findBestSwap(swapTask: SwapTaskStruct, adapters: string[], overrides?: Overrides & {
+        findBestAllInputSwap(tokenIn: string, tokenOut: string, task: StrategyPathTaskStruct, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<ContractTransaction>;
+        findBestAllInputSwapOrRevert(tokenIn: string, tokenOut: string, task: StrategyPathTaskStruct, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<ContractTransaction>;
+        findBestSwap(tokenIn: string, amountIn: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<ContractTransaction>;
         findBestSwapOrRevert(tokenIn: string, amountIn: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<ContractTransaction>;
+        findBestSwapQuote(swapTask: SwapTaskStruct, adapters: string[], overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<ContractTransaction>;
         getBestDirectPairSwap(swapTask: SwapTaskStruct, adapters: string[], gasPriceInTokenOut: BigNumberish, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<ContractTransaction>;
+        getComponentId(overrides?: CallOverrides): Promise<[number]>;
         swapAllNormalTokens(task: StrategyPathTaskStruct, target: string, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<ContractTransaction>;
+        version(overrides?: CallOverrides): Promise<[BigNumber]>;
     };
     findAllSwaps(swapTask: SwapTaskStruct, adapters: string[], overrides?: Overrides & {
         from?: string | Promise<string>;
     }): Promise<ContractTransaction>;
-    findBestSwap(swapTask: SwapTaskStruct, adapters: string[], overrides?: Overrides & {
+    findBestAllInputSwap(tokenIn: string, tokenOut: string, task: StrategyPathTaskStruct, overrides?: Overrides & {
+        from?: string | Promise<string>;
+    }): Promise<ContractTransaction>;
+    findBestAllInputSwapOrRevert(tokenIn: string, tokenOut: string, task: StrategyPathTaskStruct, overrides?: Overrides & {
+        from?: string | Promise<string>;
+    }): Promise<ContractTransaction>;
+    findBestSwap(tokenIn: string, amountIn: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: Overrides & {
         from?: string | Promise<string>;
     }): Promise<ContractTransaction>;
     findBestSwapOrRevert(tokenIn: string, amountIn: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: Overrides & {
         from?: string | Promise<string>;
     }): Promise<ContractTransaction>;
+    findBestSwapQuote(swapTask: SwapTaskStruct, adapters: string[], overrides?: Overrides & {
+        from?: string | Promise<string>;
+    }): Promise<ContractTransaction>;
     getBestDirectPairSwap(swapTask: SwapTaskStruct, adapters: string[], gasPriceInTokenOut: BigNumberish, overrides?: Overrides & {
         from?: string | Promise<string>;
     }): Promise<ContractTransaction>;
+    getComponentId(overrides?: CallOverrides): Promise<number>;
     swapAllNormalTokens(task: StrategyPathTaskStruct, target: string, overrides?: Overrides & {
         from?: string | Promise<string>;
     }): Promise<ContractTransaction>;
+    version(overrides?: CallOverrides): Promise<BigNumber>;
     callStatic: {
         findAllSwaps(swapTask: SwapTaskStruct, adapters: string[], overrides?: CallOverrides): Promise<SwapQuoteStructOutput[]>;
-        findBestSwap(swapTask: SwapTaskStruct, adapters: string[], overrides?: CallOverrides): Promise<SwapQuoteStructOutput>;
+        findBestAllInputSwap(tokenIn: string, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
+            BigNumber,
+            StrategyPathTaskStructOutput
+        ] & {
+            amountOut: BigNumber;
+        }>;
+        findBestAllInputSwapOrRevert(tokenIn: string, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
+            BigNumber,
+            StrategyPathTaskStructOutput
+        ] & {
+            amountOut: BigNumber;
+        }>;
+        findBestSwap(tokenIn: string, amountIn: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
+            BigNumber,
+            StrategyPathTaskStructOutput
+        ] & {
+            amountOut: BigNumber;
+        }>;
         findBestSwapOrRevert(tokenIn: string, amountIn: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
             BigNumber,
             StrategyPathTaskStructOutput
         ] & {
             amountOut: BigNumber;
         }>;
+        findBestSwapQuote(swapTask: SwapTaskStruct, adapters: string[], overrides?: CallOverrides): Promise<SwapQuoteStructOutput>;
         getBestDirectPairSwap(swapTask: SwapTaskStruct, adapters: string[], gasPriceInTokenOut: BigNumberish, overrides?: CallOverrides): Promise<SwapQuoteStructOutput>;
+        getComponentId(overrides?: CallOverrides): Promise<number>;
         swapAllNormalTokens(task: StrategyPathTaskStruct, target: string, overrides?: CallOverrides): Promise<StrategyPathTaskStructOutput>;
+        version(overrides?: CallOverrides): Promise<BigNumber>;
     };
     filters: {};
     estimateGas: {
         findAllSwaps(swapTask: SwapTaskStruct, adapters: string[], overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<BigNumber>;
-        findBestSwap(swapTask: SwapTaskStruct, adapters: string[], overrides?: Overrides & {
+        findBestAllInputSwap(tokenIn: string, tokenOut: string, task: StrategyPathTaskStruct, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<BigNumber>;
+        findBestAllInputSwapOrRevert(tokenIn: string, tokenOut: string, task: StrategyPathTaskStruct, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<BigNumber>;
+        findBestSwap(tokenIn: string, amountIn: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<BigNumber>;
         findBestSwapOrRevert(tokenIn: string, amountIn: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<BigNumber>;
+        findBestSwapQuote(swapTask: SwapTaskStruct, adapters: string[], overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<BigNumber>;
         getBestDirectPairSwap(swapTask: SwapTaskStruct, adapters: string[], gasPriceInTokenOut: BigNumberish, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<BigNumber>;
+        getComponentId(overrides?: CallOverrides): Promise<BigNumber>;
         swapAllNormalTokens(task: StrategyPathTaskStruct, target: string, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<BigNumber>;
+        version(overrides?: CallOverrides): Promise<BigNumber>;
     };
     populateTransaction: {
         findAllSwaps(swapTask: SwapTaskStruct, adapters: string[], overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<PopulatedTransaction>;
-        findBestSwap(swapTask: SwapTaskStruct, adapters: string[], overrides?: Overrides & {
+        findBestAllInputSwap(tokenIn: string, tokenOut: string, task: StrategyPathTaskStruct, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<PopulatedTransaction>;
+        findBestAllInputSwapOrRevert(tokenIn: string, tokenOut: string, task: StrategyPathTaskStruct, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<PopulatedTransaction>;
+        findBestSwap(tokenIn: string, amountIn: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<PopulatedTransaction>;
         findBestSwapOrRevert(tokenIn: string, amountIn: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<PopulatedTransaction>;
+        findBestSwapQuote(swapTask: SwapTaskStruct, adapters: string[], overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<PopulatedTransaction>;
         getBestDirectPairSwap(swapTask: SwapTaskStruct, adapters: string[], gasPriceInTokenOut: BigNumberish, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<PopulatedTransaction>;
+        getComponentId(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         swapAllNormalTokens(task: StrategyPathTaskStruct, target: string, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<PopulatedTransaction>;
+        version(overrides?: CallOverrides): Promise<PopulatedTransaction>;
     };
 }

package/lib/types/contracts/pathfinder/interfaces/ISwapper.d.ts

@@ -60,12 +60,18 @@ export interface ISwapperInterface extends utils.Interface {
     functions: {
         "getBestConnectorSwap((uint8,address,address,address,address[],uint256,uint256,bool),address)": FunctionFragment;
         "getBestDirectPairSwap((uint8,address,address,address,address[],uint256,uint256,bool),address)": FunctionFragment;
+        "getComponentId()": FunctionFragment;
+        "version()": FunctionFragment;
     };
-    getFunction(nameOrSignatureOrTopic: "getBestConnectorSwap" | "getBestDirectPairSwap"): FunctionFragment;
+    getFunction(nameOrSignatureOrTopic: "getBestConnectorSwap" | "getBestDirectPairSwap" | "getComponentId" | "version"): FunctionFragment;
     encodeFunctionData(functionFragment: "getBestConnectorSwap", values: [SwapTaskStruct, string]): string;
     encodeFunctionData(functionFragment: "getBestDirectPairSwap", values: [SwapTaskStruct, string]): string;
+    encodeFunctionData(functionFragment: "getComponentId", values?: undefined): string;
+    encodeFunctionData(functionFragment: "version", values?: undefined): string;
     decodeFunctionResult(functionFragment: "getBestConnectorSwap", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getBestDirectPairSwap", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getComponentId", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "version", data: BytesLike): Result;
     events: {};
 }
 export interface ISwapper extends BaseContract {
@@ -89,6 +95,8 @@ export interface ISwapper extends BaseContract {
         getBestDirectPairSwap(swapTask: SwapTaskStruct, adapter: string, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<ContractTransaction>;
+        getComponentId(overrides?: CallOverrides): Promise<[number]>;
+        version(overrides?: CallOverrides): Promise<[BigNumber]>;
     };
     getBestConnectorSwap(swapTask: SwapTaskStruct, adapter: string, overrides?: Overrides & {
         from?: string | Promise<string>;
@@ -96,9 +104,13 @@ export interface ISwapper extends BaseContract {
     getBestDirectPairSwap(swapTask: SwapTaskStruct, adapter: string, overrides?: Overrides & {
         from?: string | Promise<string>;
     }): Promise<ContractTransaction>;
+    getComponentId(overrides?: CallOverrides): Promise<number>;
+    version(overrides?: CallOverrides): Promise<BigNumber>;
     callStatic: {
         getBestConnectorSwap(swapTask: SwapTaskStruct, adapter: string, overrides?: CallOverrides): Promise<SwapQuoteStructOutput>;
         getBestDirectPairSwap(swapTask: SwapTaskStruct, adapter: string, overrides?: CallOverrides): Promise<SwapQuoteStructOutput>;
+        getComponentId(overrides?: CallOverrides): Promise<number>;
+        version(overrides?: CallOverrides): Promise<BigNumber>;
     };
     filters: {};
     estimateGas: {
@@ -108,6 +120,8 @@ export interface ISwapper extends BaseContract {
         getBestDirectPairSwap(swapTask: SwapTaskStruct, adapter: string, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<BigNumber>;
+        getComponentId(overrides?: CallOverrides): Promise<BigNumber>;
+        version(overrides?: CallOverrides): Promise<BigNumber>;
     };
     populateTransaction: {
         getBestConnectorSwap(swapTask: SwapTaskStruct, adapter: string, overrides?: Overrides & {
@@ -116,5 +130,7 @@ export interface ISwapper extends BaseContract {
         getBestDirectPairSwap(swapTask: SwapTaskStruct, adapter: string, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<PopulatedTransaction>;
+        getComponentId(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        version(overrides?: CallOverrides): Promise<PopulatedTransaction>;
     };
 }

package/lib/types/contracts/pathfinder/interfaces/IWithdrawer.sol/IWithdrawer.d.ts

@@ -12,11 +12,13 @@ export declare type BalanceStructOutput = [string, BigNumber] & {
 };
 export declare type TokenAdaptersStruct = {
     token: string;
-    adapters: string[];
+    depositAdapter: string;
+    withdrawAdapter: string;
 };
-export declare type TokenAdaptersStructOutput = [string, string[]] & {
+export declare type TokenAdaptersStructOutput = [string, string, string] & {
     token: string;
-    adapters: string[];
+    depositAdapter: string;
+    withdrawAdapter: string;
 };
 export declare type MultiCallStruct = {
     target: string;
@@ -32,11 +34,12 @@ export declare type StrategyPathTaskStruct = {
     target: string;
     connectors: string[];
     adapters: string[];
-    slippage: BigNumberish;
+    slippagePerStep: BigNumberish;
     targetType: BigNumberish;
     foundAdapters: TokenAdaptersStruct[];
     gasPriceTargetRAY: BigNumberish;
     gasUsage: BigNumberish;
+    slippageMultiplier: BigNumberish;
     initTargetBalance: BigNumberish;
     calls: MultiCallStruct[];
 };
@@ -52,6 +55,7 @@ export declare type StrategyPathTaskStructOutput = [
     BigNumber,
     BigNumber,
     BigNumber,
+    BigNumber,
     MultiCallStructOutput[]
 ] & {
     creditAccount: string;
@@ -59,26 +63,36 @@ export declare type StrategyPathTaskStructOutput = [
     target: string;
     connectors: string[];
     adapters: string[];
-    slippage: BigNumber;
+    slippagePerStep: BigNumber;
     targetType: number;
     foundAdapters: TokenAdaptersStructOutput[];
     gasPriceTargetRAY: BigNumber;
     gasUsage: BigNumber;
+    slippageMultiplier: BigNumber;
     initTargetBalance: BigNumber;
     calls: MultiCallStructOutput[];
 };
 export interface IWithdrawerInterface extends utils.Interface {
     functions: {
-        "getUnderlying(address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address[])[],uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
-        "withdraw(uint256,address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address[])[],uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
-        "withdrawAllTokens((address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address[])[],uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
+        "getComponentId()": FunctionFragment;
+        "getUnderlying(address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address,address)[],uint256,uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
+        "version()": FunctionFragment;
+        "withdraw(uint256,address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address,address)[],uint256,uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
+        "withdrawAll(address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address,address)[],uint256,uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
+        "withdrawAllTokens((address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address,address)[],uint256,uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
     };
-    getFunction(nameOrSignatureOrTopic: "getUnderlying" | "withdraw" | "withdrawAllTokens"): FunctionFragment;
+    getFunction(nameOrSignatureOrTopic: "getComponentId" | "getUnderlying" | "version" | "withdraw" | "withdrawAll" | "withdrawAllTokens"): FunctionFragment;
+    encodeFunctionData(functionFragment: "getComponentId", values?: undefined): string;
     encodeFunctionData(functionFragment: "getUnderlying", values: [string, StrategyPathTaskStruct]): string;
+    encodeFunctionData(functionFragment: "version", values?: undefined): string;
     encodeFunctionData(functionFragment: "withdraw", values: [BigNumberish, string, StrategyPathTaskStruct]): string;
+    encodeFunctionData(functionFragment: "withdrawAll", values: [string, StrategyPathTaskStruct]): string;
     encodeFunctionData(functionFragment: "withdrawAllTokens", values: [StrategyPathTaskStruct]): string;
+    decodeFunctionResult(functionFragment: "getComponentId", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getUnderlying", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "version", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "withdraw", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "withdrawAll", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "withdrawAllTokens", data: BytesLike): Result;
     events: {};
 }
@@ -97,48 +111,78 @@ export interface IWithdrawer extends BaseContract {
     once: OnEvent<this>;
     removeListener: OnEvent<this>;
     functions: {
+        getComponentId(overrides?: CallOverrides): Promise<[number]>;
         getUnderlying(tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[string, StrategyPathTaskStructOutput] & {
             tokenIn: string;
         }>;
+        version(overrides?: CallOverrides): Promise<[BigNumber]>;
         withdraw(amountIn: BigNumberish, lpToken: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
             BigNumber,
             StrategyPathTaskStructOutput
         ] & {
             amountOut: BigNumber;
         }>;
+        withdrawAll(lpToken: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
+            BigNumber,
+            StrategyPathTaskStructOutput
+        ] & {
+            amountOut: BigNumber;
+        }>;
         withdrawAllTokens(task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[StrategyPathTaskStructOutput]>;
     };
+    getComponentId(overrides?: CallOverrides): Promise<number>;
     getUnderlying(tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[string, StrategyPathTaskStructOutput] & {
         tokenIn: string;
     }>;
+    version(overrides?: CallOverrides): Promise<BigNumber>;
     withdraw(amountIn: BigNumberish, lpToken: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
         BigNumber,
         StrategyPathTaskStructOutput
     ] & {
         amountOut: BigNumber;
     }>;
+    withdrawAll(lpToken: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
+        BigNumber,
+        StrategyPathTaskStructOutput
+    ] & {
+        amountOut: BigNumber;
+    }>;
     withdrawAllTokens(task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<StrategyPathTaskStructOutput>;
     callStatic: {
+        getComponentId(overrides?: CallOverrides): Promise<number>;
         getUnderlying(tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[string, StrategyPathTaskStructOutput] & {
             tokenIn: string;
         }>;
+        version(overrides?: CallOverrides): Promise<BigNumber>;
         withdraw(amountIn: BigNumberish, lpToken: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
             BigNumber,
             StrategyPathTaskStructOutput
         ] & {
             amountOut: BigNumber;
         }>;
+        withdrawAll(lpToken: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
+            BigNumber,
+            StrategyPathTaskStructOutput
+        ] & {
+            amountOut: BigNumber;
+        }>;
         withdrawAllTokens(task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<StrategyPathTaskStructOutput>;
     };
     filters: {};
     estimateGas: {
+        getComponentId(overrides?: CallOverrides): Promise<BigNumber>;
         getUnderlying(tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<BigNumber>;
+        version(overrides?: CallOverrides): Promise<BigNumber>;
         withdraw(amountIn: BigNumberish, lpToken: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<BigNumber>;
+        withdrawAll(lpToken: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<BigNumber>;
         withdrawAllTokens(task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<BigNumber>;
     };
     populateTransaction: {
+        getComponentId(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getUnderlying(tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        version(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         withdraw(amountIn: BigNumberish, lpToken: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        withdrawAll(lpToken: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         withdrawAllTokens(task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<PopulatedTransaction>;
     };
 }

package/lib/types/contracts/pathfinder/interfaces/IWithdrawer.sol/IWithdrawerOptions.d.ts

@@ -12,11 +12,13 @@ export declare type BalanceStructOutput = [string, BigNumber] & {
 };
 export declare type TokenAdaptersStruct = {
     token: string;
-    adapters: string[];
+    depositAdapter: string;
+    withdrawAdapter: string;
 };
-export declare type TokenAdaptersStructOutput = [string, string[]] & {
+export declare type TokenAdaptersStructOutput = [string, string, string] & {
     token: string;
-    adapters: string[];
+    depositAdapter: string;
+    withdrawAdapter: string;
 };
 export declare type MultiCallStruct = {
     target: string;
@@ -32,11 +34,12 @@ export declare type StrategyPathTaskStruct = {
     target: string;
     connectors: string[];
     adapters: string[];
-    slippage: BigNumberish;
+    slippagePerStep: BigNumberish;
     targetType: BigNumberish;
     foundAdapters: TokenAdaptersStruct[];
     gasPriceTargetRAY: BigNumberish;
     gasUsage: BigNumberish;
+    slippageMultiplier: BigNumberish;
     initTargetBalance: BigNumberish;
     calls: MultiCallStruct[];
 };
@@ -52,6 +55,7 @@ export declare type StrategyPathTaskStructOutput = [
     BigNumber,
     BigNumber,
     BigNumber,
+    BigNumber,
     MultiCallStructOutput[]
 ] & {
     creditAccount: string;
@@ -59,11 +63,12 @@ export declare type StrategyPathTaskStructOutput = [
     target: string;
     connectors: string[];
     adapters: string[];
-    slippage: BigNumber;
+    slippagePerStep: BigNumber;
     targetType: number;
     foundAdapters: TokenAdaptersStructOutput[];
     gasPriceTargetRAY: BigNumber;
     gasUsage: BigNumber;
+    slippageMultiplier: BigNumber;
     initTargetBalance: BigNumber;
     calls: MultiCallStructOutput[];
 };
@@ -79,16 +84,25 @@ export declare type PathOptionStructOutput = [string, number, number] & {
 };
 export interface IWithdrawerOptionsInterface extends utils.Interface {
     functions: {
-        "getUnderlyings(uint8,address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address[])[],uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
-        "withdraw(address,uint256,uint8,address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address[])[],uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
-        "withdrawAllTokens((address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address[])[],uint256,uint256,uint256,(address,bytes)[]),(address,uint8,uint8)[])": FunctionFragment;
+        "getComponentId()": FunctionFragment;
+        "getUnderlyings(uint8,address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address,address)[],uint256,uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
+        "version()": FunctionFragment;
+        "withdraw(address,uint256,uint8,address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address,address)[],uint256,uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
+        "withdrawAll(address,uint8,address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address,address)[],uint256,uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
+        "withdrawAllTokens((address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address,address)[],uint256,uint256,uint256,uint256,(address,bytes)[]),(address,uint8,uint8)[])": FunctionFragment;
     };
-    getFunction(nameOrSignatureOrTopic: "getUnderlyings" | "withdraw" | "withdrawAllTokens"): FunctionFragment;
+    getFunction(nameOrSignatureOrTopic: "getComponentId" | "getUnderlyings" | "version" | "withdraw" | "withdrawAll" | "withdrawAllTokens"): FunctionFragment;
+    encodeFunctionData(functionFragment: "getComponentId", values?: undefined): string;
     encodeFunctionData(functionFragment: "getUnderlyings", values: [BigNumberish, string, StrategyPathTaskStruct]): string;
+    encodeFunctionData(functionFragment: "version", values?: undefined): string;
     encodeFunctionData(functionFragment: "withdraw", values: [string, BigNumberish, BigNumberish, string, StrategyPathTaskStruct]): string;
+    encodeFunctionData(functionFragment: "withdrawAll", values: [string, BigNumberish, string, StrategyPathTaskStruct]): string;
     encodeFunctionData(functionFragment: "withdrawAllTokens", values: [StrategyPathTaskStruct, PathOptionStruct[]]): string;
+    decodeFunctionResult(functionFragment: "getComponentId", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getUnderlyings", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "version", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "withdraw", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "withdrawAll", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "withdrawAllTokens", data: BytesLike): Result;
     events: {};
 }
@@ -107,54 +121,84 @@ export interface IWithdrawerOptions extends BaseContract {
     once: OnEvent<this>;
     removeListener: OnEvent<this>;
     functions: {
+        getComponentId(overrides?: CallOverrides): Promise<[number]>;
         getUnderlyings(ttIn: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
             string[],
             StrategyPathTaskStructOutput
         ] & {
             tokensIn: string[];
         }>;
+        version(overrides?: CallOverrides): Promise<[BigNumber]>;
         withdraw(tokenIn: string, amount: BigNumberish, ttOut: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
             BigNumber,
             StrategyPathTaskStructOutput
         ] & {
             amountOut: BigNumber;
         }>;
+        withdrawAll(tokenIn: string, ttOut: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
+            BigNumber,
+            StrategyPathTaskStructOutput
+        ] & {
+            amountOut: BigNumber;
+        }>;
         withdrawAllTokens(task: StrategyPathTaskStruct, pathOptions: PathOptionStruct[], overrides?: CallOverrides): Promise<[StrategyPathTaskStructOutput]>;
     };
+    getComponentId(overrides?: CallOverrides): Promise<number>;
     getUnderlyings(ttIn: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[string[], StrategyPathTaskStructOutput] & {
         tokensIn: string[];
     }>;
+    version(overrides?: CallOverrides): Promise<BigNumber>;
     withdraw(tokenIn: string, amount: BigNumberish, ttOut: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
         BigNumber,
         StrategyPathTaskStructOutput
     ] & {
         amountOut: BigNumber;
     }>;
+    withdrawAll(tokenIn: string, ttOut: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
+        BigNumber,
+        StrategyPathTaskStructOutput
+    ] & {
+        amountOut: BigNumber;
+    }>;
     withdrawAllTokens(task: StrategyPathTaskStruct, pathOptions: PathOptionStruct[], overrides?: CallOverrides): Promise<StrategyPathTaskStructOutput>;
     callStatic: {
+        getComponentId(overrides?: CallOverrides): Promise<number>;
         getUnderlyings(ttIn: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
             string[],
             StrategyPathTaskStructOutput
         ] & {
             tokensIn: string[];
         }>;
+        version(overrides?: CallOverrides): Promise<BigNumber>;
         withdraw(tokenIn: string, amount: BigNumberish, ttOut: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
             BigNumber,
             StrategyPathTaskStructOutput
         ] & {
             amountOut: BigNumber;
         }>;
+        withdrawAll(tokenIn: string, ttOut: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
+            BigNumber,
+            StrategyPathTaskStructOutput
+        ] & {
+            amountOut: BigNumber;
+        }>;
         withdrawAllTokens(task: StrategyPathTaskStruct, pathOptions: PathOptionStruct[], overrides?: CallOverrides): Promise<StrategyPathTaskStructOutput>;
     };
     filters: {};
     estimateGas: {
+        getComponentId(overrides?: CallOverrides): Promise<BigNumber>;
         getUnderlyings(ttIn: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<BigNumber>;
+        version(overrides?: CallOverrides): Promise<BigNumber>;
         withdraw(tokenIn: string, amount: BigNumberish, ttOut: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<BigNumber>;
+        withdrawAll(tokenIn: string, ttOut: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<BigNumber>;
         withdrawAllTokens(task: StrategyPathTaskStruct, pathOptions: PathOptionStruct[], overrides?: CallOverrides): Promise<BigNumber>;
     };
     populateTransaction: {
+        getComponentId(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getUnderlyings(ttIn: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        version(overrides?: CallOverrides): Promise<PopulatedTransaction>;
         withdraw(tokenIn: string, amount: BigNumberish, ttOut: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        withdrawAll(tokenIn: string, ttOut: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         withdrawAllTokens(task: StrategyPathTaskStruct, pathOptions: PathOptionStruct[], overrides?: CallOverrides): Promise<PopulatedTransaction>;
     };
 }

package/lib/types/contracts/pathfinder/interfaces/index.d.ts

@@ -7,6 +7,7 @@ export type { iWithdrawerSol };
 export type { IClosePathResolver } from "./IClosePathResolver";
 export type { IGasPricer } from "./IGasPricer";
 export type { IPathFinder } from "./IPathFinder";
+export type { IPathFinderComponent } from "./IPathFinderComponent";
 export type { IPathResolver } from "./IPathResolver";
 export type { ISwapAggregator } from "./ISwapAggregator";
 export type { ISwapper } from "./ISwapper";