@gearbox-protocol/sdk 1.2.8 → 1.3.0

package/lib/contracts/contracts.js

@@ -70,14 +70,14 @@ exports.contractsByNetwork = {
         YEARN_CURVE_FRAX_VAULT: token_1.tokenDataByNetwork.Goerli.yvCurve_FRAX,
         YEARN_CURVE_STETH_VAULT: token_1.tokenDataByNetwork.Goerli.yvCurve_stETH,
         // CONVEX
-        CONVEX_BOOSTER: "0xc9E1e57764a3aC374CFc945A3efF6383400ac4A7",
-        CONVEX_3CRV_POOL: "0x7A0bb35B1E0cfE9127B65CB816C04eEBc992FaD1",
-        CONVEX_STECRV_POOL: "0xa98b3C36Fdd697504c348402E7B47DC8E213e4f5",
-        CONVEX_SUSD_POOL: "0xC0baFa477eAB4F470f746e367bb5dC900997a93A",
-        CONVEX_FRAX3CRV_POOL: "0xbC7AF66374440f674D6bb4788Aa45D3326a8C902",
-        CONVEX_LUSD3CRV_POOL: "0x92C077f2599025C56ba335D87fc12718f04890D1",
-        CONVEX_GUSD_POOL: "0x75151C40CAD6060ff3786f7e734fF53B5A8a1940",
-        CONVEX_CLAIM_ZAP: "0x6767c6492Df4920Be1e7667531046Bd483eb177E",
+        CONVEX_BOOSTER: "0x2FA9deaC520801354de0c9d05f3693BB5b3bc266",
+        CONVEX_3CRV_POOL: "0xDd0e23aDcd118a9Dd2F22A6c4384A87880869F0f",
+        CONVEX_STECRV_POOL: "0x9b1172E8DBa26EE9159755Fb484788d9F4b5492C",
+        CONVEX_SUSD_POOL: "0xCAe4dB8C2E58A2c7848f40988A759B43951AfE2B",
+        CONVEX_FRAX3CRV_POOL: "0x7B6A58f62D76930D0E715dfbA23FCBc274a7e51E",
+        CONVEX_LUSD3CRV_POOL: "0x1dCdE1F2aAEF48CC88B224860c99052f83646fa3",
+        CONVEX_GUSD_POOL: "0xbee8ABfc2563C82FCB5523Ad580D0F4718DA7807",
+        CONVEX_CLAIM_ZAP: "0x2D30e1E9cE34907D7c13cCD18898cA606e2Ff141",
         // LIDO
         LIDO_STETH_GATEWAY: "0x1dad4166D00046acf643ce19ab94b644C3B07c9D",
         // GEARBOX
@@ -226,7 +226,7 @@ exports.contractParams = {
                 rewardToken: "SNX",
                 poolAddress: {
                     Mainnet: "0x81fCe3E10D12Da6c7266a1A169c4C96813435263",
-                    Goerli: "0x7b8584d108DC235f5eBcFcbF18FcadF7C9A5c973", // CONVEX_SUSD_POOL_EXTRA_SNX
+                    Goerli: "0xdf4f9d2995870Fef8993305573E3F64354be0daD", // CONVEX_SUSD_POOL_EXTRA_SNX
                 },
             },
         ],
@@ -241,7 +241,7 @@ exports.contractParams = {
                 rewardToken: "LDO",
                 poolAddress: {
                     Mainnet: "0x008aEa5036b819B4FEAEd10b2190FBb3954981E8",
-                    Goerli: "0xf054E0a4880645BF931B38d3e5e0ebB662Fec61B", // CONVEX_STECRV_POOL_EXTRA_LDO
+                    Goerli: "0x0c3cA5C399A951e43FEcde4B1301fb50c5DC13ef", // CONVEX_STECRV_POOL_EXTRA_LDO
                 },
             },
         ],
