Merge pull request #305 from 0xProject/fix/bignumber_config

Use configured version of bignumber in all packages

19 files changed, 18 insertions, 25 deletions

diff --git a/packages/contracts/deploy/cli.ts b/packages/contracts/deploy/cli.ts
index c3a03e406..53ae3bcfa 100644
--- a/packages/contracts/deploy/cli.ts
+++ b/packages/contracts/deploy/cli.ts
@@ -1,5 +1,5 @@
+import { BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
-import { BigNumber } from 'bignumber.js';
 import * as _ from 'lodash';
 import * as path from 'path';
 import * as Web3 from 'web3';
diff --git a/packages/contracts/deploy/migrations/migrate.ts b/packages/contracts/deploy/migrations/migrate.ts
index 85f219a81..3efd1f9a6 100644
--- a/packages/contracts/deploy/migrations/migrate.ts
+++ b/packages/contracts/deploy/migrations/migrate.ts
@@ -1,5 +1,5 @@
+import { BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
-import { BigNumber } from 'bignumber.js';
 import * as _ from 'lodash';
 
 import { Deployer } from './../src/deployer';
diff --git a/packages/contracts/deploy/test/util/constants.ts b/packages/contracts/deploy/test/util/constants.ts
index 1bd062725..d52076607 100644
--- a/packages/contracts/deploy/test/util/constants.ts
+++ b/packages/contracts/deploy/test/util/constants.ts
@@ -1,4 +1,4 @@
-import { BigNumber } from 'bignumber.js';
+import { BigNumber } from '@0xproject/utils';
 
 export const constants = {
     networkId: 0,
diff --git a/packages/contracts/globalsAugment.d.ts b/packages/contracts/globalsAugment.d.ts
index c3ea54ffe..9b16ce2ad 100644
--- a/packages/contracts/globalsAugment.d.ts
+++ b/packages/contracts/globalsAugment.d.ts
@@ -1,4 +1,4 @@
-import { BigNumber } from 'bignumber.js';
+import { BigNumber } from '@0xproject/utils';
 
 // HACK: This module overrides the Chai namespace so that we can use BigNumber types inside.
 // Source: https://github.com/Microsoft/TypeScript/issues/7352#issuecomment-191547232
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index c93043b3b..16dd2db63 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -59,7 +59,6 @@
     "@0xproject/json-schemas": "^0.7.1",
     "@0xproject/utils": "^0.1.2",
     "@0xproject/web3-wrapper": "^0.1.2",
-    "bignumber.js": "~4.1.0",
     "bluebird": "^3.5.0",
     "bn.js": "^4.11.8",
     "ethereumjs-abi": "^0.6.4",
diff --git a/packages/contracts/test/ts/ether_token.ts b/packages/contracts/test/ts/ether_token.ts
index 98f477838..f807cdaa3 100644
--- a/packages/contracts/test/ts/ether_token.ts
+++ b/packages/contracts/test/ts/ether_token.ts
@@ -1,6 +1,5 @@
 import { ZeroEx, ZeroExError } from '0x.js';
-import { promisify } from '@0xproject/utils';
-import { BigNumber } from 'bignumber.js';
+import { BigNumber, promisify } from '@0xproject/utils';
 import * as chai from 'chai';
 import Web3 = require('web3');
 
diff --git a/packages/contracts/test/ts/exchange/core.ts b/packages/contracts/test/ts/exchange/core.ts
index 19887a3e6..770ef0c43 100644
--- a/packages/contracts/test/ts/exchange/core.ts
+++ b/packages/contracts/test/ts/exchange/core.ts
@@ -1,5 +1,5 @@
 import { ZeroEx } from '0x.js';
-import { BigNumber } from 'bignumber.js';
+import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import ethUtil = require('ethereumjs-util');
 import * as Web3 from 'web3';
diff --git a/packages/contracts/test/ts/exchange/helpers.ts b/packages/contracts/test/ts/exchange/helpers.ts
index 5c5b656b5..95f68e419 100644
--- a/packages/contracts/test/ts/exchange/helpers.ts
+++ b/packages/contracts/test/ts/exchange/helpers.ts
@@ -1,5 +1,5 @@
 import { ZeroEx } from '0x.js';
-import { BigNumber } from 'bignumber.js';
+import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import ethUtil = require('ethereumjs-util');
 
diff --git a/packages/contracts/test/ts/exchange/wrapper.ts b/packages/contracts/test/ts/exchange/wrapper.ts
index 77cd03388..e69e08bcf 100644
--- a/packages/contracts/test/ts/exchange/wrapper.ts
+++ b/packages/contracts/test/ts/exchange/wrapper.ts
@@ -1,5 +1,5 @@
 import { ZeroEx } from '0x.js';
-import { BigNumber } from 'bignumber.js';
+import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import * as _ from 'lodash';
 
diff --git a/packages/contracts/test/ts/multi_sig_with_time_lock.ts b/packages/contracts/test/ts/multi_sig_with_time_lock.ts
index 19f9390d8..ea939a758 100644
--- a/packages/contracts/test/ts/multi_sig_with_time_lock.ts
+++ b/packages/contracts/test/ts/multi_sig_with_time_lock.ts
@@ -1,6 +1,5 @@
 import { RPC } from '@0xproject/dev-utils';
-import { promisify } from '@0xproject/utils';
-import { BigNumber } from 'bignumber.js';
+import { BigNumber, promisify } from '@0xproject/utils';
 import * as chai from 'chai';
 import Web3 = require('web3');
 
diff --git a/packages/contracts/test/ts/unlimited_allowance_token.ts b/packages/contracts/test/ts/unlimited_allowance_token.ts
index 008ee7ecd..c90a52095 100644
--- a/packages/contracts/test/ts/unlimited_allowance_token.ts
+++ b/packages/contracts/test/ts/unlimited_allowance_token.ts
@@ -1,5 +1,5 @@
 import { ZeroEx } from '0x.js';
-import { BigNumber } from 'bignumber.js';
+import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import * as Web3 from 'web3';
 
diff --git a/packages/contracts/test/ts/unlimited_allowance_token_v2.ts b/packages/contracts/test/ts/unlimited_allowance_token_v2.ts
index 0053aedd5..1b29a02ba 100644
--- a/packages/contracts/test/ts/unlimited_allowance_token_v2.ts
+++ b/packages/contracts/test/ts/unlimited_allowance_token_v2.ts
@@ -1,5 +1,5 @@
 import { ZeroEx } from '0x.js';
-import { BigNumber } from 'bignumber.js';
+import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import * as Web3 from 'web3';
 
diff --git a/packages/contracts/test/ts/zrx_token.ts b/packages/contracts/test/ts/zrx_token.ts
index 3122060c0..766c94c2a 100644
--- a/packages/contracts/test/ts/zrx_token.ts
+++ b/packages/contracts/test/ts/zrx_token.ts
@@ -1,5 +1,5 @@
 import { ZeroEx } from '0x.js';
-import { BigNumber } from 'bignumber.js';
+import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import Web3 = require('web3');
 
diff --git a/packages/contracts/util/balances.ts b/packages/contracts/util/balances.ts
index eaeecf1c4..6a1659ab1 100644
--- a/packages/contracts/util/balances.ts
+++ b/packages/contracts/util/balances.ts
@@ -1,11 +1,8 @@
-import { bigNumberConfigs } from '@0xproject/utils';
-import { BigNumber } from 'bignumber.js';
+import { BigNumber } from '@0xproject/utils';
 import * as _ from 'lodash';
 
 import { BalancesByOwner, ContractInstance } from './types';
 
-bigNumberConfigs.configure();
-
 export class Balances {
     private _tokenContractInstances: ContractInstance[];
     private _ownerAddresses: string[];
diff --git a/packages/contracts/util/exchange_wrapper.ts b/packages/contracts/util/exchange_wrapper.ts
index 200b0fb1e..ca79f92c4 100644
--- a/packages/contracts/util/exchange_wrapper.ts
+++ b/packages/contracts/util/exchange_wrapper.ts
@@ -1,4 +1,4 @@
-import { BigNumber } from 'bignumber.js';
+import { BigNumber } from '@0xproject/utils';
 import * as _ from 'lodash';
 
 import { formatters } from './formatters';
diff --git a/packages/contracts/util/formatters.ts b/packages/contracts/util/formatters.ts
index ab3558ee7..0d0ef6df4 100644
--- a/packages/contracts/util/formatters.ts
+++ b/packages/contracts/util/formatters.ts
@@ -1,4 +1,4 @@
-import { BigNumber } from 'bignumber.js';
+import { BigNumber } from '@0xproject/utils';
 import * as _ from 'lodash';
 
 import { Order } from './order';
diff --git a/packages/contracts/util/order.ts b/packages/contracts/util/order.ts
index 2427ffb87..e202d485b 100644
--- a/packages/contracts/util/order.ts
+++ b/packages/contracts/util/order.ts
@@ -1,5 +1,4 @@
-import { promisify } from '@0xproject/utils';
-import { BigNumber } from 'bignumber.js';
+import { BigNumber, promisify } from '@0xproject/utils';
 import ethUtil = require('ethereumjs-util');
 import * as _ from 'lodash';
 import Web3 = require('web3');
diff --git a/packages/contracts/util/order_factory.ts b/packages/contracts/util/order_factory.ts
index 3ae06a335..a45877de0 100644
--- a/packages/contracts/util/order_factory.ts
+++ b/packages/contracts/util/order_factory.ts
@@ -1,5 +1,5 @@
 import { ZeroEx } from '0x.js';
-import { BigNumber } from 'bignumber.js';
+import { BigNumber } from '@0xproject/utils';
 import * as _ from 'lodash';
 
 import { Order } from './order';
diff --git a/packages/contracts/util/types.ts b/packages/contracts/util/types.ts
index 9b225cb0b..58a7e6a2d 100644
--- a/packages/contracts/util/types.ts
+++ b/packages/contracts/util/types.ts
@@ -1,4 +1,4 @@
-import { BigNumber } from 'bignumber.js';
+import { BigNumber } from '@0xproject/utils';
 import * as Web3 from 'web3';
 
 export interface BalancesByOwner {