@gearbox-protocol/sdk 1.1.0 → 1.2.0

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

@@ -0,0 +1,210 @@
+import type { BaseContract, BigNumber, BigNumberish, BytesLike, CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, Signer, utils } from "ethers";
+import type { FunctionFragment, Result, EventFragment } from "@ethersproject/abi";
+import type { Listener, Provider } from "@ethersproject/providers";
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "../../../common";
+export declare type MultiCallStruct = {
+    target: string;
+    callData: BytesLike;
+};
+export declare type MultiCallStructOutput = [string, string] & {
+    target: string;
+    callData: string;
+};
+export declare type PathFinderResultStruct = {
+    amount: BigNumberish;
+    gasUsage: BigNumberish;
+    calls: MultiCallStruct[];
+};
+export declare type PathFinderResultStructOutput = [
+    BigNumber,
+    BigNumber,
+    MultiCallStructOutput[]
+] & {
+    amount: BigNumber;
+    gasUsage: BigNumber;
+    calls: MultiCallStructOutput[];
+};
+export declare type PathOptionStruct = {
+    target: string;
+    option: BigNumberish;
+    totalOptions: BigNumberish;
+};
+export declare type PathOptionStructOutput = [string, number, number] & {
+    target: string;
+    option: number;
+    totalOptions: number;
+};
+export declare type BalanceStruct = {
+    token: string;
+    balance: BigNumberish;
+};
+export declare type BalanceStructOutput = [string, BigNumber] & {
+    token: string;
+    balance: BigNumber;
+};
+export interface IPathFinderInterface extends utils.Interface {
+    functions: {
+        "componentAddressById(uint8)": FunctionFragment;
+        "findAllSwaps(address,uint256,address,address,address[],uint256)": FunctionFragment;
+        "findBestClosePath(address,address[],uint256,(address,uint8,uint8)[],uint256)": FunctionFragment;
+        "findOneTokenPath(address,uint256,address,address,address[],uint256)": FunctionFragment;
+        "findOpenStrategyPath(address,(address,uint256)[],address,address[],uint256)": FunctionFragment;
+        "getGasPriceTokenOutRAY(address)": FunctionFragment;
+        "isPathFinderConfigurator(address)": FunctionFragment;
+        "tokenTypes(address)": FunctionFragment;
+        "version()": FunctionFragment;
+    };
+    getFunction(nameOrSignatureOrTopic: "componentAddressById" | "findAllSwaps" | "findBestClosePath" | "findOneTokenPath" | "findOpenStrategyPath" | "getGasPriceTokenOutRAY" | "isPathFinderConfigurator" | "tokenTypes" | "version"): FunctionFragment;
+    encodeFunctionData(functionFragment: "componentAddressById", values: [BigNumberish]): string;
+    encodeFunctionData(functionFragment: "findAllSwaps", values: [string, BigNumberish, string, string, string[], BigNumberish]): string;
+    encodeFunctionData(functionFragment: "findBestClosePath", values: [string, string[], BigNumberish, PathOptionStruct[], BigNumberish]): string;
+    encodeFunctionData(functionFragment: "findOneTokenPath", values: [string, BigNumberish, string, string, string[], BigNumberish]): string;
+    encodeFunctionData(functionFragment: "findOpenStrategyPath", values: [string, BalanceStruct[], string, string[], BigNumberish]): string;
+    encodeFunctionData(functionFragment: "getGasPriceTokenOutRAY", values: [string]): string;
+    encodeFunctionData(functionFragment: "isPathFinderConfigurator", values: [string]): string;
+    encodeFunctionData(functionFragment: "tokenTypes", values: [string]): string;
+    encodeFunctionData(functionFragment: "version", values?: undefined): string;
+    decodeFunctionResult(functionFragment: "componentAddressById", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "findAllSwaps", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "findBestClosePath", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "findOneTokenPath", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "findOpenStrategyPath", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "getGasPriceTokenOutRAY", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "isPathFinderConfigurator", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "tokenTypes", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "version", data: BytesLike): Result;
+    events: {
+        "PathFinderComponentUpdate(uint8,address)": EventFragment;
+        "ResolverUpdate(uint8,uint8,uint8)": EventFragment;
+    };
+    getEvent(nameOrSignatureOrTopic: "PathFinderComponentUpdate"): EventFragment;
+    getEvent(nameOrSignatureOrTopic: "ResolverUpdate"): EventFragment;
+}
+export interface PathFinderComponentUpdateEventObject {
+    arg0: number;
+    arg1: string;
+}
+export declare type PathFinderComponentUpdateEvent = TypedEvent<[
+    number,
+    string
+], PathFinderComponentUpdateEventObject>;
+export declare type PathFinderComponentUpdateEventFilter = TypedEventFilter<PathFinderComponentUpdateEvent>;
+export interface ResolverUpdateEventObject {
+    arg0: number;
+    arg1: number;
+    arg2: number;
+}
+export declare type ResolverUpdateEvent = TypedEvent<[
+    number,
+    number,
+    number
+], ResolverUpdateEventObject>;
+export declare type ResolverUpdateEventFilter = TypedEventFilter<ResolverUpdateEvent>;
+export interface IPathFinder extends BaseContract {
+    connect(signerOrProvider: Signer | Provider | string): this;
+    attach(addressOrName: string): this;
+    deployed(): Promise<this>;
+    interface: IPathFinderInterface;
+    queryFilter<TEvent extends TypedEvent>(event: TypedEventFilter<TEvent>, fromBlockOrBlockhash?: string | number | undefined, toBlock?: string | number | undefined): Promise<Array<TEvent>>;
+    listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>;
+    listeners(eventName?: string): Array<Listener>;
+    removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this;
+    removeAllListeners(eventName?: string): this;
+    off: OnEvent<this>;
+    on: OnEvent<this>;
+    once: OnEvent<this>;
+    removeListener: OnEvent<this>;
+    functions: {
+        componentAddressById(pf: BigNumberish, overrides?: CallOverrides): Promise<[string]>;
+        findAllSwaps(tokenIn: string, amount: BigNumberish, tokenOut: string, creditAccount: string, connectors: string[], slippage: BigNumberish, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<ContractTransaction>;
+        findBestClosePath(creditAccount: string, connectors: string[], slippage: BigNumberish, pathOptions: PathOptionStruct[], iterations: BigNumberish, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<ContractTransaction>;
+        findOneTokenPath(tokenIn: string, amount: BigNumberish, tokenOut: string, creditAccount: string, connectors: string[], slippage: BigNumberish, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<ContractTransaction>;
+        findOpenStrategyPath(creditManager: string, balances: BalanceStruct[], target: string, connectors: string[], slippage: BigNumberish, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<ContractTransaction>;
+        getGasPriceTokenOutRAY(token: string, overrides?: CallOverrides): Promise<[BigNumber] & {
+            gasPrice: BigNumber;
+        }>;
+        isPathFinderConfigurator(account: string, overrides?: CallOverrides): Promise<[boolean]>;
+        tokenTypes(arg0: string, overrides?: CallOverrides): Promise<[number]>;
+        version(overrides?: CallOverrides): Promise<[BigNumber]>;
+    };
+    componentAddressById(pf: BigNumberish, overrides?: CallOverrides): Promise<string>;
+    findAllSwaps(tokenIn: string, amount: BigNumberish, tokenOut: string, creditAccount: string, connectors: string[], slippage: BigNumberish, overrides?: Overrides & {
+        from?: string | Promise<string>;
+    }): Promise<ContractTransaction>;
+    findBestClosePath(creditAccount: string, connectors: string[], slippage: BigNumberish, pathOptions: PathOptionStruct[], iterations: BigNumberish, overrides?: Overrides & {
+        from?: string | Promise<string>;
+    }): Promise<ContractTransaction>;
+    findOneTokenPath(tokenIn: string, amount: BigNumberish, tokenOut: string, creditAccount: string, connectors: string[], slippage: BigNumberish, overrides?: Overrides & {
+        from?: string | Promise<string>;
+    }): Promise<ContractTransaction>;
+    findOpenStrategyPath(creditManager: string, balances: BalanceStruct[], target: string, connectors: string[], slippage: BigNumberish, overrides?: Overrides & {
+        from?: string | Promise<string>;
+    }): Promise<ContractTransaction>;
+    getGasPriceTokenOutRAY(token: string, overrides?: CallOverrides): Promise<BigNumber>;
+    isPathFinderConfigurator(account: string, overrides?: CallOverrides): Promise<boolean>;
+    tokenTypes(arg0: string, overrides?: CallOverrides): Promise<number>;
+    version(overrides?: CallOverrides): Promise<BigNumber>;
+    callStatic: {
+        componentAddressById(pf: BigNumberish, overrides?: CallOverrides): Promise<string>;
+        findAllSwaps(tokenIn: string, amount: BigNumberish, tokenOut: string, creditAccount: string, connectors: string[], slippage: BigNumberish, overrides?: CallOverrides): Promise<PathFinderResultStructOutput[]>;
+        findBestClosePath(creditAccount: string, connectors: string[], slippage: BigNumberish, pathOptions: PathOptionStruct[], iterations: BigNumberish, overrides?: CallOverrides): Promise<PathFinderResultStructOutput>;
+        findOneTokenPath(tokenIn: string, amount: BigNumberish, tokenOut: string, creditAccount: string, connectors: string[], slippage: BigNumberish, overrides?: CallOverrides): Promise<PathFinderResultStructOutput>;
+        findOpenStrategyPath(creditManager: string, balances: BalanceStruct[], target: string, connectors: string[], slippage: BigNumberish, overrides?: CallOverrides): Promise<[BalanceStructOutput[], PathFinderResultStructOutput]>;
+        getGasPriceTokenOutRAY(token: string, overrides?: CallOverrides): Promise<BigNumber>;
+        isPathFinderConfigurator(account: string, overrides?: CallOverrides): Promise<boolean>;
+        tokenTypes(arg0: string, overrides?: CallOverrides): Promise<number>;
+        version(overrides?: CallOverrides): Promise<BigNumber>;
+    };
+    filters: {
+        "PathFinderComponentUpdate(uint8,address)"(arg0?: BigNumberish | null, arg1?: string | null): PathFinderComponentUpdateEventFilter;
+        PathFinderComponentUpdate(arg0?: BigNumberish | null, arg1?: string | null): PathFinderComponentUpdateEventFilter;
+        "ResolverUpdate(uint8,uint8,uint8)"(arg0?: BigNumberish | null, arg1?: BigNumberish | null, arg2?: BigNumberish | null): ResolverUpdateEventFilter;
+        ResolverUpdate(arg0?: BigNumberish | null, arg1?: BigNumberish | null, arg2?: BigNumberish | null): ResolverUpdateEventFilter;
+    };
+    estimateGas: {
+        componentAddressById(pf: BigNumberish, overrides?: CallOverrides): Promise<BigNumber>;
+        findAllSwaps(tokenIn: string, amount: BigNumberish, tokenOut: string, creditAccount: string, connectors: string[], slippage: BigNumberish, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<BigNumber>;
+        findBestClosePath(creditAccount: string, connectors: string[], slippage: BigNumberish, pathOptions: PathOptionStruct[], iterations: BigNumberish, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<BigNumber>;
+        findOneTokenPath(tokenIn: string, amount: BigNumberish, tokenOut: string, creditAccount: string, connectors: string[], slippage: BigNumberish, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<BigNumber>;
+        findOpenStrategyPath(creditManager: string, balances: BalanceStruct[], target: string, connectors: string[], slippage: BigNumberish, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<BigNumber>;
+        getGasPriceTokenOutRAY(token: string, overrides?: CallOverrides): Promise<BigNumber>;
+        isPathFinderConfigurator(account: string, overrides?: CallOverrides): Promise<BigNumber>;
+        tokenTypes(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
+        version(overrides?: CallOverrides): Promise<BigNumber>;
+    };
+    populateTransaction: {
+        componentAddressById(pf: BigNumberish, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        findAllSwaps(tokenIn: string, amount: BigNumberish, tokenOut: string, creditAccount: string, connectors: string[], slippage: BigNumberish, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<PopulatedTransaction>;
+        findBestClosePath(creditAccount: string, connectors: string[], slippage: BigNumberish, pathOptions: PathOptionStruct[], iterations: BigNumberish, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<PopulatedTransaction>;
+        findOneTokenPath(tokenIn: string, amount: BigNumberish, tokenOut: string, creditAccount: string, connectors: string[], slippage: BigNumberish, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<PopulatedTransaction>;
+        findOpenStrategyPath(creditManager: string, balances: BalanceStruct[], target: string, connectors: string[], slippage: BigNumberish, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<PopulatedTransaction>;
+        getGasPriceTokenOutRAY(token: string, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        isPathFinderConfigurator(account: string, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        tokenTypes(arg0: string, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        version(overrides?: CallOverrides): Promise<PopulatedTransaction>;
+    };
+}

package/lib/types/contracts/pathfinder/interfaces/IPathFinder.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,131 @@
+import type { BaseContract, BigNumber, BigNumberish, BytesLike, CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, Signer, utils } from "ethers";
+import type { FunctionFragment, Result } from "@ethersproject/abi";
+import type { Listener, Provider } from "@ethersproject/providers";
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "../../../common";
+export declare type BalanceStruct = {
+    token: string;
+    balance: BigNumberish;
+};
+export declare type BalanceStructOutput = [string, BigNumber] & {
+    token: string;
+    balance: BigNumber;
+};
+export declare type TokenAdaptersStruct = {
+    token: string;
+    adapters: string[];
+};
+export declare type TokenAdaptersStructOutput = [string, string[]] & {
+    token: string;
+    adapters: string[];
+};
+export declare type MultiCallStruct = {
+    target: string;
+    callData: BytesLike;
+};
+export declare type MultiCallStructOutput = [string, string] & {
+    target: string;
+    callData: string;
+};
+export declare type StrategyPathTaskStruct = {
+    creditAccount: string;
+    balances: BalanceStruct[];
+    target: string;
+    connectors: string[];
+    adapters: string[];
+    slippage: BigNumberish;
+    targetType: BigNumberish;
+    foundAdapters: TokenAdaptersStruct[];
+    gasPriceTargetRAY: BigNumberish;
+    gasUsage: BigNumberish;
+    initTargetBalance: BigNumberish;
+    calls: MultiCallStruct[];
+};
+export declare type StrategyPathTaskStructOutput = [
+    string,
+    BalanceStructOutput[],
+    string,
+    string[],
+    string[],
+    BigNumber,
+    number,
+    TokenAdaptersStructOutput[],
+    BigNumber,
+    BigNumber,
+    BigNumber,
+    MultiCallStructOutput[]
+] & {
+    creditAccount: string;
+    balances: BalanceStructOutput[];
+    target: string;
+    connectors: string[];
+    adapters: string[];
+    slippage: BigNumber;
+    targetType: number;
+    foundAdapters: TokenAdaptersStructOutput[];
+    gasPriceTargetRAY: BigNumber;
+    gasUsage: BigNumber;
+    initTargetBalance: BigNumber;
+    calls: MultiCallStructOutput[];
+};
+export interface IPathResolverInterface extends utils.Interface {
+    functions: {
+        "findOneTokenPath(uint8,address,uint256,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address[])[],uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
+        "findOpenStrategyPath((address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address[])[],uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
+    };
+    getFunction(nameOrSignatureOrTopic: "findOneTokenPath" | "findOpenStrategyPath"): FunctionFragment;
+    encodeFunctionData(functionFragment: "findOneTokenPath", values: [BigNumberish, string, BigNumberish, StrategyPathTaskStruct]): string;
+    encodeFunctionData(functionFragment: "findOpenStrategyPath", values: [StrategyPathTaskStruct]): string;
+    decodeFunctionResult(functionFragment: "findOneTokenPath", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "findOpenStrategyPath", data: BytesLike): Result;
+    events: {};
+}
+export interface IPathResolver extends BaseContract {
+    connect(signerOrProvider: Signer | Provider | string): this;
+    attach(addressOrName: string): this;
+    deployed(): Promise<this>;
+    interface: IPathResolverInterface;
+    queryFilter<TEvent extends TypedEvent>(event: TypedEventFilter<TEvent>, fromBlockOrBlockhash?: string | number | undefined, toBlock?: string | number | undefined): Promise<Array<TEvent>>;
+    listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>;
+    listeners(eventName?: string): Array<Listener>;
+    removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this;
+    removeAllListeners(eventName?: string): this;
+    off: OnEvent<this>;
+    on: OnEvent<this>;
+    once: OnEvent<this>;
+    removeListener: OnEvent<this>;
+    functions: {
+        findOneTokenPath(typeIn: BigNumberish, tokenIn: string, amount: BigNumberish, task: StrategyPathTaskStruct, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<ContractTransaction>;
+        findOpenStrategyPath(task: StrategyPathTaskStruct, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<ContractTransaction>;
+    };
+    findOneTokenPath(typeIn: BigNumberish, tokenIn: string, amount: BigNumberish, task: StrategyPathTaskStruct, overrides?: Overrides & {
+        from?: string | Promise<string>;
+    }): Promise<ContractTransaction>;
+    findOpenStrategyPath(task: StrategyPathTaskStruct, overrides?: Overrides & {
+        from?: string | Promise<string>;
+    }): Promise<ContractTransaction>;
+    callStatic: {
+        findOneTokenPath(typeIn: BigNumberish, tokenIn: string, amount: BigNumberish, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<StrategyPathTaskStructOutput>;
+        findOpenStrategyPath(task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<StrategyPathTaskStructOutput>;
+    };
+    filters: {};
+    estimateGas: {
+        findOneTokenPath(typeIn: BigNumberish, tokenIn: string, amount: BigNumberish, task: StrategyPathTaskStruct, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<BigNumber>;
+        findOpenStrategyPath(task: StrategyPathTaskStruct, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<BigNumber>;
+    };
+    populateTransaction: {
+        findOneTokenPath(typeIn: BigNumberish, tokenIn: string, amount: BigNumberish, task: StrategyPathTaskStruct, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<PopulatedTransaction>;
+        findOpenStrategyPath(task: StrategyPathTaskStruct, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<PopulatedTransaction>;
+    };
+}

package/lib/types/contracts/pathfinder/interfaces/IPathResolver.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/types/contracts/pathfinder/interfaces/{ISwapPathFinder.d.ts → ISwapAggregator.d.ts}

@@ -56,29 +56,89 @@ export declare type SwapQuoteStructOutput = [
     found: boolean;
     gasUsage: BigNumber;
 };
-export interface ISwapPathFinderInterface extends utils.Interface {
+export declare type BalanceStruct = {
+    token: string;
+    balance: BigNumberish;
+};
+export declare type BalanceStructOutput = [string, BigNumber] & {
+    token: string;
+    balance: BigNumber;
+};
+export declare type TokenAdaptersStruct = {
+    token: string;
+    adapters: string[];
+};
+export declare type TokenAdaptersStructOutput = [string, string[]] & {
+    token: string;
+    adapters: string[];
+};
+export declare type StrategyPathTaskStruct = {
+    creditAccount: string;
+    balances: BalanceStruct[];
+    target: string;
+    connectors: string[];
+    adapters: string[];
+    slippage: BigNumberish;
+    targetType: BigNumberish;
+    foundAdapters: TokenAdaptersStruct[];
+    gasPriceTargetRAY: BigNumberish;
+    gasUsage: BigNumberish;
+    initTargetBalance: BigNumberish;
+    calls: MultiCallStruct[];
+};
+export declare type StrategyPathTaskStructOutput = [
+    string,
+    BalanceStructOutput[],
+    string,
+    string[],
+    string[],
+    BigNumber,
+    number,
+    TokenAdaptersStructOutput[],
+    BigNumber,
+    BigNumber,
+    BigNumber,
+    MultiCallStructOutput[]
+] & {
+    creditAccount: string;
+    balances: BalanceStructOutput[];
+    target: string;
+    connectors: string[];
+    adapters: string[];
+    slippage: BigNumber;
+    targetType: number;
+    foundAdapters: TokenAdaptersStructOutput[];
+    gasPriceTargetRAY: BigNumber;
+    gasUsage: 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;
         "getBestDirectPairSwap((uint8,address,address,address,address[],uint256,uint256,bool),address[],uint256)": FunctionFragment;
-        "getPathFinder(address)": FunctionFragment;
+        "swapAllNormalTokens((address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address[])[],uint256,uint256,uint256,(address,bytes)[]),address)": FunctionFragment;
     };
-    getFunction(nameOrSignatureOrTopic: "findAllSwaps" | "findBestSwap" | "getBestDirectPairSwap" | "getPathFinder"): FunctionFragment;
+    getFunction(nameOrSignatureOrTopic: "findAllSwaps" | "findBestSwap" | "findBestSwapOrRevert" | "getBestDirectPairSwap" | "swapAllNormalTokens"): FunctionFragment;
     encodeFunctionData(functionFragment: "findAllSwaps", values: [SwapTaskStruct, string[]]): string;
     encodeFunctionData(functionFragment: "findBestSwap", values: [SwapTaskStruct, string[]]): string;
+    encodeFunctionData(functionFragment: "findBestSwapOrRevert", values: [string, BigNumberish, string, StrategyPathTaskStruct]): string;
     encodeFunctionData(functionFragment: "getBestDirectPairSwap", values: [SwapTaskStruct, string[], BigNumberish]): string;
-    encodeFunctionData(functionFragment: "getPathFinder", values: [string]): string;
+    encodeFunctionData(functionFragment: "swapAllNormalTokens", values: [StrategyPathTaskStruct, string]): string;
     decodeFunctionResult(functionFragment: "findAllSwaps", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "findBestSwap", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "findBestSwapOrRevert", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getBestDirectPairSwap", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "getPathFinder", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "swapAllNormalTokens", data: BytesLike): Result;
     events: {};
 }
-export interface ISwapPathFinder extends BaseContract {
+export interface ISwapAggregator extends BaseContract {
     connect(signerOrProvider: Signer | Provider | string): this;
     attach(addressOrName: string): this;
     deployed(): Promise<this>;
-    interface: ISwapPathFinderInterface;
+    interface: ISwapAggregatorInterface;
     queryFilter<TEvent extends TypedEvent>(event: TypedEventFilter<TEvent>, fromBlockOrBlockhash?: string | number | undefined, toBlock?: string | number | undefined): Promise<Array<TEvent>>;
     listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>;
     listeners(eventName?: string): Array<Listener>;
@@ -95,12 +155,15 @@ export interface ISwapPathFinder extends BaseContract {
         findBestSwap(swapTask: SwapTaskStruct, adapters: string[], 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>;
         getBestDirectPairSwap(swapTask: SwapTaskStruct, adapters: string[], gasPriceInTokenOut: BigNumberish, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<ContractTransaction>;
-        getPathFinder(adapter: string, overrides?: CallOverrides): Promise<[string] & {
-            pathFinder: string;
-        }>;
+        swapAllNormalTokens(task: StrategyPathTaskStruct, target: string, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<ContractTransaction>;
     };
     findAllSwaps(swapTask: SwapTaskStruct, adapters: string[], overrides?: Overrides & {
         from?: string | Promise<string>;
@@ -108,15 +171,26 @@ export interface ISwapPathFinder extends BaseContract {
     findBestSwap(swapTask: SwapTaskStruct, adapters: string[], 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>;
     getBestDirectPairSwap(swapTask: SwapTaskStruct, adapters: string[], gasPriceInTokenOut: BigNumberish, overrides?: Overrides & {
         from?: string | Promise<string>;
     }): Promise<ContractTransaction>;
-    getPathFinder(adapter: string, overrides?: CallOverrides): Promise<string>;
+    swapAllNormalTokens(task: StrategyPathTaskStruct, target: string, overrides?: Overrides & {
+        from?: string | Promise<string>;
+    }): Promise<ContractTransaction>;
     callStatic: {
         findAllSwaps(swapTask: SwapTaskStruct, adapters: string[], overrides?: CallOverrides): Promise<SwapQuoteStructOutput[]>;
         findBestSwap(swapTask: SwapTaskStruct, adapters: string[], overrides?: CallOverrides): Promise<SwapQuoteStructOutput>;
+        findBestSwapOrRevert(tokenIn: string, amountIn: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
+            BigNumber,
+            StrategyPathTaskStructOutput
+        ] & {
+            amountOut: BigNumber;
+        }>;
         getBestDirectPairSwap(swapTask: SwapTaskStruct, adapters: string[], gasPriceInTokenOut: BigNumberish, overrides?: CallOverrides): Promise<SwapQuoteStructOutput>;
-        getPathFinder(adapter: string, overrides?: CallOverrides): Promise<string>;
+        swapAllNormalTokens(task: StrategyPathTaskStruct, target: string, overrides?: CallOverrides): Promise<StrategyPathTaskStructOutput>;
     };
     filters: {};
     estimateGas: {
@@ -126,10 +200,15 @@ export interface ISwapPathFinder extends BaseContract {
         findBestSwap(swapTask: SwapTaskStruct, adapters: string[], 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>;
         getBestDirectPairSwap(swapTask: SwapTaskStruct, adapters: string[], gasPriceInTokenOut: BigNumberish, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<BigNumber>;
-        getPathFinder(adapter: string, overrides?: CallOverrides): Promise<BigNumber>;
+        swapAllNormalTokens(task: StrategyPathTaskStruct, target: string, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<BigNumber>;
     };
     populateTransaction: {
         findAllSwaps(swapTask: SwapTaskStruct, adapters: string[], overrides?: Overrides & {
@@ -138,9 +217,14 @@ export interface ISwapPathFinder extends BaseContract {
         findBestSwap(swapTask: SwapTaskStruct, adapters: string[], 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>;
         getBestDirectPairSwap(swapTask: SwapTaskStruct, adapters: string[], gasPriceInTokenOut: BigNumberish, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<PopulatedTransaction>;
-        getPathFinder(adapter: string, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        swapAllNormalTokens(task: StrategyPathTaskStruct, target: string, overrides?: Overrides & {
+            from?: string | Promise<string>;
+        }): Promise<PopulatedTransaction>;
     };
 }

package/lib/types/contracts/pathfinder/interfaces/ISwapAggregator.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/types/contracts/pathfinder/{ISwapper.d.ts → interfaces/ISwapper.d.ts}

@@ -1,7 +1,7 @@
 import type { BaseContract, BigNumber, BigNumberish, BytesLike, CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, Signer, utils } from "ethers";
 import type { FunctionFragment, Result } from "@ethersproject/abi";
 import type { Listener, Provider } from "@ethersproject/providers";
-import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "../../common";
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "../../../common";
 export declare type SwapTaskStruct = {
     swapOperation: BigNumberish;
     creditAccount: string;

package/lib/types/contracts/pathfinder/interfaces/ISwapper.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });