From eb76e4c4f5117c84270195fda0767dac3f03c893 Mon Sep 17 00:00:00 2001
From: Vladislav Shabanov <vshabanov88@gmail.com>
Date: Tue, 19 Mar 2019 17:01:48 +0700
Subject: [PATCH 1/4] Use genuine BN type

---
 packages/web3-core/types/index.d.ts                   |  2 +-
 packages/web3-eth-contract/types/index.d.ts           |  3 ++-
 packages/web3-utils/types/index.d.ts                  | 11 +++--------
 packages/web3-utils/types/tests/ascii-to-hex-test.ts  |  3 ++-
 packages/web3-utils/types/tests/bytes-to-hex-test.ts  |  3 ++-
 .../types/tests/check-address-checksum-test.ts        |  3 ++-
 packages/web3-utils/types/tests/from-ascii-test.ts    |  3 ++-
 packages/web3-utils/types/tests/from-decimal-test.ts  |  3 ++-
 packages/web3-utils/types/tests/from-utf8-test.ts     |  3 ++-
 packages/web3-utils/types/tests/from-wei-test.ts      |  3 ++-
 .../types/tests/get-signature-params-test.ts          |  3 ++-
 .../web3-utils/types/tests/get-unit-value-test.ts     |  3 ++-
 packages/web3-utils/types/tests/hex-to-ascii-test.ts  |  3 ++-
 packages/web3-utils/types/tests/hex-to-bytes-test.ts  |  3 ++-
 .../types/tests/hex-to-number-string-test.ts          |  3 ++-
 packages/web3-utils/types/tests/hex-to-number-test.ts |  3 ++-
 packages/web3-utils/types/tests/hex-to-string-test.ts |  3 ++-
 packages/web3-utils/types/tests/hex-to-utf8-test.ts   |  3 ++-
 packages/web3-utils/types/tests/is-address-test.ts    |  3 ++-
 packages/web3-utils/types/tests/is-big-number-test.ts |  3 ++-
 packages/web3-utils/types/tests/is-bloom-test.ts      |  3 ++-
 packages/web3-utils/types/tests/is-bn-test.ts         |  3 ++-
 packages/web3-utils/types/tests/is-hex-strict-test.ts |  3 ++-
 packages/web3-utils/types/tests/is-hex-test.ts        |  3 ++-
 packages/web3-utils/types/tests/is-topic-test.ts      |  3 ++-
 packages/web3-utils/types/tests/keccak256-test.ts     |  3 ++-
 packages/web3-utils/types/tests/left-pad-test.ts      |  3 ++-
 packages/web3-utils/types/tests/number-to-hex-test.ts |  3 ++-
 packages/web3-utils/types/tests/pad-left-test.ts      |  3 ++-
 packages/web3-utils/types/tests/pad-right-test.ts     |  3 ++-
 packages/web3-utils/types/tests/random-hex-test.ts    |  3 ++-
 packages/web3-utils/types/tests/right-pad-test.ts     |  3 ++-
 packages/web3-utils/types/tests/sha3-test.ts          |  3 ++-
 packages/web3-utils/types/tests/solidity-sha3-test.ts |  3 ++-
 packages/web3-utils/types/tests/string-to-hex-test.ts |  3 ++-
 packages/web3-utils/types/tests/test-address-test.ts  |  3 ++-
 packages/web3-utils/types/tests/test-topic-test.ts    |  3 ++-
 packages/web3-utils/types/tests/to-ascii-test.ts      |  3 ++-
 .../types/tests/to-check-sum-address-test.ts          |  3 ++-
 packages/web3-utils/types/tests/to-decimal-test.ts    |  3 ++-
 packages/web3-utils/types/tests/to-hex-test.ts        |  3 ++-
 .../web3-utils/types/tests/to-twos-compement-test.ts  |  3 ++-
 packages/web3-utils/types/tests/to-utf8-test.ts       |  3 ++-
 packages/web3-utils/types/tests/to-wei-test.ts        |  3 ++-
 packages/web3-utils/types/tests/utf8-to-hex-test.ts   |  3 ++-
 45 files changed, 90 insertions(+), 52 deletions(-)

diff --git a/packages/web3-core/types/index.d.ts b/packages/web3-core/types/index.d.ts
index c4d011dcc07..7f1627a271f 100644
--- a/packages/web3-core/types/index.d.ts
+++ b/packages/web3-core/types/index.d.ts
@@ -18,6 +18,7 @@
  */
 
 import * as net from 'net';
