@gearbox-protocol/sdk 1.5.8 → 1.5.11

package/lib/contracts/contracts.d.ts

@@ -71,4 +71,5 @@ export declare type UniversalParams = {
 export declare type ContractParams = UniswapV2Params | UniswapV3Params | CurveParams | CurveSteCRVPoolParams | YearnParams | ConvexParams | ConvexPoolParams | LidoParams | UniversalParams;
 export declare const contractParams: Record<SupportedContract, ContractParams>;
 export declare const contractsByAddress: Record<string, SupportedContract>;
+export declare const isSupportedContract: (t: unknown) => t is SupportedContract;
 export {};

package/lib/contracts/contracts.js

@@ -11,7 +11,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.contractsByAddress = exports.contractParams = exports.UNISWAP_V3_QUOTER = exports.contractsByNetwork = void 0;
+exports.isSupportedContract = exports.contractsByAddress = exports.contractParams = exports.UNISWAP_V3_QUOTER = exports.contractsByNetwork = void 0;
 var token_1 = require("../tokens/token");
 var mappers_1 = require("../utils/mappers");
 var adapters_1 = require("./adapters");
@@ -299,3 +299,7 @@ exports.contractsByAddress = (0, mappers_1.objectEntries)(exports.contractsByNet
     var contracts = _a[1];
     return (__assign(__assign({}, acc), (0, mappers_1.filterEmptyKeys)((0, mappers_1.keyToLowercase)((0, mappers_1.swapKeyValue)(contracts)))));
 }, {});
+var isSupportedContract = function (t) {
+    return typeof t === "string" && !!exports.contractParams[t];
+};
+exports.isSupportedContract = isSupportedContract;

package/lib/core/adapter.d.ts

@@ -1,34 +1,29 @@
 import { Signer } from "ethers";
 import { AdapterInterface } from "../contracts/adapters";
 import { SupportedContract } from "../contracts/contracts";
-import { PathFinderResultStructOutput } from "../types/contracts/pathfinder/interfaces/IPathFinder";
 import { EVMTx } from "./eventOrTx";
-export declare enum AdapterType {
-    Swap = 1,
-    LP = 2
-}
+import { TradePath } from "./trade";
 interface BaseAdapterProps {
     name: string;
-    type: AdapterType;
     adapterInterface: AdapterInterface;
     contractAddress: string;
     adapterAddress: string;
     contractSymbol: SupportedContract;
+    creditManager: string;
 }
 interface ExecuteProps {
-    tradePath: PathFinderResultStructOutput;
+    tradePath: TradePath;
     slippage: number;
     signer: Signer;
 }
 export declare class BaseAdapter {
     readonly name: string;
-    readonly type: AdapterType;
     readonly adapterInterface: AdapterInterface;
     readonly contractAddress: string;
     readonly adapterAddress: string;
     readonly contractSymbol: SupportedContract;
+    readonly creditManager: string;
     constructor(props: BaseAdapterProps);
     execute(props: ExecuteProps): Promise<EVMTx>;
-    static connect(tradePath: PathFinderResultStructOutput): BaseAdapter;
 }
 export {};

package/lib/core/adapter.js

@@ -36,21 +36,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseAdapter = exports.AdapterType = void 0;
-var adapters_1 = require("../contracts/adapters");
-var AdapterType;
-(function (AdapterType) {
-    AdapterType[AdapterType["Swap"] = 1] = "Swap";
-    AdapterType[AdapterType["LP"] = 2] = "LP";
-})(AdapterType = exports.AdapterType || (exports.AdapterType = {}));
+exports.BaseAdapter = void 0;
 var BaseAdapter = /** @class */ (function () {
     function BaseAdapter(props) {
         this.name = props.name;
-        this.type = props.type;
         this.adapterInterface = props.adapterInterface;
         this.adapterAddress = props.adapterAddress;
         this.contractAddress = props.contractAddress;
         this.contractSymbol = props.contractSymbol;
+        this.creditManager = props.creditManager;
     }
     BaseAdapter.prototype.execute = function (props) {
         return __awaiter(this, void 0, void 0, function () {
@@ -60,17 +54,6 @@ var BaseAdapter = /** @class */ (function () {
             });
         });
     };
-    BaseAdapter.connect = function (tradePath) {
-        console.debug(tradePath);
-        return new BaseAdapter({
-            name: "",
-            type: AdapterType.Swap,
-            adapterInterface: adapters_1.AdapterInterface.NO_SWAP,
-            adapterAddress: "",
-            contractAddress: "",
-            contractSymbol: "CONVEX_3CRV_POOL",
-        });
-    };
     return BaseAdapter;
 }());
 exports.BaseAdapter = BaseAdapter;

package/lib/core/trade.d.ts

@@ -1,49 +1,47 @@
-import { BigNumber, Signer } from "ethers";
+import { BigNumber } from "ethers";
 import { AdapterInterface } from "../contracts/adapters";
 import { SwapType } from "../pathfinder/tradeTypes";
-import { TokenData } from "../tokens/tokenData";
-import { PathFinderResultStructOutput } from "../types/contracts/pathfinder/interfaces/IPathFinder";
+import { ICreditFacade } from "../types";
+import { PathFinderResultStruct, PathFinderResultStructOutput } from "../types/contracts/pathfinder/interfaces/IPathFinder";
 import { BaseAdapter } from "./adapter";
 import { EVMTx } from "./eventOrTx";
