Merge development

39 files changed, 350 insertions, 224 deletions

diff --git a/contracts/examples/CHANGELOG.json b/contracts/examples/CHANGELOG.json
index 50872eb07..7f3908990 100644
--- a/contracts/examples/CHANGELOG.json
+++ b/contracts/examples/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "timestamp": 1547225310,
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1547040760,
         "version": "1.0.3",
         "changes": [
diff --git a/contracts/examples/CHANGELOG.md b/contracts/examples/CHANGELOG.md
index 4732f1746..6aa89cd76 100644
--- a/contracts/examples/CHANGELOG.md
+++ b/contracts/examples/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.4 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.0.3 - _January 9, 2019_
 
     * Dependencies updated
diff --git a/contracts/examples/package.json b/contracts/examples/package.json
index d04b5fc44..d1778f85f 100644
--- a/contracts/examples/package.json
+++ b/contracts/examples/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-examples",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -33,12 +33,12 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/examples/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.20",
-        "@0x/contracts-test-utils": "^1.0.3",
-        "@0x/dev-utils": "^1.0.22",
-        "@0x/sol-compiler": "^2.0.0",
-        "@0x/subproviders": "^2.1.9",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/abi-gen": "^1.0.21",
+        "@0x/contracts-test-utils": "^1.0.4",
+        "@0x/dev-utils": "^1.0.23",
+        "@0x/sol-compiler": "^2.0.1",
+        "@0x/subproviders": "^2.1.10",
+        "@0x/tslint-config": "^2.0.1",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -58,20 +58,20 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.11",
-        "@0x/contracts-interfaces": "^1.0.3",
-        "@0x/contracts-libs": "^1.0.3",
-        "@0x/contracts-multisig": "^1.0.3",
-        "@0x/contracts-tokens": "^1.0.3",
-        "@0x/contracts-utils": "^1.0.3",
-        "@0x/order-utils": "^3.1.0",
-        "@0x/types": "^1.5.0",
-        "@0x/typescript-typings": "^3.0.6",
-        "@0x/utils": "^2.1.1",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/base-contract": "^3.0.12",
+        "@0x/contracts-interfaces": "^1.0.4",
+        "@0x/contracts-libs": "^1.0.4",
+        "@0x/contracts-multisig": "^1.0.4",
+        "@0x/contracts-tokens": "^1.0.4",
+        "@0x/contracts-utils": "^1.0.4",
+        "@0x/order-utils": "^3.1.1",
+        "@0x/types": "^1.5.1",
+        "@0x/typescript-typings": "^3.0.7",
+        "@0x/utils": "^3.0.0",
+        "@0x/web3-wrapper": "^3.2.3",
         "@types/js-combinatorics": "^0.5.29",
         "bn.js": "^4.11.8",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.5"
     },
diff --git a/contracts/extensions/CHANGELOG.json b/contracts/extensions/CHANGELOG.json
index de1ada0a8..c4aafdd44 100644
--- a/contracts/extensions/CHANGELOG.json
+++ b/contracts/extensions/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "timestamp": 1547225310,
+        "version": "1.2.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "version": "1.2.0",
         "changes": [
             {
diff --git a/contracts/extensions/CHANGELOG.md b/contracts/extensions/CHANGELOG.md
index 452cc8e82..00a7196c4 100644
--- a/contracts/extensions/CHANGELOG.md
+++ b/contracts/extensions/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.2.1 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.2.0 - _January 9, 2019_
 
     * Added Dutch Auction Wrapper (#1465)
diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json
index 99b5b35a8..6e8c12631 100644
--- a/contracts/extensions/package.json
+++ b/contracts/extensions/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-extensions",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -44,13 +44,13 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.20",
-        "@0x/contract-wrappers": "^4.2.0",
-        "@0x/contracts-test-utils": "^1.0.3",
-        "@0x/dev-utils": "^1.0.22",
-        "@0x/sol-compiler": "^2.0.0",
-        "@0x/subproviders": "^2.1.9",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/abi-gen": "^1.0.21",
+        "@0x/contract-wrappers": "^4.2.1",
+        "@0x/contracts-test-utils": "^1.0.4",
+        "@0x/dev-utils": "^1.0.23",
+        "@0x/sol-compiler": "^2.0.1",
+        "@0x/subproviders": "^2.1.10",
+        "@0x/tslint-config": "^2.0.1",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -70,20 +70,20 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.11",
-        "@0x/contracts-interfaces": "^1.0.3",
-        "@0x/contracts-libs": "^1.0.3",
-        "@0x/contracts-protocol": "^2.2.0",
-        "@0x/contracts-tokens": "^1.0.3",
-        "@0x/contracts-utils": "^1.0.3",
-        "@0x/order-utils": "^3.1.0",
-        "@0x/types": "^1.5.0",
-        "@0x/typescript-typings": "^3.0.6",
-        "@0x/utils": "^2.1.1",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/base-contract": "^3.0.12",
+        "@0x/contracts-interfaces": "^1.0.4",
+        "@0x/contracts-libs": "^1.0.4",
+        "@0x/contracts-protocol": "^2.2.1",
+        "@0x/contracts-tokens": "^1.0.4",
+        "@0x/contracts-utils": "^1.0.4",
+        "@0x/order-utils": "^3.1.1",
+        "@0x/types": "^1.5.1",
+        "@0x/typescript-typings": "^3.0.7",
+        "@0x/utils": "^3.0.0",
+        "@0x/web3-wrapper": "^3.2.3",
         "@types/js-combinatorics": "^0.5.29",
         "bn.js": "^4.11.8",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.5"
     },
diff --git a/contracts/extensions/test/extensions/balance_threshold_filter.ts b/contracts/extensions/test/extensions/balance_threshold_filter.ts
index 07199d60b..a1c322e08 100644
--- a/contracts/extensions/test/extensions/balance_threshold_filter.ts
+++ b/contracts/extensions/test/extensions/balance_threshold_filter.ts
@@ -1457,7 +1457,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
             const orderInfoBeforeCancelling = await erc721MakerBalanceThresholdWrapper.getOrderInfoAsync(
                 validSignedOrder,
             );
-            expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+            expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
             // Cancel
             const txReceipt = await erc721MakerBalanceThresholdWrapper.cancelOrderAsync(
                 validSignedOrder,
@@ -1470,7 +1470,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
             const orderInfoAfterCancelling = await erc721MakerBalanceThresholdWrapper.getOrderInfoAsync(
                 validSignedOrder,
             );
-            expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.CANCELLED);
+            expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Cancelled);
         });
         it('Should successfully cancel order if maker does not meet balance threshold', async () => {
             // Create order where maker does not meet balance threshold
@@ -1479,7 +1479,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
             const orderInfoBeforeCancelling = await erc721NonValidBalanceThresholdWrapper.getOrderInfoAsync(
                 signedOrderWithBadMakerAddress,
             );
-            expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+            expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
             // Cancel
             const txReceipt = await erc721NonValidBalanceThresholdWrapper.cancelOrderAsync(
                 signedOrderWithBadMakerAddress,
@@ -1492,7 +1492,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
             const orderInfoAfterCancelling = await erc721MakerBalanceThresholdWrapper.getOrderInfoAsync(
                 signedOrderWithBadMakerAddress,
             );
-            expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.CANCELLED);
+            expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Cancelled);
         });
     });
 