+import BN = require('bn.js');
 import {AbstractMethodFactory} from 'web3-core-method';
 import {
     BatchRequest,
@@ -29,7 +30,6 @@ import {
     WebsocketProvider,
     WebsocketProviderOptions
 } from 'web3-providers';
-import {BN} from 'web3-utils';
 
 export class AbstractWeb3Module {
     constructor(
diff --git a/packages/web3-eth-contract/types/index.d.ts b/packages/web3-eth-contract/types/index.d.ts
index 8d0bf0ed433..f424707ec8e 100644
--- a/packages/web3-eth-contract/types/index.d.ts
+++ b/packages/web3-eth-contract/types/index.d.ts
@@ -17,8 +17,9 @@
  * @date 2018
  */
 
+import BN = require('bn.js');
 import {provider} from 'web3-providers';
-import {AbiItem, BN} from 'web3-utils';
+import {AbiItem} from 'web3-utils';
 import {PromiEvent} from 'web3-core';
 
 export class Contract {
diff --git a/packages/web3-utils/types/index.d.ts b/packages/web3-utils/types/index.d.ts
index 6f64fa4c148..da722816394 100644
--- a/packages/web3-utils/types/index.d.ts
+++ b/packages/web3-utils/types/index.d.ts
@@ -20,7 +20,7 @@
  * @date 2018
  */
 
-import BigNumber = require('bn.js');
+import BN = require('bn.js');
 import {Buffer} from 'buffer';
 
 export type Unit =
@@ -68,11 +68,6 @@ export type Mixed =
 
 export type Hex = string | number;
 
-export class BN extends BigNumber {
-    constructor(number: number | string | number[] | Buffer | BN, base?: number | 'hex', endian?: 'le' | 'be');
-    super(number: number | string | number[] | Buffer | BN, base?: number | 'hex', endian?: 'le' | 'be'): BigNumber;
-}
-
 // utils types
 export function isBN(value: string | number): boolean;
 export function isBigNumber(value: BN): boolean;
@@ -219,11 +214,11 @@ export interface AbiInput {
     name: string;
     type: string;
     indexed?: boolean;
-	components?: AbiInput[];
+    components?: AbiInput[];
 }
 
 export interface AbiOutput {
     name: string;
     type: string;
-	components?: AbiOutput[];
+    components?: AbiOutput[];
 }
diff --git a/packages/web3-utils/types/tests/ascii-to-hex-test.ts b/packages/web3-utils/types/tests/ascii-to-hex-test.ts
index 3e2a4537394..0f2f750ce85 100644
--- a/packages/web3-utils/types/tests/ascii-to-hex-test.ts
+++ b/packages/web3-utils/types/tests/ascii-to-hex-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {asciiToHex, BN} from 'web3-utils';
+import BN = require('bn.js');
+import {asciiToHex} from 'web3-utils';
 
 // $ExpectType string
 asciiToHex('I have 100!');
diff --git a/packages/web3-utils/types/tests/bytes-to-hex-test.ts b/packages/web3-utils/types/tests/bytes-to-hex-test.ts
index 5fe612c3ea5..af7253c352f 100644
--- a/packages/web3-utils/types/tests/bytes-to-hex-test.ts
+++ b/packages/web3-utils/types/tests/bytes-to-hex-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, bytesToHex} from 'web3-utils';
+import BN = require('bn.js');
+import {bytesToHex} from 'web3-utils';
 
 // $ExpectType string
 bytesToHex([72]);
diff --git a/packages/web3-utils/types/tests/check-address-checksum-test.ts b/packages/web3-utils/types/tests/check-address-checksum-test.ts
index 3e99a6bbbe5..8fe29f10969 100644
--- a/packages/web3-utils/types/tests/check-address-checksum-test.ts
+++ b/packages/web3-utils/types/tests/check-address-checksum-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, checkAddressChecksum} from 'web3-utils';
+import BN = require('bn.js');
+import {checkAddressChecksum} from 'web3-utils';
 
 // $ExpectType boolean
 checkAddressChecksum('0x8ee7f17bb3f88b01247c21ab6603880b64ae53e811f5e01138822e558cf1ab51');
diff --git a/packages/web3-utils/types/tests/from-ascii-test.ts b/packages/web3-utils/types/tests/from-ascii-test.ts
index 7e9e857494e..504c6ee2698 100644
--- a/packages/web3-utils/types/tests/from-ascii-test.ts
+++ b/packages/web3-utils/types/tests/from-ascii-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, fromAscii} from 'web3-utils';
+import BN = require('bn.js');
+import {fromAscii} from 'web3-utils';
 
 // $ExpectType string
 fromAscii('I have 100!');
diff --git a/packages/web3-utils/types/tests/from-decimal-test.ts b/packages/web3-utils/types/tests/from-decimal-test.ts
index 436657cb7b9..3870aa3e701 100644
--- a/packages/web3-utils/types/tests/from-decimal-test.ts
+++ b/packages/web3-utils/types/tests/from-decimal-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, fromDecimal} from 'web3-utils';
+import BN = require('bn.js');
+import {fromDecimal} from 'web3-utils';
 
 // $ExpectType string
 fromDecimal('232');
