@orbs-network/twap 1.7.13 → 1.7.14

package/dist/src/configs.d.ts

@@ -75,6 +75,7 @@ export declare const Configs: {
     SpiritSwap: Config;
     SpookySwap: Config;
     Pangolin: Config;
+    QuickSwap: Config;
 };
 export declare const nativeTokenAddresses: string[];
 export declare const isNativeAddress: (address: string) => boolean;

package/dist/src/configs.js

@@ -36,8 +36,8 @@ exports.ChainConfigs = {
     },
     poly: {
         chainId: 137,
-        twapAddress: "",
-        lensAddress: "",
+        twapAddress: "0xBAFdE1cc254BB94Be5866d5a86ddafde4BB44EEF",
+        lensAddress: "0xc918bdC47264687796Cd54FE362FaC4f8b99Eb55",
         bidDelaySeconds: 60,
         minChunkSizeUsd: 10,
         wToken: {
@@ -65,6 +65,7 @@ exports.Configs = {
     SpiritSwap: Object.assign(Object.assign({}, exports.ChainConfigs.ftm), { partner: "SpiritSwap", exchangeAddress: "0xAd19179201be5A51D1cBd3bB2fC651BB05822404", exchangeType: "ParaswapExchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.SpiritSwap }),
     SpookySwap: Object.assign(Object.assign({}, exports.ChainConfigs.ftm), { partner: "SpookySwap", exchangeAddress: "0x37F427DA0D12Fe2C80aCa09EE08e7e92A1B2B114", exchangeType: "UniswapV2Exchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.SpookySwap }),
     Pangolin: Object.assign(Object.assign({}, exports.ChainConfigs.avax), { partner: "Pangolin", exchangeAddress: "0x25a0A78f5ad07b2474D3D42F1c1432178465936d", exchangeType: "UniswapV2Exchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.Pangolin }),
+    QuickSwap: Object.assign(Object.assign({}, exports.ChainConfigs.poly), { partner: "QuickSwap", exchangeAddress: "0xeFE1B6096838949156e5130604434A2a13c68C68", exchangeType: "UniswapV2Exchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.QuickSwap }),
 };
 // export const UniswapV2Config: Config = {
 //   ...ChainConfigs.eth,
@@ -76,11 +77,6 @@ exports.Configs = {
 //   partner: "SushiSwap",
 //   exchangeAddress: "0x72a18A408e329E7052d08aA0746243Dc30Ad2530",
 // };
-// export const QuickSwapConfig: Config = {
-//   ...ChainConfigs.poly,
-//   partner: "QuickSwap",
-//   exchangeAddress: "0xeFE1B6096838949156e5130604434A2a13c68C68",
-// };
 exports.nativeTokenAddresses = [
     web3_candies_1.zeroAddress,
     "0x0000000000000000000000000000000000001010",

package/dist/src/lib.d.ts

@@ -27,21 +27,18 @@ export declare class TWAPLib {
     percentAboveMarket: (srcUsdMarket: BN.Value, dstUsdMarket: BN.Value, limitDstPriceFor1Src: BN.Value) => number;
     status: (order: Order) => Status;
     makerBalance(token: TokenData): Promise<BN>;
-    wrapNativeToken(amount: BN.Value, priorityFeePerGas?: BN.Value, maxFeePerGas?: BN.Value): Promise<any>;
-    unwrapNativeToken(amount: BN.Value, priorityFeePerGas?: BN.Value, maxFeePerGas?: BN.Value): Promise<any>;
-    waitForConfirmation<T>(fn: () => Promise<T>): Promise<T>;
+    wrapNativeToken(amount: BN.Value, maxPriorityFeePerGas?: BN.Value, maxFeePerGas?: BN.Value): Promise<void>;
+    unwrapNativeToken(amount: BN.Value, maxPriorityFeePerGas?: BN.Value, maxFeePerGas?: BN.Value): Promise<void>;
     hasAllowance(srcToken: TokenData, amount: BN.Value): Promise<boolean>;
-    approve(srcToken: TokenData, amount: BN.Value, priorityFeePerGas?: BN.Value, maxFeePerGas?: BN.Value): Promise<void>;
+    approve(srcToken: TokenData, amount: BN.Value, maxPriorityFeePerGas?: BN.Value, maxFeePerGas?: BN.Value): Promise<void>;
     validateTokens(srcToken: TokenData, dstToken: TokenData): TokensValidation;
     validateOrderInputs(srcToken: TokenData, dstToken: TokenData, srcAmount: BN.Value, srcChunkAmount: BN.Value, dstMinChunkAmountOut: BN.Value, deadline: BN.Value, fillDelaySeconds: BN.Value, srcUsd: BN.Value): OrderInputValidation;
-    submitOrder(srcToken: TokenData, dstToken: TokenData, srcAmount: BN.Value, srcChunkAmount: BN.Value, dstMinChunkAmountOut: BN.Value, deadline: number, fillDelaySeconds: number, srcUsd: BN.Value, priorityFeePerGas?: BN.Value, maxFeePerGas?: BN.Value): Promise<number>;
+    submitOrder(srcToken: TokenData, dstToken: TokenData, srcAmount: BN.Value, srcChunkAmount: BN.Value, dstMinChunkAmountOut: BN.Value, deadline: number, fillDelaySeconds: number, srcUsd: BN.Value, maxPriorityFeePerGas?: BN.Value, maxFeePerGas?: BN.Value): Promise<number>;
     getOrder(id: number): Promise<Order>;
-    cancelOrder(id: number, priorityFeePerGas?: BN.Value, maxFeePerGas?: BN.Value): Promise<void>;
+    cancelOrder(id: number, maxPriorityFeePerGas?: BN.Value, maxFeePerGas?: BN.Value): Promise<void>;
     getAllOrders(): Promise<Order[]>;
-    private sendTx;
     parseOrder(r: any): Order;
     getToken(address: string): Promise<TokenData>;
-    deployTaker(priorityFeePerGas?: BN.Value, maxFeePerGas?: BN.Value): Promise<void>;
     getSwapData(orderId: number): Promise<{
         srcToken: TokenData;
         dstToken: TokenData;

package/dist/src/lib.js

@@ -20,8 +20,8 @@ const web3_candies_1 = require("@defi.org/web3-candies");
 const TWAP_json_1 = __importDefault(require("../artifacts/contracts/TWAP.sol/TWAP.json"));
 const Lens_json_1 = __importDefault(require("../artifacts/contracts/periphery/Lens.sol/Lens.json"));
 const Taker_json_1 = __importDefault(require("../artifacts/contracts/periphery/Taker.sol/Taker.json"));
-const lodash_1 = __importDefault(require("lodash"));
 const paraswap_1 = require("./paraswap");
+const lodash_1 = __importDefault(require("lodash"));
 exports.twapAbi = TWAP_json_1.default.abi;
 exports.lensAbi = Lens_json_1.default.abi;
 exports.takerAbi = Taker_json_1.default.abi;
@@ -73,24 +73,14 @@ class TWAPLib {
                 return (0, web3_candies_1.erc20)(token.symbol, token.address, token.decimals).methods.balanceOf(this.maker).call().then(bignumber_js_1.default);
         });
     }
-    wrapNativeToken(amount, priorityFeePerGas, maxFeePerGas) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.sendTx((0, web3_candies_1.erc20)(this.config.wToken.symbol, this.config.wToken.address, this.config.wToken.decimals, web3_candies_1.iwethabi).methods.deposit(), priorityFeePerGas, maxFeePerGas, amount);
-        });
-    }
-    unwrapNativeToken(amount, priorityFeePerGas, maxFeePerGas) {
+    wrapNativeToken(amount, maxPriorityFeePerGas, maxFeePerGas) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.sendTx((0, web3_candies_1.erc20)(this.config.wToken.symbol, this.config.wToken.address, this.config.wToken.decimals, web3_candies_1.iwethabi).methods.withdraw((0, bignumber_js_1.default)(amount).toFixed(0)), priorityFeePerGas, maxFeePerGas);
+            yield (0, web3_candies_1.sendAndWaitForConfirmations)((0, web3_candies_1.erc20)(this.config.wToken.symbol, this.config.wToken.address, this.config.wToken.decimals, web3_candies_1.iwethabi).methods.deposit(), { from: this.maker, maxPriorityFeePerGas, maxFeePerGas, value: amount });
         });
     }
-    waitForConfirmation(fn) {
+    unwrapNativeToken(amount, maxPriorityFeePerGas, maxFeePerGas) {
         return __awaiter(this, void 0, void 0, function* () {
-            const nonceBefore = yield (0, web3_candies_1.web3)().eth.getTransactionCount(this.maker);
-            const result = yield fn();
-            while ((yield (0, web3_candies_1.web3)().eth.getTransactionCount(this.maker)) === nonceBefore) {
-                yield new Promise((r) => setTimeout(r, 1000));
-            }
-            return result;
+            yield (0, web3_candies_1.sendAndWaitForConfirmations)((0, web3_candies_1.erc20)(this.config.wToken.symbol, this.config.wToken.address, this.config.wToken.decimals, web3_candies_1.iwethabi).methods.withdraw((0, bignumber_js_1.default)(amount).toFixed(0)), { from: this.maker, maxPriorityFeePerGas, maxFeePerGas });
         });
     }
     hasAllowance(srcToken, amount) {
@@ -102,10 +92,14 @@ class TWAPLib {
             return allowance.gte(amount);
         });
     }
-    approve(srcToken, amount, priorityFeePerGas, maxFeePerGas) {
+    approve(srcToken, amount, maxPriorityFeePerGas, maxFeePerGas) {
         return __awaiter(this, void 0, void 0, function* () {
             const token = (0, web3_candies_1.erc20)(srcToken.symbol, srcToken.address, srcToken.decimals);
-            yield this.sendTx(token.methods.approve(this.config.twapAddress, amount.toString()), priorityFeePerGas, maxFeePerGas);
+            yield (0, web3_candies_1.sendAndWaitForConfirmations)(token.methods.approve(this.config.twapAddress, (0, bignumber_js_1.default)(amount).toFixed(0)), {
+                from: this.maker,
+                maxPriorityFeePerGas,
+                maxFeePerGas,
+            });
         });
     }
     validateTokens(srcToken, dstToken) {
@@ -144,12 +138,16 @@ class TWAPLib {
             return OrderInputValidation.invalidSmallestSrcChunkUsd;
         return OrderInputValidation.valid;
     }
-    submitOrder(srcToken, dstToken, srcAmount, srcChunkAmount, dstMinChunkAmountOut, deadline, fillDelaySeconds, srcUsd, priorityFeePerGas, maxFeePerGas) {
+    submitOrder(srcToken, dstToken, srcAmount, srcChunkAmount, dstMinChunkAmountOut, deadline, fillDelaySeconds, srcUsd, maxPriorityFeePerGas, maxFeePerGas) {
         return __awaiter(this, void 0, void 0, function* () {
             let validation = this.validateOrderInputs(srcToken, dstToken, srcAmount, srcChunkAmount, dstMinChunkAmountOut, deadline, fillDelaySeconds, srcUsd);
             if (validation !== OrderInputValidation.valid)
                 throw new Error(`invalid inputs: ${validation}`);
-            const tx = yield this.sendTx(this.twap.methods.ask(this.config.exchangeAddress, srcToken.address, dstToken.address, (0, bignumber_js_1.default)(srcAmount).toFixed(0), (0, bignumber_js_1.default)(srcChunkAmount).toFixed(0), (0, bignumber_js_1.default)(dstMinChunkAmountOut).toFixed(0), (0, bignumber_js_1.default)(deadline).div(1000).toFixed(0), (0, bignumber_js_1.default)(this.config.bidDelaySeconds).toFixed(0), (0, bignumber_js_1.default)(fillDelaySeconds).toFixed(0)), priorityFeePerGas, maxFeePerGas);
+            const tx = yield (0, web3_candies_1.sendAndWaitForConfirmations)(this.twap.methods.ask(this.config.exchangeAddress, srcToken.address, dstToken.address, (0, bignumber_js_1.default)(srcAmount).toFixed(0), (0, bignumber_js_1.default)(srcChunkAmount).toFixed(0), (0, bignumber_js_1.default)(dstMinChunkAmountOut).toFixed(0), (0, bignumber_js_1.default)(deadline).div(1000).toFixed(0), (0, bignumber_js_1.default)(this.config.bidDelaySeconds).toFixed(0), (0, bignumber_js_1.default)(fillDelaySeconds).toFixed(0)), {
+                from: this.maker,
+                maxPriorityFeePerGas,
+                maxFeePerGas,
+            });
             const events = (0, web3_candies_1.parseEvents)(tx, this.twap.options.jsonInterface);
             return Number(events[0].returnValues.id);
         });
@@ -159,9 +157,13 @@ class TWAPLib {
             return this.parseOrder(yield this.twap.methods.order(id).call());
         });
     }
-    cancelOrder(id, priorityFeePerGas, maxFeePerGas) {
+    cancelOrder(id, maxPriorityFeePerGas, maxFeePerGas) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.sendTx(this.twap.methods.cancel(id), priorityFeePerGas, maxFeePerGas);
+            yield (0, web3_candies_1.sendAndWaitForConfirmations)(this.twap.methods.cancel(id), {
+                from: this.maker,
+                maxPriorityFeePerGas,
+                maxFeePerGas,
+            });
         });
     }
     getAllOrders() {
@@ -169,17 +171,6 @@ class TWAPLib {
             return lodash_1.default.map(yield this.lens.methods.makerOrders(this.maker).call(), (o) => this.parseOrder(o));
         });
     }
-    sendTx(tx, priorityFeePerGas, maxFeePerGas, amount) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield tx.send({
-                from: this.maker,
-                gas: Math.floor((yield tx.estimateGas({ from: this.maker, value: amount ? (0, bignumber_js_1.default)(amount).toFixed(0) : undefined })) * 1.2),
-                maxPriorityFeePerGas: priorityFeePerGas ? (0, bignumber_js_1.default)(priorityFeePerGas).toFixed(0) : undefined,
-                maxFeePerGas: maxFeePerGas ? (0, bignumber_js_1.default)(maxFeePerGas).toFixed(0) : undefined,
-                value: amount ? (0, bignumber_js_1.default)(amount).toFixed(0) : undefined,
-            });
-        });
-    }
     parseOrder(r) {
         var _a, _b, _c, _d, _e, _f;
         return {
@@ -218,13 +209,6 @@ class TWAPLib {
             return { address, decimals: yield t.decimals(), symbol: yield t.methods.symbol().call() };
         });
     }
-    // TODO
-    deployTaker(priorityFeePerGas, maxFeePerGas) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const taker = (0, web3_candies_1.contract)(exports.takerAbi, "");
-            yield this.sendTx(taker.deploy({ data: Taker_json_1.default.bytecode, arguments: [this.config.twapAddress, [this.maker]] }), priorityFeePerGas, maxFeePerGas);
-        });
-    }
     //TODO
     getSwapData(orderId) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/typechain-hardhat/contracts/IExchange.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-import type BN from "bn.js";
 import type BigNumber from "bignumber.js";
 import type { ContractOptions } from "web3-eth-contract";
 import type { EventLog } from "web3-core";