@@ -1512,7 +1512,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
                 const orderInfoBeforeCancelling = await erc721MakerBalanceThresholdWrapper.getOrderInfoAsync(
                     signedOrder,
                 );
-                return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+                return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
             });
             // Cancel
             const txReceipt = await erc721MakerBalanceThresholdWrapper.batchCancelOrdersAsync(
@@ -1527,7 +1527,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
                 const orderInfoAfterCancelling = await erc721MakerBalanceThresholdWrapper.getOrderInfoAsync(
                     signedOrder,
                 );
-                return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.CANCELLED);
+                return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Cancelled);
             });
         });
         it('Should successfully batch cancel order if maker does not meet balance threshold', async () => {
@@ -1542,7 +1542,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
                 const orderInfoBeforeCancelling = await erc721NonValidBalanceThresholdWrapper.getOrderInfoAsync(
                     signedOrder,
                 );
-                return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+                return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
             });
             // Cancel
             const txReceipt = await erc721NonValidBalanceThresholdWrapper.batchCancelOrdersAsync(
@@ -1557,7 +1557,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
                 const orderInfoAfterCancelling = await erc721NonValidBalanceThresholdWrapper.getOrderInfoAsync(
                     signedOrder,
                 );
-                return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.CANCELLED);
+                return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Cancelled);
             });
         });
     });
@@ -1578,7 +1578,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
                 const orderInfoBeforeCancelling = await erc721MakerBalanceThresholdWrapper.getOrderInfoAsync(
                     signedOrder,
                 );
-                return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+                return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
             });
             // Cancel
             const cancelOrdersUpToThisSalt = new BigNumber(1);
@@ -1596,9 +1596,9 @@ describe(ContractName.BalanceThresholdFilter, () => {
                 );
                 const saltAsBigNumber = new BigNumber(salt);
                 if (saltAsBigNumber.lessThanOrEqualTo(cancelOrdersUpToThisSalt)) {
-                    return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.CANCELLED);
+                    return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Cancelled);
                 } else {
-                    return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+                    return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
                 }
             });
         });
@@ -1614,7 +1614,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
                 const orderInfoBeforeCancelling = await erc721NonValidBalanceThresholdWrapper.getOrderInfoAsync(
                     signedOrder,
                 );
-                return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+                return expect(orderInfoBeforeCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
             });
             // Cancel
             const cancelOrdersUpToThisSalt = new BigNumber(1);
@@ -1632,9 +1632,9 @@ describe(ContractName.BalanceThresholdFilter, () => {
                 );
                 const saltAsBigNumber = new BigNumber(salt);
                 if (saltAsBigNumber.lessThanOrEqualTo(cancelOrdersUpToThisSalt)) {
-                    return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.CANCELLED);
+                    return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Cancelled);
                 } else {
-                    return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+                    return expect(orderInfoAfterCancelling.orderStatus).to.be.equal(OrderStatus.Fillable);
                 }
             });
         });