diff --git a/packages/web3-utils/types/tests/from-utf8-test.ts b/packages/web3-utils/types/tests/from-utf8-test.ts
index c6c0fc0bd0b..8ab06f87dd3 100644
--- a/packages/web3-utils/types/tests/from-utf8-test.ts
+++ b/packages/web3-utils/types/tests/from-utf8-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, fromUtf8} from 'web3-utils';
+import BN = require('bn.js');
+import {fromUtf8} from 'web3-utils';
 
 // $ExpectType string
 fromUtf8('I have 100£');
diff --git a/packages/web3-utils/types/tests/from-wei-test.ts b/packages/web3-utils/types/tests/from-wei-test.ts
index 1eafeb9b361..852616f6881 100644
--- a/packages/web3-utils/types/tests/from-wei-test.ts
+++ b/packages/web3-utils/types/tests/from-wei-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, fromWei} from 'web3-utils';
+import BN = require('bn.js');
+import {fromWei} from 'web3-utils';
 
 const bigNumber = new BN(3);
 
diff --git a/packages/web3-utils/types/tests/get-signature-params-test.ts b/packages/web3-utils/types/tests/get-signature-params-test.ts
index 65c02aff5cb..e1f442239c0 100644
--- a/packages/web3-utils/types/tests/get-signature-params-test.ts
+++ b/packages/web3-utils/types/tests/get-signature-params-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, getSignatureParameters} from 'web3-utils';
+import BN = require('bn.js');
+import {getSignatureParameters} from 'web3-utils';
 
 // $ExpectType { r: string; s: string; v: number; }
 getSignatureParameters(
diff --git a/packages/web3-utils/types/tests/get-unit-value-test.ts b/packages/web3-utils/types/tests/get-unit-value-test.ts
index 07e73e2592b..27ffc9ac857 100644
--- a/packages/web3-utils/types/tests/get-unit-value-test.ts
+++ b/packages/web3-utils/types/tests/get-unit-value-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, getUnitValue} from 'web3-utils';
+import BN = require('bn.js');
+import {getUnitValue} from 'web3-utils';
 
 // $ExpectType string
 getUnitValue('ether');
diff --git a/packages/web3-utils/types/tests/hex-to-ascii-test.ts b/packages/web3-utils/types/tests/hex-to-ascii-test.ts
index f8fe2d58fa0..991e44ca461 100644
--- a/packages/web3-utils/types/tests/hex-to-ascii-test.ts
+++ b/packages/web3-utils/types/tests/hex-to-ascii-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, hexToAscii} from 'web3-utils';
+import BN = require('bn.js');
+import {hexToAscii} from 'web3-utils';
 
 // $ExpectType string
 hexToAscii('0x4920686176652031303021');
diff --git a/packages/web3-utils/types/tests/hex-to-bytes-test.ts b/packages/web3-utils/types/tests/hex-to-bytes-test.ts
index be4ed5e76db..9a57e3559a8 100644
--- a/packages/web3-utils/types/tests/hex-to-bytes-test.ts
+++ b/packages/web3-utils/types/tests/hex-to-bytes-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, hexToBytes} from 'web3-utils';
+import BN = require('bn.js');
+import {hexToBytes} from 'web3-utils';
 
 // $ExpectType number[]
 hexToBytes('0x000000ea');
diff --git a/packages/web3-utils/types/tests/hex-to-number-string-test.ts b/packages/web3-utils/types/tests/hex-to-number-string-test.ts
index 8f0f178915a..10d80d03912 100644
--- a/packages/web3-utils/types/tests/hex-to-number-string-test.ts
+++ b/packages/web3-utils/types/tests/hex-to-number-string-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, hexToNumberString} from 'web3-utils';
+import BN = require('bn.js');
+import {hexToNumberString} from 'web3-utils';
 
 // $ExpectType string
 hexToNumberString('0xea');
diff --git a/packages/web3-utils/types/tests/hex-to-number-test.ts b/packages/web3-utils/types/tests/hex-to-number-test.ts
index 095e612e080..597a65bfe5f 100644
--- a/packages/web3-utils/types/tests/hex-to-number-test.ts
+++ b/packages/web3-utils/types/tests/hex-to-number-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, hexToNumber} from 'web3-utils';
+import BN = require('bn.js');
+import {hexToNumber} from 'web3-utils';
 
 // $ExpectType number
 hexToNumber('232');
diff --git a/packages/web3-utils/types/tests/hex-to-string-test.ts b/packages/web3-utils/types/tests/hex-to-string-test.ts
index fcf8dd2884d..000464e7968 100644
--- a/packages/web3-utils/types/tests/hex-to-string-test.ts
+++ b/packages/web3-utils/types/tests/hex-to-string-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, hexToString} from 'web3-utils';
+import BN = require('bn.js');
+import {hexToString} from 'web3-utils';
 
 // $ExpectType string
 hexToString('0x49206861766520313030e282ac');