@@ -14,8 +13,8 @@ export interface IExchange extends BaseContract {
     constructor(jsonInterface: any[], address?: string, options?: ContractOptions): IExchange;
     clone(): IExchange;
     methods: {
-        getAmountOut(srcToken: string, dstToken: string, amountIn: number | string | BN | BigNumber, data: string | number[]): NonPayableTransactionObject<string>;
-        swap(srcToken: string, dstToken: string, amountIn: number | string | BN | BigNumber, amountOutMin: number | string | BN | BigNumber, data: string | number[]): NonPayableTransactionObject<void>;
+        getAmountOut(srcToken: string, dstToken: string, amountIn: number | string | BigNumber, data: string | number[]): NonPayableTransactionObject<string>;
+        swap(srcToken: string, dstToken: string, amountIn: number | string | BigNumber, amountOutMin: number | string | BigNumber, data: string | number[]): NonPayableTransactionObject<void>;
     };
     events: {
         allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;

package/dist/typechain-hardhat/contracts/IWETH.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-import type BN from "bn.js";
 import type BigNumber from "bignumber.js";
 import type { ContractOptions } from "web3-eth-contract";
 import type { EventLog } from "web3-core";
@@ -14,7 +13,7 @@ export interface IWETH extends BaseContract {
     constructor(jsonInterface: any[], address?: string, options?: ContractOptions): IWETH;
     clone(): IWETH;
     methods: {
-        withdraw(wad: number | string | BN | BigNumber): NonPayableTransactionObject<void>;
+        withdraw(wad: number | string | BigNumber): NonPayableTransactionObject<void>;
     };
     events: {
         allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;

package/dist/typechain-hardhat/contracts/TWAP.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-import type BN from "bn.js";
 import type BigNumber from "bignumber.js";
 import type { ContractOptions } from "web3-eth-contract";
 import type { EventLog } from "web3-core";
@@ -103,9 +102,9 @@ export interface TWAP extends BaseContract {
         STATUS_CANCELED(): NonPayableTransactionObject<string>;
         STATUS_COMPLETED(): NonPayableTransactionObject<string>;
         VERSION(): NonPayableTransactionObject<string>;
-        ask(exchange: string, srcToken: string, dstToken: string, srcAmount: number | string | BN | BigNumber, srcBidAmount: number | string | BN | BigNumber, dstMinAmount: number | string | BN | BigNumber, deadline: number | string | BN | BigNumber, bidDelay: number | string | BN | BigNumber, fillDelay: number | string | BN | BigNumber): NonPayableTransactionObject<string>;
-        bid(id: number | string | BN | BigNumber, exchange: string, dstFee: number | string | BN | BigNumber, slippagePercent: number | string | BN | BigNumber, data: string | number[]): NonPayableTransactionObject<void>;
-        book(arg0: number | string | BN | BigNumber): NonPayableTransactionObject<{
+        ask(exchange: string, srcToken: string, dstToken: string, srcAmount: number | string | BigNumber, srcBidAmount: number | string | BigNumber, dstMinAmount: number | string | BigNumber, deadline: number | string | BigNumber, bidDelay: number | string | BigNumber, fillDelay: number | string | BigNumber): NonPayableTransactionObject<string>;
+        bid(id: number | string | BigNumber, exchange: string, dstFee: number | string | BigNumber, slippagePercent: number | string | BigNumber, data: string | number[]): NonPayableTransactionObject<void>;
+        book(arg0: number | string | BigNumber): NonPayableTransactionObject<{
             id: string;
             status: string;
             filledTime: string;
@@ -143,12 +142,12 @@ export interface TWAP extends BaseContract {
             ];
             5: [string, string, string, string, string, string];
         }>;
-        cancel(id: number | string | BN | BigNumber): NonPayableTransactionObject<void>;
-        fill(id: number | string | BN | BigNumber): NonPayableTransactionObject<void>;
+        cancel(id: number | string | BigNumber): NonPayableTransactionObject<void>;
+        fill(id: number | string | BigNumber): NonPayableTransactionObject<void>;
         iweth(): NonPayableTransactionObject<string>;
         length(): NonPayableTransactionObject<string>;
-        makerOrders(arg0: string, arg1: number | string | BN | BigNumber): NonPayableTransactionObject<string>;
-        order(id: number | string | BN | BigNumber): NonPayableTransactionObject<[
+        makerOrders(arg0: string, arg1: number | string | BigNumber): NonPayableTransactionObject<string>;
+        order(id: number | string | BigNumber): NonPayableTransactionObject<[
             string,
             string,
             string,
@@ -176,8 +175,8 @@ export interface TWAP extends BaseContract {
             ]
         ]>;
         orderIdsByMaker(maker: string): NonPayableTransactionObject<string[]>;
-        prune(id: number | string | BN | BigNumber): NonPayableTransactionObject<void>;
-        status(arg0: number | string | BN | BigNumber): NonPayableTransactionObject<string>;
+        prune(id: number | string | BigNumber): NonPayableTransactionObject<void>;
+        status(arg0: number | string | BigNumber): NonPayableTransactionObject<string>;
     };
     events: {
         OrderBid(cb?: Callback<OrderBid>): EventEmitter;

package/dist/typechain-hardhat/contracts/exchange/IUniswapV2.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-import type BN from "bn.js";
 import type BigNumber from "bignumber.js";
 import type { ContractOptions } from "web3-eth-contract";
 import type { EventLog } from "web3-core";
@@ -14,9 +13,9 @@ export interface IUniswapV2 extends BaseContract {
     constructor(jsonInterface: any[], address?: string, options?: ContractOptions): IUniswapV2;
     clone(): IUniswapV2;
     methods: {
-        getAmountsOut(amountIn: number | string | BN | BigNumber, path: string[]): NonPayableTransactionObject<string[]>;
-        swapExactTokensForTokens(amountIn: number | string | BN | BigNumber, amountOutMin: number | string | BN | BigNumber, path: string[], to: string, deadline: number | string | BN | BigNumber): NonPayableTransactionObject<string[]>;
-        swapExactTokensForTokensSupportingFeeOnTransferTokens(amountIn: number | string | BN | BigNumber, amountOutMin: number | string | BN | BigNumber, path: string[], to: string, deadline: number | string | BN | BigNumber): NonPayableTransactionObject<void>;
+        getAmountsOut(amountIn: number | string | BigNumber, path: string[]): NonPayableTransactionObject<string[]>;
+        swapExactTokensForTokens(amountIn: number | string | BigNumber, amountOutMin: number | string | BigNumber, path: string[], to: string, deadline: number | string | BigNumber): NonPayableTransactionObject<string[]>;
+        swapExactTokensForTokensSupportingFeeOnTransferTokens(amountIn: number | string | BigNumber, amountOutMin: number | string | BigNumber, path: string[], to: string, deadline: number | string | BigNumber): NonPayableTransactionObject<void>;
     };
     events: {
         allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;

package/dist/typechain-hardhat/contracts/exchange/ParaswapExchange.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-import type BN from "bn.js";
 import type BigNumber from "bignumber.js";
 import type { ContractOptions } from "web3-eth-contract";
 import type { EventLog } from "web3-core";
@@ -14,9 +13,9 @@ export interface ParaswapExchange extends BaseContract {
     constructor(jsonInterface: any[], address?: string, options?: ContractOptions): ParaswapExchange;
     clone(): ParaswapExchange;
     methods: {
-        getAmountOut(arg0: string, arg1: string, arg2: number | string | BN | BigNumber, data: string | number[]): NonPayableTransactionObject<string>;
+        getAmountOut(arg0: string, arg1: string, arg2: number | string | BigNumber, data: string | number[]): NonPayableTransactionObject<string>;
         paraswap(): NonPayableTransactionObject<string>;
-        swap(_srcToken: string, _dstToken: string, amountIn: number | string | BN | BigNumber, amountOutMin: number | string | BN | BigNumber, data: string | number[]): NonPayableTransactionObject<void>;
+        swap(_srcToken: string, _dstToken: string, amountIn: number | string | BigNumber, amountOutMin: number | string | BigNumber, data: string | number[]): NonPayableTransactionObject<void>;
     };
     events: {
         allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;

package/dist/typechain-hardhat/contracts/exchange/UniswapV2Exchange.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-import type BN from "bn.js";
 import type BigNumber from "bignumber.js";
 import type { ContractOptions } from "web3-eth-contract";
 import type { EventLog } from "web3-core";
@@ -14,8 +13,8 @@ export interface UniswapV2Exchange extends BaseContract {
     constructor(jsonInterface: any[], address?: string, options?: ContractOptions): UniswapV2Exchange;
     clone(): UniswapV2Exchange;
     methods: {
-        getAmountOut(arg0: string, arg1: string, amountIn: number | string | BN | BigNumber, data: string | number[]): NonPayableTransactionObject<string>;
-        swap(_srcToken: string, arg1: string, amountIn: number | string | BN | BigNumber, amountOutMin: number | string | BN | BigNumber, data: string | number[]): NonPayableTransactionObject<void>;
+        getAmountOut(arg0: string, arg1: string, amountIn: number | string | BigNumber, data: string | number[]): NonPayableTransactionObject<string>;
+        swap(_srcToken: string, arg1: string, amountIn: number | string | BigNumber, amountOutMin: number | string | BigNumber, data: string | number[]): NonPayableTransactionObject<void>;
         uniswap(): NonPayableTransactionObject<string>;
     };
     events: {

package/dist/typechain-hardhat/contracts/periphery/Lens.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-import type BN from "bn.js";
 import type BigNumber from "bignumber.js";
 import type { ContractOptions } from "web3-eth-contract";
 import type { EventLog } from "web3-core";
@@ -42,7 +41,7 @@ export interface Lens extends BaseContract {
                 string
             ]
         ][]>;
-        takerBiddableOrders(taker: string, lastIndex: number | string | BN | BigNumber, pageSize: number | string | BN | BigNumber): NonPayableTransactionObject<[
+        takerBiddableOrders(taker: string, lastIndex: number | string | BigNumber, pageSize: number | string | BigNumber): NonPayableTransactionObject<[
             string,
             string,
             string,
@@ -69,7 +68,7 @@ export interface Lens extends BaseContract {
                 string
             ]
         ][]>;
-        takerFillableOrders(taker: string, lastIndex: number | string | BN | BigNumber, pageSize: number | string | BN | BigNumber): NonPayableTransactionObject<[
+        takerFillableOrders(taker: string, lastIndex: number | string | BigNumber, pageSize: number | string | BigNumber): NonPayableTransactionObject<[
             string,
             string,
             string,

package/dist/typechain-hardhat/contracts/periphery/Taker.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-import type BN from "bn.js";
 import type BigNumber from "bignumber.js";
 import type { ContractOptions } from "web3-eth-contract";
 import type { EventLog } from "web3-core";
@@ -14,8 +13,8 @@ export interface Taker extends BaseContract {
     constructor(jsonInterface: any[], address?: string, options?: ContractOptions): Taker;
     clone(): Taker;
     methods: {
-        bid(id: number | string | BN | BigNumber, exchange: string, dstFee: number | string | BN | BigNumber, slippagePercent: number | string | BN | BigNumber, data: string | number[]): NonPayableTransactionObject<void>;
-        fill(id: number | string | BN | BigNumber, feeExchange: string, feeMinAmountOut: number | string | BN | BigNumber, feeData: string | number[]): NonPayableTransactionObject<void>;
+        bid(id: number | string | BigNumber, exchange: string, dstFee: number | string | BigNumber, slippagePercent: number | string | BigNumber, data: string | number[]): NonPayableTransactionObject<void>;
+        fill(id: number | string | BigNumber, feeExchange: string, feeMinAmountOut: number | string | BigNumber, feeData: string | number[]): NonPayableTransactionObject<void>;
         owners(arg0: string): NonPayableTransactionObject<boolean>;
         rescue(token: string): NonPayableTransactionObject<void>;
         twap(): NonPayableTransactionObject<string>;

package/dist/typechain-hardhat/contracts/test/MockDeflationaryToken.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-import type BN from "bn.js";
 import type BigNumber from "bignumber.js";
 import type { ContractOptions } from "web3-eth-contract";
 import type { EventLog } from "web3-core";
@@ -31,16 +30,16 @@ export interface MockDeflationaryToken extends BaseContract {
     clone(): MockDeflationaryToken;
     methods: {
         allowance(owner: string, spender: string): NonPayableTransactionObject<string>;
-        approve(spender: string, amount: number | string | BN | BigNumber): NonPayableTransactionObject<boolean>;
+        approve(spender: string, amount: number | string | BigNumber): NonPayableTransactionObject<boolean>;
         balanceOf(account: string): NonPayableTransactionObject<string>;
         decimals(): NonPayableTransactionObject<string>;
-        decreaseAllowance(spender: string, subtractedValue: number | string | BN | BigNumber): NonPayableTransactionObject<boolean>;
-        increaseAllowance(spender: string, addedValue: number | string | BN | BigNumber): NonPayableTransactionObject<boolean>;
+        decreaseAllowance(spender: string, subtractedValue: number | string | BigNumber): NonPayableTransactionObject<boolean>;
+        increaseAllowance(spender: string, addedValue: number | string | BigNumber): NonPayableTransactionObject<boolean>;
         name(): NonPayableTransactionObject<string>;
         symbol(): NonPayableTransactionObject<string>;
         totalSupply(): NonPayableTransactionObject<string>;
-        transfer(to: string, amount: number | string | BN | BigNumber): NonPayableTransactionObject<boolean>;
-        transferFrom(from: string, to: string, amount: number | string | BN | BigNumber): NonPayableTransactionObject<boolean>;
+        transfer(to: string, amount: number | string | BigNumber): NonPayableTransactionObject<boolean>;
+        transferFrom(from: string, to: string, amount: number | string | BigNumber): NonPayableTransactionObject<boolean>;
     };
     events: {
         Approval(cb?: Callback<Approval>): EventEmitter;

package/dist/typechain-hardhat/contracts/test/MockExchange.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-import type BN from "bn.js";
 import type BigNumber from "bignumber.js";
 import type { ContractOptions } from "web3-eth-contract";
 import type { EventLog } from "web3-core";
@@ -14,10 +13,10 @@ export interface MockExchange extends BaseContract {
     constructor(jsonInterface: any[], address?: string, options?: ContractOptions): MockExchange;
     clone(): MockExchange;
     methods: {
-        amounts(arg0: number | string | BN | BigNumber): NonPayableTransactionObject<string>;
-        getAmountOut(arg0: string, arg1: string, arg2: number | string | BN | BigNumber, arg3: string | number[]): NonPayableTransactionObject<string>;
-        setMockAmounts(_amounts: (number | string | BN | BigNumber)[]): NonPayableTransactionObject<void>;
-        swap(_srcToken: string, _dstToken: string, amountIn: number | string | BN | BigNumber, arg3: number | string | BN | BigNumber, arg4: string | number[]): NonPayableTransactionObject<void>;
+        amounts(arg0: number | string | BigNumber): NonPayableTransactionObject<string>;
+        getAmountOut(arg0: string, arg1: string, arg2: number | string | BigNumber, arg3: string | number[]): NonPayableTransactionObject<string>;
+        setMockAmounts(_amounts: (number | string | BigNumber)[]): NonPayableTransactionObject<void>;
+        swap(_srcToken: string, _dstToken: string, amountIn: number | string | BigNumber, arg3: number | string | BigNumber, arg4: string | number[]): NonPayableTransactionObject<void>;
     };
     events: {
         allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;

package/dist/typechain-hardhat/types.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-import type BN from "bn.js";
 import type BigNumber from "bignumber.js";
 import type { EventEmitter } from "events";
 import type { EventLog, PromiEvent, TransactionReceipt } from "web3-core/types";
@@ -7,7 +6,7 @@ import type { Contract } from "web3-eth-contract";
 export interface EstimateGasOptions {
     from?: string;
     gas?: number;
-    value?: number | string | BN | BigNumber;
+    value?: number | string | BigNumber;
 }
 export interface EventOptions {
     filter?: object;
@@ -24,18 +23,18 @@ export interface ContractEventEmitter<T> extends EventEmitter {
     on(event: "error", listener: (error: Error) => void): this;
 }
 export interface NonPayableTx {
-    nonce?: string | number | BN | BigNumber;
-    chainId?: string | number | BN | BigNumber;
+    nonce?: string | number | BigNumber;
+    chainId?: string | number | BigNumber;
     from?: string;
     to?: string;
     data?: string;
-    gas?: string | number | BN | BigNumber;
-    maxPriorityFeePerGas?: string | number | BN | BigNumber;
-    maxFeePerGas?: string | number | BN | BigNumber;
-    gasPrice?: string | number | BN | BigNumber;
+    gas?: string | number | BigNumber;
+    maxPriorityFeePerGas?: string | number | BigNumber;
+    maxFeePerGas?: string | number | BigNumber;
+    gasPrice?: string | number | BigNumber;
 }
 export interface PayableTx extends NonPayableTx {
-    value?: string | number | BN | BigNumber;
+    value?: string | number | BigNumber;
 }
 export interface NonPayableTransactionObject<T> {
     arguments: any[];
@@ -51,5 +50,5 @@ export interface PayableTransactionObject<T> {
     estimateGas(tx?: PayableTx): Promise<number>;
     encodeABI(): string;
 }
-export type BlockType = "latest" | "pending" | "genesis" | "earliest" | number | BN | BigNumber;
+export type BlockType = "latest" | "pending" | "genesis" | "earliest" | number | BigNumber;
 export type BaseContract = Omit<Contract, "clone" | "once">;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbs-network/twap",
-  "version": "1.7.13",
+  "version": "1.7.14",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/orbs-network/twap.git"