Merge pull request #1517 from 0xProject/feature/bignumber-8.0

Bignumber 8.0

9 files changed, 28 insertions, 16 deletions

diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json
index 851c106d8..0fb199e58 100644
--- a/packages/utils/CHANGELOG.json
+++ b/packages/utils/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "version": "4.0.0",
+        "changes": [
+            {
+                "note": "Upgrade the bignumber.js to v8.0.2",
+                "pr": 1517
+            }
+        ]
+    },
+    {
         "timestamp": 1547561734,
         "version": "3.0.1",
         "changes": [
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 315f5a08f..b6be39210 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -34,7 +34,7 @@
         "@types/mocha": "^2.2.42",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
-        "chai-bignumber": "^2.0.1",
+        "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
         "mocha": "^4.1.0",
@@ -48,7 +48,7 @@
         "@0x/typescript-typings": "^3.0.8",
         "@types/node": "*",
         "abortcontroller-polyfill": "^1.1.9",
-        "bignumber.js": "~4.1.0",
+        "bignumber.js": "~8.0.2",
         "chalk": "^2.4.1",
         "detect-node": "2.0.3",
         "ethereum-types": "^1.1.6",
diff --git a/packages/utils/src/abi_decoder.ts b/packages/utils/src/abi_decoder.ts
index 2da46db35..28b6418d8 100644
--- a/packages/utils/src/abi_decoder.ts
+++ b/packages/utils/src/abi_decoder.ts
@@ -69,7 +69,7 @@ export class AbiDecoder {
             }
             if (param.type === SolidityTypes.Address) {
                 const baseHex = 16;
-                value = addressUtils.padZeros(new BigNumber(value).toString(baseHex));
+                value = addressUtils.padZeros(new BigNumber((value as string).toLowerCase()).toString(baseHex));
             } else if (param.type === SolidityTypes.Uint256 || param.type === SolidityTypes.Uint) {
                 value = new BigNumber(value);
             } else if (param.type === SolidityTypes.Uint8) {
diff --git a/packages/utils/src/abi_encoder/evm_data_types/bool.ts b/packages/utils/src/abi_encoder/evm_data_types/bool.ts
index 7f91f34e6..23298bc88 100644
--- a/packages/utils/src/abi_encoder/evm_data_types/bool.ts
+++ b/packages/utils/src/abi_encoder/evm_data_types/bool.ts
@@ -37,11 +37,11 @@ export class BoolDataType extends AbstractBlobDataType {
         const valueBuf = calldata.popWord();
         const valueHex = ethUtil.bufferToHex(valueBuf);
         const valueNumber = new BigNumber(valueHex, constants.HEX_BASE);
-        if (!(valueNumber.equals(0) || valueNumber.equals(1))) {
+        if (!(valueNumber.isEqualTo(0) || valueNumber.isEqualTo(1))) {
             throw new Error(`Failed to decode boolean. Expected 0x0 or 0x1, got ${valueHex}`);
         }
         /* tslint:disable boolean-naming */
-        const value: boolean = !valueNumber.equals(0);
+        const value: boolean = !valueNumber.isEqualTo(0);
         /* tslint:enable boolean-naming */
         return value;
     }
diff --git a/packages/utils/src/abi_encoder/evm_data_types/int.ts b/packages/utils/src/abi_encoder/evm_data_types/int.ts
index cc3164b18..f8be1f778 100644
--- a/packages/utils/src/abi_encoder/evm_data_types/int.ts
+++ b/packages/utils/src/abi_encoder/evm_data_types/int.ts
@@ -38,8 +38,8 @@ export class IntDataType extends AbstractBlobDataType {
             throw new Error(`Tried to instantiate Int with bad input: ${dataItem}`);
         }
         this._width = IntDataType._decodeWidthFromType(dataItem.type);
-        this._minValue = new BigNumber(2).toPower(this._width - 1).times(-1);
-        this._maxValue = new BigNumber(2).toPower(this._width - 1).sub(1);
+        this._minValue = new BigNumber(2).exponentiatedBy(this._width - 1).times(-1);
+        this._maxValue = new BigNumber(2).exponentiatedBy(this._width - 1).minus(1);
     }
 
     public encodeValue(value: BigNumber | string | number): Buffer {
diff --git a/packages/utils/src/abi_encoder/evm_data_types/uint.ts b/packages/utils/src/abi_encoder/evm_data_types/uint.ts
index 8e382e8dc..a82aa789e 100644
--- a/packages/utils/src/abi_encoder/evm_data_types/uint.ts
+++ b/packages/utils/src/abi_encoder/evm_data_types/uint.ts
@@ -38,7 +38,7 @@ export class UIntDataType extends AbstractBlobDataType {
             throw new Error(`Tried to instantiate UInt with bad input: ${dataItem}`);
         }
         this._width = UIntDataType._decodeWidthFromType(dataItem.type);
-        this._maxValue = new BigNumber(2).toPower(this._width).sub(1);
+        this._maxValue = new BigNumber(2).exponentiatedBy(this._width).minus(1);
     }
 
     public encodeValue(value: BigNumber | string | number): Buffer {
diff --git a/packages/utils/src/abi_encoder/utils/math.ts b/packages/utils/src/abi_encoder/utils/math.ts
index d84983c5b..a2a79e2a8 100644
--- a/packages/utils/src/abi_encoder/utils/math.ts
+++ b/packages/utils/src/abi_encoder/utils/math.ts
@@ -1,7 +1,7 @@
-import BigNumber from 'bignumber.js';
 import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
 
+import { BigNumber } from '../../configured_bignumber';
 import { constants } from '../utils/constants';
 
 function sanityCheckBigNumberRange(
@@ -10,10 +10,12 @@ function sanityCheckBigNumberRange(
     maxValue: BigNumber,
 ): void {
     const value = new BigNumber(value_, 10);
-    if (value.greaterThan(maxValue)) {
+    if (value.isGreaterThan(maxValue)) {
         throw new Error(`Tried to assign value of ${value}, which exceeds max value of ${maxValue}`);
-    } else if (value.lessThan(minValue)) {
+    } else if (value.isLessThan(minValue)) {
         throw new Error(`Tried to assign value of ${value}, which exceeds min value of ${minValue}`);
+    } else if (value.isNaN()) {
+        throw new Error(`Tried to assign NaN value`);
     }
 }
 function bigNumberToPaddedBuffer(value: BigNumber): Buffer {
@@ -30,7 +32,7 @@ function bigNumberToPaddedBuffer(value: BigNumber): Buffer {
 export function encodeNumericValue(value_: BigNumber | string | number): Buffer {
     const value = new BigNumber(value_, 10);
     // Case 1/2: value is non-negative
-    if (value.greaterThanOrEqualTo(0)) {
+    if (value.isGreaterThanOrEqualTo(0)) {
         const encodedPositiveValue = bigNumberToPaddedBuffer(value);
         return encodedPositiveValue;
     }
@@ -74,7 +76,7 @@ export function decodeNumericValue(encodedValue: Buffer, minValue: BigNumber): B
     const valueHex = ethUtil.bufferToHex(encodedValue);
     // Case 1/3: value is definitely non-negative because of numeric boundaries
     const value = new BigNumber(valueHex, constants.HEX_BASE);
-    if (!minValue.lessThan(0)) {
+    if (!minValue.isLessThan(0)) {
         return value;
     }
     // Case 2/3: value is non-negative because there is no leading 1 (encoded as two's-complement)
diff --git a/packages/utils/src/sign_typed_data_utils.ts b/packages/utils/src/sign_typed_data_utils.ts
index 6963b9084..adb66622d 100644
--- a/packages/utils/src/sign_typed_data_utils.ts
+++ b/packages/utils/src/sign_typed_data_utils.ts
@@ -1,8 +1,9 @@
+import { EIP712Object, EIP712ObjectValue, EIP712TypedData, EIP712Types } from '@0x/types';
 import * as ethUtil from 'ethereumjs-util';
 import * as ethers from 'ethers';
 import * as _ from 'lodash';
 
-import { EIP712Object, EIP712ObjectValue, EIP712TypedData, EIP712Types } from '@0x/types';
+import { BigNumber } from './configured_bignumber';
 
 export const signTypedDataUtils = {
     /**
@@ -70,7 +71,7 @@ export const signTypedDataUtils = {
         return ethers.utils.defaultAbiCoder.encode(encodedTypes, encodedValues);
     },
     _normalizeValue(type: string, value: any): EIP712ObjectValue {
-        const normalizedValue = type === 'uint256' && _.isObject(value) && value.isBigNumber ? value.toString() : value;
+        const normalizedValue = type === 'uint256' && BigNumber.isBigNumber(value) ? value.toString() : value;
         return normalizedValue;
     },
     _typeHash(primaryType: string, types: EIP712Types): Buffer {
diff --git a/packages/utils/test/abi_encoder/evm_data_types_test.ts b/packages/utils/test/abi_encoder/evm_data_types_test.ts
index 54d536a7e..4814ce28b 100644
--- a/packages/utils/test/abi_encoder/evm_data_types_test.ts
+++ b/packages/utils/test/abi_encoder/evm_data_types_test.ts
@@ -205,7 +205,7 @@ describe('ABI Encoder: EVM Data Type Encoding/Decoding', () => {
             // Encode Args and validate result
             expect(() => {
                 dataType.encode(args, encodingRules);
-            }).to.throw();
+            }).to.throw('Tried to assign NaN value');
         });
     });