diff --git a/packages/web3-utils/types/tests/hex-to-utf8-test.ts b/packages/web3-utils/types/tests/hex-to-utf8-test.ts
index 60200a012e5..021fe0fc6f1 100644
--- a/packages/web3-utils/types/tests/hex-to-utf8-test.ts
+++ b/packages/web3-utils/types/tests/hex-to-utf8-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, hexToUtf8} from 'web3-utils';
+import BN = require('bn.js');
+import {hexToUtf8} from 'web3-utils';
 
 // $ExpectType string
 hexToUtf8('0x49206861766520313030e282ac');
diff --git a/packages/web3-utils/types/tests/is-address-test.ts b/packages/web3-utils/types/tests/is-address-test.ts
index a357848a301..ece81498a38 100644
--- a/packages/web3-utils/types/tests/is-address-test.ts
+++ b/packages/web3-utils/types/tests/is-address-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, isAddress} from 'web3-utils';
+import BN = require('bn.js');
+import {isAddress} from 'web3-utils';
 
 // $ExpectType boolean
 isAddress('0x8ee7f17bb3f88b01247c21ab6603880b64ae53e811f5e01138822e558cf1ab51');
diff --git a/packages/web3-utils/types/tests/is-big-number-test.ts b/packages/web3-utils/types/tests/is-big-number-test.ts
index d59710a6a96..99968cf8ff2 100644
--- a/packages/web3-utils/types/tests/is-big-number-test.ts
+++ b/packages/web3-utils/types/tests/is-big-number-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {isBigNumber, BN} from 'web3-utils';
+import BN = require('bn.js');
+import {isBigNumber} from 'web3-utils';
 
 // $ExpectType boolean
 isBigNumber(new BN(3));
diff --git a/packages/web3-utils/types/tests/is-bloom-test.ts b/packages/web3-utils/types/tests/is-bloom-test.ts
index c9bb8f98fa4..e0256e92fc8 100644
--- a/packages/web3-utils/types/tests/is-bloom-test.ts
+++ b/packages/web3-utils/types/tests/is-bloom-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, isBloom} from 'web3-utils';
+import BN = require('bn.js');
+import {isBloom} from 'web3-utils';
 
 // $ExpectType boolean
 isBloom('0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef');
diff --git a/packages/web3-utils/types/tests/is-bn-test.ts b/packages/web3-utils/types/tests/is-bn-test.ts
index bffc3ef0798..1a4c9d1efe7 100644
--- a/packages/web3-utils/types/tests/is-bn-test.ts
+++ b/packages/web3-utils/types/tests/is-bn-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {isBN, BN} from 'web3-utils';
+import BN = require('bn.js');
+import {isBN} from 'web3-utils';
 
 // $ExpectType boolean
 isBN(7);
diff --git a/packages/web3-utils/types/tests/is-hex-strict-test.ts b/packages/web3-utils/types/tests/is-hex-strict-test.ts
index 2521a8cfa9f..70c7c469f48 100644
--- a/packages/web3-utils/types/tests/is-hex-strict-test.ts
+++ b/packages/web3-utils/types/tests/is-hex-strict-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, isHexStrict} from 'web3-utils';
+import BN = require('bn.js');
+import {isHexStrict} from 'web3-utils';
 
 // $ExpectType boolean
 isHexStrict('0xc1912');
diff --git a/packages/web3-utils/types/tests/is-hex-test.ts b/packages/web3-utils/types/tests/is-hex-test.ts
index e86328f3cb3..64ffa687ce9 100644
--- a/packages/web3-utils/types/tests/is-hex-test.ts
+++ b/packages/web3-utils/types/tests/is-hex-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, isHex} from 'web3-utils';
+import BN = require('bn.js');
+import {isHex} from 'web3-utils';
 
 // $ExpectType boolean
 isHex('0xc1912');
diff --git a/packages/web3-utils/types/tests/is-topic-test.ts b/packages/web3-utils/types/tests/is-topic-test.ts
index e5cb9dfa863..bb600827c60 100644
--- a/packages/web3-utils/types/tests/is-topic-test.ts
+++ b/packages/web3-utils/types/tests/is-topic-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, isTopic} from 'web3-utils';
+import BN = require('bn.js');
+import {isTopic} from 'web3-utils';
 
 // $ExpectType boolean
 isTopic('0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef');
diff --git a/packages/web3-utils/types/tests/keccak256-test.ts b/packages/web3-utils/types/tests/keccak256-test.ts
index a2e114e32d8..7f3f571e19a 100644
--- a/packages/web3-utils/types/tests/keccak256-test.ts
+++ b/packages/web3-utils/types/tests/keccak256-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, keccak256} from 'web3-utils';
+import BN = require('bn.js');
+import {keccak256} from 'web3-utils';
 
 // $ExpectType string
 keccak256('234');