@@ -256,7 +256,7 @@ exports.contractParams = {
                 rewardToken: "FXS",
                 poolAddress: {
                     Mainnet: "0xcDEC6714eB482f28f4889A0c122868450CDBF0b0",
-                    Goerli: "0x1cC308372C200E1BCDC13228984C0aF5cD2EC21C", // CONVEX_FRAX3CRV_POOL_EXTRA_FXS
+                    Goerli: "0xA7e78d9886f0460B07FF3dEf34Deb83a67431f63", // CONVEX_FRAX3CRV_POOL_EXTRA_FXS
                 },
             },
         ],
@@ -271,7 +271,7 @@ exports.contractParams = {
                 rewardToken: "LQTY",
                 poolAddress: {
                     Mainnet: "0x55d59b791f06dc519B176791c4E037E8Cf2f6361",
-                    Goerli: "0xB1375A1cb890D1fA98Bb68aA250333f455E6a4c6", // CONVEX_LUSD3CRV_POOL_EXTRA_LQTY
+                    Goerli: "0x7679e60cBb6a1007A8f322E64cD716647C03cE32", // CONVEX_LUSD3CRV_POOL_EXTRA_LQTY
                 },
             },
         ],

package/lib/core/creditAccount.js

@@ -53,6 +53,7 @@ var CreditAccountData = /** @class */ (function () {
             _this.allTokens.push(tokenLC);
         });
         this.isDeleting = false;