diff --git a/contracts/extensions/test/extensions/order_validator.ts b/contracts/extensions/test/extensions/order_validator.ts
index 82a6b937f..7d8675f36 100644
--- a/contracts/extensions/test/extensions/order_validator.ts
+++ b/contracts/extensions/test/extensions/order_validator.ts
@@ -432,7 +432,7 @@ describe('OrderValidator', () => {
                 takerAddress,
             );
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
-            expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+            expect(orderInfo.orderStatus).to.be.equal(OrderStatus.Fillable);
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
             expect(traderInfo.makerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
@@ -485,7 +485,7 @@ describe('OrderValidator', () => {
                 takerAddress,
             );
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
-            expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+            expect(orderInfo.orderStatus).to.be.equal(OrderStatus.Fillable);
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
             expect(traderInfo.makerBalance).to.be.bignumber.equal(makerBalance);
@@ -514,10 +514,10 @@ describe('OrderValidator', () => {
             ] = await orderValidator.getOrdersAndTradersInfo.callAsync(orders, takers);
             const expectedOrderHash1 = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedOrderHash2 = orderHashUtils.getOrderHashHex(signedOrder2);
-            expect(orderInfo1.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+            expect(orderInfo1.orderStatus).to.be.equal(OrderStatus.Fillable);
             expect(orderInfo1.orderHash).to.be.equal(expectedOrderHash1);
             expect(orderInfo1.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(orderInfo2.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+            expect(orderInfo2.orderStatus).to.be.equal(OrderStatus.Fillable);
             expect(orderInfo2.orderHash).to.be.equal(expectedOrderHash2);
             expect(orderInfo2.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
             expect(traderInfo1.makerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
@@ -581,10 +581,10 @@ describe('OrderValidator', () => {
             ] = await orderValidator.getOrdersAndTradersInfo.callAsync(orders, takers);
             const expectedOrderHash1 = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedOrderHash2 = orderHashUtils.getOrderHashHex(signedOrder2);
-            expect(orderInfo1.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+            expect(orderInfo1.orderStatus).to.be.equal(OrderStatus.Fillable);
             expect(orderInfo1.orderHash).to.be.equal(expectedOrderHash1);
             expect(orderInfo1.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(orderInfo2.orderStatus).to.be.equal(OrderStatus.FILLABLE);
+            expect(orderInfo2.orderStatus).to.be.equal(OrderStatus.Fillable);
             expect(orderInfo2.orderHash).to.be.equal(expectedOrderHash2);
             expect(orderInfo2.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
             expect(traderInfo1.makerBalance).to.be.bignumber.equal(makerBalance);
diff --git a/contracts/interfaces/CHANGELOG.json b/contracts/interfaces/CHANGELOG.json
index 50872eb07..7f3908990 100644
--- a/contracts/interfaces/CHANGELOG.json
+++ b/contracts/interfaces/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "timestamp": 1547225310,
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1547040760,
         "version": "1.0.3",
         "changes": [
diff --git a/contracts/interfaces/CHANGELOG.md b/contracts/interfaces/CHANGELOG.md
index 4732f1746..6aa89cd76 100644
--- a/contracts/interfaces/CHANGELOG.md
+++ b/contracts/interfaces/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.4 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.0.3 - _January 9, 2019_
 
     * Dependencies updated
diff --git a/contracts/interfaces/README.md b/contracts/interfaces/README.md
index b7d519abb..81dd4c3ac 100644
--- a/contracts/interfaces/README.md
+++ b/contracts/interfaces/README.md
@@ -6,8 +6,8 @@ Smart contract interfaces of the 0x protocol.
 
 Contracts that make up and interact with version 2.0.0 of the protocol can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
 
-*   [protocol](./contracts/protocol)
-    *   This directory contains the contract interfaces that make up version 2.0.0. A full specification can be found [here](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md).
+-   [protocol](./contracts/protocol)
+    -   This directory contains the contract interfaces that make up version 2.0.0. A full specification can be found [here](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md).
 
 ## Bug bounty
 
diff --git a/contracts/interfaces/package.json b/contracts/interfaces/package.json
index 9017f0a73..8e3f67f67 100644
--- a/contracts/interfaces/package.json
+++ b/contracts/interfaces/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-interfaces",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -30,9 +30,9 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/interfaces/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.20",
-        "@0x/sol-compiler": "^2.0.0",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/abi-gen": "^1.0.21",
+        "@0x/sol-compiler": "^2.0.1",
+        "@0x/tslint-config": "^2.0.1",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "solhint": "^1.4.1",
@@ -41,14 +41,14 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.11",
-        "@0x/contracts-libs": "^1.0.3",
-        "@0x/contracts-utils": "^1.0.3",
-        "@0x/types": "^1.5.0",
-        "@0x/typescript-typings": "^3.0.6",
-        "@0x/utils": "^2.1.1",
-        "@0x/web3-wrapper": "^3.2.2",
-        "ethereum-types": "^1.1.4",
+        "@0x/base-contract": "^3.0.12",
+        "@0x/contracts-libs": "^1.0.4",
+        "@0x/contracts-utils": "^1.0.4",
+        "@0x/types": "^1.5.1",
+        "@0x/typescript-typings": "^3.0.7",
+        "@0x/utils": "^3.0.0",
+        "@0x/web3-wrapper": "^3.2.3",
+        "ethereum-types": "^1.1.5",
         "lodash": "^4.17.5"
     },
     "publishConfig": {
diff --git a/contracts/libs/CHANGELOG.json b/contracts/libs/CHANGELOG.json
index 50872eb07..7f3908990 100644
--- a/contracts/libs/CHANGELOG.json
+++ b/contracts/libs/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "timestamp": 1547225310,
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1547040760,
         "version": "1.0.3",
         "changes": [
diff --git a/contracts/libs/CHANGELOG.md b/contracts/libs/CHANGELOG.md
index 4732f1746..6aa89cd76 100644
--- a/contracts/libs/CHANGELOG.md
+++ b/contracts/libs/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.4 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.0.3 - _January 9, 2019_
 
     * Dependencies updated
diff --git a/contracts/libs/README.md b/contracts/libs/README.md
index 66eedf6be..cfa631679 100644
--- a/contracts/libs/README.md
+++ b/contracts/libs/README.md
@@ -6,10 +6,10 @@ Smart contracts libs used in the 0x protocol.
 
 Contracts can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
 
-*   [libs](./contracts/protocol)
-    *   This directory contains the libs.
-*   [test](./contracts/test)
-    *   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
+-   [libs](./contracts/protocol)
+    -   This directory contains the libs.
+-   [test](./contracts/test)
+    -   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
 
 ## Contributing
 
diff --git a/contracts/libs/package.json b/contracts/libs/package.json
index 9d28cc038..5946faf74 100644
--- a/contracts/libs/package.json
+++ b/contracts/libs/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-libs",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -44,12 +44,12 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/libs/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.20",
-        "@0x/contracts-test-utils": "^1.0.3",
-        "@0x/dev-utils": "^1.0.22",
-        "@0x/sol-compiler": "^2.0.0",
-        "@0x/subproviders": "^2.1.9",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/abi-gen": "^1.0.21",
+        "@0x/contracts-test-utils": "^1.0.4",
+        "@0x/dev-utils": "^1.0.23",
+        "@0x/sol-compiler": "^2.0.1",
+        "@0x/subproviders": "^2.1.10",
+        "@0x/tslint-config": "^2.0.1",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -69,17 +69,17 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.11",
-        "@0x/contracts-multisig": "^1.0.3",
-        "@0x/contracts-utils": "^1.0.3",
-        "@0x/order-utils": "^3.1.0",
-        "@0x/types": "^1.5.0",
-        "@0x/typescript-typings": "^3.0.6",
-        "@0x/utils": "^2.1.1",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/base-contract": "^3.0.12",
+        "@0x/contracts-multisig": "^1.0.4",
+        "@0x/contracts-utils": "^1.0.4",
+        "@0x/order-utils": "^3.1.1",
+        "@0x/types": "^1.5.1",
+        "@0x/typescript-typings": "^3.0.7",
+        "@0x/utils": "^3.0.0",
+        "@0x/web3-wrapper": "^3.2.3",
         "@types/js-combinatorics": "^0.5.29",
         "bn.js": "^4.11.8",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.5"
     },
diff --git a/contracts/multisig/CHANGELOG.json b/contracts/multisig/CHANGELOG.json
index 50872eb07..7f3908990 100644
--- a/contracts/multisig/CHANGELOG.json
+++ b/contracts/multisig/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "timestamp": 1547225310,
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1547040760,
         "version": "1.0.3",
         "changes": [
diff --git a/contracts/multisig/CHANGELOG.md b/contracts/multisig/CHANGELOG.md
index 4732f1746..6aa89cd76 100644
--- a/contracts/multisig/CHANGELOG.md
+++ b/contracts/multisig/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.4 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.0.3 - _January 9, 2019_
 
     * Dependencies updated
diff --git a/contracts/multisig/README.md b/contracts/multisig/README.md
index 93db63b5b..e29f46251 100644
--- a/contracts/multisig/README.md
+++ b/contracts/multisig/README.md
@@ -6,10 +6,10 @@ MultiSig smart contracts
 
 Contracts can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
 
-*   [multisig](./contracts/multisig)
-    *   This directory contains the [Gnosis MultiSigWallet](https://github.com/gnosis/MultiSigWallet) and a custom extension that adds a timelock to transactions within the MultiSigWallet.
-*   [test](./contracts/test)
-    *   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
+-   [multisig](./contracts/multisig)
+    -   This directory contains the [Gnosis MultiSigWallet](https://github.com/gnosis/MultiSigWallet) and a custom extension that adds a timelock to transactions within the MultiSigWallet.
+-   [test](./contracts/test)
+    -   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
 
 ## Contributing
 
diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json
index e0bbc001d..030323cbf 100644
--- a/contracts/multisig/package.json
+++ b/contracts/multisig/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-multisig",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -44,12 +44,12 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.20",
-        "@0x/contracts-test-utils": "^1.0.3",
-        "@0x/dev-utils": "^1.0.22",
-        "@0x/sol-compiler": "^2.0.0",
-        "@0x/subproviders": "^2.1.9",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/abi-gen": "^1.0.21",
+        "@0x/contracts-test-utils": "^1.0.4",
+        "@0x/dev-utils": "^1.0.23",
+        "@0x/sol-compiler": "^2.0.1",
+        "@0x/subproviders": "^2.1.10",
+        "@0x/tslint-config": "^2.0.1",
         "@types/bn.js": "^4.11.0",
         "@types/ethereumjs-abi": "^0.6.0",
         "@types/lodash": "4.14.104",
@@ -69,13 +69,13 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.11",
-        "@0x/order-utils": "^3.1.0",
-        "@0x/types": "^1.5.0",
-        "@0x/typescript-typings": "^3.0.6",
-        "@0x/utils": "^2.1.1",
-        "@0x/web3-wrapper": "^3.2.2",
-        "ethereum-types": "^1.1.4",
+        "@0x/base-contract": "^3.0.12",
+        "@0x/order-utils": "^3.1.1",
+        "@0x/types": "^1.5.1",
+        "@0x/typescript-typings": "^3.0.7",
+        "@0x/utils": "^3.0.0",
+        "@0x/web3-wrapper": "^3.2.3",
+        "ethereum-types": "^1.1.5",
         "lodash": "^4.17.5"
     },
     "publishConfig": {
diff --git a/contracts/protocol/CHANGELOG.json b/contracts/protocol/CHANGELOG.json
index 6672ce9c3..039f0f94a 100644
--- a/contracts/protocol/CHANGELOG.json
+++ b/contracts/protocol/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "timestamp": 1547225310,
+        "version": "2.2.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "version": "2.2.0",
         "changes": [
             {
diff --git a/contracts/protocol/CHANGELOG.md b/contracts/protocol/CHANGELOG.md
index a8ad921a2..75d4b9a5e 100644
--- a/contracts/protocol/CHANGELOG.md
+++ b/contracts/protocol/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.2.1 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v2.2.0 - _January 9, 2019_
 
     * Added LibAddressArray (#1383)
diff --git a/contracts/protocol/README.md b/contracts/protocol/README.md
index 5fc9c0a89..dc1f32c98 100644
--- a/contracts/protocol/README.md
+++ b/contracts/protocol/README.md
@@ -6,10 +6,10 @@ Smart contracts that implement the 0x protocol. Addresses of the deployed contra
 
 Contracts that make up and interact with version 2.0.0 of the protocol can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
 
-*   [protocol](./contracts/protocol)
-    *   This directory contains the contracts that make up version 2.0.0. A full specification can be found [here](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md).
-*   [test](./contracts/test)
-    *   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
+-   [protocol](./contracts/protocol)
+    -   This directory contains the contracts that make up version 2.0.0. A full specification can be found [here](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md).
+-   [test](./contracts/test)
+    -   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
 
 ## Bug bounty
 
diff --git a/contracts/protocol/package.json b/contracts/protocol/package.json
index 7d49dfbe8..daece8876 100644
--- a/contracts/protocol/package.json
+++ b/contracts/protocol/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-protocol",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -44,11 +44,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.20",
-        "@0x/dev-utils": "^1.0.22",
-        "@0x/sol-compiler": "^2.0.0",
-        "@0x/subproviders": "^2.1.9",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/abi-gen": "^1.0.21",
+        "@0x/dev-utils": "^1.0.23",
+        "@0x/sol-compiler": "^2.0.1",
+        "@0x/subproviders": "^2.1.10",
+        "@0x/tslint-config": "^2.0.1",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -68,22 +68,22 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.11",
-        "@0x/contracts-examples": "^1.0.3",
-        "@0x/contracts-interfaces": "^1.0.3",
-        "@0x/contracts-libs": "^1.0.3",
-        "@0x/contracts-multisig": "^1.0.3",
-        "@0x/contracts-test-utils": "^1.0.3",
-        "@0x/contracts-tokens": "^1.0.3",
-        "@0x/contracts-utils": "^1.0.3",
-        "@0x/order-utils": "^3.1.0",
-        "@0x/types": "^1.5.0",
-        "@0x/typescript-typings": "^3.0.6",
-        "@0x/utils": "^2.1.1",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/base-contract": "^3.0.12",
+        "@0x/contracts-examples": "^1.0.4",
+        "@0x/contracts-interfaces": "^1.0.4",
+        "@0x/contracts-libs": "^1.0.4",
+        "@0x/contracts-multisig": "^1.0.4",
+        "@0x/contracts-test-utils": "^1.0.4",
+        "@0x/contracts-tokens": "^1.0.4",
+        "@0x/contracts-utils": "^1.0.4",
+        "@0x/order-utils": "^3.1.1",
+        "@0x/types": "^1.5.1",
+        "@0x/typescript-typings": "^3.0.7",
+        "@0x/utils": "^3.0.0",
+        "@0x/web3-wrapper": "^3.2.3",
         "@types/js-combinatorics": "^0.5.29",
         "bn.js": "^4.11.8",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.5"
     },
diff --git a/contracts/protocol/test/exchange/core.ts b/contracts/protocol/test/exchange/core.ts
index 42db8623d..700643b79 100644
--- a/contracts/protocol/test/exchange/core.ts
+++ b/contracts/protocol/test/exchange/core.ts
@@ -1043,7 +1043,7 @@ describe('Exchange core', () => {
             const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = new BigNumber(0);
-            const expectedOrderStatus = OrderStatus.FILLABLE;
+            const expectedOrderStatus = OrderStatus.Fillable;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1053,7 +1053,7 @@ describe('Exchange core', () => {
             const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = signedOrder.takerAssetAmount;
-            const expectedOrderStatus = OrderStatus.FULLY_FILLED;
+            const expectedOrderStatus = OrderStatus.FullyFilled;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1064,7 +1064,7 @@ describe('Exchange core', () => {
             const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = takerAssetFillAmount;
-            const expectedOrderStatus = OrderStatus.FILLABLE;
+            const expectedOrderStatus = OrderStatus.Fillable;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1074,7 +1074,7 @@ describe('Exchange core', () => {
             const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = new BigNumber(0);
-            const expectedOrderStatus = OrderStatus.CANCELLED;
+            const expectedOrderStatus = OrderStatus.Cancelled;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1086,7 +1086,7 @@ describe('Exchange core', () => {
             const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = takerAssetFillAmount;
-            const expectedOrderStatus = OrderStatus.CANCELLED;
+            const expectedOrderStatus = OrderStatus.Cancelled;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1098,7 +1098,7 @@ describe('Exchange core', () => {
             const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = new BigNumber(0);
-            const expectedOrderStatus = OrderStatus.EXPIRED;
+            const expectedOrderStatus = OrderStatus.Expired;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1112,7 +1112,7 @@ describe('Exchange core', () => {
             const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = takerAssetFillAmount;
-            const expectedOrderStatus = OrderStatus.EXPIRED;
+            const expectedOrderStatus = OrderStatus.Expired;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1126,7 +1126,7 @@ describe('Exchange core', () => {
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = signedOrder.takerAssetAmount;
             // FULLY_FILLED takes precedence over EXPIRED
-            const expectedOrderStatus = OrderStatus.FULLY_FILLED;
+            const expectedOrderStatus = OrderStatus.FullyFilled;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1136,7 +1136,7 @@ describe('Exchange core', () => {
             const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = new BigNumber(0);
-            const expectedOrderStatus = OrderStatus.INVALID_MAKER_ASSET_AMOUNT;
+            const expectedOrderStatus = OrderStatus.InvalidMakerAssetAmount;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
@@ -1146,7 +1146,7 @@ describe('Exchange core', () => {
             const orderInfo = await exchangeWrapper.getOrderInfoAsync(signedOrder);
             const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
             const expectedTakerAssetFilledAmount = new BigNumber(0);
-            const expectedOrderStatus = OrderStatus.INVALID_TAKER_ASSET_AMOUNT;
+            const expectedOrderStatus = OrderStatus.InvalidTakerAssetAmount;
             expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
             expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
             expect(orderInfo.orderStatus).to.equal(expectedOrderStatus);
diff --git a/contracts/protocol/test/exchange/wrapper.ts b/contracts/protocol/test/exchange/wrapper.ts
index c9efb0c9d..4c4506945 100644
--- a/contracts/protocol/test/exchange/wrapper.ts
+++ b/contracts/protocol/test/exchange/wrapper.ts
@@ -1288,7 +1288,7 @@ describe('Exchange wrappers', () => {
                 _.forEach(signedOrders, (signedOrder, index) => {
                     const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
                     const expectedTakerAssetFilledAmount = new BigNumber(0);
-                    const expectedOrderStatus = OrderStatus.FILLABLE;
+                    const expectedOrderStatus = OrderStatus.Fillable;
                     const orderInfo = ordersInfo[index];
                     expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
                     expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1303,7 +1303,7 @@ describe('Exchange wrappers', () => {
                 _.forEach(signedOrders, (signedOrder, index) => {
                     const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
                     const expectedTakerAssetFilledAmount = signedOrder.takerAssetAmount.div(2);
-                    const expectedOrderStatus = OrderStatus.FILLABLE;
+                    const expectedOrderStatus = OrderStatus.Fillable;
                     const orderInfo = ordersInfo[index];
                     expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
                     expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1317,7 +1317,7 @@ describe('Exchange wrappers', () => {
                 _.forEach(signedOrders, (signedOrder, index) => {
                     const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
                     const expectedTakerAssetFilledAmount = signedOrder.takerAssetAmount;
-                    const expectedOrderStatus = OrderStatus.FULLY_FILLED;
+                    const expectedOrderStatus = OrderStatus.FullyFilled;
                     const orderInfo = ordersInfo[index];
                     expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
                     expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1331,7 +1331,7 @@ describe('Exchange wrappers', () => {
                 _.forEach(signedOrders, (signedOrder, index) => {
                     const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
                     const expectedTakerAssetFilledAmount = new BigNumber(0);
-                    const expectedOrderStatus = OrderStatus.CANCELLED;
+                    const expectedOrderStatus = OrderStatus.Cancelled;
                     const orderInfo = ordersInfo[index];
                     expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
                     expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1347,7 +1347,7 @@ describe('Exchange wrappers', () => {
                 _.forEach(signedOrders, (signedOrder, index) => {
                     const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
                     const expectedTakerAssetFilledAmount = signedOrder.takerAssetAmount.div(2);
-                    const expectedOrderStatus = OrderStatus.CANCELLED;
+                    const expectedOrderStatus = OrderStatus.Cancelled;
                     const orderInfo = ordersInfo[index];
                     expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
                     expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1363,7 +1363,7 @@ describe('Exchange wrappers', () => {
                 _.forEach(signedOrders, (signedOrder, index) => {
                     const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
                     const expectedTakerAssetFilledAmount = new BigNumber(0);
-                    const expectedOrderStatus = OrderStatus.EXPIRED;
+                    const expectedOrderStatus = OrderStatus.Expired;
                     const orderInfo = ordersInfo[index];
                     expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
                     expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1381,7 +1381,7 @@ describe('Exchange wrappers', () => {
                 _.forEach(signedOrders, (signedOrder, index) => {
                     const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
                     const expectedTakerAssetFilledAmount = signedOrder.takerAssetAmount.div(2);
-                    const expectedOrderStatus = OrderStatus.EXPIRED;
+                    const expectedOrderStatus = OrderStatus.Expired;
                     const orderInfo = ordersInfo[index];
                     expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
                     expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(expectedTakerAssetFilledAmount);
@@ -1408,7 +1408,7 @@ describe('Exchange wrappers', () => {
 
                 const expectedUnfilledOrderHash = orderHashUtils.getOrderHashHex(unfilledOrder);
                 const expectedUnfilledTakerAssetFilledAmount = new BigNumber(0);
-                const expectedUnfilledOrderStatus = OrderStatus.FILLABLE;
+                const expectedUnfilledOrderStatus = OrderStatus.Fillable;
                 const unfilledOrderInfo = ordersInfo[0];
                 expect(unfilledOrderInfo.orderHash).to.be.equal(expectedUnfilledOrderHash);
                 expect(unfilledOrderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(
@@ -1418,7 +1418,7 @@ describe('Exchange wrappers', () => {
 
                 const expectedPartialOrderHash = orderHashUtils.getOrderHashHex(partiallyFilledOrder);
                 const expectedPartialTakerAssetFilledAmount = partiallyFilledOrder.takerAssetAmount.div(2);
-                const expectedPartialOrderStatus = OrderStatus.FILLABLE;
+                const expectedPartialOrderStatus = OrderStatus.Fillable;
                 const partialOrderInfo = ordersInfo[1];
                 expect(partialOrderInfo.orderHash).to.be.equal(expectedPartialOrderHash);
                 expect(partialOrderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(
@@ -1428,7 +1428,7 @@ describe('Exchange wrappers', () => {
 
                 const expectedFilledOrderHash = orderHashUtils.getOrderHashHex(fullyFilledOrder);
                 const expectedFilledTakerAssetFilledAmount = fullyFilledOrder.takerAssetAmount;
-                const expectedFilledOrderStatus = OrderStatus.FULLY_FILLED;
+                const expectedFilledOrderStatus = OrderStatus.FullyFilled;
                 const filledOrderInfo = ordersInfo[2];
                 expect(filledOrderInfo.orderHash).to.be.equal(expectedFilledOrderHash);
                 expect(filledOrderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(
@@ -1438,7 +1438,7 @@ describe('Exchange wrappers', () => {
 
                 const expectedCancelledOrderHash = orderHashUtils.getOrderHashHex(cancelledOrder);
                 const expectedCancelledTakerAssetFilledAmount = new BigNumber(0);
-                const expectedCancelledOrderStatus = OrderStatus.CANCELLED;
+                const expectedCancelledOrderStatus = OrderStatus.Cancelled;
                 const cancelledOrderInfo = ordersInfo[3];
                 expect(cancelledOrderInfo.orderHash).to.be.equal(expectedCancelledOrderHash);
                 expect(cancelledOrderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(
@@ -1448,7 +1448,7 @@ describe('Exchange wrappers', () => {
 
                 const expectedExpiredOrderHash = orderHashUtils.getOrderHashHex(expiredOrder);
                 const expectedExpiredTakerAssetFilledAmount = new BigNumber(0);
-                const expectedExpiredOrderStatus = OrderStatus.EXPIRED;
+                const expectedExpiredOrderStatus = OrderStatus.Expired;
                 const expiredOrderInfo = ordersInfo[4];
                 expect(expiredOrderInfo.orderHash).to.be.equal(expectedExpiredOrderHash);
                 expect(expiredOrderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(
diff --git a/contracts/protocol/test/utils/match_order_tester.ts b/contracts/protocol/test/utils/match_order_tester.ts
index 8f574704e..31864820f 100644
--- a/contracts/protocol/test/utils/match_order_tester.ts
+++ b/contracts/protocol/test/utils/match_order_tester.ts
@@ -268,15 +268,15 @@ export class MatchOrderTester {
         const maxAmountBoughtByLeftMaker = signedOrderLeft.takerAssetAmount.minus(initialLeftOrderFilledAmount);
         const leftOrderInfo: OrderInfo = await this._exchangeWrapper.getOrderInfoAsync(signedOrderLeft);
         const leftExpectedStatus = expectedTransferAmounts.amountBoughtByLeftMaker.equals(maxAmountBoughtByLeftMaker)
-            ? OrderStatus.FULLY_FILLED
-            : OrderStatus.FILLABLE;
+            ? OrderStatus.FullyFilled
+            : OrderStatus.Fillable;
         expect(leftOrderInfo.orderStatus, 'Checking exchange status for left order').to.be.equal(leftExpectedStatus);
         // Assert right order status
         const maxAmountBoughtByRightMaker = signedOrderRight.takerAssetAmount.minus(initialRightOrderFilledAmount);
         const rightOrderInfo: OrderInfo = await this._exchangeWrapper.getOrderInfoAsync(signedOrderRight);
         const rightExpectedStatus = expectedTransferAmounts.amountBoughtByRightMaker.equals(maxAmountBoughtByRightMaker)
-            ? OrderStatus.FULLY_FILLED
-            : OrderStatus.FILLABLE;
+            ? OrderStatus.FullyFilled
+            : OrderStatus.Fillable;
         expect(rightOrderInfo.orderStatus, 'Checking exchange status for right order').to.be.equal(rightExpectedStatus);
     }
     /// @dev Asserts account balances after matching orders.
diff --git a/contracts/test-utils/CHANGELOG.json b/contracts/test-utils/CHANGELOG.json
index 8ba8d179a..7bebd0fcb 100644
--- a/contracts/test-utils/CHANGELOG.json
+++ b/contracts/test-utils/CHANGELOG.json
@@ -1,5 +1,23 @@
 [
     {
+        "version": "2.0.0",
+        "changes": [
+            {
+                "note": "Renamed OrderStatus enum members to PascalCase to conform with tslint enum-naming rule",
+                "pr": 1474
+            }
+        ]
+    },
+    {
+        "timestamp": 1547225310,
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1547040760,
         "version": "1.0.3",
         "changes": [
diff --git a/contracts/test-utils/CHANGELOG.md b/contracts/test-utils/CHANGELOG.md
index 4732f1746..6aa89cd76 100644
--- a/contracts/test-utils/CHANGELOG.md
+++ b/contracts/test-utils/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.4 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.0.3 - _January 9, 2019_
 
     * Dependencies updated
diff --git a/contracts/test-utils/package.json b/contracts/test-utils/package.json
index 2653fc0e4..bf3b23921 100644
--- a/contracts/test-utils/package.json
+++ b/contracts/test-utils/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-test-utils",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -40,19 +40,19 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/sol-coverage": "^1.0.0",
-        "@0x/sol-profiler": "^1.0.0",
-        "@0x/sol-trace": "^1.0.0",
-        "@0x/abi-gen": "^1.0.20",
-        "@0x/dev-utils": "^1.0.22",
-        "@0x/order-utils": "^3.1.0",
-        "@0x/sol-compiler": "^2.0.0",
-        "@0x/subproviders": "^2.1.9",
-        "@0x/tslint-config": "^2.0.0",
-        "@0x/types": "^1.5.0",
-        "@0x/typescript-typings": "^3.0.6",
-        "@0x/utils": "^2.1.1",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/abi-gen": "^1.0.21",
+        "@0x/dev-utils": "^1.0.23",
+        "@0x/order-utils": "^3.1.1",
+        "@0x/sol-compiler": "^2.0.1",
+        "@0x/sol-coverage": "^1.0.1",
+        "@0x/sol-profiler": "^1.0.1",
+        "@0x/sol-trace": "^1.0.1",
+        "@0x/subproviders": "^2.1.10",
+        "@0x/tslint-config": "^2.0.1",
+        "@0x/types": "^1.5.1",
+        "@0x/typescript-typings": "^3.0.7",
+        "@0x/utils": "^3.0.0",
+        "@0x/web3-wrapper": "^3.2.3",
         "@types/bn.js": "^4.11.0",
         "@types/ethereumjs-abi": "^0.6.0",
         "@types/js-combinatorics": "^0.5.29",
@@ -63,7 +63,7 @@
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^2.0.1",
         "dirty-chai": "^2.0.1",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethereumjs-abi": "0.6.5",
         "ethereumjs-util": "^5.1.1",
         "ethers": "~4.0.4",
diff --git a/contracts/test-utils/src/types.ts b/contracts/test-utils/src/types.ts
index 1630eab0d..60cb2b102 100644
--- a/contracts/test-utils/src/types.ts
+++ b/contracts/test-utils/src/types.ts
@@ -70,13 +70,13 @@ export interface Token {
 }
 
 export enum OrderStatus {
-    INVALID,
-    INVALID_MAKER_ASSET_AMOUNT,
-    INVALID_TAKER_ASSET_AMOUNT,
-    FILLABLE,
-    EXPIRED,
-    FULLY_FILLED,
-    CANCELLED,
+    Invalid,
+    InvalidMakerAssetAmount,
+    InvalidTakerAssetAmount,
+    Fillable,
+    Expired,
+    FullyFilled,
+    Cancelled,
 }
 
 export enum ContractName {
diff --git a/contracts/tokens/CHANGELOG.json b/contracts/tokens/CHANGELOG.json
index 50872eb07..7f3908990 100644
--- a/contracts/tokens/CHANGELOG.json
+++ b/contracts/tokens/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "timestamp": 1547225310,
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1547040760,
         "version": "1.0.3",
         "changes": [
diff --git a/contracts/tokens/CHANGELOG.md b/contracts/tokens/CHANGELOG.md
index 4732f1746..6aa89cd76 100644
--- a/contracts/tokens/CHANGELOG.md
+++ b/contracts/tokens/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.4 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.0.3 - _January 9, 2019_
 
     * Dependencies updated
diff --git a/contracts/tokens/README.md b/contracts/tokens/README.md
index 9c4106d41..2d1db92f0 100644
--- a/contracts/tokens/README.md
+++ b/contracts/tokens/README.md
@@ -6,10 +6,10 @@ Token smart contracts that are used in the 0x protocol. Addresses of the deploye
 
 Token contracts that make up and interact with version 2.0.0 of the protocol can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
 
-*   [tokens](./contracts/tokens)
-    *   This directory contains implementations of different tokens and token standards, including [wETH](https://weth.io/), ZRX, [ERC20](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md), and [ERC721](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md).
-*   [test](./contracts/test)
-    *   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
+-   [tokens](./contracts/tokens)
+    -   This directory contains implementations of different tokens and token standards, including [wETH](https://weth.io/), ZRX, [ERC20](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md), and [ERC721](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md).
+-   [test](./contracts/test)
+    -   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
 
 ## Bug bounty
 
diff --git a/contracts/tokens/package.json b/contracts/tokens/package.json
index 31bf8f7cc..4601566e3 100644
--- a/contracts/tokens/package.json
+++ b/contracts/tokens/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-tokens",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -44,12 +44,12 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.20",
-        "@0x/contracts-test-utils": "^1.0.3",
-        "@0x/dev-utils": "^1.0.22",
-        "@0x/sol-compiler": "^2.0.0",
-        "@0x/subproviders": "^2.1.9",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/abi-gen": "^1.0.21",
+        "@0x/contracts-test-utils": "^1.0.4",
+        "@0x/dev-utils": "^1.0.23",
+        "@0x/sol-compiler": "^2.0.1",
+        "@0x/subproviders": "^2.1.10",
+        "@0x/tslint-config": "^2.0.1",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -69,19 +69,19 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.11",
-        "@0x/contracts-interfaces": "^1.0.3",
-        "@0x/contracts-libs": "^1.0.3",
-        "@0x/contracts-multisig": "^1.0.3",
-        "@0x/contracts-utils": "^1.0.3",
-        "@0x/order-utils": "^3.1.0",
-        "@0x/types": "^1.5.0",
-        "@0x/typescript-typings": "^3.0.6",
-        "@0x/utils": "^2.1.1",
-        "@0x/web3-wrapper": "^3.2.2",
+        "@0x/base-contract": "^3.0.12",
+        "@0x/contracts-interfaces": "^1.0.4",
+        "@0x/contracts-libs": "^1.0.4",
+        "@0x/contracts-multisig": "^1.0.4",
+        "@0x/contracts-utils": "^1.0.4",
+        "@0x/order-utils": "^3.1.1",
+        "@0x/types": "^1.5.1",
+        "@0x/typescript-typings": "^3.0.7",
+        "@0x/utils": "^3.0.0",
+        "@0x/web3-wrapper": "^3.2.3",
         "@types/js-combinatorics": "^0.5.29",
         "bn.js": "^4.11.8",
-        "ethereum-types": "^1.1.4",
+        "ethereum-types": "^1.1.5",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.5"
     },
diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json
index 50872eb07..7f3908990 100644
--- a/contracts/utils/CHANGELOG.json
+++ b/contracts/utils/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "timestamp": 1547225310,
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1547040760,
         "version": "1.0.3",
         "changes": [
diff --git a/contracts/utils/CHANGELOG.md b/contracts/utils/CHANGELOG.md
index 4732f1746..6aa89cd76 100644
--- a/contracts/utils/CHANGELOG.md
+++ b/contracts/utils/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.4 - _January 11, 2019_
+
+    * Dependencies updated
+
 ## v1.0.3 - _January 9, 2019_
 
     * Dependencies updated
diff --git a/contracts/utils/README.md b/contracts/utils/README.md
index e7c7b49ff..2f872ddb5 100644
--- a/contracts/utils/README.md
+++ b/contracts/utils/README.md
@@ -6,10 +6,10 @@ Smart contracts utils used in the 0x protocol.
 
 Contracts can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
 
-*   [utils](./contracts/utils)
-    *   This directory contains libraries and utils.
-*   [test](./contracts/test)
-    *   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
+-   [utils](./contracts/utils)
+    -   This directory contains libraries and utils.
+-   [test](./contracts/test)
+    -   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
 
 ## Contributing
 
diff --git a/contracts/utils/package.json b/contracts/utils/package.json
index 732556f34..3745323ce 100644
--- a/contracts/utils/package.json
+++ b/contracts/utils/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-utils",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -44,12 +44,12 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/utils/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.20",
-        "@0x/contracts-test-utils": "^1.0.3",
-        "@0x/dev-utils": "^1.0.22",
-        "@0x/sol-compiler": "^2.0.0",
-        "@0x/subproviders": "^2.1.9",
-        "@0x/tslint-config": "^2.0.0",
+        "@0x/abi-gen": "^1.0.21",
+        "@0x/contracts-test-utils": "^1.0.4",
+        "@0x/dev-utils": "^1.0.23",
+        "@0x/sol-compiler": "^2.0.1",
+        "@0x/subproviders": "^2.1.10",
+        "@0x/tslint-config": "^2.0.1",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
@@ -70,14 +70,14 @@
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.11",
-        "@0x/contracts-multisig": "^1.0.3",
-        "@0x/order-utils": "^3.1.0",
-        "@0x/types": "^1.5.0",
-        "@0x/typescript-typings": "^3.0.6",
-        "@0x/utils": "^2.1.1",
-        "@0x/web3-wrapper": "^3.2.2",
-        "ethereum-types": "^1.1.4",
+        "@0x/base-contract": "^3.0.12",
+        "@0x/contracts-multisig": "^1.0.4",
+        "@0x/order-utils": "^3.1.1",
+        "@0x/types": "^1.5.1",
+        "@0x/typescript-typings": "^3.0.7",
+        "@0x/utils": "^3.0.0",
+        "@0x/web3-wrapper": "^3.2.3",
+        "ethereum-types": "^1.1.5",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.5"
     },