diff --git a/packages/web3-utils/types/tests/left-pad-test.ts b/packages/web3-utils/types/tests/left-pad-test.ts
index 54af4065e4d..936f198ea4c 100644
--- a/packages/web3-utils/types/tests/left-pad-test.ts
+++ b/packages/web3-utils/types/tests/left-pad-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, leftPad} from 'web3-utils';
+import BN = require('bn.js');
+import {leftPad} from 'web3-utils';
 
 const bigNumber = new BN(3);
 // $ExpectType string
diff --git a/packages/web3-utils/types/tests/number-to-hex-test.ts b/packages/web3-utils/types/tests/number-to-hex-test.ts
index a66dc2e83db..102e22f7518 100644
--- a/packages/web3-utils/types/tests/number-to-hex-test.ts
+++ b/packages/web3-utils/types/tests/number-to-hex-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, numberToHex} from 'web3-utils';
+import BN = require('bn.js');
+import {numberToHex} from 'web3-utils';
 
 // $ExpectType string
 numberToHex('232');
diff --git a/packages/web3-utils/types/tests/pad-left-test.ts b/packages/web3-utils/types/tests/pad-left-test.ts
index 389eed0366c..e763df68fdf 100644
--- a/packages/web3-utils/types/tests/pad-left-test.ts
+++ b/packages/web3-utils/types/tests/pad-left-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, padLeft} from 'web3-utils';
+import BN = require('bn.js');
+import {padLeft} from 'web3-utils';
 
 const bigNumber = new BN(3);
 
diff --git a/packages/web3-utils/types/tests/pad-right-test.ts b/packages/web3-utils/types/tests/pad-right-test.ts
index 3b1c794a620..97202a820b3 100644
--- a/packages/web3-utils/types/tests/pad-right-test.ts
+++ b/packages/web3-utils/types/tests/pad-right-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, padRight} from 'web3-utils';
+import BN = require('bn.js');
+import {padRight} from 'web3-utils';
 
 const bigNumber = new BN(3);
 
diff --git a/packages/web3-utils/types/tests/random-hex-test.ts b/packages/web3-utils/types/tests/random-hex-test.ts
index 75d70eeee14..64465afb93e 100644
--- a/packages/web3-utils/types/tests/random-hex-test.ts
+++ b/packages/web3-utils/types/tests/random-hex-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, randomHex} from 'web3-utils';
+import BN = require('bn.js');
+import {randomHex} from 'web3-utils';
 
 // $ExpectType string
 randomHex(32);
diff --git a/packages/web3-utils/types/tests/right-pad-test.ts b/packages/web3-utils/types/tests/right-pad-test.ts
index b8e3f1633a0..f81ace7dc72 100644
--- a/packages/web3-utils/types/tests/right-pad-test.ts
+++ b/packages/web3-utils/types/tests/right-pad-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, rightPad} from 'web3-utils';
+import BN = require('bn.js');
+import {rightPad} from 'web3-utils';
 
 const bigNumber = new BN(3);
 
diff --git a/packages/web3-utils/types/tests/sha3-test.ts b/packages/web3-utils/types/tests/sha3-test.ts
index 782bdede589..a92330aa5d4 100644
--- a/packages/web3-utils/types/tests/sha3-test.ts
+++ b/packages/web3-utils/types/tests/sha3-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, sha3} from 'web3-utils';
+import BN = require('bn.js');
+import {sha3} from 'web3-utils';
 
 // $ExpectType string
 sha3('234');
diff --git a/packages/web3-utils/types/tests/solidity-sha3-test.ts b/packages/web3-utils/types/tests/solidity-sha3-test.ts
index 354de793f97..89a5b0e8f21 100644
--- a/packages/web3-utils/types/tests/solidity-sha3-test.ts
+++ b/packages/web3-utils/types/tests/solidity-sha3-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, soliditySha3} from 'web3-utils';
+import BN = require('bn.js');
+import {soliditySha3} from 'web3-utils';
 
 // $ExpectType string
 soliditySha3('234564535', '0xfff23243', true, -10);
diff --git a/packages/web3-utils/types/tests/string-to-hex-test.ts b/packages/web3-utils/types/tests/string-to-hex-test.ts
index b01a779a895..a8c4370d344 100644
--- a/packages/web3-utils/types/tests/string-to-hex-test.ts
+++ b/packages/web3-utils/types/tests/string-to-hex-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, stringToHex} from 'web3-utils';
+import BN = require('bn.js');
+import {stringToHex} from 'web3-utils';
 
 // $ExpectType string
 stringToHex('I have 100£');
diff --git a/packages/web3-utils/types/tests/test-address-test.ts b/packages/web3-utils/types/tests/test-address-test.ts
index 05b26b6e702..8c47a1c91ac 100644
--- a/packages/web3-utils/types/tests/test-address-test.ts
+++ b/packages/web3-utils/types/tests/test-address-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, testAddress} from 'web3-utils';
+import BN = require('bn.js');
+import {testAddress} from 'web3-utils';
 
 const bigNumber = new BN(3);
 
