@gearbox-protocol/sdk 1.2.9 → 1.3.1

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/index.d.ts

@@ -14,7 +14,6 @@ export * from "./core/tokenDistributor";
 export * from "./core/transactions";
 export * from "./oracles/oracles";
 export * from "./oracles/priceFeeds";
-export * from "./pathfinder/trade";
 export * from "./payload/creditAccount";
 export * from "./payload/creditManager";
 export * from "./payload/creditSession";

package/lib/index.js

@@ -31,7 +31,6 @@ __exportStar(require("./core/tokenDistributor"), exports);
 __exportStar(require("./core/transactions"), exports);
 __exportStar(require("./oracles/oracles"), exports);
 __exportStar(require("./oracles/priceFeeds"), exports);
-__exportStar(require("./pathfinder/trade"), exports);
 __exportStar(require("./payload/creditAccount"), exports);
 __exportStar(require("./payload/creditManager"), exports);
 __exportStar(require("./payload/creditSession"), exports);

package/lib/tokens/normal.d.ts

@@ -4,7 +4,7 @@ import { TokenType } from "./tokenType";
 export declare type NormalToken = "1INCH" | "AAVE" | "COMP" | "CRV" | "DPI" | "FEI" | "LINK" | "SNX" | "SUSHI" | "UNI" | "USDT" | "USDC" | "DAI" | "WETH" | "WBTC" | "YFI" | "STETH" | "FTM" | "CVX" | "FRAX" | "FXS" | "LDO" | "SPELL" | "LUSD" | "sUSD" | "GUSD" | "LUNA" | "LQTY";
 export declare type NormalTokenData = {
     symbol: NormalToken;
-    type: TokenType.CONNECTOR | TokenType.NORMAL_TOKEN;
+    type: TokenType.NORMAL_TOKEN;
     swapActions: Array<TradeAction>;
     lpActions?: Array<TradeAction>;
 } & TokenBase;

package/lib/tokens/normal.js

@@ -88,7 +88,7 @@ exports.normalTokens = {
         name: "DAI",
         decimals: 18,
         symbol: "DAI",
-        type: tokenType_1.TokenType.CONNECTOR,
+        type: tokenType_1.TokenType.NORMAL_TOKEN,
         swapActions: [
             {
                 type: tradeTypes_1.TradeType.UniswapV3Swap,
@@ -243,7 +243,7 @@ exports.normalTokens = {
         name: "USDC",
         decimals: 6,
         symbol: "USDC",
-        type: tokenType_1.TokenType.CONNECTOR,
+        type: tokenType_1.TokenType.NORMAL_TOKEN,
         swapActions: [
             {
                 type: tradeTypes_1.TradeType.UniswapV3Swap,
@@ -332,7 +332,7 @@ exports.normalTokens = {
         name: "WBTC",
         decimals: 8,
         symbol: "WBTC",
-        type: tokenType_1.TokenType.CONNECTOR,
+        type: tokenType_1.TokenType.NORMAL_TOKEN,
         swapActions: [
             {
                 type: tradeTypes_1.TradeType.UniswapV3Swap,
@@ -359,7 +359,7 @@ exports.normalTokens = {
         name: "WETH",
         decimals: 18,
         symbol: "WETH",
-        type: tokenType_1.TokenType.CONNECTOR,
+        type: tokenType_1.TokenType.NORMAL_TOKEN,
         swapActions: [
             {
                 type: tradeTypes_1.TradeType.UniswapV3Swap,

package/lib/tokens/token.js

@@ -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/tokens/tokenType.d.ts

@@ -1,12 +1,11 @@
 export declare enum TokenType {
-    CONNECTOR = 0,
-    NORMAL_TOKEN = 1,
-    CURVE_LP = 2,
-    META_CURVE_LP = 3,
-    YEARN_VAULT = 4,
-    YEARN_VAULT_OF_CURVE_LP = 5,
-    YEARN_VAULT_OF_META_CURVE_LP = 6,
-    CONVEX_LP_TOKEN = 7,
-    CONVEX_STAKED_PHANTOM_TOKEN = 8,
-    DIESEL_LP_TOKEN = 9
+    NORMAL_TOKEN = 0,
+    CURVE_LP = 1,
+    META_CURVE_LP = 2,
+    YEARN_VAULT = 3,
+    YEARN_VAULT_OF_CURVE_LP = 4,
+    YEARN_VAULT_OF_META_CURVE_LP = 5,
+    CONVEX_LP_TOKEN = 6,
+    CONVEX_STAKED_PHANTOM_TOKEN = 7,
+    DIESEL_LP_TOKEN = 8
 }

package/lib/tokens/tokenType.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TokenType = void 0;
 var TokenType;
 (function (TokenType) {
-    TokenType[TokenType["CONNECTOR"] = 0] = "CONNECTOR";
-    TokenType[TokenType["NORMAL_TOKEN"] = 1] = "NORMAL_TOKEN";
-    TokenType[TokenType["CURVE_LP"] = 2] = "CURVE_LP";
-    TokenType[TokenType["META_CURVE_LP"] = 3] = "META_CURVE_LP";
-    TokenType[TokenType["YEARN_VAULT"] = 4] = "YEARN_VAULT";
-    TokenType[TokenType["YEARN_VAULT_OF_CURVE_LP"] = 5] = "YEARN_VAULT_OF_CURVE_LP";
-    TokenType[TokenType["YEARN_VAULT_OF_META_CURVE_LP"] = 6] = "YEARN_VAULT_OF_META_CURVE_LP";
-    TokenType[TokenType["CONVEX_LP_TOKEN"] = 7] = "CONVEX_LP_TOKEN";
-    TokenType[TokenType["CONVEX_STAKED_PHANTOM_TOKEN"] = 8] = "CONVEX_STAKED_PHANTOM_TOKEN";
-    TokenType[TokenType["DIESEL_LP_TOKEN"] = 9] = "DIESEL_LP_TOKEN";
+    // CONNECTOR,
+    TokenType[TokenType["NORMAL_TOKEN"] = 0] = "NORMAL_TOKEN";
+    TokenType[TokenType["CURVE_LP"] = 1] = "CURVE_LP";
+    TokenType[TokenType["META_CURVE_LP"] = 2] = "META_CURVE_LP";
+    TokenType[TokenType["YEARN_VAULT"] = 3] = "YEARN_VAULT";
+    TokenType[TokenType["YEARN_VAULT_OF_CURVE_LP"] = 4] = "YEARN_VAULT_OF_CURVE_LP";
+    TokenType[TokenType["YEARN_VAULT_OF_META_CURVE_LP"] = 5] = "YEARN_VAULT_OF_META_CURVE_LP";
+    TokenType[TokenType["CONVEX_LP_TOKEN"] = 6] = "CONVEX_LP_TOKEN";
+    TokenType[TokenType["CONVEX_STAKED_PHANTOM_TOKEN"] = 7] = "CONVEX_STAKED_PHANTOM_TOKEN";
+    TokenType[TokenType["DIESEL_LP_TOKEN"] = 8] = "DIESEL_LP_TOKEN";
 })(TokenType = exports.TokenType || (exports.TokenType = {}));

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";