+import { TXSwap } from "./transactions";
+export declare type TradePath = Pick<PathFinderResultStructOutput, keyof PathFinderResultStruct>;
 export interface BaseTradeInterface {
     swapType: SwapType;
+    sourceAmount: BigNumber;
     expectedAmount: BigNumber;
     rate: BigNumber;
     tokenFrom: string;
     tokenTo: string;
-    operationName: string;
+    operationName: TradeOperations;
 }
-export interface TradeProps {
+export interface TradeProps extends BaseTradeInterface {
     adapter: BaseAdapter;
-    tradePath: PathFinderResultStructOutput;
-    swapType: SwapType;
-    expectedAmount: BigNumber;
-    rate: BigNumber;
-    tokenFrom: string;
-    tokenTo: string;
-    operationName: string;
-}
-export interface ConnectTradeProps {
-    adapter: BaseAdapter;
-    tradePath: PathFinderResultStructOutput;
+    tradePath: TradePath;
+    creditFacade: ICreditFacade;
 }
+export declare type TradeOperations = "farmWithdraw" | "farmDeposit" | "swap" | "unknownOperation";
 export declare class Trade implements BaseTradeInterface {
     protected helper: BaseAdapter;
-    protected tradePath: PathFinderResultStructOutput;
+    protected tradePath: TradePath;
+    protected creditFacade: ICreditFacade;
     readonly swapType: SwapType;
+    readonly sourceAmount: BigNumber;
     readonly expectedAmount: BigNumber;
     readonly rate: BigNumber;
     readonly tokenFrom: string;
     readonly tokenTo: string;
-    readonly operationName: string;
-    constructor({ tradePath, adapter }: TradeProps);
-    static connect({ tradePath, adapter }: ConnectTradeProps): Trade;
+    readonly operationName: TradeOperations;
+    constructor(props: TradeProps);
     getName(): string;
     getAdapterInterface(): AdapterInterface;
     getContractAddress(): string;
     getAdapterAddress(): string;
-    execute(slippage: number, signer: Signer): Promise<EVMTx>;
-    toString(tokenData: Record<string, TokenData>): string;
+    execute(): Promise<EVMTx>;
+    protected _execute(): Promise<TXSwap>;
+    toString(): string;
     getFromAmount(slippage: number): BigNumber;
     getToAmount(slippage: number): BigNumber;
+    static getOperationName(tokenInAddress: string, tokenOutAddress: string): TradeOperations;
 }

package/lib/core/trade.js

@@ -1,36 +1,66 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Trade = void 0;
-var ethers_1 = require("ethers");
-var tradeTypes_1 = require("../pathfinder/tradeTypes");
+var decimals_1 = require("../tokens/decimals");
+var token_1 = require("../tokens/token");
 var formatter_1 = require("../utils/formatter");
-var adapter_1 = require("./adapter");
 var constants_1 = require("./constants");
+var transactions_1 = require("./transactions");
+var OPERATION_NAMES = {
+    farmWithdraw: "Farm withdraw",
+    farmDeposit: "Farm deposit",
+    swap: "Swap",
+    unknownOperation: "Unknown operation",
+};
 var Trade = /** @class */ (function () {
-    function Trade(_a) {
-        var tradePath = _a.tradePath, adapter = _a.adapter;
-        this.helper = adapter;
-        this.tradePath = tradePath;
-        this.swapType = tradeTypes_1.SwapType.ExactInput;
-        this.expectedAmount = ethers_1.BigNumber.from(0);
-        this.rate = ethers_1.BigNumber.from(0);
-        this.tokenFrom = "";
-        this.tokenTo = "";
-        this.operationName = "";
+    function Trade(props) {
+        this.helper = props.adapter;
+        this.tradePath = props.tradePath;
+        this.creditFacade = props.creditFacade;
+        this.swapType = props.swapType;
+        this.sourceAmount = props.sourceAmount;
+        this.expectedAmount = props.expectedAmount;
+        this.rate = props.rate;
+        this.tokenFrom = props.tokenFrom;
+        this.tokenTo = props.tokenTo;
+        this.operationName = props.operationName;
     }
-    Trade.connect = function (_a) {
-        var tradePath = _a.tradePath, adapter = _a.adapter;
-        return new Trade({
-            tradePath: tradePath,
-            adapter: adapter,
-            swapType: tradeTypes_1.SwapType.ExactInput,
-            expectedAmount: ethers_1.BigNumber.from(0),
-            rate: ethers_1.BigNumber.from(0),
-            tokenFrom: "",
-            tokenTo: "",
-            operationName: "",
-        });
-    };
     Trade.prototype.getName = function () {
         return this.helper.name;
     };
@@ -43,17 +73,42 @@ var Trade = /** @class */ (function () {
     Trade.prototype.getAdapterAddress = function () {
         return this.helper.adapterAddress;
     };
-    Trade.prototype.execute = function (slippage, signer) {
-        return this.helper.execute({ tradePath: this.tradePath, slippage: slippage, signer: signer });
+    Trade.prototype.execute = function () {
+        return this._execute();
     };
-    Trade.prototype.toString = function (tokenData) {
-        var result = this.helper.type === adapter_1.AdapterType.Swap
-            ? "Swap "
-            : "".concat(this.operationName || "Farm", " ");
-        var fromToken = tokenData[this.tokenFrom];
-        var toToken = tokenData[this.tokenTo];
-        result += "".concat((0, formatter_1.formatBN)(this.tradePath.amount, fromToken.decimals), " ").concat(fromToken.symbol, " \u21D2 ").concat((0, formatter_1.formatBN)(this.expectedAmount, toToken.decimals), " ").concat(toToken.symbol, " on ").concat(this.helper.name);
-        return result;
+    Trade.prototype._execute = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var receipt;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.creditFacade.multicall(this.tradePath.calls)];
+                    case 1:
+                        receipt = _a.sent();
+                        return [2 /*return*/, new transactions_1.TXSwap({
+                                txHash: receipt.hash,
+                                protocol: this.helper.contractAddress,
+                                operation: OPERATION_NAMES[this.operationName],
+                                amountFrom: this.sourceAmount,
+                                amountTo: this.expectedAmount,
+                                tokenFrom: this.tokenFrom,
+                                tokenTo: this.tokenTo,
+                                creditManager: this.helper.creditManager,
+                                timestamp: 0,
+                            })];
+                }
+            });
+        });
+    };
+    Trade.prototype.toString = function () {
+        var symbolFrom = token_1.tokenSymbolByAddress[this.tokenFrom.toLowerCase()];
+        var symbolTo = token_1.tokenSymbolByAddress[this.tokenTo.toLowerCase()];
+        if (!symbolFrom)
+            throw new Error("Unknown token: ".concat(this.tokenFrom));
+        if (!symbolTo)
+            throw new Error("Unknown token: ".concat(this.tokenTo));
+        var decimalsFrom = decimals_1.decimals[symbolFrom];
+        var decimalsTo = decimals_1.decimals[symbolTo];
+        return "".concat(this.operationName, " ").concat((0, formatter_1.formatBN)(this.sourceAmount, decimalsFrom), " ").concat(symbolFrom, " \u21D2 ").concat((0, formatter_1.formatBN)(this.expectedAmount, decimalsTo), " ").concat(symbolTo, " on ").concat(this.helper.name);
     };
     Trade.prototype.getFromAmount = function (slippage) {
         return this.expectedAmount
@@ -65,6 +120,23 @@ var Trade = /** @class */ (function () {
             .mul(constants_1.PERCENTAGE_FACTOR + slippage)
             .div(constants_1.PERCENTAGE_FACTOR);
     };
+    Trade.getOperationName = function (tokenInAddress, tokenOutAddress) {
+        var tokenInSymbol = token_1.tokenSymbolByAddress[tokenInAddress];
+        var tokenOutSymbol = token_1.tokenSymbolByAddress[tokenOutAddress];
+        var tokenInIsLp = (0, token_1.isLPToken)(tokenInSymbol);
+        var tokenOutIsLp = (0, token_1.isLPToken)(tokenOutSymbol);
+        if (!tokenInSymbol)
+            throw new Error("Unknown token: ".concat(tokenInAddress));
+        if (!tokenOutSymbol)
+            throw new Error("Unknown token: ".concat(tokenOutAddress));
+        if (tokenInIsLp && !tokenOutIsLp)
+            return "farmWithdraw";
+        if (!tokenInIsLp && tokenOutIsLp)
+            return "farmDeposit";
+        if (!tokenInIsLp && !tokenOutIsLp)
+            return "swap";
+        return "unknownOperation";
+    };
     return Trade;
 }());
 exports.Trade = Trade;

package/lib/parsers/txParser.d.ts

@@ -2,17 +2,25 @@ import { SupportedContract } from "../contracts/contracts";
 import { NetworkType } from "../core/constants";
 import { SupportedToken } from "../tokens/token";
 import { MultiCallStruct } from "../types/contracts/interfaces/ICreditFacade.sol/ICreditFacade";
+import { AbstractParser } from "./abstractParser";
 import { IParser } from "./iParser";
 export interface AdapterForParser {
     adapter: string;
     contract: string;
 }
+interface ParseData {
+    contract: string;
+    adapterName: string;
+}
 export declare class TxParser {
-    protected static parsers: Record<string, IParser>;
+    protected static parsers: Record<string, IParser & AbstractParser>;
     static parse(address: string, calldata: string): string;
+    static getParseData(address: string): ParseData;
     static parseMultiCall(calls: Array<MultiCallStruct>): Array<string>;
     static addAdapters(adapters: Array<AdapterForParser>): void;
     static addContracts(network: NetworkType): void;
     static addCreditFacade(creditFacade: string, underlying: SupportedToken): void;
+    static getParser(address: string): IParser & AbstractParser;
     protected static addParser(address: string, contract: SupportedContract, adapterType: number, isContract: boolean): void;
 }
+export {};

package/lib/parsers/txParser.js

@@ -15,11 +15,13 @@ var TxParser = /** @class */ (function () {
     function TxParser() {
     }
     TxParser.parse = function (address, calldata) {
-        var parser = this.parsers[address.toLowerCase()];
-        if (!parser)
-            throw new Error("Can find parser for ".concat(address));
+        var parser = this.getParser(address);
         return parser.parse(calldata);
     };
+    TxParser.getParseData = function (address) {
+        var parser = this.getParser(address);
+        return { contract: parser.contract, adapterName: parser.adapterName };
+    };
     TxParser.parseMultiCall = function (calls) {
         return calls.map(function (call) {
             return TxParser.parse(call.target, call.callData.toString());
@@ -42,6 +44,12 @@ var TxParser = /** @class */ (function () {
     TxParser.addCreditFacade = function (creditFacade, underlying) {
         this.parsers[creditFacade.toLowerCase()] = new creditFacadeParser_1.CreditFacadeParser(underlying);
     };
+    TxParser.getParser = function (address) {
+        var parser = this.parsers[address.toLowerCase()];
+        if (!parser)
+            throw new Error("Can find parser for ".concat(address));
+        return parser;
+    };
     TxParser.addParser = function (address, contract, adapterType, isContract) {
         var addressLC = address.toLowerCase();
         switch (adapters_1.AdapterInterface[adapterType]) {

package/lib/tokens/token.d.ts

@@ -19,3 +19,4 @@ export declare const tokenDataByNetwork: Record<NetworkType, Record<SupportedTok
 export declare const tokenSymbolByAddress: Record<string, SupportedToken>;
 export declare const isSupportedToken: (t: unknown) => t is SupportedToken;
 export declare const isLPToken: (t: unknown) => t is LPTokens;
+export declare function getDecimals(token: SupportedToken | string): number;

package/lib/tokens/token.js

@@ -11,10 +11,11 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isLPToken = exports.isSupportedToken = exports.tokenSymbolByAddress = exports.tokenDataByNetwork = exports.supportedTokens = exports.lpTokens = void 0;
+exports.getDecimals = exports.isLPToken = exports.isSupportedToken = exports.tokenSymbolByAddress = exports.tokenDataByNetwork = exports.supportedTokens = exports.lpTokens = void 0;
 var mappers_1 = require("../utils/mappers");
 var convex_1 = require("./convex");
 var curveLP_1 = require("./curveLP");
+var decimals_1 = require("./decimals");
 var gear_1 = require("./gear");
 var normal_1 = require("./normal");
 var yearn_1 = require("./yearn");
@@ -171,3 +172,14 @@ var isLPToken = function (t) {
     return typeof t === "string" && !!exports.lpTokens[t];
 };
 exports.isLPToken = isLPToken;
+function getDecimals(token) {
+    var dec = decimals_1.decimals[token];
+    if (dec)
+        return dec;
+    dec = decimals_1.decimals[exports.tokenSymbolByAddress[token.toLowerCase()]];
+    if (!dec) {
+        throw new Error("Decimals for ".concat(token, " not found"));
+    }
+    return dec;
+}
+exports.getDecimals = getDecimals;

package/lib/types/factories/contracts/support/MultiCall.sol/Multicall2__factory.d.ts

@@ -12,7 +12,7 @@ export declare class Multicall2__factory extends ContractFactory {
     }): TransactionRequest;
     attach(address: string): Multicall2;
     connect(signer: Signer): Multicall2__factory;
-    static readonly bytecode = "0x608060405234801561001057600080fd5b50610b51806100206000396000f3fe608060405234801561001057600080fd5b50600436106100d45760003560e01c806372425d9d11610081578063bce38bd71161005b578063bce38bd714610181578063c3077fa9146101a1578063ee82ac5e146101b457600080fd5b806372425d9d1461016757806386d516e81461016d578063a8b0574e1461017357600080fd5b8063399542e9116100b2578063399542e91461011757806342cbb15c146101395780634d2301cc1461013f57600080fd5b80630f28c97d146100d9578063252dba42146100ee57806327e86d6e1461010f575b600080fd5b425b6040519081526020015b60405180910390f35b6101016100fc3660046107df565b6101c6565b6040516100e5929190610896565b6100db610373565b61012a61012536600461091e565b610386565b6040516100e5939291906109db565b436100db565b6100db61014d366004610a03565b73ffffffffffffffffffffffffffffffffffffffff163190565b446100db565b456100db565b6040514181526020016100e5565b61019461018f36600461091e565b61039e565b6040516100e59190610a25565b61012a6101af3660046107df565b610599565b6100db6101c2366004610a38565b4090565b8051439060609067ffffffffffffffff8111156101e5576101e56105b6565b60405190808252806020026020018201604052801561021857816020015b60608152602001906001900390816102035790505b50905060005b835181101561036d5760008085838151811061023c5761023c610a51565b60200260200101516000015173ffffffffffffffffffffffffffffffffffffffff1686848151811061027057610270610a51565b6020026020010151602001516040516102899190610a80565b6000604051808303816000865af19150503d80600081146102c6576040519150601f19603f3d011682016040523d82523d6000602084013e6102cb565b606091505b50915091508161033c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4d756c746963616c6c206167677265676174653a2063616c6c206661696c656460448201526064015b60405180910390fd5b8084848151811061034f5761034f610a51565b602002602001018190525050508061036690610acb565b905061021e565b50915091565b6000610380600143610b04565b40905090565b4380406060610395858561039e565b90509250925092565b6060815167ffffffffffffffff8111156103ba576103ba6105b6565b60405190808252806020026020018201604052801561040057816020015b6040805180820190915260008152606060208201528152602001906001900390816103d85790505b50905060005b82518110156105925760008084838151811061042457610424610a51565b60200260200101516000015173ffffffffffffffffffffffffffffffffffffffff1685848151811061045857610458610a51565b6020026020010151602001516040516104719190610a80565b6000604051808303816000865af19150503d80600081146104ae576040519150601f19603f3d011682016040523d82523d6000602084013e6104b3565b606091505b5091509150851561054b578161054b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602160248201527f4d756c746963616c6c32206167677265676174653a2063616c6c206661696c6560448201527f64000000000000000000000000000000000000000000000000000000000000006064820152608401610333565b604051806040016040528083151581526020018281525084848151811061057457610574610a51565b602002602001018190525050508061058b90610acb565b9050610406565b5092915050565b60008060606105a9600185610386565b9196909550909350915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040805190810167ffffffffffffffff81118282101715610608576106086105b6565b60405290565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715610655576106556105b6565b604052919050565b803573ffffffffffffffffffffffffffffffffffffffff8116811461068157600080fd5b919050565b6000601f838184011261069857600080fd5b8235602067ffffffffffffffff808311156106b5576106b56105b6565b8260051b6106c483820161060e565b93845286810183019383810190898611156106de57600080fd5b84890192505b858310156107d2578235848111156106fc5760008081fd5b890160407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0828d0381018213156107335760008081fd5b61073b6105e5565b61074689850161065d565b8152828401358881111561075a5760008081fd5b8085019450508d603f8501126107705760008081fd5b8884013588811115610784576107846105b6565b6107938a848e8401160161060e565b92508083528e848287010111156107aa5760008081fd5b808486018b85013760009083018a0152808901919091528452505091840191908401906106e4565b9998505050505050505050565b6000602082840312156107f157600080fd5b813567ffffffffffffffff81111561080857600080fd5b61081484828501610686565b949350505050565b60005b8381101561083757818101518382015260200161081f565b83811115610846576000848401525b50505050565b6000815180845261086481602086016020860161081c565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b600060408201848352602060408185015281855180845260608601915060608160051b870101935082870160005b82811015610910577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa08887030184526108fe86835161084c565b955092840192908401906001016108c4565b509398975050505050505050565b6000806040838503121561093157600080fd5b8235801515811461094157600080fd5b9150602083013567ffffffffffffffff81111561095d57600080fd5b61096985828601610686565b9150509250929050565b6000815180845260208085019450848260051b860182860160005b858110156109ce578383038952815180511515845285015160408685018190526109ba8186018361084c565b9a87019a945050509084019060010161098e565b5090979650505050505050565b8381528260208201526060604082015260006109fa6060830184610973565b95945050505050565b600060208284031215610a1557600080fd5b610a1e8261065d565b9392505050565b602081526000610a1e6020830184610973565b600060208284031215610a4a57600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60008251610a9281846020870161081c565b9190910192915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff821415610afd57610afd610a9c565b5060010190565b600082821015610b1657610b16610a9c565b50039056fea2646970667358221220125df3e1e21b5f72a198b151923a51a6f30c33ef274b23d8593ad64b95e7c91f64736f6c634300080a0033";
+    static readonly bytecode = "0x608060405234801561001057600080fd5b50610b51806100206000396000f3fe608060405234801561001057600080fd5b50600436106100d45760003560e01c806372425d9d11610081578063bce38bd71161005b578063bce38bd714610181578063c3077fa9146101a1578063ee82ac5e146101b457600080fd5b806372425d9d1461016757806386d516e81461016d578063a8b0574e1461017357600080fd5b8063399542e9116100b2578063399542e91461011757806342cbb15c146101395780634d2301cc1461013f57600080fd5b80630f28c97d146100d9578063252dba42146100ee57806327e86d6e1461010f575b600080fd5b425b6040519081526020015b60405180910390f35b6101016100fc3660046107df565b6101c6565b6040516100e5929190610896565b6100db610373565b61012a61012536600461091e565b610386565b6040516100e5939291906109db565b436100db565b6100db61014d366004610a03565b73ffffffffffffffffffffffffffffffffffffffff163190565b446100db565b456100db565b6040514181526020016100e5565b61019461018f36600461091e565b61039e565b6040516100e59190610a25565b61012a6101af3660046107df565b610599565b6100db6101c2366004610a38565b4090565b8051439060609067ffffffffffffffff8111156101e5576101e56105b6565b60405190808252806020026020018201604052801561021857816020015b60608152602001906001900390816102035790505b50905060005b835181101561036d5760008085838151811061023c5761023c610a51565b60200260200101516000015173ffffffffffffffffffffffffffffffffffffffff1686848151811061027057610270610a51565b6020026020010151602001516040516102899190610a80565b6000604051808303816000865af19150503d80600081146102c6576040519150601f19603f3d011682016040523d82523d6000602084013e6102cb565b606091505b50915091508161033c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4d756c746963616c6c206167677265676174653a2063616c6c206661696c656460448201526064015b60405180910390fd5b8084848151811061034f5761034f610a51565b602002602001018190525050508061036690610acb565b905061021e565b50915091565b6000610380600143610b04565b40905090565b4380406060610395858561039e565b90509250925092565b6060815167ffffffffffffffff8111156103ba576103ba6105b6565b60405190808252806020026020018201604052801561040057816020015b6040805180820190915260008152606060208201528152602001906001900390816103d85790505b50905060005b82518110156105925760008084838151811061042457610424610a51565b60200260200101516000015173ffffffffffffffffffffffffffffffffffffffff1685848151811061045857610458610a51565b6020026020010151602001516040516104719190610a80565b6000604051808303816000865af19150503d80600081146104ae576040519150601f19603f3d011682016040523d82523d6000602084013e6104b3565b606091505b5091509150851561054b578161054b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602160248201527f4d756c746963616c6c32206167677265676174653a2063616c6c206661696c6560448201527f64000000000000000000000000000000000000000000000000000000000000006064820152608401610333565b604051806040016040528083151581526020018281525084848151811061057457610574610a51565b602002602001018190525050508061058b90610acb565b9050610406565b5092915050565b60008060606105a9600185610386565b9196909550909350915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040805190810167ffffffffffffffff81118282101715610608576106086105b6565b60405290565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715610655576106556105b6565b604052919050565b803573ffffffffffffffffffffffffffffffffffffffff8116811461068157600080fd5b919050565b6000601f838184011261069857600080fd5b8235602067ffffffffffffffff808311156106b5576106b56105b6565b8260051b6106c483820161060e565b93845286810183019383810190898611156106de57600080fd5b84890192505b858310156107d2578235848111156106fc5760008081fd5b890160407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0828d0381018213156107335760008081fd5b61073b6105e5565b61074689850161065d565b8152828401358881111561075a5760008081fd5b8085019450508d603f8501126107705760008081fd5b8884013588811115610784576107846105b6565b6107938a848e8401160161060e565b92508083528e848287010111156107aa5760008081fd5b808486018b85013760009083018a0152808901919091528452505091840191908401906106e4565b9998505050505050505050565b6000602082840312156107f157600080fd5b813567ffffffffffffffff81111561080857600080fd5b61081484828501610686565b949350505050565b60005b8381101561083757818101518382015260200161081f565b83811115610846576000848401525b50505050565b6000815180845261086481602086016020860161081c565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b600060408201848352602060408185015281855180845260608601915060608160051b870101935082870160005b82811015610910577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa08887030184526108fe86835161084c565b955092840192908401906001016108c4565b509398975050505050505050565b6000806040838503121561093157600080fd5b8235801515811461094157600080fd5b9150602083013567ffffffffffffffff81111561095d57600080fd5b61096985828601610686565b9150509250929050565b6000815180845260208085019450848260051b860182860160005b858110156109ce578383038952815180511515845285015160408685018190526109ba8186018361084c565b9a87019a945050509084019060010161098e565b5090979650505050505050565b8381528260208201526060604082015260006109fa6060830184610973565b95945050505050565b600060208284031215610a1557600080fd5b610a1e8261065d565b9392505050565b602081526000610a1e6020830184610973565b600060208284031215610a4a57600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60008251610a9281846020870161081c565b9190910192915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff821415610afd57610afd610a9c565b5060010190565b600082821015610b1657610b16610a9c565b50039056fea26469706673582212202c69e970f479545d7be246c48610ba0d642f18252c98dea6e14ebbeeb819c8f864736f6c634300080a0033";
     static readonly abi: {
         inputs: ({
             internalType: string;

package/lib/types/factories/contracts/support/MultiCall.sol/Multicall2__factory.js

@@ -333,7 +333,7 @@ var _abi = [
         type: "function",
     },
 ];
-var _bytecode = "0x608060405234801561001057600080fd5b50610b51806100206000396000f3fe608060405234801561001057600080fd5b50600436106100d45760003560e01c806372425d9d11610081578063bce38bd71161005b578063bce38bd714610181578063c3077fa9146101a1578063ee82ac5e146101b457600080fd5b806372425d9d1461016757806386d516e81461016d578063a8b0574e1461017357600080fd5b8063399542e9116100b2578063399542e91461011757806342cbb15c146101395780634d2301cc1461013f57600080fd5b80630f28c97d146100d9578063252dba42146100ee57806327e86d6e1461010f575b600080fd5b425b6040519081526020015b60405180910390f35b6101016100fc3660046107df565b6101c6565b6040516100e5929190610896565b6100db610373565b61012a61012536600461091e565b610386565b6040516100e5939291906109db565b436100db565b6100db61014d366004610a03565b73ffffffffffffffffffffffffffffffffffffffff163190565b446100db565b456100db565b6040514181526020016100e5565b61019461018f36600461091e565b61039e565b6040516100e59190610a25565b61012a6101af3660046107df565b610599565b6100db6101c2366004610a38565b4090565b8051439060609067ffffffffffffffff8111156101e5576101e56105b6565b60405190808252806020026020018201604052801561021857816020015b60608152602001906001900390816102035790505b50905060005b835181101561036d5760008085838151811061023c5761023c610a51565b60200260200101516000015173ffffffffffffffffffffffffffffffffffffffff1686848151811061027057610270610a51565b6020026020010151602001516040516102899190610a80565b6000604051808303816000865af19150503d80600081146102c6576040519150601f19603f3d011682016040523d82523d6000602084013e6102cb565b606091505b50915091508161033c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4d756c746963616c6c206167677265676174653a2063616c6c206661696c656460448201526064015b60405180910390fd5b8084848151811061034f5761034f610a51565b602002602001018190525050508061036690610acb565b905061021e565b50915091565b6000610380600143610b04565b40905090565b4380406060610395858561039e565b90509250925092565b6060815167ffffffffffffffff8111156103ba576103ba6105b6565b60405190808252806020026020018201604052801561040057816020015b6040805180820190915260008152606060208201528152602001906001900390816103d85790505b50905060005b82518110156105925760008084838151811061042457610424610a51565b60200260200101516000015173ffffffffffffffffffffffffffffffffffffffff1685848151811061045857610458610a51565b6020026020010151602001516040516104719190610a80565b6000604051808303816000865af19150503d80600081146104ae576040519150601f19603f3d011682016040523d82523d6000602084013e6104b3565b606091505b5091509150851561054b578161054b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602160248201527f4d756c746963616c6c32206167677265676174653a2063616c6c206661696c6560448201527f64000000000000000000000000000000000000000000000000000000000000006064820152608401610333565b604051806040016040528083151581526020018281525084848151811061057457610574610a51565b602002602001018190525050508061058b90610acb565b9050610406565b5092915050565b60008060606105a9600185610386565b9196909550909350915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040805190810167ffffffffffffffff81118282101715610608576106086105b6565b60405290565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715610655576106556105b6565b604052919050565b803573ffffffffffffffffffffffffffffffffffffffff8116811461068157600080fd5b919050565b6000601f838184011261069857600080fd5b8235602067ffffffffffffffff808311156106b5576106b56105b6565b8260051b6106c483820161060e565b93845286810183019383810190898611156106de57600080fd5b84890192505b858310156107d2578235848111156106fc5760008081fd5b890160407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0828d0381018213156107335760008081fd5b61073b6105e5565b61074689850161065d565b8152828401358881111561075a5760008081fd5b8085019450508d603f8501126107705760008081fd5b8884013588811115610784576107846105b6565b6107938a848e8401160161060e565b92508083528e848287010111156107aa5760008081fd5b808486018b85013760009083018a0152808901919091528452505091840191908401906106e4565b9998505050505050505050565b6000602082840312156107f157600080fd5b813567ffffffffffffffff81111561080857600080fd5b61081484828501610686565b949350505050565b60005b8381101561083757818101518382015260200161081f565b83811115610846576000848401525b50505050565b6000815180845261086481602086016020860161081c565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b600060408201848352602060408185015281855180845260608601915060608160051b870101935082870160005b82811015610910577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa08887030184526108fe86835161084c565b955092840192908401906001016108c4565b509398975050505050505050565b6000806040838503121561093157600080fd5b8235801515811461094157600080fd5b9150602083013567ffffffffffffffff81111561095d57600080fd5b61096985828601610686565b9150509250929050565b6000815180845260208085019450848260051b860182860160005b858110156109ce578383038952815180511515845285015160408685018190526109ba8186018361084c565b9a87019a945050509084019060010161098e565b5090979650505050505050565b8381528260208201526060604082015260006109fa6060830184610973565b95945050505050565b600060208284031215610a1557600080fd5b610a1e8261065d565b9392505050565b602081526000610a1e6020830184610973565b600060208284031215610a4a57600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60008251610a9281846020870161081c565b9190910192915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff821415610afd57610afd610a9c565b5060010190565b600082821015610b1657610b16610a9c565b50039056fea2646970667358221220125df3e1e21b5f72a198b151923a51a6f30c33ef274b23d8593ad64b95e7c91f64736f6c634300080a0033";
+var _bytecode = "0x608060405234801561001057600080fd5b50610b51806100206000396000f3fe608060405234801561001057600080fd5b50600436106100d45760003560e01c806372425d9d11610081578063bce38bd71161005b578063bce38bd714610181578063c3077fa9146101a1578063ee82ac5e146101b457600080fd5b806372425d9d1461016757806386d516e81461016d578063a8b0574e1461017357600080fd5b8063399542e9116100b2578063399542e91461011757806342cbb15c146101395780634d2301cc1461013f57600080fd5b80630f28c97d146100d9578063252dba42146100ee57806327e86d6e1461010f575b600080fd5b425b6040519081526020015b60405180910390f35b6101016100fc3660046107df565b6101c6565b6040516100e5929190610896565b6100db610373565b61012a61012536600461091e565b610386565b6040516100e5939291906109db565b436100db565b6100db61014d366004610a03565b73ffffffffffffffffffffffffffffffffffffffff163190565b446100db565b456100db565b6040514181526020016100e5565b61019461018f36600461091e565b61039e565b6040516100e59190610a25565b61012a6101af3660046107df565b610599565b6100db6101c2366004610a38565b4090565b8051439060609067ffffffffffffffff8111156101e5576101e56105b6565b60405190808252806020026020018201604052801561021857816020015b60608152602001906001900390816102035790505b50905060005b835181101561036d5760008085838151811061023c5761023c610a51565b60200260200101516000015173ffffffffffffffffffffffffffffffffffffffff1686848151811061027057610270610a51565b6020026020010151602001516040516102899190610a80565b6000604051808303816000865af19150503d80600081146102c6576040519150601f19603f3d011682016040523d82523d6000602084013e6102cb565b606091505b50915091508161033c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4d756c746963616c6c206167677265676174653a2063616c6c206661696c656460448201526064015b60405180910390fd5b8084848151811061034f5761034f610a51565b602002602001018190525050508061036690610acb565b905061021e565b50915091565b6000610380600143610b04565b40905090565b4380406060610395858561039e565b90509250925092565b6060815167ffffffffffffffff8111156103ba576103ba6105b6565b60405190808252806020026020018201604052801561040057816020015b6040805180820190915260008152606060208201528152602001906001900390816103d85790505b50905060005b82518110156105925760008084838151811061042457610424610a51565b60200260200101516000015173ffffffffffffffffffffffffffffffffffffffff1685848151811061045857610458610a51565b6020026020010151602001516040516104719190610a80565b6000604051808303816000865af19150503d80600081146104ae576040519150601f19603f3d011682016040523d82523d6000602084013e6104b3565b606091505b5091509150851561054b578161054b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602160248201527f4d756c746963616c6c32206167677265676174653a2063616c6c206661696c6560448201527f64000000000000000000000000000000000000000000000000000000000000006064820152608401610333565b604051806040016040528083151581526020018281525084848151811061057457610574610a51565b602002602001018190525050508061058b90610acb565b9050610406565b5092915050565b60008060606105a9600185610386565b9196909550909350915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040805190810167ffffffffffffffff81118282101715610608576106086105b6565b60405290565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715610655576106556105b6565b604052919050565b803573ffffffffffffffffffffffffffffffffffffffff8116811461068157600080fd5b919050565b6000601f838184011261069857600080fd5b8235602067ffffffffffffffff808311156106b5576106b56105b6565b8260051b6106c483820161060e565b93845286810183019383810190898611156106de57600080fd5b84890192505b858310156107d2578235848111156106fc5760008081fd5b890160407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0828d0381018213156107335760008081fd5b61073b6105e5565b61074689850161065d565b8152828401358881111561075a5760008081fd5b8085019450508d603f8501126107705760008081fd5b8884013588811115610784576107846105b6565b6107938a848e8401160161060e565b92508083528e848287010111156107aa5760008081fd5b808486018b85013760009083018a0152808901919091528452505091840191908401906106e4565b9998505050505050505050565b6000602082840312156107f157600080fd5b813567ffffffffffffffff81111561080857600080fd5b61081484828501610686565b949350505050565b60005b8381101561083757818101518382015260200161081f565b83811115610846576000848401525b50505050565b6000815180845261086481602086016020860161081c565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b600060408201848352602060408185015281855180845260608601915060608160051b870101935082870160005b82811015610910577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa08887030184526108fe86835161084c565b955092840192908401906001016108c4565b509398975050505050505050565b6000806040838503121561093157600080fd5b8235801515811461094157600080fd5b9150602083013567ffffffffffffffff81111561095d57600080fd5b61096985828601610686565b9150509250929050565b6000815180845260208085019450848260051b860182860160005b858110156109ce578383038952815180511515845285015160408685018190526109ba8186018361084c565b9a87019a945050509084019060010161098e565b5090979650505050505050565b8381528260208201526060604082015260006109fa6060830184610973565b95945050505050565b600060208284031215610a1557600080fd5b610a1e8261065d565b9392505050565b602081526000610a1e6020830184610973565b600060208284031215610a4a57600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60008251610a9281846020870161081c565b9190910192915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff821415610afd57610afd610a9c565b5060010190565b600082821015610b1657610b16610a9c565b50039056fea26469706673582212202c69e970f479545d7be246c48610ba0d642f18252c98dea6e14ebbeeb819c8f864736f6c634300080a0033";
 var isSuperArgs = function (xs) { return xs.length > 1; };
 var Multicall2__factory = /** @class */ (function (_super) {
     __extends(Multicall2__factory, _super);

package/lib/utils/multicall.d.ts

@@ -1,4 +1,4 @@
-import { ethers } from "ethers";
+import { ethers, Signer } from "ethers";
 import { Multicall2 } from "../types";
 export interface CallData<T extends ethers.utils.Interface> {
     method: keyof T["functions"];
@@ -15,7 +15,7 @@ export declare class MultiCallContract<T extends ethers.utils.Interface> {
     private readonly _address;
     private readonly _interface;
     protected _multiCall: Multicall2;
-    constructor(address: string, intrerface: T, provider: ethers.providers.Provider);
+    constructor(address: string, intrerface: T, provider: ethers.providers.Provider | Signer);
     call<R extends Array<any>>(data: Array<CallData<T>>): Promise<R>;
     get address(): string;
     get interface(): T;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "1.5.8",
+  "version": "1.5.11",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",