diff --git a/packages/web3-utils/types/tests/test-topic-test.ts b/packages/web3-utils/types/tests/test-topic-test.ts
index 26a4fbd1083..5c306083ed8 100644
--- a/packages/web3-utils/types/tests/test-topic-test.ts
+++ b/packages/web3-utils/types/tests/test-topic-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, testTopic} from 'web3-utils';
+import BN = require('bn.js');
+import {testTopic} from 'web3-utils';
 
 const bigNumber = new BN(3);
 
diff --git a/packages/web3-utils/types/tests/to-ascii-test.ts b/packages/web3-utils/types/tests/to-ascii-test.ts
index fcb6888555f..9d086a2394a 100644
--- a/packages/web3-utils/types/tests/to-ascii-test.ts
+++ b/packages/web3-utils/types/tests/to-ascii-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, toAscii} from 'web3-utils';
+import BN = require('bn.js');
+import {toAscii} from 'web3-utils';
 
 // $ExpectType string
 toAscii('0x4920686176652031303021');
diff --git a/packages/web3-utils/types/tests/to-check-sum-address-test.ts b/packages/web3-utils/types/tests/to-check-sum-address-test.ts
index 56f80a9f2cd..6fe37fb577f 100644
--- a/packages/web3-utils/types/tests/to-check-sum-address-test.ts
+++ b/packages/web3-utils/types/tests/to-check-sum-address-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, toChecksumAddress} from 'web3-utils';
+import BN = require('bn.js');
+import {toChecksumAddress} from 'web3-utils';
 
 // $ExpectType string
 toChecksumAddress('0x8ee7f17bb3f88b01247c21ab6603880b64ae53e811f5e01138822e558cf1ab51');
diff --git a/packages/web3-utils/types/tests/to-decimal-test.ts b/packages/web3-utils/types/tests/to-decimal-test.ts
index 2d03932963d..77793f81165 100644
--- a/packages/web3-utils/types/tests/to-decimal-test.ts
+++ b/packages/web3-utils/types/tests/to-decimal-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, toDecimal} from 'web3-utils';
+import BN = require('bn.js');
+import {toDecimal} from 'web3-utils';
 
 // $ExpectType number
 toDecimal('232');
diff --git a/packages/web3-utils/types/tests/to-hex-test.ts b/packages/web3-utils/types/tests/to-hex-test.ts
index 37452c879e6..0c2be5b9709 100644
--- a/packages/web3-utils/types/tests/to-hex-test.ts
+++ b/packages/web3-utils/types/tests/to-hex-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, toHex} from 'web3-utils';
+import BN = require('bn.js');
+import {toHex} from 'web3-utils';
 
 // $ExpectType string
 toHex('234');
diff --git a/packages/web3-utils/types/tests/to-twos-compement-test.ts b/packages/web3-utils/types/tests/to-twos-compement-test.ts
index 4239a6554c5..1162976b26f 100644
--- a/packages/web3-utils/types/tests/to-twos-compement-test.ts
+++ b/packages/web3-utils/types/tests/to-twos-compement-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {toTwosComplement, BN} from 'web3-utils';
+import BN = require('bn.js');
+import {toTwosComplement} from 'web3-utils';
 
 // $ExpectType string
 toTwosComplement(4);
diff --git a/packages/web3-utils/types/tests/to-utf8-test.ts b/packages/web3-utils/types/tests/to-utf8-test.ts
index 2e4fc759de1..54c10748f96 100644
--- a/packages/web3-utils/types/tests/to-utf8-test.ts
+++ b/packages/web3-utils/types/tests/to-utf8-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, toUtf8} from 'web3-utils';
+import BN = require('bn.js');
+import {toUtf8} from 'web3-utils';
 
 // $ExpectType string
 toUtf8('0x49206861766520313030e282ac');
diff --git a/packages/web3-utils/types/tests/to-wei-test.ts b/packages/web3-utils/types/tests/to-wei-test.ts
index 9f9b14dacfc..ee725b53c04 100644
--- a/packages/web3-utils/types/tests/to-wei-test.ts
+++ b/packages/web3-utils/types/tests/to-wei-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, toWei} from 'web3-utils';
+import BN = require('bn.js');
+import {toWei} from 'web3-utils';
 
 const bigNumber = new BN(3);
 
diff --git a/packages/web3-utils/types/tests/utf8-to-hex-test.ts b/packages/web3-utils/types/tests/utf8-to-hex-test.ts
index afae926654c..116551bc63b 100644
--- a/packages/web3-utils/types/tests/utf8-to-hex-test.ts
+++ b/packages/web3-utils/types/tests/utf8-to-hex-test.ts
@@ -20,7 +20,8 @@
  * @date 2018
  */
 