+        this.version = ethers_1.BigNumber.from(payload.version || 1).toNumber();
     }
     CreditAccountData.prototype.balancesSorted = function (prices, tokens) {
         return sortBalances(this.balances, prices, tokens).map(function (_a) {

package/lib/core/creditManager.js

@@ -41,7 +41,7 @@ var CreditManagerData = /** @class */ (function () {
         this.canBorrow = payload.canBorrow || false;
         this.borrowRate =
             ethers_1.BigNumber.from(payload.borrowRate || 0)
-                .mul(constants_1.PERCENTAGE_FACTOR)
+                .mul(ethers_1.BigNumber.from(payload.feeInterest).add(constants_1.PERCENTAGE_FACTOR))
                 .mul(constants_1.PERCENTAGE_DECIMALS)
                 .div(constants_1.RAY)
                 .toNumber() / constants_1.PERCENTAGE_FACTOR;
@@ -70,10 +70,10 @@ var CreditManagerData = /** @class */ (function () {
         this.isIncreaseDebtForbidden = payload.isIncreaseDebtForbidden || false;
         this.forbiddenTokenMask = ethers_1.BigNumber.from(payload.forbiddenTokenMask || 0);
         this.feeInterest = ethers_1.BigNumber.from(payload.feeInterest).toNumber();
-        this.feeLiquidation = ethers_1.BigNumber.from(payload.feeInterest).toNumber();
-        this.liquidationDiscount = ethers_1.BigNumber.from(payload.feeInterest).toNumber();
-        this.feeLiquidationExpired = ethers_1.BigNumber.from(payload.feeInterest).toNumber();
-        this.liquidationDiscountExpired = ethers_1.BigNumber.from(payload.feeInterest).toNumber();
+        this.feeLiquidation = ethers_1.BigNumber.from(payload.feeLiquidation).toNumber();
+        this.liquidationDiscount = ethers_1.BigNumber.from(payload.feeLiquidation).toNumber();
+        this.feeLiquidationExpired = ethers_1.BigNumber.from(payload.feeLiquidationExpired).toNumber();
+        this.liquidationDiscountExpired = ethers_1.BigNumber.from(payload.feeLiquidationExpired).toNumber();
     }
     CreditManagerData.prototype.getContractETH = function (signer) {
         return types_1.ICreditManager__factory.connect(this.address, signer);
@@ -138,9 +138,11 @@ var CreditManagerData = /** @class */ (function () {
 exports.CreditManagerData = CreditManagerData;
 function calcMaxIncreaseBorrow(healthFactor, borrowAmountPlusInterest, maxLeverageFactor) {
     var healthFactorPercentage = Math.floor(healthFactor * constants_1.PERCENTAGE_FACTOR);
-    var minHealthFactor = Math.floor((constants_1.UNDERLYING_TOKEN_LIQUIDATION_THRESHOLD *
-        (maxLeverageFactor + constants_1.LEVERAGE_DECIMALS)) /
-        maxLeverageFactor);
+    var minHealthFactor = maxLeverageFactor > 0
+        ? Math.floor((constants_1.UNDERLYING_TOKEN_LIQUIDATION_THRESHOLD *
+            (maxLeverageFactor + constants_1.LEVERAGE_DECIMALS)) /
+            maxLeverageFactor)
+        : 10000;
     var result = borrowAmountPlusInterest
         .mul(healthFactorPercentage - minHealthFactor)
         .div(minHealthFactor - constants_1.UNDERLYING_TOKEN_LIQUIDATION_THRESHOLD);

package/lib/pathfinder/path.js

@@ -120,7 +120,7 @@ var Path = /** @class */ (function () {
                         return [4 /*yield*/, initialPath.withdrawTokens()];
                     case 2:
                         lpPaths = _a.sent();
-                        // const pathFinder = ISwapPathFinder__factory.connect(
+                        // const pathFinder = ISwapAggregator__factory.connect(
                         //   pathFindersByNetwork[networkType].PATH_FINDER,
                         //   provider,
                         // );

package/lib/pathfinder/yVault.js

@@ -57,7 +57,7 @@ var YearnVaultPathFinder = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        p = Object.assign(Object.create(Object.getPrototypeOf(path)), path);
+                        p = path.clone();
                         vaultBalances = (0, mappers_1.objectEntries)(yearn_1.yearnTokens).reduce(function (acc, _a) {
                             var yVault = _a[0], tokenData = _a[1];
                             var typedVault = yVault;

package/lib/tokens/token.js

@@ -113,7 +113,7 @@ exports.tokenDataByNetwork = {
         /// UPDATE
         STETH: "0xd628baa42b3080593a231016bF3F229161C9F745",
         FTM: "0x0bf727bFFB6008Fa8b0B480Dd8f77Fa47B539830",
-        CVX: "0x84F96e4e2c67C3737dA005572bEf639465a81777",
+        CVX: "0x9683a59Ad8D7B5ac3eD01e4cff1D1A2a51A8f1c0",
         FRAX: "0x92d43093959C7DDa89896418bCE9DE0B87879646",
         FXS: "0x34C035818Dd308f3aC20e68bC03C3E4FC8924d9d",
         LDO: "0x13781b54cd88cC115a17Db53b058706B29FaD341",
@@ -145,12 +145,12 @@ exports.tokenDataByNetwork = {
         cvxLUSD3CRV: "0xe5E3C00Edb8A5270B34737bf926E87346906227f",
         cvxgusd3CRV: "0xB8111E77D074Dd7820323751a373DC8d103c4EeD",
         // CONVEX PHANTOM TOKEN ADDRESSES
-        stkcvx3Crv: "0x67dccf07a27182668ccF062392E696a95cDEfB7f",
-        stkcvxFRAX3CRV: "0xF98b96D84c87c214DbE50922B65DB10768AF13B0",
-        stkcvxgusd3CRV: "0x29532d0E34EAeda74e3c6620D1246C271D4cd3D3",
-        stkcvxsteCRV: "0x6F73a8206DfEd633C43ce24E1e3Da4aC2Cd1b9E2",
-        stkcvxcrvPlain3andSUSD: "0xC14f4b0c3483086ECE724F5a7771D144B45BdD1e",
-        stkcvxLUSD3CRV: "0xb72CeF4FE4cA8d2683A9434385650C2A8A650F59",
+        stkcvx3Crv: "0xBF70B7Ee99FfA772E8636321f052d9C4168E8115",
+        stkcvxFRAX3CRV: "0x2807BD098f77Db8f65D4dEbF54466099497c4a34",
+        stkcvxgusd3CRV: "0x48665052cA3ce45ac23e0f2919dD0f3A204bD421",
+        stkcvxsteCRV: "0x35CE969bade4D57AC45914eA1450d77b3f1d60A0",
+        stkcvxcrvPlain3andSUSD: "0x12692Afe7e39359162c3CD5a62179F18819FebfD",
+        stkcvxLUSD3CRV: "0xe63607F72fb7C48aaAed779fC9858F815adABD1c",
         // GEARBOX
         dDAI: "TODO: DEPLOY ME",
         dUSDC: "TODO: DEPLOY ME",

package/lib/types/contracts/interfaces/V1/{IPriceOracle.sol/IPriceOracleV2.d.ts → IPriceOracle.d.ts}

@@ -1,8 +1,8 @@
 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 interface IPriceOracleV2Interface extends utils.Interface {
+import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent } from "../../../common";
+export interface IPriceOracleInterface extends utils.Interface {
     functions: {
         "addPriceFeed(address,address)": FunctionFragment;
         "convert(uint256,address,address)": FunctionFragment;
@@ -29,11 +29,11 @@ export declare type NewPriceFeedEvent = TypedEvent<[
     string
 ], NewPriceFeedEventObject>;
 export declare type NewPriceFeedEventFilter = TypedEventFilter<NewPriceFeedEvent>;
-export interface IPriceOracleV2 extends BaseContract {
+export interface IPriceOracle extends BaseContract {
     connect(signerOrProvider: Signer | Provider | string): this;
     attach(addressOrName: string): this;
     deployed(): Promise<this>;
-    interface: IPriceOracleV2Interface;
+    interface: IPriceOracleInterface;
     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>;

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

@@ -1,4 +1,3 @@
-import type * as iPriceOracleSol from "./IPriceOracle.sol";
-export type { iPriceOracleSol };
 export type { ICreditFilter } from "./ICreditFilter";
 export type { ICreditManager } from "./ICreditManager";
+export type { IPriceOracle } from "./IPriceOracle";

package/lib/types/contracts/pathfinder/interfaces/IDepositor.sol/IDepositorOptions.d.ts

@@ -70,15 +70,18 @@ export declare type StrategyPathTaskStructOutput = [
 export interface IDepositorOptionsInterface extends utils.Interface {
     functions: {
         "deposit(uint8,address,uint256,address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address[])[],uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
-        "depositAll(address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address[])[],uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
+        "depositAll(uint8,address,address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address[])[],uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
+        "depositAllTokens(address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address[])[],uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
         "getUnderlyings(uint8,address,(address,(address,uint256)[],address,address[],address[],uint256,uint8,(address,address[])[],uint256,uint256,uint256,(address,bytes)[]))": FunctionFragment;
     };
-    getFunction(nameOrSignatureOrTopic: "deposit" | "depositAll" | "getUnderlyings"): FunctionFragment;
+    getFunction(nameOrSignatureOrTopic: "deposit" | "depositAll" | "depositAllTokens" | "getUnderlyings"): FunctionFragment;
     encodeFunctionData(functionFragment: "deposit", values: [BigNumberish, string, BigNumberish, string, StrategyPathTaskStruct]): string;
-    encodeFunctionData(functionFragment: "depositAll", values: [string, StrategyPathTaskStruct]): string;
+    encodeFunctionData(functionFragment: "depositAll", values: [BigNumberish, string, string, StrategyPathTaskStruct]): string;
+    encodeFunctionData(functionFragment: "depositAllTokens", values: [string, StrategyPathTaskStruct]): string;
     encodeFunctionData(functionFragment: "getUnderlyings", values: [BigNumberish, string, StrategyPathTaskStruct]): string;
     decodeFunctionResult(functionFragment: "deposit", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "depositAll", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "depositAllTokens", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getUnderlyings", data: BytesLike): Result;
     events: {};
 }
@@ -103,7 +106,13 @@ export interface IDepositorOptions extends BaseContract {
         ] & {
             amountOut: BigNumber;
         }>;
-        depositAll(tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
+        depositAll(ttIn: BigNumberish, tokenIn: string, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
+            BigNumber,
+            StrategyPathTaskStructOutput
+        ] & {
+            amountOut: BigNumber;
+        }>;
+        depositAllTokens(tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
             BigNumber,
             StrategyPathTaskStructOutput
         ] & {
@@ -122,7 +131,13 @@ export interface IDepositorOptions extends BaseContract {
     ] & {
         amountOut: BigNumber;
     }>;
-    depositAll(tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
+    depositAll(ttIn: BigNumberish, tokenIn: string, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
+        BigNumber,
+        StrategyPathTaskStructOutput
+    ] & {
+        amountOut: BigNumber;
+    }>;
+    depositAllTokens(tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
         BigNumber,
         StrategyPathTaskStructOutput
     ] & {
@@ -138,7 +153,13 @@ export interface IDepositorOptions extends BaseContract {
         ] & {
             amountOut: BigNumber;
         }>;
-        depositAll(tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
+        depositAll(ttIn: BigNumberish, tokenIn: string, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
+            BigNumber,
+            StrategyPathTaskStructOutput
+        ] & {
+            amountOut: BigNumber;
+        }>;
+        depositAllTokens(tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<[
             BigNumber,
             StrategyPathTaskStructOutput
         ] & {
@@ -154,12 +175,14 @@ export interface IDepositorOptions extends BaseContract {
     filters: {};
     estimateGas: {
         deposit(ttIn: BigNumberish, tokenIn: string, amount: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<BigNumber>;
-        depositAll(tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<BigNumber>;
+        depositAll(ttIn: BigNumberish, tokenIn: string, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<BigNumber>;
+        depositAllTokens(tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<BigNumber>;
         getUnderlyings(ttIn: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<BigNumber>;
     };
     populateTransaction: {
         deposit(ttIn: BigNumberish, tokenIn: string, amount: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        depositAll(tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        depositAll(ttIn: BigNumberish, tokenIn: string, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        depositAllTokens(tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<PopulatedTransaction>;
         getUnderlyings(ttIn: BigNumberish, tokenOut: string, task: StrategyPathTaskStruct, overrides?: CallOverrides): Promise<PopulatedTransaction>;
     };
 }

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

@@ -2,6 +2,35 @@ import type { BaseContract, BigNumber, BigNumberish, BytesLike, CallOverrides, C
 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 SwapTaskStruct = {
+    swapOperation: BigNumberish;
+    creditAccount: string;
+    tokenIn: string;
+    tokenOut: string;
+    connectors: string[];
+    amount: BigNumberish;
+    slippage: BigNumberish;
+    externalSlippage: boolean;
+};
+export declare type SwapTaskStructOutput = [
+    number,
+    string,
+    string,
+    string,
+    string[],
+    BigNumber,
+    BigNumber,
+    boolean
+] & {
+    swapOperation: number;
+    creditAccount: string;
+    tokenIn: string;
+    tokenOut: string;
+    connectors: string[];
+    amount: BigNumber;
+    slippage: BigNumber;
+    externalSlippage: boolean;
+};
 export declare type MultiCallStruct = {
     target: string;
     callData: BytesLike;
@@ -45,7 +74,7 @@ export declare type BalanceStructOutput = [string, BigNumber] & {
 export interface IPathFinderInterface extends utils.Interface {
     functions: {
         "componentAddressById(uint8)": FunctionFragment;
-        "findAllSwaps(address,uint256,address,address,address[],uint256)": FunctionFragment;
+        "findAllSwaps((uint8,address,address,address,address[],uint256,uint256,bool))": 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;
@@ -56,7 +85,7 @@ export interface IPathFinderInterface extends utils.Interface {
     };
     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: "findAllSwaps", values: [SwapTaskStruct]): 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;
@@ -116,7 +145,7 @@ export interface IPathFinder extends BaseContract {
     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 & {
+        findAllSwaps(swapTask: SwapTaskStruct, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<ContractTransaction>;
         findBestClosePath(creditAccount: string, connectors: string[], slippage: BigNumberish, pathOptions: PathOptionStruct[], iterations: BigNumberish, overrides?: Overrides & {
@@ -136,7 +165,7 @@ export interface IPathFinder extends BaseContract {
         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 & {
+    findAllSwaps(swapTask: SwapTaskStruct, overrides?: Overrides & {
         from?: string | Promise<string>;
     }): Promise<ContractTransaction>;
     findBestClosePath(creditAccount: string, connectors: string[], slippage: BigNumberish, pathOptions: PathOptionStruct[], iterations: BigNumberish, overrides?: Overrides & {
@@ -154,7 +183,7 @@ export interface IPathFinder extends BaseContract {
     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[]>;
+        findAllSwaps(swapTask: SwapTaskStruct, 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]>;
@@ -171,7 +200,7 @@ export interface IPathFinder extends BaseContract {
     };
     estimateGas: {
         componentAddressById(pf: BigNumberish, overrides?: CallOverrides): Promise<BigNumber>;
-        findAllSwaps(tokenIn: string, amount: BigNumberish, tokenOut: string, creditAccount: string, connectors: string[], slippage: BigNumberish, overrides?: Overrides & {
+        findAllSwaps(swapTask: SwapTaskStruct, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<BigNumber>;
         findBestClosePath(creditAccount: string, connectors: string[], slippage: BigNumberish, pathOptions: PathOptionStruct[], iterations: BigNumberish, overrides?: Overrides & {
@@ -190,7 +219,7 @@ export interface IPathFinder extends BaseContract {
     };
     populateTransaction: {
         componentAddressById(pf: BigNumberish, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        findAllSwaps(tokenIn: string, amount: BigNumberish, tokenOut: string, creditAccount: string, connectors: string[], slippage: BigNumberish, overrides?: Overrides & {
+        findAllSwaps(swapTask: SwapTaskStruct, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<PopulatedTransaction>;
         findBestClosePath(creditAccount: string, connectors: string[], slippage: BigNumberish, pathOptions: PathOptionStruct[], iterations: BigNumberish, overrides?: Overrides & {

package/lib/types/contracts/test/index.d.ts

@@ -2,3 +2,5 @@ import type * as mocks from "./mocks";
 export type { mocks };
 import type * as sigp from "./sigp";
 export type { sigp };
+import type * as suites from "./suites";
+export type { suites };

package/lib/types/contracts/test/suites/index.d.ts

@@ -0,0 +1,2 @@
+import type * as mainnet from "./mainnet";
+export type { mainnet };

package/lib/types/contracts/test/suites/mainnet/IPriceFeedsRegistry.d.ts

@@ -0,0 +1,42 @@
+import type { BaseContract, BigNumber, BigNumberish, BytesLike, CallOverrides, 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 interface IPriceFeedsRegistryInterface extends utils.Interface {
+    functions: {
+        "priceFeeds(uint8)": FunctionFragment;
+    };
+    getFunction(nameOrSignatureOrTopic: "priceFeeds"): FunctionFragment;
+    encodeFunctionData(functionFragment: "priceFeeds", values: [BigNumberish]): string;
+    decodeFunctionResult(functionFragment: "priceFeeds", data: BytesLike): Result;
+    events: {};
+}
+export interface IPriceFeedsRegistry extends BaseContract {
+    connect(signerOrProvider: Signer | Provider | string): this;
+    attach(addressOrName: string): this;
+    deployed(): Promise<this>;
+    interface: IPriceFeedsRegistryInterface;
+    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: {
+        priceFeeds(token: BigNumberish, overrides?: CallOverrides): Promise<[string]>;
+    };
+    priceFeeds(token: BigNumberish, overrides?: CallOverrides): Promise<string>;
+    callStatic: {
+        priceFeeds(token: BigNumberish, overrides?: CallOverrides): Promise<string>;
+    };
+    filters: {};
+    estimateGas: {
+        priceFeeds(token: BigNumberish, overrides?: CallOverrides): Promise<BigNumber>;
+    };
+    populateTransaction: {
+        priceFeeds(token: BigNumberish, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+    };
+}

package/lib/types/contracts/test/suites/mainnet/IPriceFeedsRegistry.js

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

package/lib/types/contracts/test/suites/mainnet/ITokenTestSuite.d.ts

@@ -0,0 +1,58 @@
+import type { BaseContract, BigNumber, BigNumberish, BytesLike, CallOverrides, 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 interface ITokenTestSuiteInterface extends utils.Interface {
+    functions: {
+        "addressOf(uint8)": FunctionFragment;
+        "priceFeeds(uint8)": FunctionFragment;
+        "priceFeeds(address)": FunctionFragment;
+    };
+    getFunction(nameOrSignatureOrTopic: "addressOf" | "priceFeeds(uint8)" | "priceFeeds(address)"): FunctionFragment;
+    encodeFunctionData(functionFragment: "addressOf", values: [BigNumberish]): string;
+    encodeFunctionData(functionFragment: "priceFeeds(uint8)", values: [BigNumberish]): string;
+    encodeFunctionData(functionFragment: "priceFeeds(address)", values: [string]): string;
+    decodeFunctionResult(functionFragment: "addressOf", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "priceFeeds(uint8)", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "priceFeeds(address)", data: BytesLike): Result;
+    events: {};
+}
+export interface ITokenTestSuite extends BaseContract {
+    connect(signerOrProvider: Signer | Provider | string): this;
+    attach(addressOrName: string): this;
+    deployed(): Promise<this>;
+    interface: ITokenTestSuiteInterface;
+    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: {
+        addressOf(t: BigNumberish, overrides?: CallOverrides): Promise<[string]>;
+        "priceFeeds(uint8)"(t: BigNumberish, overrides?: CallOverrides): Promise<[string]>;
+        "priceFeeds(address)"(token: string, overrides?: CallOverrides): Promise<[string]>;
+    };
+    addressOf(t: BigNumberish, overrides?: CallOverrides): Promise<string>;
+    "priceFeeds(uint8)"(t: BigNumberish, overrides?: CallOverrides): Promise<string>;
+    "priceFeeds(address)"(token: string, overrides?: CallOverrides): Promise<string>;
+    callStatic: {
+        addressOf(t: BigNumberish, overrides?: CallOverrides): Promise<string>;
+        "priceFeeds(uint8)"(t: BigNumberish, overrides?: CallOverrides): Promise<string>;
+        "priceFeeds(address)"(token: string, overrides?: CallOverrides): Promise<string>;
+    };
+    filters: {};
+    estimateGas: {
+        addressOf(t: BigNumberish, overrides?: CallOverrides): Promise<BigNumber>;
+        "priceFeeds(uint8)"(t: BigNumberish, overrides?: CallOverrides): Promise<BigNumber>;
+        "priceFeeds(address)"(token: string, overrides?: CallOverrides): Promise<BigNumber>;
+    };
+    populateTransaction: {
+        addressOf(t: BigNumberish, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        "priceFeeds(uint8)"(t: BigNumberish, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+        "priceFeeds(address)"(token: string, overrides?: CallOverrides): Promise<PopulatedTransaction>;
+    };
+}

package/lib/types/contracts/test/suites/mainnet/ITokenTestSuite.js

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

package/lib/types/contracts/test/suites/mainnet/index.d.ts

@@ -0,0 +1,2 @@
+export type { IPriceFeedsRegistry } from "./IPriceFeedsRegistry";
+export type { ITokenTestSuite } from "./ITokenTestSuite";

package/lib/types/contracts/test/suites/mainnet/index.js

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

package/lib/types/factories/contracts/interfaces/V1/{IPriceOracle.sol/IPriceOracleV2__factory.d.ts → IPriceOracle__factory.d.ts}

@@ -1,7 +1,7 @@
 import { Signer } from "ethers";
 import type { Provider } from "@ethersproject/providers";
-import type { IPriceOracleV2, IPriceOracleV2Interface } from "../../../../../contracts/interfaces/V1/IPriceOracle.sol/IPriceOracleV2";
-export declare class IPriceOracleV2__factory {
+import type { IPriceOracle, IPriceOracleInterface } from "../../../../contracts/interfaces/V1/IPriceOracle";
+export declare class IPriceOracle__factory {
     static readonly abi: ({
         anonymous: boolean;
         inputs: {
@@ -30,6 +30,6 @@ export declare class IPriceOracleV2__factory {
         type: string;
         anonymous?: undefined;
     })[];
-    static createInterface(): IPriceOracleV2Interface;
-    static connect(address: string, signerOrProvider: Signer | Provider): IPriceOracleV2;
+    static createInterface(): IPriceOracleInterface;
+    static connect(address: string, signerOrProvider: Signer | Provider): IPriceOracle;
 }

package/lib/types/factories/contracts/interfaces/V1/{IPriceOracle.sol/IPriceOracleV2__factory.js → IPriceOracle__factory.js}

@@ -3,7 +3,7 @@
 /* tslint:disable */
 /* eslint-disable */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IPriceOracleV2__factory = void 0;
+exports.IPriceOracle__factory = void 0;
 var ethers_1 = require("ethers");
 var _abi = [
     {
@@ -97,16 +97,16 @@ var _abi = [
         type: "function",
     },
 ];
-var IPriceOracleV2__factory = /** @class */ (function () {
-    function IPriceOracleV2__factory() {
+var IPriceOracle__factory = /** @class */ (function () {
+    function IPriceOracle__factory() {
     }
-    IPriceOracleV2__factory.createInterface = function () {
+    IPriceOracle__factory.createInterface = function () {
         return new ethers_1.utils.Interface(_abi);
     };
-    IPriceOracleV2__factory.connect = function (address, signerOrProvider) {
+    IPriceOracle__factory.connect = function (address, signerOrProvider) {
         return new ethers_1.Contract(address, _abi, signerOrProvider);
     };
-    IPriceOracleV2__factory.abi = _abi;
-    return IPriceOracleV2__factory;
+    IPriceOracle__factory.abi = _abi;
+    return IPriceOracle__factory;
 }());
-exports.IPriceOracleV2__factory = IPriceOracleV2__factory;
+exports.IPriceOracle__factory = IPriceOracle__factory;

package/lib/types/factories/contracts/interfaces/V1/index.d.ts

@@ -1,3 +1,3 @@
-export * as iPriceOracleSol from "./IPriceOracle.sol";
 export { ICreditFilter__factory } from "./ICreditFilter__factory";
 export { ICreditManager__factory } from "./ICreditManager__factory";
+export { IPriceOracle__factory } from "./IPriceOracle__factory";

package/lib/types/factories/contracts/interfaces/V1/index.js

@@ -1,34 +1,12 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ICreditManager__factory = exports.ICreditFilter__factory = exports.iPriceOracleSol = void 0;
+exports.IPriceOracle__factory = exports.ICreditManager__factory = exports.ICreditFilter__factory = void 0;
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-exports.iPriceOracleSol = __importStar(require("./IPriceOracle.sol"));
 var ICreditFilter__factory_1 = require("./ICreditFilter__factory");
 Object.defineProperty(exports, "ICreditFilter__factory", { enumerable: true, get: function () { return ICreditFilter__factory_1.ICreditFilter__factory; } });
 var ICreditManager__factory_1 = require("./ICreditManager__factory");
 Object.defineProperty(exports, "ICreditManager__factory", { enumerable: true, get: function () { return ICreditManager__factory_1.ICreditManager__factory; } });
+var IPriceOracle__factory_1 = require("./IPriceOracle__factory");
+Object.defineProperty(exports, "IPriceOracle__factory", { enumerable: true, get: function () { return IPriceOracle__factory_1.IPriceOracle__factory; } });