-import {BN, utf8ToHex} from 'web3-utils';
+import BN = require('bn.js');
+import {utf8ToHex} from 'web3-utils';
 
 // $ExpectType string
 utf8ToHex('I have 100£');

From 61b9827725cb4c2d3c353d81d44bf25ee618f47f Mon Sep 17 00:00:00 2001
From: Vladislav Shabanov <vshabanov88@gmail.com>
Date: Tue, 19 Mar 2019 17:08:44 +0700
Subject: [PATCH 2/4] Deps

---
 packages/web3-core/package-lock.json         | 8 ++++++++
 packages/web3-core/package.json              | 1 +
 packages/web3-eth-contract/package-lock.json | 8 ++++++++
 packages/web3-eth-contract/package.json      | 1 +
 4 files changed, 18 insertions(+)

diff --git a/packages/web3-core/package-lock.json b/packages/web3-core/package-lock.json
index 0e3f4a0a243..dd5d48e0f46 100644
--- a/packages/web3-core/package-lock.json
+++ b/packages/web3-core/package-lock.json
@@ -12,6 +12,14 @@
 				"regenerator-runtime": "^0.12.0"
 			}
 		},
+		"@types/bn.js": {
+			"version": "4.11.4",
+			"resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.4.tgz",
+			"integrity": "sha512-AO8WW+aRcKWKQAYTfKLzwnpL6U+TfPqS+haRrhCy5ff04Da8WZud3ZgVjspQXaEXJDcTlsjUEVvL39wegDek5w==",
+			"requires": {
+				"@types/node": "*"
+			}
+		},
 		"@types/node": {
 			"version": "10.12.18",
 			"resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.18.tgz",
diff --git a/packages/web3-core/package.json b/packages/web3-core/package.json
index b96660ba169..ad49b9e2bf1 100644
--- a/packages/web3-core/package.json
+++ b/packages/web3-core/package.json
@@ -16,6 +16,7 @@
         "dtslint": "dtslint types --onlyTestTsNext"
     },
     "dependencies": {
+        "@types/bn.js": "^4.11.4",
         "@babel/runtime": "^7.3.1",
         "@types/node": "^10.12.18",
         "lodash": "^4.17.11",
diff --git a/packages/web3-eth-contract/package-lock.json b/packages/web3-eth-contract/package-lock.json
index 3ef0af8d38c..149381d0b97 100644
--- a/packages/web3-eth-contract/package-lock.json
+++ b/packages/web3-eth-contract/package-lock.json
@@ -12,6 +12,14 @@
 				"regenerator-runtime": "^0.12.0"
 			}
 		},
+		"@types/bn.js": {
+			"version": "4.11.4",
+			"resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.4.tgz",
+			"integrity": "sha512-AO8WW+aRcKWKQAYTfKLzwnpL6U+TfPqS+haRrhCy5ff04Da8WZud3ZgVjspQXaEXJDcTlsjUEVvL39wegDek5w==",
+			"requires": {
+				"@types/node": "*"
+			}
+		},
 		"@types/parsimmon": {
 			"version": "1.10.0",
 			"resolved": "https://registry.npmjs.org/@types/parsimmon/-/parsimmon-1.10.0.tgz",
diff --git a/packages/web3-eth-contract/package.json b/packages/web3-eth-contract/package.json
index ceaf3a05c80..92df73c5d74 100644
--- a/packages/web3-eth-contract/package.json
+++ b/packages/web3-eth-contract/package.json
@@ -16,6 +16,7 @@
         "dtslint": "dtslint types --onlyTestTsNext"
     },
     "dependencies": {
+        "@types/bn.js": "^4.11.4",
         "@babel/runtime": "^7.3.1",
         "lodash": "^4.17.11",
         "web3-core": "1.0.0-beta.48",

From 26a381ce606b2525f9e909126398bbe63dedb299 Mon Sep 17 00:00:00 2001
From: Vladislav Shabanov <vshabanov88@gmail.com>
Date: Tue, 19 Mar 2019 17:15:43 +0700
Subject: [PATCH 3/4] Cleanup

---
 packages/web3-utils/types/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/web3-utils/types/index.d.ts b/packages/web3-utils/types/index.d.ts
index da722816394..764b7469f99 100644
--- a/packages/web3-utils/types/index.d.ts
+++ b/packages/web3-utils/types/index.d.ts
@@ -214,11 +214,11 @@ export interface AbiInput {
     name: string;
     type: string;
     indexed?: boolean;
-    components?: AbiInput[];
+	components?: AbiInput[];
 }
 
 export interface AbiOutput {
     name: string;
     type: string;
-    components?: AbiOutput[];
+	components?: AbiOutput[];
 }

From b1f49a50e438fa74b0397d1a06690153731d961e Mon Sep 17 00:00:00 2001
From: Vladislav Shabanov <vshabanov88@gmail.com>
Date: Mon, 25 Mar 2019 19:10:42 +0700
Subject: [PATCH 4/4] Add deps through lerna

---
 packages/web3-core/package-lock.json         | 12 ++++++++++++
 packages/web3-core/package.json              |  2 +-
 packages/web3-eth-contract/package-lock.json | 17 +++++++++++++++++
 packages/web3-eth-contract/package.json      |  2 +-
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/packages/web3-core/package-lock.json b/packages/web3-core/package-lock.json
index 491c7d62f03..da8c5b2828a 100644
--- a/packages/web3-core/package-lock.json
+++ b/packages/web3-core/package-lock.json
@@ -180,10 +180,22 @@
 			"integrity": "sha512-ph4GXLw3HYzlQMJOFcpCqWHuL3MxJ/344OR7wn0wlQGchQGTIVNsSUl8iKEMatpy2geNMysgA9fQa6xVhHOkTQ==",
 			"dev": true,
 			"requires": {
+				"definitelytyped-header-parser": "github:Microsoft/definitelytyped-header-parser#production",
 				"fs-extra": "^6.0.1",
 				"strip-json-comments": "^2.0.1",
 				"tslint": "^5.12.0",
 				"typescript": "^3.4.0-dev.20190315"
+			},
+			"dependencies": {
+				"definitelytyped-header-parser": {
+					"version": "github:Microsoft/definitelytyped-header-parser#d957ad0bb2f4ecb60ac04f734e0b38fbc8e70b8a",
+					"from": "github:Microsoft/definitelytyped-header-parser#production",
+					"dev": true,
+					"requires": {
+						"@types/parsimmon": "^1.3.0",
+						"parsimmon": "^1.2.0"
+					}
+				}
 			}
 		},
 		"escape-string-regexp": {
diff --git a/packages/web3-core/package.json b/packages/web3-core/package.json
index e3a8f188e3b..ddef7edd1b7 100644
--- a/packages/web3-core/package.json
+++ b/packages/web3-core/package.json
@@ -16,8 +16,8 @@
         "dtslint": "dtslint types --onlyTestTsNext"
     },
     "dependencies": {
-        "@types/bn.js": "^4.11.4",
         "@babel/runtime": "^7.3.1",
+        "@types/bn.js": "^4.11.4",
         "@types/node": "^10.12.18",
         "lodash": "^4.17.11",
         "web3-utils": "1.0.0-beta.50"
diff --git a/packages/web3-eth-contract/package-lock.json b/packages/web3-eth-contract/package-lock.json
index 2c2e4ed4bd6..d207c4c1663 100644
--- a/packages/web3-eth-contract/package-lock.json
+++ b/packages/web3-eth-contract/package-lock.json
@@ -20,6 +20,11 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/node": {
+			"version": "11.11.6",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz",
+			"integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ=="
+		},
 		"@types/parsimmon": {
 			"version": "1.10.0",
 			"resolved": "https://registry.npmjs.org/@types/parsimmon/-/parsimmon-1.10.0.tgz",
@@ -175,10 +180,22 @@
 			"integrity": "sha512-ph4GXLw3HYzlQMJOFcpCqWHuL3MxJ/344OR7wn0wlQGchQGTIVNsSUl8iKEMatpy2geNMysgA9fQa6xVhHOkTQ==",
 			"dev": true,
 			"requires": {
+				"definitelytyped-header-parser": "github:Microsoft/definitelytyped-header-parser#production",
 				"fs-extra": "^6.0.1",
 				"strip-json-comments": "^2.0.1",
 				"tslint": "^5.12.0",
 				"typescript": "^3.4.0-dev.20190315"
+			},
+			"dependencies": {
+				"definitelytyped-header-parser": {
+					"version": "github:Microsoft/definitelytyped-header-parser#d957ad0bb2f4ecb60ac04f734e0b38fbc8e70b8a",
+					"from": "github:Microsoft/definitelytyped-header-parser#production",
+					"dev": true,
+					"requires": {
+						"@types/parsimmon": "^1.3.0",
+						"parsimmon": "^1.2.0"
+					}
+				}
 			}
 		},
 		"escape-string-regexp": {
diff --git a/packages/web3-eth-contract/package.json b/packages/web3-eth-contract/package.json
index ab1b382462a..85b95cb1fd9 100644
--- a/packages/web3-eth-contract/package.json
+++ b/packages/web3-eth-contract/package.json
@@ -16,8 +16,8 @@
         "dtslint": "dtslint types --onlyTestTsNext"
     },
     "dependencies": {
-        "@types/bn.js": "^4.11.4",
         "@babel/runtime": "^7.3.1",
+        "@types/bn.js": "^4.11.4",
         "lodash": "^4.17.11",
         "web3-core": "1.0.0-beta.50",
         "web3-core-helpers": "1.0.0-beta.50",