Publish

- @0xproject/react-docs-example@0.0.10 - @0xproject/react-docs@0.0.10 - @0xproject/react-shared@0.1.5 - @0xproject/website@0.0.31
Updated CHANGELOGS
2018-05-04 23:55:03 +02:00 · 2018-05-04 23:54:57 +02:00 · 2018-05-04 22:41:39 +02:00 · 2018-05-04 21:17:07 +02:00 · 2018-05-04 20:44:18 +02:00 · 2018-05-04 20:44:12 +02:00
395 changed files with 8592 additions and 10302 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -124,6 +124,10 @@ jobs:
          key: coverage-sol-cov-{{ .Environment.CIRCLE_SHA1 }}
          paths:
            - ~/repo/packages/sol-cov/coverage/lcov.info
+      - save_cache:
+          key: coverage-metacoin-{{ .Environment.CIRCLE_SHA1 }}
+          paths:
+            - ~/repo/packages/metacoin/coverage/lcov.info
  lint:
    working_directory: ~/repo
    docker:
@@ -177,6 +181,9 @@ jobs:
      - restore_cache:
          keys:
            - coverage-0xjs-{{ .Environment.CIRCLE_SHA1 }}
+      - restore_cache:
+          keys:
+            - coverage-metacoin-{{ .Environment.CIRCLE_SHA1 }}
      - run: yarn report_coverage
 workflows:
  version: 2
--- a/.gitignore
+++ b/.gitignore
@@ -74,7 +74,10 @@ packages/react-docs/example/public/bundle*
 bin/

 # generated contract artifacts
-packages/contracts/src/artifacts
+packages/sol-cov/test/fixtures/artifacts
+packages/metacoin/artifacts
+packages/0x.js/test/artifacts
+packages/migrations/src/artifacts

 # generated contract wrappers
 packages/0x.js/src/contract_wrappers/generated/
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,5 +1,7 @@
 lib
 .nyc_output
 /packages/contracts/src/artifacts
+/packages/metacoin/artifacts
+/packages/migrations/src/artifacts
 package.json
 scripts/postpublish_utils.js
--- a/1
+++ b/1
@@ -1 +0,0 @@
-*        @abandeali1 @BMillman19 @dekz @fabioberger @LogvinovLeon @Recmo
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+*   Using welcoming and inclusive language
+*   Being respectful of differing viewpoints and experiences
+*   Gracefully accepting constructive criticism
+*   Focusing on what is best for the community
+*   Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+*   The use of sexualized language or imagery and unwelcome sexual attention or advances
+*   Trolling, insulting/derogatory comments, and personal or political attacks
+*   Public or private harassment
+*   Publishing others' private information, such as a physical or electronic address, without explicit permission
+*   Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at team@0xproject.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -36,7 +36,6 @@

 *   [ ] Change requires a change to the documentation.
 *   [ ] Added tests to cover my changes.
-*   [ ] Added new entries to the relevant CHANGELOGs.
-*   [ ] Updated the new versions of the changed packages in the relevant CHANGELOGs.
+*   [ ] Added new entries to the relevant CHANGELOG.jsons.
 *   [ ] Labeled this PR with the 'WIP' label if it is a work in progress.
 *   [ ] Labeled this PR with the labels corresponding to the changed package.
--- a/README.md
+++ b/README.md
@@ -14,7 +14,6 @@ This repository is a monorepo including the 0x protocol smart contracts and nume
 [![Discord](https://img.shields.io/badge/chat-rocket.chat-yellow.svg?style=flat)](https://chat.0xproject.com)
 [![Join the chat at https://gitter.im/0xProject/Lobby](https://badges.gitter.im/0xProject/Lobby.svg)](https://gitter.im/0xProject/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-[![Greenkeeper badge](https://badges.greenkeeper.io/0xProject/0x-monorepo.svg?token=7c22e5c72acf39d3ead8d29c5d9bb38f9096df3e643024dcedd53ab732847be1&ts=1496426342666)](https://greenkeeper.io/)

 ### Published Packages

@@ -32,7 +31,7 @@ This repository is a monorepo including the 0x protocol smart contracts and nume
 | [`@0xproject/react-docs`](/packages/react-docs)                 | [![npm](https://img.shields.io/npm/v/@0xproject/react-docs.svg)](https://www.npmjs.com/package/@0xproject/react-docs)                 | React documentation component for rendering TypeDoc & Doxity generated JSON |
 | [`@0xproject/react-shared`](/packages/react-shared)             | [![npm](https://img.shields.io/npm/v/@0xproject/react-shared.svg)](https://www.npmjs.com/package/@0xproject/react-shared)             | 0x shared react components                                                  |
 | [`@0xproject/sra-report`](/packages/sra-report)                 | [![npm](https://img.shields.io/npm/v/@0xproject/sra-report.svg)](https://www.npmjs.com/package/@0xproject/sra-report)                 | Generate reports for standard relayer API compliance                        |
-| [`@0xproject/sol-cov`](/packages/sol-cov)                       | [![npm](https://img.shields.io/npm/v/@0xproject/sol-cov.svg)](https://www.npmjs.com/package/@0xproject/sol-cov)                       | Solidity test coverage tool tool                                            |
+| [`@0xproject/sol-cov`](/packages/sol-cov)                       | [![npm](https://img.shields.io/npm/v/@0xproject/sol-cov.svg)](https://www.npmjs.com/package/@0xproject/sol-cov)                       | Solidity test coverage tool                                                 |
 | [`@0xproject/subproviders`](/packages/subproviders)             | [![npm](https://img.shields.io/npm/v/@0xproject/subproviders.svg)](https://www.npmjs.com/package/@0xproject/subproviders)             | Useful web3 subproviders (e.g LedgerSubprovider)                            |
 | [`@0xproject/tslint-config`](/packages/tslint-config)           | [![npm](https://img.shields.io/npm/v/@0xproject/tslint-config.svg)](https://www.npmjs.com/package/@0xproject/tslint-config)           | Custom 0x development TSLint rules                                          |
 | [`@0xproject/types`](/packages/types)                           | [![npm](https://img.shields.io/npm/v/@0xproject/types.svg)](https://www.npmjs.com/package/@0xproject/types)                           | Shared type declarations                                                    |
@@ -74,7 +73,7 @@ You can include those by prepending @0xproject/typescript-typings package to you

 We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.

-Please read our [contribution guidelines](./CONTRIBUTING.md) before getting started.
+#### Read our [contribution guidelines](./CONTRIBUTING.md).

 ### Install dependencies

@@ -118,24 +117,6 @@ yarn lerna:run lint

 ### Run Tests

-Before running the tests, you will need to spin up a [TestRPC](https://www.npmjs.com/package/ethereumjs-testrpc) instance and deploy all the 0x smart contracts.
-
-In a separate terminal, start TestRPC (a convenience command is provided as part of this repo)
-
 ```bash
-yarn testrpc
-```
-
-Then in your main terminal run
-
-```
-cd packages/contracts
-yarn migrate
-cd ..
-```
-
-And finally from the root project directory run
-
-```bash
-yarn lerna:run test
+yarn lerna:test
 ```
--- a/package.json
+++ b/package.json
@@ -13,11 +13,13 @@
        "test:installation": "node ./packages/monorepo-scripts/lib/test_installation.js",
        "lerna:install": "yarn install",
        "lerna:run": "lerna run",
+        "lerna:test": "lerna run test",
        "lerna:clean": "lerna run clean",
        "lerna:build": "lerna run build",
        "lerna:rebuild": "run-s lerna:clean lerna:build",
        "lerna:publish": "run-s lerna:install lerna:rebuild script:publish",
        "lerna:publish:dry": "run-s lerna:install lerna:rebuild script:publish:dry",
+        "lerna:stage_docs": "lerna run docs:stage",
        "script:publish": "node ./packages/monorepo-scripts/lib/publish.js",
        "script:publish:dry": "IS_DRY_RUN=true yarn script:publish"
    },
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -1,10 +1,87 @@
 [
+    {
+        "timestamp": 1525453812,
+        "version": "0.37.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "0.37.0",
+        "changes": [
+            {
+                "note": "Fixed expiration watcher comparator to handle orders with equal expiration times",
+                "pr": 526
+            },
+            {
+                "note": "Update Web3 Provider Engine to 14.0.4",
+                "pr": 555
+            },
+            {
+                "note": "Add `zeroEx.getProvider()`",
+                "pr": 559
+            },
+            {
+                "note": "Move `ZeroExError.InvalidSignature` to `@0xproject/order-utils` `OrderError.InvalidSignature`",
+                "pr": 559
+            }
+        ],
+        "timestamp": 1525428773
+    },
+    {
+        "version": "0.36.3",
+        "changes": [
+            {
+                "note": "Move @0xproject/migrations to devDependencies"
+            }
+        ],
+        "timestamp": 1524079658
+    },
+    {
+        "timestamp": 1524073495,
+        "version": "0.36.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "0.36.1",
+        "changes": [
+            {
+                "note": "Internal changes and refactoring"
+            },
+            {
+                "note": "Fix redundant expired order removal bug",
+                "pr": 527
+            }
+        ],
+        "timestamp": 1524044013
+    },
+    {
+        "version": "0.36.0",
+        "changes": [
+            {
+                "note": "Moved Web3.Provider to `@0xproject/types:Provider`",
+                "pr": 501
+            },
+            {
+                "note":
+                    "Add `zeroEx.exchange.getOrderStateAsync` to allow obtaining current OrderState for a signedOrder",
+                "pr": 510
+            }
+        ],
+        "timestamp": 1523462196
+    },
    {
        "version": "0.35.0",
        "changes": [
            {
                "note":
-                    "Removed `ZeroExError.TransactionMiningTimeout` and moved it to '@0xproject/web3_wrapper' `Web3WrapperErrors.TransactionMiningTimeout`",
+                    "Removed `ZeroExError.TransactionMiningTimeout` and moved it to '@0xproject/web3-wrapper' `Web3WrapperErrors.TransactionMiningTimeout`",
                "pr": 485
            }
        ],
@@ -46,8 +123,7 @@
                "pr": 456
            }
        ],
-        "timestamp": 1521298800,
-        "isPublished": true
+        "timestamp": 1521298800
    },
    {
        "version": "0.33.1",
@@ -56,8 +132,7 @@
                "note": "Add missing EthersJs typescript typings as dependency"
            }
        ],
-        "timestamp": 1520434800,
-        "isPublished": true
+        "timestamp": 1520434800
    },
    {
        "version": "0.33.0",
@@ -83,8 +158,7 @@
                "pr": 429
            }
        ],
-        "timestamp": 1520089200,
-        "isPublished": true
+        "timestamp": 1520089200
    },
    {
        "version": "0.32.2",
@@ -94,8 +168,7 @@
                "pr": 389
            }
        ],
-        "timestamp": 1518102000,
-        "isPublished": true
+        "timestamp": 1518102000
    },
    {
        "version": "0.32.1",
@@ -109,8 +182,7 @@
                "pr": 371
            }
        ],
-        "timestamp": 1517929200,
-        "isPublished": true
+        "timestamp": 1517929200
    },
    {
        "version": "0.32.0",
@@ -125,8 +197,7 @@
                "pr": 366
            }
        ],
-        "timestamp": 1517756400,
-        "isPublished": true
+        "timestamp": 1517756400
    },
    {
        "version": "0.31.1",
@@ -136,8 +207,7 @@
                "pr": 357
            }
        ],
-        "timestamp": 1517410800,
-        "isPublished": true
+        "timestamp": 1517410800
    },
    {
        "version": "0.31.0",
@@ -148,8 +218,7 @@
                "pr": 349
            }
        ],
-        "timestamp": 1517238000,
-        "isPublished": true
+        "timestamp": 1517238000
    },
    {
        "version": "0.30.2",
@@ -162,8 +231,7 @@
                "note": "Move @0xproject/types to dependencies from devDependencies fixing missing type errors"
            }
        ],
-        "timestamp": 1517151600,
-        "isPublished": true
+        "timestamp": 1517151600
    },
    {
        "version": "0.30.1",
@@ -177,8 +245,7 @@
                "pr": 341
            }
        ],
-        "timestamp": 1516719600,
-        "isPublished": true
+        "timestamp": 1516719600
    },
    {
        "version": "0.30.0",
@@ -197,8 +264,7 @@
                "pr": 321
            }
        ],
-        "timestamp": 1516114800,
-        "isPublished": true
+        "timestamp": 1516114800
    },
    {
        "version": "0.29.1",
@@ -208,8 +274,7 @@
                "pr": 305
            }
        ],
-        "timestamp": 1515596400,
-        "isPublished": true
+        "timestamp": 1515596400
    },
    {
        "version": "0.29.0",
@@ -223,8 +288,7 @@
                "pr": 287
            }
        ],
-        "timestamp": 1514386800,
-        "isPublished": true
+        "timestamp": 1514386800
    },
    {
        "version": "0.28.0",
@@ -270,8 +334,7 @@
                "pr": 278
            }
        ],
-        "timestamp": 1513695600,
-        "isPublished": true
+        "timestamp": 1513695600
    },
    {
        "version": "0.27.1",
@@ -280,8 +343,7 @@
                "note": "Export `TransactionOpts` type"
            }
        ],
-        "timestamp": 1511794800,
-        "isPublished": true
+        "timestamp": 1511794800
    },
    {
        "version": "0.27.0",
@@ -326,8 +388,7 @@
                "pr": 236
            }
        ],
-        "timestamp": 1511794800,
-        "isPublished": true
+        "timestamp": 1511794800
    },
    {
        "version": "0.26.0",
@@ -347,8 +408,7 @@
                "pr": 225
            }
        ],
-        "timestamp": 1511190000,
-        "isPublished": true
+        "timestamp": 1511190000
    },
    {
        "version": "0.25.1",
@@ -367,8 +427,7 @@
                "pr": 200
            }
        ],
-        "timestamp": 1510498800,
-        "isPublished": true
+        "timestamp": 1510498800
    },
    {
        "version": "0.23.0",
@@ -381,8 +440,7 @@
                "note": "Subscribe callbacks now receive an error object as their first argument"
            }
        ],
-        "timestamp": 1510412400,
-        "isPublished": true
+        "timestamp": 1510412400
    },
    {
        "version": "0.22.6",
@@ -392,8 +450,7 @@
                "pr": 206
            }
        ],
-        "timestamp": 1510239600,
-        "isPublished": true
+        "timestamp": 1510239600
    },
    {
        "version": "0.22.5",
@@ -402,8 +459,7 @@
                "note": "Re-publish v0.22.4 to fix publishing issue"
            }
        ],
-        "timestamp": 1509980400,
-        "isPublished": true
+        "timestamp": 1509980400
    },
    {
        "version": "0.22.4",
@@ -412,8 +468,7 @@
                "note": "Upgraded bignumber.js to a new version that ships with native typings"
            }
        ],
-        "timestamp": 1508857200,
-        "isPublished": true
+        "timestamp": 1508857200
    },
    {
        "version": "0.22.3",
@@ -423,8 +478,7 @@
                "pr": 199
            }
        ],
-        "timestamp": 1508857200,
-        "isPublished": true
+        "timestamp": 1508857200
    },
    {
        "version": "0.22.2",
@@ -434,8 +488,7 @@
                "pr": 197
            }
        ],
-        "timestamp": 1508770800,
-        "isPublished": true
+        "timestamp": 1508770800
    },
    {
        "version": "0.22.0",
@@ -450,8 +503,7 @@
                "pr": 187
            }
        ],
-        "timestamp": 1508079600,
-        "isPublished": true
+        "timestamp": 1508079600
    },
    {
        "version": "0.21.4",
@@ -462,8 +514,7 @@
                "pr": 194
            }
        ],
-        "timestamp": 1507820400,
-        "isPublished": true
+        "timestamp": 1507820400
    },
    {
        "version": "0.21.3",
@@ -473,8 +524,7 @@
                "pr": 193
            }
        ],
-        "timestamp": 1507734000,
-        "isPublished": true
+        "timestamp": 1507734000
    },
    {
        "version": "0.21.2",
@@ -484,8 +534,7 @@
                "pr": 190
            }
        ],
-        "timestamp": 1507647600,
-        "isPublished": true
+        "timestamp": 1507647600
    },
    {
        "version": "0.21.1",
@@ -495,8 +544,7 @@
                "pr": 189
            }
        ],
-        "timestamp": 1507647600,
-        "isPublished": true
+        "timestamp": 1507647600
    },
    {
        "version": "0.21.0",
@@ -542,8 +590,7 @@
                "pr": 185
            }
        ],
-        "timestamp": 1507561200,
-        "isPublished": true
+        "timestamp": 1507561200
    },
    {
        "version": "0.20.0",
@@ -561,8 +608,7 @@
                "pr": 181
            }
        ],
-        "timestamp": 1507129200,
-        "isPublished": true
+        "timestamp": 1507129200
    },
    {
        "version": "0.19.0",
@@ -580,8 +626,7 @@
                "pr": 175
            }
        ],
-        "timestamp": 1506610800,
-        "isPublished": true
+        "timestamp": 1506610800
    },
    {
        "version": "0.18.0",
@@ -591,8 +636,7 @@
                "pr": 170
            }
        ],
-        "timestamp": 1506351600,
-        "isPublished": true
+        "timestamp": 1506351600
    },
    {
        "version": "0.17.0",
@@ -602,8 +646,7 @@
                "pr": 171
            }
        ],
-        "timestamp": 1506351600,
-        "isPublished": true
+        "timestamp": 1506351600
    },
    {
        "version": "0.16.0",
@@ -626,8 +669,7 @@
                "pr": 165
            }
        ],
-        "timestamp": 1505833200,
-        "isPublished": true
+        "timestamp": 1505833200
    },
    {
        "version": "0.15.0",
@@ -638,8 +680,7 @@
                "pr": 161
            }
        ],
-        "timestamp": 1504796400,
-        "isPublished": true
+        "timestamp": 1504796400
    },
    {
        "version": "0.14.2",
@@ -649,8 +690,7 @@
                "pr": 160
            }
        ],
-        "timestamp": 1504710000,
-        "isPublished": true
+        "timestamp": 1504710000
    },
    {
        "version": "0.14.1",
@@ -660,8 +700,7 @@
                "pr": 159
            }
        ],
-        "timestamp": 1504710000,
-        "isPublished": true
+        "timestamp": 1504710000
    },
    {
        "version": "0.14.0",
@@ -679,8 +718,7 @@
                "pr": 157
            }
        ],
-        "timestamp": 1504623600,
-        "isPublished": true
+        "timestamp": 1504623600
    },
    {
        "version": "0.13.0",
@@ -704,8 +742,7 @@
                "pr": 152
            }
        ],
-        "timestamp": 1504623600,
-        "isPublished": true
+        "timestamp": 1504623600
    },
    {
        "version": "0.12.1",
@@ -723,8 +760,7 @@
                "pr": 139
            }
        ],
-        "timestamp": 1504278000,
-        "isPublished": true
+        "timestamp": 1504278000
    },
    {
        "version": "0.11.0",
@@ -742,8 +778,7 @@
                "pr": 137
            }
        ],
-        "timestamp": 1503500400,
-        "isPublished": true
+        "timestamp": 1503500400
    },
    {
        "version": "0.10.4",
@@ -753,8 +788,7 @@
                "pr": 135
            }
        ],
-        "timestamp": 1503500400,
-        "isPublished": true
+        "timestamp": 1503500400
    },
    {
        "version": "0.10.1",
@@ -808,8 +842,7 @@
                "pr": 127
            }
        ],
-        "timestamp": 1503500400,
-        "isPublished": true
+        "timestamp": 1503500400
    },
    {
        "version": "0.9.3",
@@ -819,8 +852,7 @@
                "pr": 118
            }
        ],
-        "timestamp": 1503327600,
-        "isPublished": true
+        "timestamp": 1503327600
    },
    {
        "version": "0.9.2",
@@ -833,8 +865,7 @@
                "pr": 118
            }
        ],
-        "timestamp": 1503241200,
-        "isPublished": true
+        "timestamp": 1503241200
    },
    {
        "version": "0.9.1",
@@ -844,8 +875,7 @@
                "pr": 120
            }
        ],
-        "timestamp": 1502809200,
-        "isPublished": true
+        "timestamp": 1502809200
    },
    {
        "version": "0.9.0",
@@ -882,8 +912,7 @@
                "pr": 109
            }
        ],
-        "timestamp": 1500994800,
-        "isPublished": true
+        "timestamp": 1500994800
    },
    {
        "version": "0.8.0",
@@ -925,8 +954,7 @@
                "note": "Fixed the bug where `zeroEx.setProviderAsync` didn't invalidate etherToken contract's instance"
            }
        ],
-        "timestamp": 1499094000,
-        "isPublished": true
+        "timestamp": 1499094000
    },
    {
        "version": "0.7.1",
@@ -937,8 +965,7 @@
                "pr": 81
            }
        ],
-        "timestamp": 1498402800,
-        "isPublished": true
+        "timestamp": 1498402800
    },
    {
        "version": "0.7.0",
@@ -960,8 +987,7 @@
                    "Renamed type `LogCancelArgs` to `LogCancelContractEventArgs` and `LogFillArgs` to `LogFillContractEventArgs`"
            }
        ],
-        "timestamp": 1498057200,
-        "isPublished": true
+        "timestamp": 1498057200
    },
    {
        "version": "0.6.2",
@@ -973,8 +999,7 @@
                "note": "Improved documentation"
            }
        ],
-        "timestamp": 1497970800,
-        "isPublished": true
+        "timestamp": 1497970800
    },
    {
        "version": "0.6.1",
@@ -983,8 +1008,7 @@
                "note": "Improved documentation"
            }
        ],
-        "timestamp": 1497798000,
-        "isPublished": true
+        "timestamp": 1497798000
    },
    {
        "version": "0.6.0",
@@ -996,8 +1020,7 @@
                "note": "Added types for contract event arguments"
            }
        ],
-        "timestamp": 1497798000,
-        "isPublished": true
+        "timestamp": 1497798000
    },
    {
        "version": "0.5.2",
@@ -1007,8 +1030,7 @@
                    "Fixed the bug in `postpublish` script that caused that only unminified UMD bundle was uploaded to release page"
            }
        ],
-        "timestamp": 1497452400,
-        "isPublished": true
+        "timestamp": 1497452400
    },
    {
        "version": "0.5.1",
@@ -1017,7 +1039,6 @@
                "note": "Added `postpublish` script to publish to Github Releases with assets."
            }
        ],
-        "timestamp": 1497452400,
-        "isPublished": true
+        "timestamp": 1497452400
    }
 ]
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -5,9 +5,38 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v0.37.1 - _May 4, 2018_
+
+    * Dependencies updated
+
+## v0.37.0 - _May 4, 2018_
+
+    * Fixed expiration watcher comparator to handle orders with equal expiration times (#526)
+    * Update Web3 Provider Engine to 14.0.4 (#555)
+    * Add `zeroEx.getProvider()` (#559)
+    * Move `ZeroExError.InvalidSignature` to `@0xproject/order-utils` `OrderError.InvalidSignature` (#559)
+
+## v0.36.3 - _April 18, 2018_
+
+    * Move @0xproject/migrations to devDependencies
+
+## v0.36.2 - _April 18, 2018_
+
+    * Dependencies updated
+
+## v0.36.1 - _April 18, 2018_
+
+    * Internal changes and refactoring
+    * Fix redundant expired order removal bug (#527)
+
+## v0.36.0 - _April 11, 2018_
+
+    * Moved Web3.Provider to `@0xproject/types:Provider` (#501)
+    * Add `zeroEx.exchange.getOrderStateAsync` to allow obtaining current OrderState for a signedOrder (#510)
+
 ## v0.35.0 - _April 2, 2018_

-    * Removed `ZeroExError.TransactionMiningTimeout` and moved it to '@0xproject/web3_wrapper' `Web3WrapperErrors.TransactionMiningTimeout` (#485)
+    * Removed `ZeroExError.TransactionMiningTimeout` and moved it to '@0xproject/web3-wrapper' `Web3WrapperErrors.TransactionMiningTimeout` (#485)

 ## v0.34.0 - _April 2, 2018_

--- a/packages/0x.js/README.md
+++ b/packages/0x.js/README.md
@@ -1,5 +1,9 @@
 ## 0x.js

+A TypeScript/Javascript library for interacting with the 0x protocol.
+
+### Read the [Documentation](https://0xproject.com/docs/0x.js).
+
 ## Installation

 0x.js ships as both a [UMD](https://github.com/umdjs/umd) module and a [CommonJS](https://en.wikipedia.org/wiki/CommonJS) package.
@@ -38,10 +42,66 @@ Download the UMD module from our [releases page](https://github.com/0xProject/0x
 <script type="text/javascript" src="0x.js"></script>
 ```

-## Documentation
+## Contributing

-Extensive documentation of 0x.js can be found on [our website][docs-url].
+We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.

-[website-url]: https://0xproject.com/
-[whitepaper-url]: https://0xproject.com/pdfs/0x_white_paper.pdf
-[docs-url]: https://0xproject.com/docs/0xjs
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
+
+### Install dependencies
+
+If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
+
+```bash
+yarn config set workspaces-experimental true
+```
+
+Then install dependencies
+
+```bash
+yarn install
+```
+
+### Build
+
+If this is your **first** time building this package, you must first build **all** packages within the monorepo. This is because packages that depend on other packages located inside this monorepo are symlinked when run from **within** the monorepo. This allows you to make changes across multiple packages without first publishing dependent packages to NPM. To build all packages, run the following from the monorepo root directory:
+
+```bash
+yarn lerna:rebuild
+```
+
+Or continuously rebuild on change:
+
+```bash
+yarn dev
+```
+
+You can also build this specific package by running the following from within its directory:
+
+```bash
+yarn build
+```
+
+or continuously rebuild on change:
+
+```bash
+yarn build:watch
+```
+
+### Clean
+
+```bash
+yarn clean
+```
+
+### Lint
+
+```bash
+yarn lint
+```
+
+### Run Tests
+
+```bash
+yarn test
+```
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
 {
    "name": "0x.js",
-    "version": "0.35.0",
+    "version": "0.37.1",
    "description": "A javascript library for interacting with the 0x protocol",
    "keywords": [
        "0x.js",
@@ -15,25 +15,26 @@
        "build:watch": "tsc -w",
        "prebuild": "run-s clean generate_contract_wrappers",
        "build": "run-p build:umd:prod build:commonjs; exit 0;",
-        "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis 'src/artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'",
+        "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis 'src/compact_artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'",
        "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
        "test:circleci": "run-s test:coverage",
        "test": "run-s clean test:commonjs",
        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
        "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
-        "update_contracts": "for i in ${npm_package_config_artifacts}; do copyfiles -u 4 ../contracts/build/contracts/$i.json ../0x.js/src/artifacts; done;",
+        "update_artifacts": "for i in ${npm_package_config_contracts}; do copyfiles -u 4 ../migrations/src/artifacts/$i.json test/artifacts; done;",
        "clean": "shx rm -rf _bundles lib test_temp scripts",
        "build:umd:prod": "NODE_ENV=production webpack",
-        "build:commonjs": "tsc && copyfiles -u 2 './src/artifacts/**/*.json' ./lib/src/artifacts && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
+        "build:commonjs": "tsc && yarn update_artifacts && copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
        "test:commonjs": "run-s build:commonjs run_mocha",
-        "run_mocha": "mocha lib/test/**/*_test.js --timeout 10000 --bail --exit",
+        "run_mocha": "mocha lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit",
        "manual:postpublish": "yarn build; node ./scripts/postpublish.js",
        "docs:stage": "yarn build && node ./scripts/stage_docs.js",
        "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES",
        "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json"
    },
    "config": {
-        "artifacts": "TokenTransferProxy Exchange TokenRegistry Token EtherToken",
+        "compact_artifacts": "Exchange DummyToken ZRXToken Token EtherToken TokenTransferProxy TokenRegistry",
+        "contracts": "Exchange DummyToken ZRXToken Token WETH9 TokenTransferProxy MultiSigWallet MultiSigWalletWithTimeLock MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress MaliciousToken TokenRegistry Arbitrage EtherDelta AccountLevels",
        "postpublish": {
            "assets": [
                "packages/0x.js/_bundles/index.js",
@@ -60,15 +61,17 @@
        "node": ">=6.0.0"
    },
    "devDependencies": {
-        "@0xproject/abi-gen": "^0.2.9",
-        "@0xproject/dev-utils": "^0.3.4",
-        "@0xproject/monorepo-scripts": "^0.1.16",
-        "@0xproject/tslint-config": "^0.4.14",
+        "@0xproject/deployer": "^0.4.2",
+        "@0xproject/dev-utils": "^0.4.0",
+        "@0xproject/migrations": "^0.0.4",
+        "@0xproject/monorepo-scripts": "^0.1.19",
+        "@0xproject/subproviders": "^0.10.0",
+        "@0xproject/tslint-config": "^0.4.17",
        "@types/bintrees": "^1.0.2",
-        "@types/jsonschema": "^1.1.1",
        "@types/lodash": "4.14.104",
        "@types/mocha": "^2.2.42",
        "@types/node": "^8.0.53",
+        "@types/request": "2.47.0",
        "@types/sinon": "^2.2.2",
        "@types/uuid": "^3.4.2",
        "awesome-typescript-loader": "^3.1.3",
@@ -84,31 +87,30 @@
        "opn-cli": "^3.1.0",
        "prettier": "^1.11.1",
        "request": "^2.81.0",
-        "request-promise-native": "^1.0.5",
        "shx": "^0.2.2",
        "sinon": "^4.0.0",
        "source-map-support": "^0.5.0",
-        "truffle-hdwallet-provider": "^0.0.3",
        "tslint": "5.8.0",
        "typedoc": "0xProject/typedoc",
        "typescript": "2.7.1",
-        "web3-provider-engine": "^13.0.1",
+        "web3-provider-engine": "^14.0.4",
        "webpack": "^3.1.0"
    },
    "dependencies": {
-        "@0xproject/assert": "^0.2.5",
-        "@0xproject/base-contract": "^0.1.0",
-        "@0xproject/json-schemas": "^0.7.19",
-        "@0xproject/types": "^0.5.0",
-        "@0xproject/typescript-typings": "^0.0.3",
-        "@0xproject/utils": "^0.5.0",
-        "@0xproject/web3-wrapper": "^0.5.0",
+        "@0xproject/assert": "^0.2.8",
+        "@0xproject/base-contract": "^0.3.0",
+        "@0xproject/json-schemas": "^0.7.22",
+        "@0xproject/order-utils": "^0.0.3",
+        "@0xproject/types": "^0.6.2",
+        "@0xproject/typescript-typings": "^0.3.0",
+        "@0xproject/utils": "^0.6.0",
+        "@0xproject/web3-wrapper": "^0.6.2",
        "bintrees": "^1.0.2",
        "bn.js": "^4.11.8",
        "ethereumjs-abi": "^0.6.4",
        "ethereumjs-blockstream": "^2.0.6",
        "ethereumjs-util": "^5.1.1",
-        "ethers-contracts": "^2.2.1",
+        "ethers": "^3.0.15",
        "js-sha3": "^0.7.0",
        "lodash": "^4.17.4",
        "uuid": "^3.1.0",
--- a/packages/0x.js/src/0x.ts
+++ b/packages/0x.js/src/0x.ts
@@ -1,5 +1,12 @@
 import { schemas, SchemaValidator } from '@0xproject/json-schemas';
-import { ECSignature, Order, SignedOrder, TransactionReceiptWithDecodedLogs } from '@0xproject/types';
+import {
+    generatePseudoRandomSalt,
+    getOrderHashHex,
+    isValidOrderHash,
+    isValidSignature,
+    signOrderHashAsync,
+} from '@0xproject/order-utils';
+import { ECSignature, Order, Provider, SignedOrder, TransactionReceiptWithDecodedLogs } from '@0xproject/types';
 import { AbiDecoder, BigNumber, intervalUtils } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as ethUtil from 'ethereumjs-util';
@@ -15,11 +22,10 @@ import { OrderStateWatcher } from './order_watcher/order_state_watcher';
 import { zeroExConfigSchema } from './schemas/zero_ex_config_schema';
 import { zeroExPrivateNetworkConfigSchema } from './schemas/zero_ex_private_network_config_schema';
 import { zeroExPublicNetworkConfigSchema } from './schemas/zero_ex_public_network_config_schema';
-import { OrderStateWatcherConfig, Web3Provider, ZeroExConfig, ZeroExError } from './types';
+import { OrderStateWatcherConfig, ZeroExConfig, ZeroExError } from './types';
 import { assert } from './utils/assert';
 import { constants } from './utils/constants';
 import { decorators } from './utils/decorators';
-import { signatureUtils } from './utils/signature_utils';
 import { utils } from './utils/utils';

 /**
@@ -33,7 +39,6 @@ export class ZeroEx {
     * this constant for your convenience.
     */
    public static NULL_ADDRESS = constants.NULL_ADDRESS;
-
    /**
     * An instance of the ExchangeWrapper class containing methods for interacting with the 0x Exchange smart contract.
     */
@@ -58,6 +63,15 @@ export class ZeroEx {
     */
    public proxy: TokenTransferProxyWrapper;
    private _web3Wrapper: Web3Wrapper;
+    /**
+     * Generates a pseudo-random 256-bit salt.
+     * The salt can be included in a 0x order, ensuring that the order generates a unique orderHash
+     * and will not collide with other outstanding orders that are identical in all other parameters.
+     * @return  A pseudo-random 256-bit number that can be used as a salt.
+     */
+    public static generatePseudoRandomSalt(): BigNumber {
+        return generatePseudoRandomSalt();
+    }
    /**
     * Verifies that the elliptic curve signature `signature` was generated
     * by signing `data` with the private key corresponding to the `signerAddress` address.
@@ -67,27 +81,15 @@ export class ZeroEx {
     * @return  Whether the signature is valid for the supplied signerAddress and data.
     */
    public static isValidSignature(data: string, signature: ECSignature, signerAddress: string): boolean {
-        assert.isHexString('data', data);
-        assert.doesConformToSchema('signature', signature, schemas.ecSignatureSchema);
-        assert.isETHAddressHex('signerAddress', signerAddress);
-        const normalizedSignerAddress = signerAddress.toLowerCase();
-
-        const isValidSignature = signatureUtils.isValidSignature(data, signature, normalizedSignerAddress);
-        return isValidSignature;
+        return isValidSignature(data, signature, signerAddress);
    }
    /**
-     * Generates a pseudo-random 256-bit salt.
-     * The salt can be included in a 0x order, ensuring that the order generates a unique orderHash
-     * and will not collide with other outstanding orders that are identical in all other parameters.
-     * @return  A pseudo-random 256-bit number that can be used as a salt.
+     * Computes the orderHash for a supplied order.
+     * @param   order   An object that conforms to the Order or SignedOrder interface definitions.
+     * @return  The resulting orderHash from hashing the supplied order.
     */
-    public static generatePseudoRandomSalt(): BigNumber {
-        // BigNumber.random returns a pseudo-random number between 0 & 1 with a passed in number of decimal places.
-        // Source: https://mikemcl.github.io/bignumber.js/#random
-        const randomNumber = BigNumber.random(constants.MAX_DIGITS_IN_UNSIGNED_256_INT);
-        const factor = new BigNumber(10).pow(constants.MAX_DIGITS_IN_UNSIGNED_256_INT - 1);
-        const salt = randomNumber.times(factor).round();
-        return salt;
+    public static getOrderHashHex(order: Order | SignedOrder): string {
+        return getOrderHashHex(order);
    }
    /**
     * Checks if the supplied hex encoded order hash is valid.
@@ -97,12 +99,7 @@ export class ZeroEx {
     * @return  Whether the supplied orderHash has the expected format.
     */
    public static isValidOrderHash(orderHash: string): boolean {
-        // Since this method can be called to check if any arbitrary string conforms to an orderHash's
-        // format, we only assert that we were indeed passed a string.
-        assert.isString('orderHash', orderHash);
-        const schemaValidator = new SchemaValidator();
-        const isValidOrderHash = schemaValidator.validate(orderHash, schemas.orderHashSchema).valid;
-        return isValidOrderHash;
+        return isValidOrderHash(orderHash);
    }
    /**
     * A unit amount is defined as the amount of a token above the specified decimal places (integer part).
@@ -115,10 +112,8 @@ export class ZeroEx {
    public static toUnitAmount(amount: BigNumber, decimals: number): BigNumber {
        assert.isValidBaseUnitAmount('amount', amount);
        assert.isNumber('decimals', decimals);
-
-        const aUnit = new BigNumber(10).pow(decimals);
-        const unit = amount.div(aUnit);
-        return unit;
+        const unitAmount = Web3Wrapper.toUnitAmount(amount, decimals);
+        return unitAmount;
    }
    /**
     * A baseUnit is defined as the smallest denomination of a token. An amount expressed in baseUnits
@@ -131,34 +126,17 @@ export class ZeroEx {
    public static toBaseUnitAmount(amount: BigNumber, decimals: number): BigNumber {
        assert.isBigNumber('amount', amount);
        assert.isNumber('decimals', decimals);
-
-        const unit = new BigNumber(10).pow(decimals);
-        const baseUnitAmount = amount.times(unit);
-        const hasDecimals = baseUnitAmount.decimalPlaces() !== 0;
-        if (hasDecimals) {
-            throw new Error(`Invalid unit amount: ${amount.toString()} - Too many decimal places`);
-        }
+        const baseUnitAmount = Web3Wrapper.toBaseUnitAmount(amount, decimals);
        return baseUnitAmount;
    }
-    /**
-     * Computes the orderHash for a supplied order.
-     * @param   order   An object that conforms to the Order or SignedOrder interface definitions.
-     * @return  The resulting orderHash from hashing the supplied order.
-     */
-    @decorators.syncZeroExErrorHandler
-    public static getOrderHashHex(order: Order | SignedOrder): string {
-        assert.doesConformToSchema('order', order, schemas.orderSchema);
-        const orderHashHex = utils.getOrderHashHex(order);
-        return orderHashHex;
-    }
    /**
     * Instantiates a new ZeroEx instance that provides the public interface to the 0x.js library.
-     * @param   provider    The Web3.js Provider instance you would like the 0x.js library to use for interacting with
+     * @param   provider    The Provider instance you would like the 0x.js library to use for interacting with
     *                      the Ethereum network.
     * @param   config      The configuration object. Look up the type for the description.
     * @return  An instance of the 0x.js ZeroEx class.
     */
-    constructor(provider: Web3Provider, config: ZeroExConfig) {
+    constructor(provider: Provider, config: ZeroExConfig) {
        assert.isWeb3Provider('provider', provider);
        assert.doesConformToSchema('config', config, zeroExConfigSchema, [
            zeroExPrivateNetworkConfigSchema,
@@ -199,7 +177,7 @@ export class ZeroEx {
     * @param   provider    The Web3Provider you would like the 0x.js library to use from now on.
     * @param   networkId   The id of the network your provider is connected to
     */
-    public setProvider(provider: Web3Provider, networkId: number): void {
+    public setProvider(provider: Provider, networkId: number): void {
        this._web3Wrapper.setProvider(provider);
        (this.exchange as any)._invalidateContractInstances();
        (this.exchange as any)._setNetworkId(networkId);
@@ -212,6 +190,13 @@ export class ZeroEx {
        (this.etherToken as any)._invalidateContractInstance();
        (this.etherToken as any)._setNetworkId(networkId);
    }
+    /**
+     * Get the provider instance currently used by 0x.js
+     * @return  Web3 provider instance
+     */
+    public getProvider(): Provider {
+        return this._web3Wrapper.getProvider();
+    }
    /**
     * Get user Ethereum addresses available through the supplied web3 provider available for sending transactions.
     * @return  An array of available user Ethereum addresses.
@@ -225,7 +210,7 @@ export class ZeroEx {
     * This method currently supports TestRPC, Geth and Parity above and below V1.6.6
     * @param   orderHash       Hex encoded orderHash to sign.
     * @param   signerAddress   The hex encoded Ethereum address you wish to sign it with. This address
-     *          must be available via the Web3.Provider supplied to 0x.js.
+     *          must be available via the Provider supplied to 0x.js.
     * @param   shouldAddPersonalMessagePrefix  Some signers add the personal message prefix `\x19Ethereum Signed Message`
     *          themselves (e.g Parity Signer, Ledger, TestRPC) and others expect it to already be done by the client
     *          (e.g Metamask). Depending on which signer this request is going to, decide on whether to add the prefix
@@ -237,41 +222,12 @@ export class ZeroEx {
        signerAddress: string,
        shouldAddPersonalMessagePrefix: boolean,
    ): Promise<ECSignature> {
-        assert.isHexString('orderHash', orderHash);
-        await assert.isSenderAddressAsync('signerAddress', signerAddress, this._web3Wrapper);
-        const normalizedSignerAddress = signerAddress.toLowerCase();
-
-        let msgHashHex = orderHash;
-        if (shouldAddPersonalMessagePrefix) {
-            const orderHashBuff = ethUtil.toBuffer(orderHash);
-            const msgHashBuff = ethUtil.hashPersonalMessage(orderHashBuff);
-            msgHashHex = ethUtil.bufferToHex(msgHashBuff);
-        }
-
-        const signature = await this._web3Wrapper.signMessageAsync(normalizedSignerAddress, msgHashHex);
-
-        // HACK: There is no consensus on whether the signatureHex string should be formatted as
-        // v + r + s OR r + s + v, and different clients (even different versions of the same client)
-        // return the signature params in different orders. In order to support all client implementations,
-        // we parse the signature in both ways, and evaluate if either one is a valid signature.
-        const validVParamValues = [27, 28];
-        const ecSignatureVRS = signatureUtils.parseSignatureHexAsVRS(signature);
-        if (_.includes(validVParamValues, ecSignatureVRS.v)) {
-            const isValidVRSSignature = ZeroEx.isValidSignature(orderHash, ecSignatureVRS, normalizedSignerAddress);
-            if (isValidVRSSignature) {
-                return ecSignatureVRS;
-            }
-        }
-
-        const ecSignatureRSV = signatureUtils.parseSignatureHexAsRSV(signature);
-        if (_.includes(validVParamValues, ecSignatureRSV.v)) {
-            const isValidRSVSignature = ZeroEx.isValidSignature(orderHash, ecSignatureRSV, normalizedSignerAddress);
-            if (isValidRSVSignature) {
-                return ecSignatureRSV;
-            }
-        }
-
-        throw new Error(ZeroExError.InvalidSignature);
+        return signOrderHashAsync(
+            this._web3Wrapper.getProvider(),
+            orderHash,
+            signerAddress,
+            shouldAddPersonalMessagePrefix,
+        );
    }
    /**
     * Waits for a transaction to be mined and returns the transaction receipt.
--- a/packages/0x.js/src/abstract/balance_and_proxy_allowance_fetcher.ts
+++ b/packages/0x.js/src/abstract/balance_and_proxy_allowance_fetcher.ts
@@ -0,0 +1,6 @@
+import { BigNumber } from '@0xproject/utils';
+
+export abstract class BalanceAndProxyAllowanceFetcher {
+    public abstract async getBalanceAsync(tokenAddress: string, userAddress: string): Promise<BigNumber>;
+    public abstract async getProxyAllowanceAsync(tokenAddress: string, userAddress: string): Promise<BigNumber>;
+}
--- a/packages/0x.js/src/abstract/order_filled_cancelled_fetcher.ts
+++ b/packages/0x.js/src/abstract/order_filled_cancelled_fetcher.ts
@@ -0,0 +1,6 @@
+import { BigNumber } from '@0xproject/utils';
+
+export abstract class OrderFilledCancelledFetcher {
+    public abstract async getFilledTakerAmountAsync(orderHash: string): Promise<BigNumber>;
+    public abstract async getCancelledTakerAmountAsync(orderHash: string): Promise<BigNumber>;
+}
--- a/packages/0x.js/src/artifacts.ts
+++ b/packages/0x.js/src/artifacts.ts
@@ -1,10 +1,10 @@
-import * as DummyTokenArtifact from './artifacts/DummyToken.json';
-import * as EtherTokenArtifact from './artifacts/EtherToken.json';
-import * as ExchangeArtifact from './artifacts/Exchange.json';
-import * as TokenArtifact from './artifacts/Token.json';
-import * as TokenRegistryArtifact from './artifacts/TokenRegistry.json';
-import * as TokenTransferProxyArtifact from './artifacts/TokenTransferProxy.json';
-import * as ZRXArtifact from './artifacts/ZRX.json';
+import * as DummyTokenArtifact from './compact_artifacts/DummyToken.json';
+import * as EtherTokenArtifact from './compact_artifacts/EtherToken.json';
+import * as ExchangeArtifact from './compact_artifacts/Exchange.json';
+import * as TokenArtifact from './compact_artifacts/Token.json';
+import * as TokenRegistryArtifact from './compact_artifacts/TokenRegistry.json';
+import * as TokenTransferProxyArtifact from './compact_artifacts/TokenTransferProxy.json';
+import * as ZRXArtifact from './compact_artifacts/ZRX.json';
 import { Artifact } from './types';

 export const artifacts = {
--- a/packages/0x.js/src/compact_artifacts/DummyToken.json
+++ b/packages/0x.js/src/compact_artifacts/DummyToken.json
--- a/packages/0x.js/src/compact_artifacts/EtherToken.json
+++ b/packages/0x.js/src/compact_artifacts/EtherToken.json
--- a/packages/0x.js/src/compact_artifacts/Exchange.json
+++ b/packages/0x.js/src/compact_artifacts/Exchange.json
--- a/packages/0x.js/src/compact_artifacts/Token.json
+++ b/packages/0x.js/src/compact_artifacts/Token.json
--- a/packages/0x.js/src/compact_artifacts/TokenRegistry.json
+++ b/packages/0x.js/src/compact_artifacts/TokenRegistry.json
--- a/packages/0x.js/src/compact_artifacts/TokenTransferProxy.json
+++ b/packages/0x.js/src/compact_artifacts/TokenTransferProxy.json
--- a/packages/0x.js/src/compact_artifacts/ZRX.json
+++ b/packages/0x.js/src/compact_artifacts/ZRX.json
--- a/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
@@ -191,7 +191,12 @@ export class EtherTokenWrapper extends ContractWrapper {
            artifacts.EtherTokenArtifact,
            etherTokenAddress,
        );
-        const contractInstance = new EtherTokenContract(this._web3Wrapper, abi, address);
+        const contractInstance = new EtherTokenContract(
+            abi,
+            address,
+            this._web3Wrapper.getProvider(),
+            this._web3Wrapper.getContractDefaults(),
+        );
        etherTokenContract = contractInstance;
        this._etherTokenContractsByAddress[etherTokenAddress] = etherTokenContract;
        return etherTokenContract;
--- a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
@@ -1,4 +1,5 @@
 import { schemas } from '@0xproject/json-schemas';
+import { getOrderHashHex } from '@0xproject/order-utils';
 import {
    BlockParamLiteral,
    DecodedLogArgs,
@@ -13,6 +14,8 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';

 import { artifacts } from '../artifacts';
+import { SimpleBalanceAndProxyAllowanceFetcher } from '../fetchers/simple_balance_and_proxy_allowance_fetcher';
+import { SimpleOrderFilledCancelledFetcher } from '../fetchers/simple_order_filled_cancelled_fetcher';
 import {
    BlockRange,
    EventCallback,
@@ -23,6 +26,7 @@ import {
    OrderAddresses,
    OrderCancellationRequest,
    OrderFillRequest,
+    OrderState,
    OrderTransactionOpts,
    OrderValues,
    ValidateOrderFillableOpts,
@@ -30,6 +34,7 @@ import {
 import { assert } from '../utils/assert';
 import { decorators } from '../utils/decorators';
 import { ExchangeTransferSimulator } from '../utils/exchange_transfer_simulator';
+import { OrderStateUtils } from '../utils/order_state_utils';
 import { OrderValidationUtils } from '../utils/order_validation_utils';
 import { utils } from '../utils/utils';

@@ -41,7 +46,6 @@ import {
    LogErrorContractEventArgs,
 } from './generated/exchange';
 import { TokenWrapper } from './token_wrapper';
-
 const SHOULD_VALIDATE_BY_DEFAULT = true;

 interface ExchangeContractErrCodesToMsgs {
@@ -170,7 +174,7 @@ export class ExchangeWrapper extends ContractWrapper {
     * @param   shouldThrowOnInsufficientBalanceOrAllowance Whether or not you wish for the contract call to throw
     *                                                      if upon execution the tokens cannot be transferred.
     * @param   takerAddress                                The user Ethereum address who would like to fill this order.
-     *                                                      Must be available via the supplied Web3.Provider
+     *                                                      Must be available via the supplied Provider
     *                                                      passed to 0x.js.
     * @param   orderTransactionOpts                        Optional arguments this method accepts.
     * @return  Transaction hash.
@@ -235,7 +239,7 @@ export class ExchangeWrapper extends ContractWrapper {
     *                                                      If set to false, the call will continue to fill subsequent
     *                                                      signedOrders even when some cannot be filled.
     * @param   takerAddress                                The user Ethereum address who would like to fill these
-     *                                                      orders. Must be available via the supplied Web3.Provider
+     *                                                      orders. Must be available via the supplied Provider
     *                                                      passed to 0x.js.
     * @param   orderTransactionOpts                        Optional arguments this method accepts.
     * @return  Transaction hash.
@@ -335,7 +339,7 @@ export class ExchangeWrapper extends ContractWrapper {
     *                                                          cannot be filled.
     * @param   takerAddress                                    The user Ethereum address who would like to fill
     *                                                          these orders. Must be available via the supplied
-     *                                                          Web3.Provider passed to 0x.js.
+     *                                                          Provider passed to 0x.js.
     * @param   orderTransactionOpts                            Optional arguments this method accepts.
     * @return  Transaction hash.
     */
@@ -416,7 +420,7 @@ export class ExchangeWrapper extends ContractWrapper {
     *                                  signedOrder you wish to fill.
     * @param   fillTakerTokenAmount    The total amount of the takerTokens you would like to fill.
     * @param   takerAddress            The user Ethereum address who would like to fill this order.
-     *                                  Must be available via the supplied Web3.Provider passed to 0x.js.
+     *                                  Must be available via the supplied Provider passed to 0x.js.
     * @param   orderTransactionOpts    Optional arguments this method accepts.
     * @return  Transaction hash.
     */
@@ -470,7 +474,7 @@ export class ExchangeWrapper extends ContractWrapper {
     * filled (each to the specified fillAmount) or aborted.
     * @param   orderFillRequests           An array of objects that conform to the OrderFillRequest interface.
     * @param   takerAddress                The user Ethereum address who would like to fill there orders.
-     *                                      Must be available via the supplied Web3.Provider passed to 0x.js.
+     *                                      Must be available via the supplied Provider passed to 0x.js.
     * @param   orderTransactionOpts        Optional arguments this method accepts.
     * @return  Transaction hash.
     */
@@ -567,7 +571,7 @@ export class ExchangeWrapper extends ContractWrapper {
            ? SHOULD_VALIDATE_BY_DEFAULT
            : orderTransactionOpts.shouldValidate;
        if (shouldValidate) {
-            const orderHash = utils.getOrderHashHex(order);
+            const orderHash = getOrderHashHex(order);
            const unavailableTakerTokenAmount = await this.getUnavailableTakerAmountAsync(orderHash);
            OrderValidationUtils.validateCancelOrderThrowIfInvalid(
                order,
@@ -626,7 +630,7 @@ export class ExchangeWrapper extends ContractWrapper {
            : orderTransactionOpts.shouldValidate;
        if (shouldValidate) {
            for (const orderCancellationRequest of orderCancellationRequests) {
-                const orderHash = utils.getOrderHashHex(orderCancellationRequest.order);
+                const orderHash = getOrderHashHex(orderCancellationRequest.order);
                const unavailableTakerTokenAmount = await this.getUnavailableTakerAmountAsync(orderHash);
                OrderValidationUtils.validateCancelOrderThrowIfInvalid(
                    orderCancellationRequest.order,
@@ -765,7 +769,7 @@ export class ExchangeWrapper extends ContractWrapper {
     *                                  signedOrder you wish to fill.
     * @param   fillTakerTokenAmount    The total amount of the takerTokens you would like to fill.
     * @param   takerAddress            The user Ethereum address who would like to fill this order.
-     *                                  Must be available via the supplied Web3.Provider passed to 0x.js.
+     *                                  Must be available via the supplied Provider passed to 0x.js.
     */
    public async validateFillOrderThrowIfInvalidAsync(
        signedOrder: SignedOrder,
@@ -798,7 +802,7 @@ export class ExchangeWrapper extends ContractWrapper {
    ): Promise<void> {
        assert.doesConformToSchema('order', order, schemas.orderSchema);
        assert.isValidBaseUnitAmount('cancelTakerTokenAmount', cancelTakerTokenAmount);
-        const orderHash = utils.getOrderHashHex(order);
+        const orderHash = getOrderHashHex(order);
        const unavailableTakerTokenAmount = await this.getUnavailableTakerAmountAsync(orderHash);
        OrderValidationUtils.validateCancelOrderThrowIfInvalid(
            order,
@@ -812,7 +816,7 @@ export class ExchangeWrapper extends ContractWrapper {
     *                                  signedOrder you wish to fill.
     * @param   fillTakerTokenAmount    The total amount of the takerTokens you would like to fill.
     * @param   takerAddress            The user Ethereum address who would like to fill this order.
-     *                                  Must be available via the supplied Web3.Provider passed to 0x.js.
+     *                                  Must be available via the supplied Provider passed to 0x.js.
     */
    public async validateFillOrKillOrderThrowIfInvalidAsync(
        signedOrder: SignedOrder,
@@ -873,6 +877,28 @@ export class ExchangeWrapper extends ContractWrapper {
            throw new Error(errMessage);
        }
    }
+    /**
+     * Gets the latest OrderState of a signedOrder
+     * @param   signedOrder   The signedOrder
+     * @param   stateLayer    Optional, desired blockchain state layer (defaults to latest).
+     * @return  OrderState of the signedOrder
+     */
+    public async getOrderStateAsync(
+        signedOrder: SignedOrder,
+        stateLayer: BlockParamLiteral = BlockParamLiteral.Latest,
+    ): Promise<OrderState> {
+        const simpleBalanceAndProxyAllowanceFetcher = new SimpleBalanceAndProxyAllowanceFetcher(
+            this._tokenWrapper,
+            stateLayer,
+        );
+        const simpleOrderFilledCancelledFetcher = new SimpleOrderFilledCancelledFetcher(this, stateLayer);
+        const orderStateUtils = new OrderStateUtils(
+            simpleBalanceAndProxyAllowanceFetcher,
+            simpleOrderFilledCancelledFetcher,
+        );
+        const orderState = orderStateUtils.getOrderStateAsync(signedOrder);
+        return orderState;
+    }
    /**
     * Returns the ZRX token address used by the exchange contract.
     * @return Address of ZRX token
@@ -920,7 +946,12 @@ export class ExchangeWrapper extends ContractWrapper {
            artifacts.ExchangeArtifact,
            this._contractAddressIfExists,
        );
-        const contractInstance = new ExchangeContract(this._web3Wrapper, abi, address);
+        const contractInstance = new ExchangeContract(
+            abi,
+            address,
+            this._web3Wrapper.getProvider(),
+            this._web3Wrapper.getContractDefaults(),
+        );
        this._exchangeContractIfExists = contractInstance;
        return this._exchangeContractIfExists;
    }
--- a/packages/0x.js/src/contract_wrappers/token_registry_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/token_registry_wrapper.ts
@@ -121,7 +121,12 @@ export class TokenRegistryWrapper extends ContractWrapper {
            artifacts.TokenRegistryArtifact,
            this._contractAddressIfExists,
        );
-        const contractInstance = new TokenRegistryContract(this._web3Wrapper, abi, address);
+        const contractInstance = new TokenRegistryContract(
+            abi,
+            address,
+            this._web3Wrapper.getProvider(),
+            this._web3Wrapper.getContractDefaults(),
+        );
        this._tokenRegistryContractIfExists = contractInstance;
        return this._tokenRegistryContractIfExists;
    }
--- a/packages/0x.js/src/contract_wrappers/token_transfer_proxy_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/token_transfer_proxy_wrapper.ts
@@ -63,7 +63,12 @@ export class TokenTransferProxyWrapper extends ContractWrapper {
            artifacts.TokenTransferProxyArtifact,
            this._contractAddressIfExists,
        );
-        const contractInstance = new TokenTransferProxyContract(this._web3Wrapper, abi, address);
+        const contractInstance = new TokenTransferProxyContract(
+            abi,
+            address,
+            this._web3Wrapper.getProvider(),
+            this._web3Wrapper.getContractDefaults(),
+        );
        this._tokenTransferProxyContractIfExists = contractInstance;
        return this._tokenTransferProxyContractIfExists;
    }
--- a/packages/0x.js/src/contract_wrappers/token_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/token_wrapper.ts
@@ -421,7 +421,12 @@ export class TokenWrapper extends ContractWrapper {
            artifacts.TokenArtifact,
            normalizedTokenAddress,
        );
-        const contractInstance = new TokenContract(this._web3Wrapper, abi, address);
+        const contractInstance = new TokenContract(
+            abi,
+            address,
+            this._web3Wrapper.getProvider(),
+            this._web3Wrapper.getContractDefaults(),
+        );
        tokenContract = contractInstance;
        this._tokenContractsByAddress[normalizedTokenAddress] = tokenContract;
        return tokenContract;
--- a/packages/0x.js/src/fetchers/simple_balance_and_proxy_allowance_fetcher.ts
+++ b/packages/0x.js/src/fetchers/simple_balance_and_proxy_allowance_fetcher.ts
@@ -0,0 +1,28 @@
+import { BlockParamLiteral } from '@0xproject/types';
+import { BigNumber } from '@0xproject/utils';
+
+import { BalanceAndProxyAllowanceFetcher } from '../abstract/balance_and_proxy_allowance_fetcher';
+import { TokenWrapper } from '../contract_wrappers/token_wrapper';
+
+export class SimpleBalanceAndProxyAllowanceFetcher implements BalanceAndProxyAllowanceFetcher {
+    private _tokenWrapper: TokenWrapper;
+    private _defaultBlock: BlockParamLiteral;
+    constructor(token: TokenWrapper, defaultBlock: BlockParamLiteral) {
+        this._tokenWrapper = token;
+        this._defaultBlock = defaultBlock;
+    }
+    public async getBalanceAsync(tokenAddress: string, userAddress: string): Promise<BigNumber> {
+        const methodOpts = {
+            defaultBlock: this._defaultBlock,
+        };
+        const balance = this._tokenWrapper.getBalanceAsync(tokenAddress, userAddress, methodOpts);
+        return balance;
+    }
+    public async getProxyAllowanceAsync(tokenAddress: string, userAddress: string): Promise<BigNumber> {
+        const methodOpts = {
+            defaultBlock: this._defaultBlock,
+        };
+        const proxyAllowance = this._tokenWrapper.getProxyAllowanceAsync(tokenAddress, userAddress, methodOpts);
+        return proxyAllowance;
+    }
+}
--- a/packages/0x.js/src/fetchers/simple_order_filled_cancelled_fetcher.ts
+++ b/packages/0x.js/src/fetchers/simple_order_filled_cancelled_fetcher.ts
@@ -0,0 +1,28 @@
+import { BlockParamLiteral } from '@0xproject/types';
+import { BigNumber } from '@0xproject/utils';
+
+import { OrderFilledCancelledFetcher } from '../abstract/order_filled_cancelled_fetcher';
+import { ExchangeWrapper } from '../contract_wrappers/exchange_wrapper';
+
+export class SimpleOrderFilledCancelledFetcher implements OrderFilledCancelledFetcher {
+    private _exchangeWrapper: ExchangeWrapper;
+    private _defaultBlock: BlockParamLiteral;
+    constructor(exchange: ExchangeWrapper, defaultBlock: BlockParamLiteral) {
+        this._exchangeWrapper = exchange;
+        this._defaultBlock = defaultBlock;
+    }
+    public async getFilledTakerAmountAsync(orderHash: string): Promise<BigNumber> {
+        const methodOpts = {
+            defaultBlock: this._defaultBlock,
+        };
+        const filledTakerAmount = this._exchangeWrapper.getFilledTakerAmountAsync(orderHash, methodOpts);
+        return filledTakerAmount;
+    }
+    public async getCancelledTakerAmountAsync(orderHash: string): Promise<BigNumber> {
+        const methodOpts = {
+            defaultBlock: this._defaultBlock,
+        };
+        const cancelledTakerAmount = this._exchangeWrapper.getCancelledTakerAmountAsync(orderHash, methodOpts);
+        return cancelledTakerAmount;
+    }
+}
--- a/packages/0x.js/src/globals.d.ts
+++ b/packages/0x.js/src/globals.d.ts
@@ -1,11 +1,3 @@
-declare module 'web3_beta';
-declare module 'request-promise-native';
-
-// semver-sort declarations
-declare module 'semver-sort' {
-    const desc: (versions: string[]) => string[];
-}
-
 declare module '*.json' {
    const json: any;
    /* tslint:disable */
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -11,7 +11,6 @@ export {
    OrderCancellationRequest,
    OrderFillRequest,
    ContractEventArgs,
-    Web3Provider,
    ZeroExConfig,
    MethodOpts,
    OrderTransactionOpts,
@@ -32,6 +31,7 @@ export {
    ContractEventArg,
    LogWithDecodedArgs,
    Order,
+    Provider,
    SignedOrder,
    ECSignature,
    TransactionReceipt,
--- a/packages/0x.js/src/order_watcher/event_watcher.ts
+++ b/packages/0x.js/src/order_watcher/event_watcher.ts
@@ -13,7 +13,7 @@ enum LogEventState {
    Added,
 }

-/*
+/**
 * The EventWatcher watches for blockchain events at the specified block confirmation
 * depth.
 */
--- a/packages/0x.js/src/order_watcher/expiration_watcher.ts
+++ b/packages/0x.js/src/order_watcher/expiration_watcher.ts
@@ -22,8 +22,17 @@ export class ExpirationWatcher {
        this._expirationMarginMs = expirationMarginIfExistsMs || DEFAULT_EXPIRATION_MARGIN_MS;
        this._orderExpirationCheckingIntervalMs =
            expirationMarginIfExistsMs || DEFAULT_ORDER_EXPIRATION_CHECKING_INTERVAL_MS;
-        const scoreFunction = (orderHash: string) => this._expiration[orderHash].toNumber();
-        const comparator = (lhs: string, rhs: string) => scoreFunction(lhs) - scoreFunction(rhs);
+        const comparator = (lhsOrderHash: string, rhsOrderHash: string) => {
+            const lhsExpiration = this._expiration[lhsOrderHash].toNumber();
+            const rhsExpiration = this._expiration[rhsOrderHash].toNumber();
+            if (lhsExpiration !== rhsExpiration) {
+                return lhsExpiration - rhsExpiration;
+            } else {
+                // HACK: If two orders have identical expirations, the order in which they are emitted by the
+                // ExpirationWatcher does not matter, so we emit them in alphabetical order by orderHash.
+                return lhsOrderHash.localeCompare(rhsOrderHash);
+            }
+        };
        this._orderHashByExpirationRBTree = new RBTree(comparator);
    }
    public subscribe(callback: (orderHash: string) => void): void {
@@ -48,6 +57,9 @@ export class ExpirationWatcher {
        this._orderHashByExpirationRBTree.insert(orderHash);
    }
    public removeOrder(orderHash: string): void {
+        if (_.isUndefined(this._expiration[orderHash])) {
+            return; // noop since order already removed
+        }
        this._orderHashByExpirationRBTree.remove(orderHash);
        delete this._expiration[orderHash];
    }
--- a/packages/0x.js/src/order_watcher/order_state_watcher.ts
+++ b/packages/0x.js/src/order_watcher/order_state_watcher.ts
@@ -87,7 +87,7 @@ export class OrderStateWatcher {
            _.isUndefined(config) || _.isUndefined(config.stateLayer) ? BlockParamLiteral.Latest : config.stateLayer;
        this._eventWatcher = new EventWatcher(web3Wrapper, pollingIntervalIfExistsMs, stateLayer);
        this._balanceAndProxyAllowanceLazyStore = new BalanceAndProxyAllowanceLazyStore(token, stateLayer);
-        this._orderFilledCancelledLazyStore = new OrderFilledCancelledLazyStore(exchange);
+        this._orderFilledCancelledLazyStore = new OrderFilledCancelledLazyStore(exchange, stateLayer);
        this._orderStateUtils = new OrderStateUtils(
            this._balanceAndProxyAllowanceLazyStore,
            this._orderFilledCancelledLazyStore,
@@ -131,7 +131,7 @@ export class OrderStateWatcher {
        }
        delete this._orderByOrderHash[orderHash];
        delete this._orderStateByOrderHashCache[orderHash];
-        const exchange = (this._orderFilledCancelledLazyStore as any)._exchange as ExchangeWrapper;
+        const exchange = (this._orderFilledCancelledLazyStore as any)._exchangeWrapper as ExchangeWrapper;
        const zrxTokenAddress = exchange.getZRXTokenAddress();

        this._removeFromDependentOrderHashes(signedOrder.maker, zrxTokenAddress, orderHash);
@@ -374,7 +374,7 @@ export class OrderStateWatcher {
        }
    }
    private _getZRXTokenAddress(): string {
-        const exchange = (this._orderFilledCancelledLazyStore as any)._exchange as ExchangeWrapper;
+        const exchange = (this._orderFilledCancelledLazyStore as any)._exchangeWrapper as ExchangeWrapper;
        const zrxTokenAddress = exchange.getZRXTokenAddress();
        return zrxTokenAddress;
    }
--- a/packages/0x.js/src/stores/balance_proxy_allowance_lazy_store.ts
+++ b/packages/0x.js/src/stores/balance_proxy_allowance_lazy_store.ts
@@ -2,13 +2,14 @@ import { BlockParamLiteral } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import * as _ from 'lodash';

+import { BalanceAndProxyAllowanceFetcher } from '../abstract/balance_and_proxy_allowance_fetcher';
 import { TokenWrapper } from '../contract_wrappers/token_wrapper';

 /**
 * Copy on read store for balances/proxyAllowances of tokens/accounts
 */
-export class BalanceAndProxyAllowanceLazyStore {
-    private _token: TokenWrapper;
+export class BalanceAndProxyAllowanceLazyStore implements BalanceAndProxyAllowanceFetcher {
+    private _tokenWrapper: TokenWrapper;
    private _defaultBlock: BlockParamLiteral;
    private _balance: {
        [tokenAddress: string]: {
@@ -21,7 +22,7 @@ export class BalanceAndProxyAllowanceLazyStore {
        };
    };
    constructor(token: TokenWrapper, defaultBlock: BlockParamLiteral) {
-        this._token = token;
+        this._tokenWrapper = token;
        this._defaultBlock = defaultBlock;
        this._balance = {};
        this._proxyAllowance = {};
@@ -31,7 +32,7 @@ export class BalanceAndProxyAllowanceLazyStore {
            const methodOpts = {
                defaultBlock: this._defaultBlock,
            };
-            const balance = await this._token.getBalanceAsync(tokenAddress, userAddress, methodOpts);
+            const balance = await this._tokenWrapper.getBalanceAsync(tokenAddress, userAddress, methodOpts);
            this.setBalance(tokenAddress, userAddress, balance);
        }
        const cachedBalance = this._balance[tokenAddress][userAddress];
@@ -59,7 +60,11 @@ export class BalanceAndProxyAllowanceLazyStore {
            const methodOpts = {
                defaultBlock: this._defaultBlock,
            };
-            const proxyAllowance = await this._token.getProxyAllowanceAsync(tokenAddress, userAddress, methodOpts);
+            const proxyAllowance = await this._tokenWrapper.getProxyAllowanceAsync(
+                tokenAddress,
+                userAddress,
+                methodOpts,
+            );
            this.setProxyAllowance(tokenAddress, userAddress, proxyAllowance);
        }
        const cachedProxyAllowance = this._proxyAllowance[tokenAddress][userAddress];
--- a/packages/0x.js/src/stores/order_filled_cancelled_lazy_store.ts
+++ b/packages/0x.js/src/stores/order_filled_cancelled_lazy_store.ts
@@ -2,30 +2,33 @@ import { BlockParamLiteral } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import * as _ from 'lodash';

+import { OrderFilledCancelledFetcher } from '../abstract/order_filled_cancelled_fetcher';
 import { ExchangeWrapper } from '../contract_wrappers/exchange_wrapper';

 /**
 * Copy on read store for filled/cancelled taker amounts
 */
-export class OrderFilledCancelledLazyStore {
-    private _exchange: ExchangeWrapper;
+export class OrderFilledCancelledLazyStore implements OrderFilledCancelledFetcher {
+    private _exchangeWrapper: ExchangeWrapper;
+    private _defaultBlock: BlockParamLiteral;
    private _filledTakerAmount: {
        [orderHash: string]: BigNumber;
    };
    private _cancelledTakerAmount: {
        [orderHash: string]: BigNumber;
    };
-    constructor(exchange: ExchangeWrapper) {
-        this._exchange = exchange;
+    constructor(exchange: ExchangeWrapper, defaultBlock: BlockParamLiteral) {
+        this._exchangeWrapper = exchange;
+        this._defaultBlock = defaultBlock;
        this._filledTakerAmount = {};
        this._cancelledTakerAmount = {};
    }
    public async getFilledTakerAmountAsync(orderHash: string): Promise<BigNumber> {
        if (_.isUndefined(this._filledTakerAmount[orderHash])) {
            const methodOpts = {
-                defaultBlock: BlockParamLiteral.Pending,
+                defaultBlock: this._defaultBlock,
            };
-            const filledTakerAmount = await this._exchange.getFilledTakerAmountAsync(orderHash, methodOpts);
+            const filledTakerAmount = await this._exchangeWrapper.getFilledTakerAmountAsync(orderHash, methodOpts);
            this.setFilledTakerAmount(orderHash, filledTakerAmount);
        }
        const cachedFilled = this._filledTakerAmount[orderHash];
@@ -40,9 +43,12 @@ export class OrderFilledCancelledLazyStore {
    public async getCancelledTakerAmountAsync(orderHash: string): Promise<BigNumber> {
        if (_.isUndefined(this._cancelledTakerAmount[orderHash])) {
            const methodOpts = {
-                defaultBlock: BlockParamLiteral.Pending,
+                defaultBlock: this._defaultBlock,
            };
-            const cancelledTakerAmount = await this._exchange.getCancelledTakerAmountAsync(orderHash, methodOpts);
+            const cancelledTakerAmount = await this._exchangeWrapper.getCancelledTakerAmountAsync(
+                orderHash,
+                methodOpts,
+            );
            this.setCancelledTakerAmount(orderHash, cancelledTakerAmount);
        }
        const cachedCancelled = this._cancelledTakerAmount[orderHash];
--- a/packages/0x.js/src/types.ts
+++ b/packages/0x.js/src/types.ts
@@ -27,7 +27,6 @@ export enum ZeroExError {
    TokenContractDoesNotExist = 'TOKEN_CONTRACT_DOES_NOT_EXIST',
    UnhandledError = 'UNHANDLED_ERROR',
    UserHasNoAssociatedAddress = 'USER_HAS_NO_ASSOCIATED_ADDRESSES',
-    InvalidSignature = 'INVALID_SIGNATURE',
    ContractNotDeployedOnNetwork = 'CONTRACT_NOT_DEPLOYED_ON_NETWORK',
    InsufficientAllowanceForTransfer = 'INSUFFICIENT_ALLOWANCE_FOR_TRANSFER',
    InsufficientBalanceForTransfer = 'INSUFFICIENT_BALANCE_FOR_TRANSFER',
@@ -155,20 +154,12 @@ export type AsyncMethod = (...args: any[]) => Promise<any>;
 export type SyncMethod = (...args: any[]) => any;

 /**
- * We re-export the `Web3.Provider` type specified in the Web3 Typescript typings
- * since it is the type of the `provider` argument to the `ZeroEx` constructor.
- * It is however a `Web3` library type, not a native `0x.js` type. To learn more
- * about providers, visit https://0xproject.com/wiki#Web3-Provider-Explained
- */
-export type Web3Provider = Web3.Provider;
-
-/*
- * orderExpirationCheckingIntervalMs: How often to check for expired orders. Default: 50
- * eventPollingIntervalMs: How often to poll the Ethereum node for new events. Default: 200
+ * orderExpirationCheckingIntervalMs: How often to check for expired orders. Default=50.
+ * eventPollingIntervalMs: How often to poll the Ethereum node for new events. Default=200.
 * expirationMarginMs: Amount of time before order expiry that you'd like to be notified
- * of an orders expiration. Default: 0
- * cleanupJobIntervalMs: How often to run a cleanup job which revalidates all the orders. Defaults: 1h
- * stateLayer: Optional blockchain state layer OrderWatcher will monitor for new events. Default: latest
+ * of an orders expiration. Default=0.
+ * cleanupJobIntervalMs: How often to run a cleanup job which revalidates all the orders. Default=1hr.
+ * stateLayer: Optional blockchain state layer OrderWatcher will monitor for new events. Default=latest.
 */
 export interface OrderStateWatcherConfig {
    orderExpirationCheckingIntervalMs?: number;
@@ -178,7 +169,7 @@ export interface OrderStateWatcherConfig {
    stateLayer: BlockParamLiteral;
 }

-/*
+/**
 * networkId: The id of the underlying ethereum network your provider is connected to. (1-mainnet, 3-ropsten, 4-rinkeby, 42-kovan, 50-testrpc)
 * gasPrice: Gas price to use with every transaction
 * exchangeContractAddress: The address of an exchange contract to use
@@ -209,7 +200,7 @@ export interface Artifact {
    };
 }

-/*
+/**
 * expectedFillTakerTokenAmount: If specified, the validation method will ensure that the
 * supplied order maker has a sufficient allowance/balance to fill this amount of the order's
 * takerTokenAmount. If not specified, the validation method ensures that the maker has a sufficient
@@ -219,7 +210,7 @@ export interface ValidateOrderFillableOpts {
    expectedFillTakerTokenAmount?: BigNumber;
 }

-/*
+/**
 * defaultBlock: The block up to which to query the blockchain state. Setting this to a historical block number
 * let's the user query the blockchain's state at an arbitrary point in time. In order for this to work, the
 * backing  Ethereum node must keep the entire historical state of the chain (e.g setting `--pruning=archive`
@@ -229,7 +220,7 @@ export interface MethodOpts {
    defaultBlock?: BlockParam;
 }

-/*
+/**
 * gasPrice: Gas price in Wei to use for a transaction
 * gasLimit: The amount of gas to send with a transaction
 */
@@ -238,9 +229,9 @@ export interface TransactionOpts {
    gasLimit?: number;
 }

-/*
+/**
 * shouldValidate: Flag indicating whether the library should make attempts to validate a transaction before
- * broadcasting it. For example, order has a valid signature, maker has sufficient funds, etc. Default: true
+ * broadcasting it. For example, order has a valid signature, maker has sufficient funds, etc. Default=true.
 */
 export interface OrderTransactionOpts extends TransactionOpts {
    shouldValidate?: boolean;
--- a/packages/0x.js/src/utils/assert.ts
+++ b/packages/0x.js/src/utils/assert.ts
@@ -8,13 +8,13 @@ import { BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';

-import { signatureUtils } from '../utils/signature_utils';
+import { isValidSignature } from '@0xproject/order-utils';

 export const assert = {
    ...sharedAssert,
    isValidSignature(orderHash: string, ecSignature: ECSignature, signerAddress: string) {
-        const isValidSignature = signatureUtils.isValidSignature(orderHash, ecSignature, signerAddress);
-        this.assert(isValidSignature, `Expected order with hash '${orderHash}' to have a valid signature`);
+        const isValid = isValidSignature(orderHash, ecSignature, signerAddress);
+        this.assert(isValid, `Expected order with hash '${orderHash}' to have a valid signature`);
    },
    async isSenderAddressAsync(
        variableName: string,
@@ -28,8 +28,4 @@ export const assert = {
            `Specified ${variableName} ${senderAddressHex} isn't available through the supplied web3 provider`,
        );
    },
-    async isUserAddressAvailableAsync(web3Wrapper: Web3Wrapper): Promise<void> {
-        const availableAddresses = await web3Wrapper.getAvailableAddressesAsync();
-        this.assert(!_.isEmpty(availableAddresses), 'No addresses were available on the provided web3 provider');
-    },
 };
--- a/packages/0x.js/src/utils/constants.ts
+++ b/packages/0x.js/src/utils/constants.ts
@@ -3,7 +3,6 @@ import { BigNumber } from '@0xproject/utils';
 export const constants = {
    NULL_ADDRESS: '0x0000000000000000000000000000000000000000',
    TESTRPC_NETWORK_ID: 50,
-    MAX_DIGITS_IN_UNSIGNED_256_INT: 78,
    INVALID_JUMP_PATTERN: 'invalid JUMP at',
    OUT_OF_GAS_PATTERN: 'out of gas',
    INVALID_TAKER_FORMAT: 'instance.taker is not of a type(s) string',
--- a/packages/0x.js/src/utils/exchange_transfer_simulator.ts
+++ b/packages/0x.js/src/utils/exchange_transfer_simulator.ts
@@ -5,6 +5,7 @@ import * as _ from 'lodash';
 import { TokenWrapper } from '../contract_wrappers/token_wrapper';
 import { BalanceAndProxyAllowanceLazyStore } from '../stores/balance_proxy_allowance_lazy_store';
 import { ExchangeContractErrs, TradeSide, TransferType } from '../types';
+import { constants } from '../utils/constants';

 enum FailureReason {
    Balance = 'balance',
@@ -66,6 +67,13 @@ export class ExchangeTransferSimulator {
        tradeSide: TradeSide,
        transferType: TransferType,
    ): Promise<void> {
+        // HACK: When simulating an open order (e.g taker is NULL_ADDRESS), we don't want to adjust balances/
+        // allowances for the taker. We do however, want to increase the balance of the maker since the maker
+        // might be relying on those funds to fill subsequent orders or pay the order's fees.
+        if (from === constants.NULL_ADDRESS && tradeSide === TradeSide.Taker) {
+            await this._increaseBalanceAsync(tokenAddress, to, amountInBaseUnits);
+            return;
+        }
        const balance = await this._store.getBalanceAsync(tokenAddress, from);
        const proxyAllowance = await this._store.getProxyAllowanceAsync(tokenAddress, from);
        if (proxyAllowance.lessThan(amountInBaseUnits)) {
--- a/packages/0x.js/src/utils/order_state_utils.ts
+++ b/packages/0x.js/src/utils/order_state_utils.ts
@@ -3,17 +3,17 @@ import { BigNumber } from '@0xproject/utils';
 import * as _ from 'lodash';

 import { ZeroEx } from '../0x';
+import { BalanceAndProxyAllowanceFetcher } from '../abstract/balance_and_proxy_allowance_fetcher';
+import { OrderFilledCancelledFetcher } from '../abstract/order_filled_cancelled_fetcher';
 import { ExchangeWrapper } from '../contract_wrappers/exchange_wrapper';
 import { RemainingFillableCalculator } from '../order_watcher/remaining_fillable_calculator';
-import { BalanceAndProxyAllowanceLazyStore } from '../stores/balance_proxy_allowance_lazy_store';
-import { OrderFilledCancelledLazyStore } from '../stores/order_filled_cancelled_lazy_store';
 import { ExchangeContractErrs, OrderRelevantState, OrderState, OrderStateInvalid, OrderStateValid } from '../types';

 const ACCEPTABLE_RELATIVE_ROUNDING_ERROR = 0.0001;

 export class OrderStateUtils {
-    private _balanceAndProxyAllowanceLazyStore: BalanceAndProxyAllowanceLazyStore;
-    private _orderFilledCancelledLazyStore: OrderFilledCancelledLazyStore;
+    private _balanceAndProxyAllowanceFetcher: BalanceAndProxyAllowanceFetcher;
+    private _orderFilledCancelledFetcher: OrderFilledCancelledFetcher;
    private static _validateIfOrderIsValid(signedOrder: SignedOrder, orderRelevantState: OrderRelevantState): void {
        const unavailableTakerTokenAmount = orderRelevantState.cancelledTakerTokenAmount.add(
            orderRelevantState.filledTakerTokenAmount,
@@ -49,11 +49,11 @@ export class OrderStateUtils {
        }
    }
    constructor(
-        balanceAndProxyAllowanceLazyStore: BalanceAndProxyAllowanceLazyStore,
-        orderFilledCancelledLazyStore: OrderFilledCancelledLazyStore,
+        balanceAndProxyAllowanceFetcher: BalanceAndProxyAllowanceFetcher,
+        orderFilledCancelledFetcher: OrderFilledCancelledFetcher,
    ) {
-        this._balanceAndProxyAllowanceLazyStore = balanceAndProxyAllowanceLazyStore;
-        this._orderFilledCancelledLazyStore = orderFilledCancelledLazyStore;
+        this._balanceAndProxyAllowanceFetcher = balanceAndProxyAllowanceFetcher;
+        this._orderFilledCancelledFetcher = orderFilledCancelledFetcher;
    }
    public async getOrderStateAsync(signedOrder: SignedOrder): Promise<OrderState> {
        const orderRelevantState = await this.getOrderRelevantStateAsync(signedOrder);
@@ -80,27 +80,27 @@ export class OrderStateUtils {
        // If we pass it from the instantiator - there is no opportunity to get it there
        // because JS doesn't support async constructors.
        // Moreover - it's cached under the hood so it's equivalent to an async constructor.
-        const exchange = (this._orderFilledCancelledLazyStore as any)._exchange as ExchangeWrapper;
+        const exchange = (this._orderFilledCancelledFetcher as any)._exchangeWrapper as ExchangeWrapper;
        const zrxTokenAddress = exchange.getZRXTokenAddress();
        const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-        const makerBalance = await this._balanceAndProxyAllowanceLazyStore.getBalanceAsync(
+        const makerBalance = await this._balanceAndProxyAllowanceFetcher.getBalanceAsync(
            signedOrder.makerTokenAddress,
            signedOrder.maker,
        );
-        const makerProxyAllowance = await this._balanceAndProxyAllowanceLazyStore.getProxyAllowanceAsync(
+        const makerProxyAllowance = await this._balanceAndProxyAllowanceFetcher.getProxyAllowanceAsync(
            signedOrder.makerTokenAddress,
            signedOrder.maker,
        );
-        const makerFeeBalance = await this._balanceAndProxyAllowanceLazyStore.getBalanceAsync(
+        const makerFeeBalance = await this._balanceAndProxyAllowanceFetcher.getBalanceAsync(
            zrxTokenAddress,
            signedOrder.maker,
        );
-        const makerFeeProxyAllowance = await this._balanceAndProxyAllowanceLazyStore.getProxyAllowanceAsync(
+        const makerFeeProxyAllowance = await this._balanceAndProxyAllowanceFetcher.getProxyAllowanceAsync(
            zrxTokenAddress,
            signedOrder.maker,
        );
-        const filledTakerTokenAmount = await this._orderFilledCancelledLazyStore.getFilledTakerAmountAsync(orderHash);
-        const cancelledTakerTokenAmount = await this._orderFilledCancelledLazyStore.getCancelledTakerAmountAsync(
+        const filledTakerTokenAmount = await this._orderFilledCancelledFetcher.getFilledTakerAmountAsync(orderHash);
+        const cancelledTakerTokenAmount = await this._orderFilledCancelledFetcher.getCancelledTakerAmountAsync(
            orderHash,
        );
        const unavailableTakerTokenAmount = await exchange.getUnavailableTakerAmountAsync(orderHash);
--- a/packages/0x.js/src/utils/order_validation_utils.ts
+++ b/packages/0x.js/src/utils/order_validation_utils.ts
@@ -1,3 +1,4 @@
+import { getOrderHashHex, OrderError } from '@0xproject/order-utils';
 import { Order, SignedOrder } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import * as _ from 'lodash';
@@ -113,7 +114,7 @@ export class OrderValidationUtils {
        zrxTokenAddress: string,
        expectedFillTakerTokenAmount?: BigNumber,
    ): Promise<void> {
-        const orderHash = utils.getOrderHashHex(signedOrder);
+        const orderHash = getOrderHashHex(signedOrder);
        const unavailableTakerTokenAmount = await this._exchangeWrapper.getUnavailableTakerAmountAsync(orderHash);
        OrderValidationUtils._validateRemainingFillAmountNotZeroOrThrow(
            signedOrder.takerTokenAmount,
@@ -124,31 +125,12 @@ export class OrderValidationUtils {
        if (!_.isUndefined(expectedFillTakerTokenAmount)) {
            fillTakerTokenAmount = expectedFillTakerTokenAmount;
        }
-        const fillMakerTokenAmount = OrderValidationUtils._getPartialAmount(
+        await OrderValidationUtils.validateFillOrderBalancesAllowancesThrowIfInvalidAsync(
+            exchangeTradeEmulator,
+            signedOrder,
            fillTakerTokenAmount,
-            signedOrder.takerTokenAmount,
-            signedOrder.makerTokenAmount,
-        );
-        await exchangeTradeEmulator.transferFromAsync(
-            signedOrder.makerTokenAddress,
-            signedOrder.maker,
            signedOrder.taker,
-            fillMakerTokenAmount,
-            TradeSide.Maker,
-            TransferType.Trade,
-        );
-        const makerFeeAmount = OrderValidationUtils._getPartialAmount(
-            fillTakerTokenAmount,
-            signedOrder.takerTokenAmount,
-            signedOrder.makerFee,
-        );
-        await exchangeTradeEmulator.transferFromAsync(
            zrxTokenAddress,
-            signedOrder.maker,
-            signedOrder.feeRecipient,
-            makerFeeAmount,
-            TradeSide.Maker,
-            TransferType.Fee,
        );
    }
    public async validateFillOrderThrowIfInvalidAsync(
@@ -161,9 +143,9 @@ export class OrderValidationUtils {
        if (fillTakerTokenAmount.eq(0)) {
            throw new Error(ExchangeContractErrs.OrderFillAmountZero);
        }
-        const orderHash = utils.getOrderHashHex(signedOrder);
+        const orderHash = getOrderHashHex(signedOrder);
        if (!ZeroEx.isValidSignature(orderHash, signedOrder.ecSignature, signedOrder.maker)) {
-            throw new Error(ZeroExError.InvalidSignature);
+            throw new Error(OrderError.InvalidSignature);
        }
        const unavailableTakerTokenAmount = await this._exchangeWrapper.getUnavailableTakerAmountAsync(orderHash);
        OrderValidationUtils._validateRemainingFillAmountNotZeroOrThrow(
--- a/packages/0x.js/src/utils/signature_utils.ts
+++ b/packages/0x.js/src/utils/signature_utils.ts
@@ -1,45 +0,0 @@
-import { ECSignature } from '@0xproject/types';
-import * as ethUtil from 'ethereumjs-util';
-
-export const signatureUtils = {
-    isValidSignature(data: string, signature: ECSignature, signerAddress: string): boolean {
-        const dataBuff = ethUtil.toBuffer(data);
-        const msgHashBuff = ethUtil.hashPersonalMessage(dataBuff);
-        try {
-            const pubKey = ethUtil.ecrecover(
-                msgHashBuff,
-                signature.v,
-                ethUtil.toBuffer(signature.r),
-                ethUtil.toBuffer(signature.s),
-            );
-            const retrievedAddress = ethUtil.bufferToHex(ethUtil.pubToAddress(pubKey));
-            return retrievedAddress === signerAddress;
-        } catch (err) {
-            return false;
-        }
-    },
-    parseSignatureHexAsVRS(signatureHex: string): ECSignature {
-        const signatureBuffer = ethUtil.toBuffer(signatureHex);
-        let v = signatureBuffer[0];
-        if (v < 27) {
-            v += 27;
-        }
-        const r = signatureBuffer.slice(1, 33);
-        const s = signatureBuffer.slice(33, 65);
-        const ecSignature: ECSignature = {
-            v,
-            r: ethUtil.bufferToHex(r),
-            s: ethUtil.bufferToHex(s),
-        };
-        return ecSignature;
-    },
-    parseSignatureHexAsRSV(signatureHex: string): ECSignature {
-        const { v, r, s } = ethUtil.fromRpcSig(signatureHex);
-        const ecSignature: ECSignature = {
-            v,
-            r: ethUtil.bufferToHex(r),
-            s: ethUtil.bufferToHex(s),
-        };
-        return ecSignature;
-    },
-};
--- a/packages/0x.js/src/utils/utils.ts
+++ b/packages/0x.js/src/utils/utils.ts
@@ -1,59 +1,9 @@
-import { Order, SignedOrder, SolidityTypes } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
-import BN = require('bn.js');
-import * as ethABI from 'ethereumjs-abi';
-import * as ethUtil from 'ethereumjs-util';
-import * as _ from 'lodash';

 export const utils = {
-    /**
-     * Converts BigNumber instance to BN
-     * The only reason we convert to BN is to remain compatible with `ethABI. soliditySHA3` that
-     * expects values of Solidity type `uint` to be passed as type `BN`.
-     * We do not use BN anywhere else in the codebase.
-     */
-    bigNumberToBN(value: BigNumber) {
-        return new BN(value.toString(), 10);
-    },
    spawnSwitchErr(name: string, value: any): Error {
        return new Error(`Unexpected switch value: ${value} encountered for ${name}`);
    },
-    getOrderHashHex(order: Order | SignedOrder): string {
-        const orderParts = [
-            { value: order.exchangeContractAddress, type: SolidityTypes.Address },
-            { value: order.maker, type: SolidityTypes.Address },
-            { value: order.taker, type: SolidityTypes.Address },
-            { value: order.makerTokenAddress, type: SolidityTypes.Address },
-            { value: order.takerTokenAddress, type: SolidityTypes.Address },
-            { value: order.feeRecipient, type: SolidityTypes.Address },
-            {
-                value: utils.bigNumberToBN(order.makerTokenAmount),
-                type: SolidityTypes.Uint256,
-            },
-            {
-                value: utils.bigNumberToBN(order.takerTokenAmount),
-                type: SolidityTypes.Uint256,
-            },
-            {
-                value: utils.bigNumberToBN(order.makerFee),
-                type: SolidityTypes.Uint256,
-            },
-            {
-                value: utils.bigNumberToBN(order.takerFee),
-                type: SolidityTypes.Uint256,
-            },
-            {
-                value: utils.bigNumberToBN(order.expirationUnixTimestampSec),
-                type: SolidityTypes.Uint256,
-            },
-            { value: utils.bigNumberToBN(order.salt), type: SolidityTypes.Uint256 },
-        ];
-        const types = _.map(orderParts, o => o.type);
-        const values = _.map(orderParts, o => o.value);
-        const hashBuff = ethABI.soliditySHA3(types, values);
-        const hashHex = ethUtil.bufferToHex(hashBuff);
-        return hashHex;
-    },
    getCurrentUnixTimestampSec(): BigNumber {
        return new BigNumber(Date.now() / 1000).round();
    },
--- a/packages/0x.js/test/0x.js_test.ts
+++ b/packages/0x.js/test/0x.js_test.ts
@@ -3,6 +3,7 @@ import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import * as _ from 'lodash';
 import 'mocha';
+import * as path from 'path';
 import * as Sinon from 'sinon';

 import { ApprovalContractEventArgs, LogWithDecodedArgs, Order, TokenEvents, ZeroEx } from '../src';
@@ -10,19 +11,20 @@ import { ApprovalContractEventArgs, LogWithDecodedArgs, Order, TokenEvents, Zero
 import { chaiSetup } from './utils/chai_setup';
 import { constants } from './utils/constants';
 import { TokenUtils } from './utils/token_utils';
-import { web3, web3Wrapper } from './utils/web3_wrapper';
+import { provider, web3Wrapper } from './utils/web3_wrapper';

 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
 chaiSetup.configure();
 const expect = chai.expect;

-const SHOULD_ADD_PERSONAL_MESSAGE_PREFIX = false;
-
 describe('ZeroEx library', () => {
-    const config = {
-        networkId: constants.TESTRPC_NETWORK_ID,
-    };
-    const zeroEx = new ZeroEx(web3.currentProvider, config);
+    let zeroEx: ZeroEx;
+    before(async () => {
+        const config = {
+            networkId: constants.TESTRPC_NETWORK_ID,
+        };
+        zeroEx = new ZeroEx(provider, config);
+    });
    describe('#setProvider', () => {
        it('overrides provider in nested web3s and invalidates contractInstances', async () => {
            // Instantiate the contract instances with the current provider
@@ -31,10 +33,9 @@ describe('ZeroEx library', () => {
            expect((zeroEx.exchange as any)._exchangeContractIfExists).to.not.be.undefined();
            expect((zeroEx.tokenRegistry as any)._tokenRegistryContractIfExists).to.not.be.undefined();

-            const newProvider = web3Factory.getRpcProvider();
            // Add property to newProvider so that we can differentiate it from old provider
-            (newProvider as any).zeroExTestId = 1;
-            zeroEx.setProvider(newProvider, constants.TESTRPC_NETWORK_ID);
+            (provider as any).zeroExTestId = 1;
+            zeroEx.setProvider(provider, constants.TESTRPC_NETWORK_ID);

            // Check that contractInstances with old provider are removed after provider update
            expect((zeroEx.exchange as any)._exchangeContractIfExists).to.be.undefined();
@@ -60,14 +61,12 @@ describe('ZeroEx library', () => {
        };
        const address = '0x5409ed021d9299bf6814279a6a1411a7e866a631';
        it("should return false if the data doesn't pertain to the signature & address", async () => {
-            expect(ZeroEx.isValidSignature('0x0', signature, address)).to.be.false();
            return expect(
                (zeroEx.exchange as any)._isValidSignatureUsingContractCallAsync('0x0', signature, address),
            ).to.become(false);
        });
        it("should return false if the address doesn't pertain to the signature & data", async () => {
            const validUnrelatedAddress = '0x8b0292b11a196601ed2ce54b665cafeca0347d42';
-            expect(ZeroEx.isValidSignature(dataHex, signature, validUnrelatedAddress)).to.be.false();
            return expect(
                (zeroEx.exchange as any)._isValidSignatureUsingContractCallAsync(
                    dataHex,
@@ -78,45 +77,16 @@ describe('ZeroEx library', () => {
        });
        it("should return false if the signature doesn't pertain to the dataHex & address", async () => {
            const wrongSignature = _.assign({}, signature, { v: 28 });
-            expect(ZeroEx.isValidSignature(dataHex, wrongSignature, address)).to.be.false();
            return expect(
                (zeroEx.exchange as any)._isValidSignatureUsingContractCallAsync(dataHex, wrongSignature, address),
            ).to.become(false);
        });
        it('should return true if the signature does pertain to the dataHex & address', async () => {
-            const isValidSignatureLocal = ZeroEx.isValidSignature(dataHex, signature, address);
-            expect(isValidSignatureLocal).to.be.true();
            return expect(
                (zeroEx.exchange as any)._isValidSignatureUsingContractCallAsync(dataHex, signature, address),
            ).to.become(true);
        });
    });
-    describe('#generateSalt', () => {
-        it('generates different salts', () => {
-            const equal = ZeroEx.generatePseudoRandomSalt().eq(ZeroEx.generatePseudoRandomSalt());
-            expect(equal).to.be.false();
-        });
-        it('generates salt in range [0..2^256)', () => {
-            const salt = ZeroEx.generatePseudoRandomSalt();
-            expect(salt.greaterThanOrEqualTo(0)).to.be.true();
-            const twoPow256 = new BigNumber(2).pow(256);
-            expect(salt.lessThan(twoPow256)).to.be.true();
-        });
-    });
-    describe('#isValidOrderHash', () => {
-        it('returns false if the value is not a hex string', () => {
-            const isValid = ZeroEx.isValidOrderHash('not a hex');
-            expect(isValid).to.be.false();
-        });
-        it('returns false if the length is wrong', () => {
-            const isValid = ZeroEx.isValidOrderHash('0xdeadbeef');
-            expect(isValid).to.be.false();
-        });
-        it('returns true if order hash is correct', () => {
-            const isValid = ZeroEx.isValidOrderHash('0x' + Array(65).join('0'));
-            expect(isValid).to.be.true();
-        });
-    });
    describe('#toUnitAmount', () => {
        it('should throw if invalid baseUnit amount supplied as argument', () => {
            const invalidBaseUnitAmount = new BigNumber(1000000000.4);
@@ -149,106 +119,6 @@ describe('ZeroEx library', () => {
            );
        });
    });
-    describe('#getOrderHashHex', () => {
-        const expectedOrderHash = '0x39da987067a3c9e5f1617694f1301326ba8c8b0498ebef5df4863bed394e3c83';
-        const fakeExchangeContractAddress = '0xb69e673309512a9d726f87304c6984054f87a93b';
-        const order: Order = {
-            maker: constants.NULL_ADDRESS,
-            taker: constants.NULL_ADDRESS,
-            feeRecipient: constants.NULL_ADDRESS,
-            makerTokenAddress: constants.NULL_ADDRESS,
-            takerTokenAddress: constants.NULL_ADDRESS,
-            exchangeContractAddress: fakeExchangeContractAddress,
-            salt: new BigNumber(0),
-            makerFee: new BigNumber(0),
-            takerFee: new BigNumber(0),
-            makerTokenAmount: new BigNumber(0),
-            takerTokenAmount: new BigNumber(0),
-            expirationUnixTimestampSec: new BigNumber(0),
-        };
-        it('calculates the order hash', async () => {
-            const orderHash = ZeroEx.getOrderHashHex(order);
-            expect(orderHash).to.be.equal(expectedOrderHash);
-        });
-        it('throws a readable error message if taker format is invalid', async () => {
-            const orderWithInvalidtakerFormat = {
-                ...order,
-                taker: (null as any) as string,
-            };
-            const expectedErrorMessage =
-                'Order taker must be of type string. If you want anyone to be able to fill an order - pass ZeroEx.NULL_ADDRESS';
-            expect(() => ZeroEx.getOrderHashHex(orderWithInvalidtakerFormat)).to.throw(expectedErrorMessage);
-        });
-    });
-    describe('#signOrderHashAsync', () => {
-        let stubs: Sinon.SinonStub[] = [];
-        let makerAddress: string;
-        before(async () => {
-            const availableAddreses = await zeroEx.getAvailableAddressesAsync();
-            makerAddress = availableAddreses[0];
-        });
-        afterEach(() => {
-            // clean up any stubs after the test has completed
-            _.each(stubs, s => s.restore());
-            stubs = [];
-        });
-        it('Should return the correct ECSignature', async () => {
-            const orderHash = '0x6927e990021d23b1eb7b8789f6a6feaf98fe104bb0cf8259421b79f9a34222b0';
-            const expectedECSignature = {
-                v: 27,
-                r: '0x61a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33',
-                s: '0x40349190569279751135161d22529dc25add4f6069af05be04cacbda2ace2254',
-            };
-            const ecSignature = await zeroEx.signOrderHashAsync(
-                orderHash,
-                makerAddress,
-                SHOULD_ADD_PERSONAL_MESSAGE_PREFIX,
-            );
-            expect(ecSignature).to.deep.equal(expectedECSignature);
-        });
-        it('should return the correct ECSignature for signatureHex concatenated as R + S + V', async () => {
-            const orderHash = '0x34decbedc118904df65f379a175bb39ca18209d6ce41d5ed549d54e6e0a95004';
-            const signature =
-                '0x22109d11d79cb8bf96ed88625e1cd9558800c4073332a9a02857499883ee5ce3050aa3cc1f2c435e67e114cdce54b9527b4f50548342401bc5d2b77adbdacb021b';
-            const expectedECSignature = {
-                v: 27,
-                r: '0x22109d11d79cb8bf96ed88625e1cd9558800c4073332a9a02857499883ee5ce3',
-                s: '0x050aa3cc1f2c435e67e114cdce54b9527b4f50548342401bc5d2b77adbdacb02',
-            };
-            stubs = [
-                Sinon.stub((zeroEx as any)._web3Wrapper, 'signMessageAsync').returns(Promise.resolve(signature)),
-                Sinon.stub(ZeroEx, 'isValidSignature').returns(true),
-            ];
-
-            const ecSignature = await zeroEx.signOrderHashAsync(
-                orderHash,
-                makerAddress,
-                SHOULD_ADD_PERSONAL_MESSAGE_PREFIX,
-            );
-            expect(ecSignature).to.deep.equal(expectedECSignature);
-        });
-        it('should return the correct ECSignature for signatureHex concatenated as V + R + S', async () => {
-            const orderHash = '0xc793e33ffded933b76f2f48d9aa3339fc090399d5e7f5dec8d3660f5480793f7';
-            const signature =
-                '0x1bc80bedc6756722672753413efdd749b5adbd4fd552595f59c13427407ee9aee02dea66f25a608bbae457e020fb6decb763deb8b7192abab624997242da248960';
-            const expectedECSignature = {
-                v: 27,
-                r: '0xc80bedc6756722672753413efdd749b5adbd4fd552595f59c13427407ee9aee0',
-                s: '0x2dea66f25a608bbae457e020fb6decb763deb8b7192abab624997242da248960',
-            };
-            stubs = [
-                Sinon.stub((zeroEx as any)._web3Wrapper, 'signMessageAsync').returns(Promise.resolve(signature)),
-                Sinon.stub(ZeroEx, 'isValidSignature').returns(true),
-            ];
-
-            const ecSignature = await zeroEx.signOrderHashAsync(
-                orderHash,
-                makerAddress,
-                SHOULD_ADD_PERSONAL_MESSAGE_PREFIX,
-            );
-            expect(ecSignature).to.deep.equal(expectedECSignature);
-        });
-    });
    describe('#awaitTransactionMinedAsync', () => {
        beforeEach(async () => {
            await blockchainLifecycle.startAsync();
@@ -278,7 +148,7 @@ describe('ZeroEx library', () => {
                exchangeContractAddress: ZeroEx.NULL_ADDRESS,
                networkId: constants.TESTRPC_NETWORK_ID,
            };
-            const zeroExWithWrongExchangeAddress = new ZeroEx(web3.currentProvider, zeroExConfig);
+            const zeroExWithWrongExchangeAddress = new ZeroEx(provider, zeroExConfig);
            expect(zeroExWithWrongExchangeAddress.exchange.getContractAddress()).to.be.equal(ZeroEx.NULL_ADDRESS);
        });
        it('allows to specify token registry token contract address', async () => {
@@ -286,7 +156,7 @@ describe('ZeroEx library', () => {
                tokenRegistryContractAddress: ZeroEx.NULL_ADDRESS,
                networkId: constants.TESTRPC_NETWORK_ID,
            };
-            const zeroExWithWrongTokenRegistryAddress = new ZeroEx(web3.currentProvider, zeroExConfig);
+            const zeroExWithWrongTokenRegistryAddress = new ZeroEx(provider, zeroExConfig);
            expect(zeroExWithWrongTokenRegistryAddress.tokenRegistry.getContractAddress()).to.be.equal(
                ZeroEx.NULL_ADDRESS,
            );
--- a/packages/0x.js/test/artifacts_test.ts
+++ b/packages/0x.js/test/artifacts_test.ts
@@ -1,5 +1,5 @@
+import { web3Factory } from '@0xproject/dev-utils';
 import * as fs from 'fs';
-import HDWalletProvider = require('truffle-hdwallet-provider');

 import { ZeroEx } from '../src';

@@ -14,14 +14,11 @@ const TIMEOUT = 10000;
 describe('Artifacts', () => {
    describe('contracts are deployed on kovan', () => {
        const kovanRpcUrl = constants.KOVAN_RPC_URL;
-        const packageJSONContent = fs.readFileSync('package.json', 'utf-8');
-        const packageJSON = JSON.parse(packageJSONContent);
-        const mnemonic = packageJSON.config.mnemonic;
-        const web3Provider = new HDWalletProvider(mnemonic, kovanRpcUrl);
+        const provider = web3Factory.create({ rpcUrl: kovanRpcUrl }).currentProvider;
        const config = {
            networkId: constants.KOVAN_NETWORK_ID,
        };
-        const zeroEx = new ZeroEx(web3Provider, config);
+        const zeroEx = new ZeroEx(provider, config);
        it('token registry contract is deployed', async () => {
            await (zeroEx.tokenRegistry as any)._getTokenRegistryContractAsync();
        }).timeout(TIMEOUT);
@@ -34,14 +31,11 @@ describe('Artifacts', () => {
    });
    describe('contracts are deployed on ropsten', () => {
        const ropstenRpcUrl = constants.ROPSTEN_RPC_URL;
-        const packageJSONContent = fs.readFileSync('package.json', 'utf-8');
-        const packageJSON = JSON.parse(packageJSONContent);
-        const mnemonic = packageJSON.config.mnemonic;
-        const web3Provider = new HDWalletProvider(mnemonic, ropstenRpcUrl);
+        const provider = web3Factory.create({ rpcUrl: ropstenRpcUrl }).currentProvider;
        const config = {
            networkId: constants.ROPSTEN_NETWORK_ID,
        };
-        const zeroEx = new ZeroEx(web3Provider, config);
+        const zeroEx = new ZeroEx(provider, config);
        it('token registry contract is deployed', async () => {
            await (zeroEx.tokenRegistry as any)._getTokenRegistryContractAsync();
        }).timeout(TIMEOUT);
--- a/packages/0x.js/test/assert_test.ts
+++ b/packages/0x.js/test/assert_test.ts
@@ -1,43 +0,0 @@
-import { web3Factory } from '@0xproject/dev-utils';
-import * as chai from 'chai';
-import 'mocha';
-
-import { ZeroEx } from '../src';
-import { assert } from '../src/utils/assert';
-
-import { constants } from './utils/constants';
-
-const expect = chai.expect;
-
-describe('Assertion library', () => {
-    const web3 = web3Factory.create();
-    const config = {
-        networkId: constants.TESTRPC_NETWORK_ID,
-    };
-    const zeroEx = new ZeroEx(web3.currentProvider, config);
-    describe('#isSenderAddressHexAsync', () => {
-        it('throws when address is invalid', async () => {
-            const address = '0xdeadbeef';
-            const varName = 'address';
-            return expect(
-                assert.isSenderAddressAsync(varName, address, (zeroEx as any)._web3Wrapper),
-            ).to.be.rejectedWith(`Expected ${varName} to be of type ETHAddressHex, encountered: ${address}`);
-        });
-        it('throws when address is unavailable', async () => {
-            const validUnrelatedAddress = '0x8b0292b11a196601eddce54b665cafeca0347d42';
-            const varName = 'address';
-            return expect(
-                assert.isSenderAddressAsync(varName, validUnrelatedAddress, (zeroEx as any)._web3Wrapper),
-            ).to.be.rejectedWith(
-                `Specified ${varName} ${validUnrelatedAddress} isn't available through the supplied web3 provider`,
-            );
-        });
-        it("doesn't throw if address is available", async () => {
-            const availableAddress = (await zeroEx.getAvailableAddressesAsync())[0];
-            const varName = 'address';
-            return expect(
-                assert.isSenderAddressAsync(varName, availableAddress, (zeroEx as any)._web3Wrapper),
-            ).to.become(undefined);
-        });
-    });
-});
--- a/packages/0x.js/test/ether_token_wrapper_test.ts
+++ b/packages/0x.js/test/ether_token_wrapper_test.ts
@@ -1,8 +1,8 @@
 import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-utils';
 import { BigNumber } from '@0xproject/utils';
+import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as chai from 'chai';
 import 'mocha';
-import * as Web3 from 'web3';

 import {
    ApprovalContractEventArgs,
@@ -23,7 +23,7 @@ import { chaiSetup } from './utils/chai_setup';
 import { constants } from './utils/constants';
 import { reportNodeCallbackErrors } from './utils/report_callback_errors';
 import { TokenUtils } from './utils/token_utils';
-import { web3, web3Wrapper } from './utils/web3_wrapper';
+import { provider, web3Wrapper } from './utils/web3_wrapper';

 chaiSetup.configure();
 const expect = chai.expect;
@@ -54,12 +54,12 @@ describe('EtherTokenWrapper', () => {
    const depositAmount = new BigNumber(42);
    const withdrawalAmount = new BigNumber(42);
    before(async () => {
-        zeroEx = new ZeroEx(web3.currentProvider, zeroExConfig);
+        zeroEx = new ZeroEx(provider, zeroExConfig);
        tokens = await zeroEx.tokenRegistry.getTokensAsync();
        userAddresses = await zeroEx.getAvailableAddressesAsync();
        addressWithETH = userAddresses[0];
        wethContractAddress = zeroEx.etherToken.getContractAddressIfExists() as string;
-        depositWeiAmount = (zeroEx as any)._web3Wrapper.toWei(new BigNumber(5));
+        depositWeiAmount = Web3Wrapper.toWei(new BigNumber(5));
        decimalPlaces = 7;
        addressWithoutFunds = userAddresses[1];
    });
@@ -78,7 +78,7 @@ describe('EtherTokenWrapper', () => {
            const UNKNOWN_NETWORK_NETWORK_ID = 10;
            expect(
                () =>
-                    new ZeroEx(web3.currentProvider, {
+                    new ZeroEx(provider, {
                        networkId: UNKNOWN_NETWORK_NETWORK_ID,
                    } as any),
            ).to.throw();
@@ -105,7 +105,7 @@ describe('EtherTokenWrapper', () => {
        it('should throw if user has insufficient ETH balance for deposit', async () => {
            const preETHBalance = await (zeroEx as any)._web3Wrapper.getBalanceInWeiAsync(addressWithETH);

-            const extraETHBalance = (zeroEx as any)._web3Wrapper.toWei(5, 'ether');
+            const extraETHBalance = Web3Wrapper.toWei(new BigNumber(5));
            const overETHBalanceinWei = preETHBalance.add(extraETHBalance);

            return expect(
@@ -260,8 +260,7 @@ describe('EtherTokenWrapper', () => {
                    callbackNeverToBeCalled,
                );
                const callbackToBeCalled = reportNodeCallbackErrors(done)();
-                const newProvider = web3Factory.getRpcProvider();
-                zeroEx.setProvider(newProvider, constants.TESTRPC_NETWORK_ID);
+                zeroEx.setProvider(provider, constants.TESTRPC_NETWORK_ID);
                await zeroEx.etherToken.depositAsync(etherTokenAddress, transferAmount, addressWithETH);
                zeroEx.etherToken.subscribe(
                    etherTokenAddress,
--- a/packages/0x.js/test/event_watcher_test.ts
+++ b/packages/0x.js/test/event_watcher_test.ts
@@ -5,7 +5,6 @@ import * as chai from 'chai';
 import * as _ from 'lodash';
 import 'mocha';
 import * as Sinon from 'sinon';
-import * as Web3 from 'web3';

 import { LogEvent } from '../src';
 import { EventWatcher } from '../src/order_watcher/event_watcher';
@@ -13,12 +12,12 @@ import { DoneCallback } from '../src/types';

 import { chaiSetup } from './utils/chai_setup';
 import { reportNodeCallbackErrors } from './utils/report_callback_errors';
+import { provider } from './utils/web3_wrapper';

 chaiSetup.configure();
 const expect = chai.expect;

 describe('EventWatcher', () => {
-    let web3: Web3;
    let stubs: Sinon.SinonStub[] = [];
    let eventWatcher: EventWatcher;
    let web3Wrapper: Web3Wrapper;
@@ -53,9 +52,8 @@ describe('EventWatcher', () => {
        transactionIndex: 0,
    };
    before(async () => {
-        web3 = web3Factory.create();
        const pollingIntervalMs = 10;
-        web3Wrapper = new Web3Wrapper(web3.currentProvider);
+        web3Wrapper = new Web3Wrapper(provider);
        eventWatcher = new EventWatcher(web3Wrapper, pollingIntervalMs);
    });
    afterEach(() => {
--- a/packages/0x.js/test/exchange_transfer_simulator_test.ts
+++ b/packages/0x.js/test/exchange_transfer_simulator_test.ts
@@ -9,7 +9,7 @@ import { ExchangeTransferSimulator } from '../src/utils/exchange_transfer_simula

 import { chaiSetup } from './utils/chai_setup';
 import { constants } from './utils/constants';
-import { web3, web3Wrapper } from './utils/web3_wrapper';
+import { provider, web3Wrapper } from './utils/web3_wrapper';

 chaiSetup.configure();
 const expect = chai.expect;
@@ -19,7 +19,7 @@ describe('ExchangeTransferSimulator', () => {
    const config = {
        networkId: constants.TESTRPC_NETWORK_ID,
    };
-    const zeroEx = new ZeroEx(web3.currentProvider, config);
+    const zeroEx = new ZeroEx(provider, config);
    const transferAmount = new BigNumber(5);
    let userAddresses: string[];
    let tokens: Token[];
--- a/packages/0x.js/test/exchange_wrapper_test.ts
+++ b/packages/0x.js/test/exchange_wrapper_test.ts
@@ -4,7 +4,6 @@ import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import * as _ from 'lodash';
 import 'mocha';
-import * as Web3 from 'web3';

 import {
    BlockRange,
@@ -15,6 +14,7 @@ import {
    LogFillContractEventArgs,
    OrderCancellationRequest,
    OrderFillRequest,
+    OrderState,
    SignedOrder,
    Token,
    ZeroEx,
@@ -26,7 +26,7 @@ import { constants } from './utils/constants';
 import { FillScenarios } from './utils/fill_scenarios';
 import { reportNodeCallbackErrors } from './utils/report_callback_errors';
 import { TokenUtils } from './utils/token_utils';
-import { web3, web3Wrapper } from './utils/web3_wrapper';
+import { provider, web3Wrapper } from './utils/web3_wrapper';

 chaiSetup.configure();
 const expect = chai.expect;
@@ -46,7 +46,7 @@ describe('ExchangeWrapper', () => {
        networkId: constants.TESTRPC_NETWORK_ID,
    };
    before(async () => {
-        zeroEx = new ZeroEx(web3.currentProvider, config);
+        zeroEx = new ZeroEx(provider, config);
        exchangeContractAddress = zeroEx.exchange.getContractAddress();
        userAddresses = await zeroEx.getAvailableAddressesAsync();
        tokens = await zeroEx.tokenRegistry.getTokensAsync();
@@ -977,8 +977,7 @@ describe('ExchangeWrapper', () => {
                );
                zeroEx.exchange.subscribe(ExchangeEvents.LogFill, indexFilterValues, callbackNeverToBeCalled);

-                const newProvider = web3Factory.getRpcProvider();
-                zeroEx.setProvider(newProvider, constants.TESTRPC_NETWORK_ID);
+                zeroEx.setProvider(provider, constants.TESTRPC_NETWORK_ID);

                const callback = reportNodeCallbackErrors(done)(
                    (logEvent: DecodedLogEvent<LogFillContractEventArgs>) => {
@@ -1156,4 +1155,41 @@ describe('ExchangeWrapper', () => {
            expect(args.maker).to.be.equal(differentMakerAddress);
        });
    });
+    describe('#getOrderStateAsync', () => {
+        let maker: string;
+        let taker: string;
+        let makerToken: Token;
+        let takerToken: Token;
+        let signedOrder: SignedOrder;
+        let orderState: OrderState;
+        const fillableAmount = ZeroEx.toBaseUnitAmount(new BigNumber(5), constants.ZRX_DECIMALS);
+        before(async () => {
+            [, maker, taker] = userAddresses;
+            tokens = await zeroEx.tokenRegistry.getTokensAsync();
+            [makerToken, takerToken] = tokenUtils.getDummyTokens();
+        });
+        it('should report orderStateValid when order is fillable', async () => {
+            signedOrder = await fillScenarios.createFillableSignedOrderAsync(
+                makerToken.address,
+                takerToken.address,
+                maker,
+                taker,
+                fillableAmount,
+            );
+            orderState = await zeroEx.exchange.getOrderStateAsync(signedOrder);
+            expect(orderState.isValid).to.be.true();
+        });
+        it('should report orderStateInvalid when maker allowance set to 0', async () => {
+            signedOrder = await fillScenarios.createFillableSignedOrderAsync(
+                makerToken.address,
+                takerToken.address,
+                maker,
+                taker,
+                fillableAmount,
+            );
+            await zeroEx.token.setProxyAllowanceAsync(makerToken.address, maker, new BigNumber(0));
+            orderState = await zeroEx.exchange.getOrderStateAsync(signedOrder);
+            expect(orderState.isValid).to.be.false();
+        });
+    });
 }); // tslint:disable:max-file-line-count
--- a/packages/0x.js/test/expiration_watcher_test.ts
+++ b/packages/0x.js/test/expiration_watcher_test.ts
@@ -4,7 +4,6 @@ import * as chai from 'chai';
 import * as _ from 'lodash';
 import 'mocha';
 import * as Sinon from 'sinon';
-import * as Web3 from 'web3';

 import { ZeroEx } from '../src/0x';
 import { ExpirationWatcher } from '../src/order_watcher/expiration_watcher';
@@ -16,7 +15,7 @@ import { constants } from './utils/constants';
 import { FillScenarios } from './utils/fill_scenarios';
 import { reportNoErrorCallbackErrors } from './utils/report_callback_errors';
 import { TokenUtils } from './utils/token_utils';
-import { web3, web3Wrapper } from './utils/web3_wrapper';
+import { provider, web3Wrapper } from './utils/web3_wrapper';

 chaiSetup.configure();
 const expect = chai.expect;
@@ -44,7 +43,7 @@ describe('ExpirationWatcher', () => {
        const config = {
            networkId: constants.TESTRPC_NETWORK_ID,
        };
-        zeroEx = new ZeroEx(web3.currentProvider, config);
+        zeroEx = new ZeroEx(provider, config);
        exchangeContractAddress = zeroEx.exchange.getContractAddress();
        userAddresses = await zeroEx.getAvailableAddressesAsync();
        tokens = await zeroEx.tokenRegistry.getTokensAsync();
@@ -154,4 +153,43 @@ describe('ExpirationWatcher', () => {
            timer.tick(order2Lifetime * 1000);
        })().catch(done);
    });
+    it('emits events in correct order when expirations are equal', (done: DoneCallback) => {
+        (async () => {
+            const order1Lifetime = 60;
+            const order2Lifetime = 60;
+            const order1ExpirationUnixTimestampSec = currentUnixTimestampSec.plus(order1Lifetime);
+            const order2ExpirationUnixTimestampSec = currentUnixTimestampSec.plus(order2Lifetime);
+            const signedOrder1 = await fillScenarios.createFillableSignedOrderAsync(
+                makerTokenAddress,
+                takerTokenAddress,
+                makerAddress,
+                takerAddress,
+                fillableAmount,
+                order1ExpirationUnixTimestampSec,
+            );
+            const signedOrder2 = await fillScenarios.createFillableSignedOrderAsync(
+                makerTokenAddress,
+                takerTokenAddress,
+                makerAddress,
+                takerAddress,
+                fillableAmount,
+                order2ExpirationUnixTimestampSec,
+            );
+            const orderHash1 = ZeroEx.getOrderHashHex(signedOrder1);
+            const orderHash2 = ZeroEx.getOrderHashHex(signedOrder2);
+            expirationWatcher.addOrder(orderHash1, signedOrder1.expirationUnixTimestampSec.times(1000));
+            expirationWatcher.addOrder(orderHash2, signedOrder2.expirationUnixTimestampSec.times(1000));
+            const expirationOrder = orderHash1 < orderHash2 ? [orderHash1, orderHash2] : [orderHash2, orderHash1];
+            const expectToBeCalledOnce = false;
+            const callbackAsync = reportNoErrorCallbackErrors(done, expectToBeCalledOnce)((hash: string) => {
+                const orderHash = expirationOrder.shift();
+                expect(hash).to.be.equal(orderHash);
+                if (_.isEmpty(expirationOrder)) {
+                    done();
+                }
+            });
+            expirationWatcher.subscribe(callbackAsync);
+            timer.tick(order2Lifetime * 1000);
+        })().catch(done);
+    });
 });
--- a/packages/0x.js/test/global_hooks.ts
+++ b/packages/0x.js/test/global_hooks.ts
@@ -0,0 +1,7 @@
+import { runMigrationsAsync } from '@0xproject/migrations';
+
+import { deployer } from './utils/deployer';
+
+before('migrate contracts', async () => {
+    await runMigrationsAsync(deployer);
+});
--- a/packages/0x.js/test/order_state_watcher_test.ts
+++ b/packages/0x.js/test/order_state_watcher_test.ts
@@ -3,7 +3,6 @@ import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import * as _ from 'lodash';
 import 'mocha';
-import * as Web3 from 'web3';

 import {
    ExchangeContractErrs,
@@ -23,7 +22,7 @@ import { constants } from './utils/constants';
 import { FillScenarios } from './utils/fill_scenarios';
 import { reportNodeCallbackErrors } from './utils/report_callback_errors';
 import { TokenUtils } from './utils/token_utils';
-import { web3, web3Wrapper } from './utils/web3_wrapper';
+import { provider, web3Wrapper } from './utils/web3_wrapper';

 const TIMEOUT_MS = 150;

@@ -51,7 +50,7 @@ describe('OrderStateWatcher', () => {
    const decimals = constants.ZRX_DECIMALS;
    const fillableAmount = ZeroEx.toBaseUnitAmount(new BigNumber(5), decimals);
    before(async () => {
-        zeroEx = new ZeroEx(web3.currentProvider, config);
+        zeroEx = new ZeroEx(provider, config);
        orderStateWatcher = zeroEx.createOrderStateWatcher();
        exchangeContractAddress = zeroEx.exchange.getContractAddress();
        userAddresses = await zeroEx.getAvailableAddressesAsync();
--- a/packages/0x.js/test/order_validation_test.ts
+++ b/packages/0x.js/test/order_validation_test.ts
@@ -1,9 +1,9 @@
 import { BlockchainLifecycle, devConstants } from '@0xproject/dev-utils';
+import { OrderError } from '@0xproject/order-utils';
 import { BlockParamLiteral } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import * as Sinon from 'sinon';
-import * as Web3 from 'web3';

 import { ExchangeContractErrs, SignedOrder, Token, ZeroEx, ZeroExError } from '../src';
 import { TradeSide, TransferType } from '../src/types';
@@ -14,7 +14,7 @@ import { chaiSetup } from './utils/chai_setup';
 import { constants } from './utils/constants';
 import { FillScenarios } from './utils/fill_scenarios';
 import { TokenUtils } from './utils/token_utils';
-import { web3, web3Wrapper } from './utils/web3_wrapper';
+import { provider, web3Wrapper } from './utils/web3_wrapper';

 chaiSetup.configure();
 const expect = chai.expect;
@@ -40,7 +40,7 @@ describe('OrderValidation', () => {
        networkId: constants.TESTRPC_NETWORK_ID,
    };
    before(async () => {
-        zeroEx = new ZeroEx(web3.currentProvider, config);
+        zeroEx = new ZeroEx(provider, config);
        exchangeContractAddress = zeroEx.exchange.getContractAddress();
        userAddresses = await zeroEx.getAvailableAddressesAsync();
        [coinbase, makerAddress, takerAddress, feeRecipient] = userAddresses;
@@ -69,6 +69,40 @@ describe('OrderValidation', () => {
            );
            await zeroEx.exchange.validateOrderFillableOrThrowAsync(signedOrder);
        });
+        it('should succeed if the maker is buying ZRX and has no ZRX balance', async () => {
+            const makerFee = new BigNumber(2);
+            const takerFee = new BigNumber(2);
+            const signedOrder = await fillScenarios.createFillableSignedOrderWithFeesAsync(
+                makerTokenAddress,
+                zrxTokenAddress,
+                makerFee,
+                takerFee,
+                makerAddress,
+                takerAddress,
+                fillableAmount,
+                feeRecipient,
+            );
+            const zrxMakerBalance = await zeroEx.token.getBalanceAsync(zrxTokenAddress, makerAddress);
+            await zeroEx.token.transferAsync(zrxTokenAddress, makerAddress, takerAddress, zrxMakerBalance);
+            await zeroEx.exchange.validateOrderFillableOrThrowAsync(signedOrder);
+        });
+        it('should succeed if the maker is buying ZRX and has no ZRX balance and there is no specified taker', async () => {
+            const makerFee = new BigNumber(2);
+            const takerFee = new BigNumber(2);
+            const signedOrder = await fillScenarios.createFillableSignedOrderWithFeesAsync(
+                makerTokenAddress,
+                zrxTokenAddress,
+                makerFee,
+                takerFee,
+                makerAddress,
+                constants.NULL_ADDRESS,
+                fillableAmount,
+                feeRecipient,
+            );
+            const zrxMakerBalance = await zeroEx.token.getBalanceAsync(zrxTokenAddress, makerAddress);
+            await zeroEx.token.transferAsync(zrxTokenAddress, makerAddress, takerAddress, zrxMakerBalance);
+            await zeroEx.exchange.validateOrderFillableOrThrowAsync(signedOrder);
+        });
        it('should succeed if the order is asymmetric and fillable', async () => {
            const makerFillableAmount = fillableAmount;
            const takerFillableAmount = fillableAmount.minus(4);
@@ -136,7 +170,7 @@ describe('OrderValidation', () => {
            signedOrder.ecSignature.v = 28 - signedOrder.ecSignature.v + 27;
            return expect(
                zeroEx.exchange.validateFillOrderThrowIfInvalidAsync(signedOrder, fillableAmount, takerAddress),
-            ).to.be.rejectedWith(ZeroExError.InvalidSignature);
+            ).to.be.rejectedWith(OrderError.InvalidSignature);
        });
        it('should throw when the order is fully filled or cancelled', async () => {
            const signedOrder = await fillScenarios.createFillableSignedOrderAsync(
@@ -470,4 +504,4 @@ describe('OrderValidation', () => {
            expect(partialTakerFee).to.be.bignumber.equal(takerPartialFee);
        });
    });
-});
+}); // tslint:disable-line:max-file-line-count
--- a/packages/0x.js/test/subscription_test.ts
+++ b/packages/0x.js/test/subscription_test.ts
@@ -3,7 +3,6 @@ import { BigNumber } from '@0xproject/utils';
 import * as _ from 'lodash';
 import 'mocha';
 import * as Sinon from 'sinon';
-import * as Web3 from 'web3';

 import { ApprovalContractEventArgs, DecodedLogEvent, Token, TokenEvents, ZeroEx } from '../src';
 import { DoneCallback } from '../src/types';
@@ -11,7 +10,7 @@ import { DoneCallback } from '../src/types';
 import { chaiSetup } from './utils/chai_setup';
 import { constants } from './utils/constants';
 import { assertNodeCallbackError } from './utils/report_callback_errors';
-import { web3, web3Wrapper } from './utils/web3_wrapper';
+import { provider, web3Wrapper } from './utils/web3_wrapper';

 chaiSetup.configure();
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
@@ -26,7 +25,7 @@ describe('SubscriptionTest', () => {
        networkId: constants.TESTRPC_NETWORK_ID,
    };
    before(async () => {
-        zeroEx = new ZeroEx(web3.currentProvider, config);
+        zeroEx = new ZeroEx(provider, config);
        userAddresses = await zeroEx.getAvailableAddressesAsync();
        tokens = await zeroEx.tokenRegistry.getTokensAsync();
        coinbase = userAddresses[0];
--- a/packages/0x.js/test/token_registry_wrapper_test.ts
+++ b/packages/0x.js/test/token_registry_wrapper_test.ts
@@ -8,7 +8,7 @@ import { Token, ZeroEx } from '../src';

 import { chaiSetup } from './utils/chai_setup';
 import { constants } from './utils/constants';
-import { web3, web3Wrapper } from './utils/web3_wrapper';
+import { provider, web3Wrapper } from './utils/web3_wrapper';

 chaiSetup.configure();
 const expect = chai.expect;
@@ -31,7 +31,7 @@ describe('TokenRegistryWrapper', () => {
        networkId: constants.TESTRPC_NETWORK_ID,
    };
    before(async () => {
-        zeroEx = new ZeroEx(web3.currentProvider, config);
+        zeroEx = new ZeroEx(provider, config);
        tokens = await zeroEx.tokenRegistry.getTokensAsync();
        _.map(tokens, token => {
            tokenAddressBySymbol[token.symbol] = token.address;
--- a/packages/0x.js/test/token_transfer_proxy_wrapper_test.ts
+++ b/packages/0x.js/test/token_transfer_proxy_wrapper_test.ts
@@ -1,14 +1,13 @@
-import { web3Factory } from '@0xproject/dev-utils';
 import * as chai from 'chai';

 import { ZeroEx } from '../src';

 import { chaiSetup } from './utils/chai_setup';
 import { constants } from './utils/constants';
+import { provider } from './utils/web3_wrapper';

 chaiSetup.configure();
 const expect = chai.expect;
-const web3 = web3Factory.create();

 describe('TokenTransferProxyWrapper', () => {
    let zeroEx: ZeroEx;
@@ -16,7 +15,7 @@ describe('TokenTransferProxyWrapper', () => {
        networkId: constants.TESTRPC_NETWORK_ID,
    };
    before(async () => {
-        zeroEx = new ZeroEx(web3.currentProvider, config);
+        zeroEx = new ZeroEx(provider, config);
    });
    describe('#isAuthorizedAsync', () => {
        it('should return false if the address is not authorized', async () => {
--- a/packages/0x.js/test/token_wrapper_test.ts
+++ b/packages/0x.js/test/token_wrapper_test.ts
@@ -1,9 +1,10 @@
-import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-utils';
+import { BlockchainLifecycle, devConstants } from '@0xproject/dev-utils';
+import { EmptyWalletSubprovider } from '@0xproject/subproviders';
+import { Provider } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as chai from 'chai';
 import 'mocha';
-import * as Web3 from 'web3';
+import Web3ProviderEngine = require('web3-provider-engine');

 import {
    ApprovalContractEventArgs,
@@ -22,7 +23,7 @@ import { chaiSetup } from './utils/chai_setup';
 import { constants } from './utils/constants';
 import { reportNodeCallbackErrors } from './utils/report_callback_errors';
 import { TokenUtils } from './utils/token_utils';
-import { web3, web3Wrapper } from './utils/web3_wrapper';
+import { provider, web3Wrapper } from './utils/web3_wrapper';

 chaiSetup.configure();
 const expect = chai.expect;
@@ -39,7 +40,7 @@ describe('TokenWrapper', () => {
        networkId: constants.TESTRPC_NETWORK_ID,
    };
    before(async () => {
-        zeroEx = new ZeroEx(web3.currentProvider, config);
+        zeroEx = new ZeroEx(provider, config);
        userAddresses = await zeroEx.getAvailableAddressesAsync();
        tokens = await zeroEx.tokenRegistry.getTokensAsync();
        tokenUtils = new TokenUtils(tokens);
@@ -164,7 +165,7 @@ describe('TokenWrapper', () => {
        });
    });
    describe('#getBalanceAsync', () => {
-        describe('With web3 provider with accounts', () => {
+        describe('With provider with accounts', () => {
            it('should return the balance for an existing ERC20 token', async () => {
                const token = tokens[0];
                const ownerAddress = coinbase;
@@ -187,14 +188,14 @@ describe('TokenWrapper', () => {
                return expect(balance).to.be.bignumber.equal(expectedBalance);
            });
        });
-        describe('With web3 provider without accounts', () => {
+        describe('With provider without accounts', () => {
            let zeroExWithoutAccounts: ZeroEx;
            before(async () => {
                const hasAddresses = false;
-                const web3WithoutAccounts = web3Factory.create({ hasAddresses });
-                zeroExWithoutAccounts = new ZeroEx(web3WithoutAccounts.currentProvider, config);
+                const emptyWalletProvider = addEmptyWalletSubprovider(provider);
+                zeroExWithoutAccounts = new ZeroEx(emptyWalletProvider, config);
            });
-            it('should return balance even when called with Web3 provider instance without addresses', async () => {
+            it('should return balance even when called with provider instance without addresses', async () => {
                const token = tokens[0];
                const ownerAddress = coinbase;
                const balance = await zeroExWithoutAccounts.token.getBalanceAsync(token.address, ownerAddress);
@@ -277,7 +278,7 @@ describe('TokenWrapper', () => {
        });
    });
    describe('#getAllowanceAsync', () => {
-        describe('With web3 provider with accounts', () => {
+        describe('With provider with accounts', () => {
            it('should get the proxy allowance', async () => {
                const token = tokens[0];
                const ownerAddress = coinbase;
@@ -299,12 +300,12 @@ describe('TokenWrapper', () => {
                return expect(allowance).to.be.bignumber.equal(expectedAllowance);
            });
        });
-        describe('With web3 provider without accounts', () => {
+        describe('With provider without accounts', () => {
            let zeroExWithoutAccounts: ZeroEx;
            before(async () => {
                const hasAddresses = false;
-                const web3WithoutAccounts = web3Factory.create({ hasAddresses });
-                zeroExWithoutAccounts = new ZeroEx(web3WithoutAccounts.currentProvider, config);
+                const emptyWalletProvider = addEmptyWalletSubprovider(provider);
+                zeroExWithoutAccounts = new ZeroEx(emptyWalletProvider, config);
            });
            it('should get the proxy allowance', async () => {
                const token = tokens[0];
@@ -424,8 +425,7 @@ describe('TokenWrapper', () => {
                );
                zeroEx.token.subscribe(tokenAddress, TokenEvents.Transfer, indexFilterValues, callbackNeverToBeCalled);
                const callbackToBeCalled = reportNodeCallbackErrors(done)();
-                const newProvider = web3Factory.getRpcProvider();
-                zeroEx.setProvider(newProvider, constants.TESTRPC_NETWORK_ID);
+                zeroEx.setProvider(provider, constants.TESTRPC_NETWORK_ID);
                zeroEx.token.subscribe(tokenAddress, TokenEvents.Transfer, indexFilterValues, callbackToBeCalled);
                await zeroEx.token.transferAsync(tokenAddress, coinbase, addressWithoutFunds, transferAmount);
            })().catch(done);
@@ -515,3 +515,14 @@ describe('TokenWrapper', () => {
    });
 });
 // tslint:disable:max-file-line-count
+
+function addEmptyWalletSubprovider(p: Provider): Provider {
+    const providerEngine = new Web3ProviderEngine();
+    providerEngine.addProvider(new EmptyWalletSubprovider());
+    const currentSubproviders = (p as any)._providers;
+    for (const subprovider of currentSubproviders) {
+        providerEngine.addProvider(subprovider);
+    }
+    providerEngine.start();
+    return providerEngine;
+}
--- a/packages/contracts/migrations/index.ts
+++ b/packages/contracts/migrations/index.ts
@@ -2,19 +2,17 @@ import { Deployer } from '@0xproject/deployer';
 import { devConstants } from '@0xproject/dev-utils';
 import * as path from 'path';

-import { constants } from '../util/constants';
+import { constants } from './constants';

-import { runMigrationsAsync } from './migrate';
+import { provider } from './web3_wrapper';

+const artifactsDir = path.resolve('test', 'artifacts');
 const deployerOpts = {
-    artifactsDir: path.resolve('src', 'artifacts'),
-    jsonrpcUrl: devConstants.RPC_URL,
+    artifactsDir,
+    provider,
    networkId: constants.TESTRPC_NETWORK_ID,
    defaults: {
        gas: devConstants.GAS_ESTIMATE,
    },
 };
-
 export const deployer = new Deployer(deployerOpts);
-
-runMigrationsAsync(deployer).catch(console.log);
--- a/packages/0x.js/test/utils/fill_scenarios.ts
+++ b/packages/0x.js/test/utils/fill_scenarios.ts
@@ -1,10 +1,10 @@
+import { orderFactory } from '@0xproject/order-utils';
 import { BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';

 import { SignedOrder, Token, ZeroEx } from '../../src';
 import { artifacts } from '../../src/artifacts';
 import { DummyTokenContract } from '../../src/contract_wrappers/generated/dummy_token';
-import { orderFactory } from '../utils/order_factory';

 import { constants } from './constants';

@@ -36,7 +36,12 @@ export class FillScenarios {
        for (const token of this._tokens) {
            if (token.symbol !== 'ZRX' && token.symbol !== 'WETH') {
                const defaults = {};
-                const dummyToken = new DummyTokenContract(web3Wrapper, artifacts.DummyTokenArtifact.abi, token.address);
+                const dummyToken = new DummyTokenContract(
+                    artifacts.DummyTokenArtifact.abi,
+                    token.address,
+                    web3Wrapper.getProvider(),
+                    web3Wrapper.getContractDefaults(),
+                );
                const tokenSupply = ZeroEx.toBaseUnitAmount(INITIAL_COINBASE_TOKEN_SUPPLY_IN_UNITS, token.decimals);
                const txHash = await dummyToken.setBalance.sendTransactionAsync(this._coinbase, tokenSupply, {
                    from: this._coinbase,
@@ -159,7 +164,7 @@ export class FillScenarios {
        ]);

        const signedOrder = await orderFactory.createSignedOrderAsync(
-            this._zeroEx,
+            this._zeroEx.getProvider(),
            makerAddress,
            takerAddress,
            makerFee,
--- a/packages/0x.js/test/utils/web3_wrapper.ts
+++ b/packages/0x.js/test/utils/web3_wrapper.ts
@@ -1,6 +1,9 @@
-import { web3Factory } from '@0xproject/dev-utils';
+import { devConstants, web3Factory } from '@0xproject/dev-utils';
+import { Provider } from '@0xproject/types';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
-import * as Web3 from 'web3';

-export const web3 = web3Factory.create();
-export const web3Wrapper = new Web3Wrapper(web3.currentProvider);
+const web3 = web3Factory.create({ shouldUseInProcessGanache: true });
+const provider: Provider = web3.currentProvider;
+const web3Wrapper = new Web3Wrapper(web3.currentProvider);
+
+export { provider, web3Wrapper };
--- a/packages/abi-gen/CHANGELOG.json
+++ b/packages/abi-gen/CHANGELOG.json
@@ -1,4 +1,31 @@
 [
+    {
+        "timestamp": 1525428773,
+        "version": "0.2.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1524044013,
+        "version": "0.2.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1523462196,
+        "version": "0.2.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1522673609,
        "version": "0.2.9",
@@ -15,8 +42,7 @@
            {
                "note": "Dependencies updated"
            }
-        ],
-        "isPublished": true
+        ]
    },
    {
        "version": "0.2.5",
@@ -26,8 +52,7 @@
                "pr": 452
            }
        ],
-        "timestamp": 1521298800,
-        "isPublished": true
+        "timestamp": 1521298800
    },
    {
        "version": "0.2.4",
@@ -47,8 +72,7 @@
                "pr": 413
            }
        ],
-        "timestamp": 1520089200,
-        "isPublished": true
+        "timestamp": 1520089200
    },
    {
        "version": "0.2.1",
@@ -58,8 +82,7 @@
                "pr": 389
            }
        ],
-        "timestamp": 1518102000,
-        "isPublished": true
+        "timestamp": 1518102000
    },
    {
        "version": "0.2.0",
@@ -74,8 +97,7 @@
                "pr": 388
            }
        ],
-        "timestamp": 1517929200,
-        "isPublished": true
+        "timestamp": 1517929200
    },
    {
        "version": "0.1.0",
@@ -93,7 +115,6 @@
                "pr": 304
            }
        ],
-        "timestamp": 1515596400,
-        "isPublished": true
+        "timestamp": 1515596400
    }
 ]
--- a/packages/abi-gen/CHANGELOG.md
+++ b/packages/abi-gen/CHANGELOG.md
@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v0.2.12 - _May 4, 2018_
+
+    * Dependencies updated
+
+## v0.2.11 - _April 18, 2018_
+
+    * Dependencies updated
+
+## v0.2.10 - _April 11, 2018_
+
+    * Dependencies updated
+
 ## v0.2.9 - _April 2, 2018_

    * Dependencies updated
--- a/packages/abi-gen/README.md
+++ b/packages/abi-gen/README.md
@@ -57,3 +57,61 @@ See the [type definition](https://github.com/0xProject/0x-monorepo/tree/developm
 ## Output files

 Output files will be generated within an output folder with names converted to camel case and taken from abi file names. If you already have some files in that folder they will be overwritten.
+
+## Contributing
+
+We welcome improvements and fixes from the wider community! To report bugs within this package, please create an issue in this repository.
+
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
+
+### Install dependencies
+
+If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
+
+```bash
+yarn config set workspaces-experimental true
+```
+
+Then install dependencies
+
+```bash
+yarn install
+```
+
+### Build
+
+If this is your **first** time building this package, you must first build **all** packages within the monorepo. This is because packages that depend on other packages located inside this monorepo are symlinked when run from **within** the monorepo. This allows you to make changes across multiple packages without first publishing dependent packages to NPM. To build all packages, run the following from the monorepo root directory:
+
+```bash
+yarn lerna:rebuild
+```
+
+Or continuously rebuild on change:
+
+```bash
+yarn dev
+```
+
+You can also build this specific package by running the following from within its directory:
+
+```bash
+yarn build
+```
+
+or continuously rebuild on change:
+
+```bash
+yarn build:watch
+```
+
+### Clean
+
+```bash
+yarn clean
+```
+
+### Lint
+
+```bash
+yarn lint
+```
--- a/packages/abi-gen/package.json
+++ b/packages/abi-gen/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0xproject/abi-gen",
-    "version": "0.2.9",
+    "version": "0.2.12",
    "description": "Generate contract wrappers from ABI and handlebars templates",
    "main": "lib/index.js",
    "types": "lib/index.d.ts",
@@ -24,9 +24,9 @@
    },
    "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
    "dependencies": {
-        "@0xproject/types": "^0.5.0",
-        "@0xproject/typescript-typings": "^0.0.3",
-        "@0xproject/utils": "^0.5.0",
+        "@0xproject/types": "^0.6.2",
+        "@0xproject/typescript-typings": "^0.3.0",
+        "@0xproject/utils": "^0.6.0",
        "chalk": "^2.3.0",
        "glob": "^7.1.2",
        "handlebars": "^4.0.11",
@@ -36,8 +36,8 @@
        "yargs": "^10.0.3"
    },
    "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.16",
-        "@0xproject/tslint-config": "^0.4.14",
+        "@0xproject/monorepo-scripts": "^0.1.19",
+        "@0xproject/tslint-config": "^0.4.17",
        "@types/glob": "^5.0.33",
        "@types/handlebars": "^4.0.36",
        "@types/mkdirp": "^0.5.1",
--- a/packages/abi-gen/src/globals.d.ts
+++ b/packages/abi-gen/src/globals.d.ts
@@ -1,8 +1,3 @@
-declare function toSnakeCase(str: string): string;
-declare module 'to-snake-case' {
-    export = toSnakeCase;
-}
-
 declare module '*.json' {
    const json: any;
    /* tslint:disable */
--- a/packages/abi-gen/src/index.ts
+++ b/packages/abi-gen/src/index.ts
@@ -1,7 +1,7 @@
 #!/usr/bin/env node

 import { AbiDefinition, ConstructorAbi, EventAbi, MethodAbi } from '@0xproject/types';
-import { logUtils } from '@0xproject/utils';
+import { abiUtils, logUtils } from '@0xproject/utils';
 import chalk from 'chalk';
 import * as fs from 'fs';
 import { sync as globSync } from 'glob';
@@ -12,7 +12,7 @@ import * as yargs from 'yargs';

 import toSnakeCase = require('to-snake-case');

-import { ContextData, ContractsBackend, ParamKind } from './types';
+import { ContextData, ContractsBackend, Method, ParamKind } from './types';
 import { utils } from './utils';

 const ABI_TYPE_CONSTRUCTOR = 'constructor';
@@ -83,7 +83,6 @@ function writeOutputFile(name: string, renderedTsCode: string): void {

 Handlebars.registerHelper('parameterType', utils.solTypeToTsType.bind(utils, ParamKind.Input, args.backend));
 Handlebars.registerHelper('returnType', utils.solTypeToTsType.bind(utils, ParamKind.Output, args.backend));
-
 if (args.partials) {
    registerPartials(args.partials);
 }
@@ -126,11 +125,12 @@ for (const abiFileName of abiFileNames) {
    }

    const methodAbis = ABI.filter((abi: AbiDefinition) => abi.type === ABI_TYPE_METHOD) as MethodAbi[];
-    const methodsData = _.map(methodAbis, methodAbi => {
-        _.map(methodAbi.inputs, (input, i: number) => {
+    const sanitizedMethodAbis = abiUtils.renameOverloadedMethods(methodAbis) as MethodAbi[];
+    const methodsData = _.map(methodAbis, (methodAbi, methodAbiIndex: number) => {
+        _.forEach(methodAbi.inputs, (input, inputIndex: number) => {
            if (_.isEmpty(input.name)) {
                // Auto-generated getters don't have parameter names
-                input.name = `index_${i}`;
+                input.name = `index_${inputIndex}`;
            }
        });
        // This will make templates simpler
@@ -138,6 +138,8 @@ for (const abiFileName of abiFileNames) {
            ...methodAbi,
            singleReturnValue: methodAbi.outputs.length === 1,
            hasReturnValue: methodAbi.outputs.length !== 0,
+            tsName: sanitizedMethodAbis[methodAbiIndex].name,
+            functionSignature: abiUtils.getFunctionSignature(methodAbi),
        };
        return methodData;
    });
--- a/packages/abi-gen/src/types.ts
+++ b/packages/abi-gen/src/types.ts
@@ -5,13 +5,6 @@ export enum ParamKind {
    Output = 'output',
 }

-export enum AbiType {
-    Function = 'function',
-    Constructor = 'constructor',
-    Event = 'event',
-    Fallback = 'fallback',
-}
-
 export enum ContractsBackend {
    Web3 = 'web3',
    Ethers = 'ethers',
@@ -20,6 +13,8 @@ export enum ContractsBackend {
 export interface Method extends MethodAbi {
    singleReturnValue: boolean;
    hasReturnValue: boolean;
+    tsName: string;
+    functionSignature: string;
 }

 export interface ContextData {
--- a/packages/abi-gen/src/utils.ts
+++ b/packages/abi-gen/src/utils.ts
@@ -1,9 +1,9 @@
-import { ConstructorAbi, DataItem } from '@0xproject/types';
+import { AbiType, ConstructorAbi, DataItem } from '@0xproject/types';
 import * as fs from 'fs';
 import * as _ from 'lodash';
 import * as path from 'path';

-import { AbiType, ContractsBackend, ParamKind } from './types';
+import { ContractsBackend, ParamKind } from './types';

 export const utils = {
    solTypeToTsType(paramKind: ParamKind, backend: ContractsBackend, solType: string, components?: DataItem[]): string {
--- a/packages/assert/CHANGELOG.json
+++ b/packages/assert/CHANGELOG.json
@@ -1,4 +1,31 @@
 [
+    {
+        "timestamp": 1525428773,
+        "version": "0.2.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1524044013,
+        "version": "0.2.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1523462196,
+        "version": "0.2.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1522673609,
        "version": "0.2.5",
@@ -15,8 +42,7 @@
            {
                "note": "Dependencies updated"
            }
-        ],
-        "isPublished": true
+        ]
    },
    {
        "version": "0.2.0",
@@ -26,8 +52,7 @@
                "pr": 412
            }
        ],
-        "timestamp": 1520434800,
-        "isPublished": true
+        "timestamp": 1520434800
    },
    {
        "version": "0.1.0",
@@ -41,8 +66,7 @@
                "pr": 385
            }
        ],
-        "timestamp": 1520089200,
-        "isPublished": true
+        "timestamp": 1520089200
    },
    {
        "version": "0.0.18",
@@ -52,8 +76,7 @@
                "pr": 389
            }
        ],
-        "timestamp": 1486566000,
-        "isPublished": true
+        "timestamp": 1486566000
    },
    {
        "version": "0.0.4",
@@ -66,7 +89,6 @@
                    "Added assertion isValidBaseUnitAmount which checks both that the value is a valid bigNumber and that it does not contain decimals."
            }
        ],
-        "timestamp": 1510585200,
-        "isPublished": true
+        "timestamp": 1510585200
    }
 ]
--- a/packages/assert/CHANGELOG.md
+++ b/packages/assert/CHANGELOG.md
@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v0.2.8 - _May 4, 2018_
+
+    * Dependencies updated
+
+## v0.2.7 - _April 18, 2018_
+
+    * Dependencies updated
+
+## v0.2.6 - _April 11, 2018_
+
+    * Dependencies updated
+
 ## v0.2.5 - _April 2, 2018_

    * Dependencies updated
--- a/packages/assert/README.md
+++ b/packages/assert/README.md
@@ -26,11 +26,11 @@ If your project is in [TypeScript](https://www.typescriptlang.org/), add the fol

 ## Contributing

-We strongly encourage that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+We welcome improvements and fixes from the wider community! To report bugs within this package, please create an issue in this repository.

 Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.

-### Install Dependencies
+### Install dependencies

 If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:

@@ -46,10 +46,36 @@ yarn install

 ### Build

+If this is your **first** time building this package, you must first build **all** packages within the monorepo. This is because packages that depend on other packages located inside this monorepo are symlinked when run from **within** the monorepo. This allows you to make changes across multiple packages without first publishing dependent packages to NPM. To build all packages, run the following from the monorepo root directory:
+
+```bash
+yarn lerna:rebuild
+```
+
+Or continuously rebuild on change:
+
+```bash
+yarn dev
+```
+
+You can also build this specific package by running the following from within its directory:
+
 ```bash
 yarn build
 ```

+or continuously rebuild on change:
+
+```bash
+yarn build:watch
+```
+
+### Clean
+
+```bash
+yarn clean
+```
+
 ### Lint

 ```bash
--- a/packages/assert/package.json
+++ b/packages/assert/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0xproject/assert",
-    "version": "0.2.5",
+    "version": "0.2.8",
    "description": "Provides a standard way of performing type and schema validation across 0x projects",
    "main": "lib/src/index.js",
    "types": "lib/src/index.d.ts",
@@ -9,7 +9,7 @@
        "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
        "clean": "shx rm -rf lib test_temp scripts",
        "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
-        "run_mocha": "mocha lib/test/**/*_test.js",
+        "run_mocha": "mocha lib/test/**/*_test.js --exit",
        "prepublishOnly": "run-p build",
        "test": "run-s clean build run_mocha",
        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
@@ -27,8 +27,8 @@
    },
    "homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md",
    "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.16",
-        "@0xproject/tslint-config": "^0.4.14",
+        "@0xproject/monorepo-scripts": "^0.1.19",
+        "@0xproject/tslint-config": "^0.4.17",
        "@types/lodash": "4.14.104",
        "@types/mocha": "^2.2.42",
        "@types/valid-url": "^1.0.2",
@@ -43,9 +43,9 @@
        "typescript": "2.7.1"
    },
    "dependencies": {
-        "@0xproject/json-schemas": "^0.7.19",
-        "@0xproject/typescript-typings": "^0.0.3",
-        "@0xproject/utils": "^0.5.0",
+        "@0xproject/json-schemas": "^0.7.22",
+        "@0xproject/typescript-typings": "^0.3.0",
+        "@0xproject/utils": "^0.6.0",
        "lodash": "^4.17.4",
        "valid-url": "^1.0.9"
    },
--- a/packages/assert/src/index.ts
+++ b/packages/assert/src/index.ts
@@ -61,7 +61,7 @@ export const assert = {
    },
    isWeb3Provider(variableName: string, value: any): void {
        const isWeb3Provider = _.isFunction(value.send) || _.isFunction(value.sendAsync);
-        this.assert(isWeb3Provider, this.typeAssertionMessage(variableName, 'Web3.Provider', value));
+        this.assert(isWeb3Provider, this.typeAssertionMessage(variableName, 'Provider', value));
    },
    doesConformToSchema(variableName: string, value: any, schema: Schema, subSchemas?: Schema[]): void {
        const schemaValidator = new SchemaValidator();
--- a/packages/base-contract/CHANGELOG.json
+++ b/packages/base-contract/CHANGELOG.json
@@ -1,4 +1,33 @@
 [
+    {
+        "version": "0.3.0",
+        "changes": [
+            {
+                "note": "Update ethers-contracts to ethers.js",
+                "pr": 540
+            }
+        ],
+        "timestamp": 1525428773
+    },
+    {
+        "timestamp": 1524044013,
+        "version": "0.2.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "0.2.0",
+        "changes": [
+            {
+                "note": "Contract wrappers now accept Provider and defaults instead of Web3Wrapper",
+                "pr": 501
+            }
+        ],
+        "timestamp": 1523462196
+    },
    {
        "version": "0.1.0",
        "changes": [
@@ -24,8 +53,7 @@
            {
                "note": "Dependencies updated"
            }
-        ],
-        "isPublished": true
+        ]
    },
    {
        "version": "0.0.2",
@@ -34,7 +62,6 @@
                "note": "Initial release"
            }
        ],
-        "timestamp": 1520089200,
-        "isPublished": true
+        "timestamp": 1520089200
    }
 ]
--- a/packages/base-contract/CHANGELOG.md
+++ b/packages/base-contract/CHANGELOG.md
@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v0.3.0 - _May 4, 2018_
+
+    * Update ethers-contracts to ethers.js (#540)
+
+## v0.2.1 - _April 18, 2018_
+
+    * Dependencies updated
+
+## v0.2.0 - _April 11, 2018_
+
+    * Contract wrappers now accept Provider and defaults instead of Web3Wrapper (#501)
+
 ## v0.1.0 - _April 2, 2018_

    * Add tests for traversing ABI tree (#485)
--- a/packages/base-contract/package.json
+++ b/packages/base-contract/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0xproject/base-contract",
-    "version": "0.1.0",
+    "version": "0.3.0",
    "description": "0x Base TS contract",
    "main": "lib/src/index.js",
    "types": "lib/src/index.d.ts",
@@ -26,8 +26,8 @@
    },
    "homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md",
    "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.16",
-        "@0xproject/tslint-config": "^0.4.14",
+        "@0xproject/monorepo-scripts": "^0.1.19",
+        "@0xproject/tslint-config": "^0.4.17",
        "@types/lodash": "4.14.104",
        "chai": "^4.0.1",
        "copyfiles": "^1.2.0",
@@ -38,11 +38,11 @@
        "typescript": "2.7.1"
    },
    "dependencies": {
-        "@0xproject/types": "^0.5.0",
-        "@0xproject/typescript-typings": "^0.0.3",
-        "@0xproject/utils": "^0.5.0",
-        "@0xproject/web3-wrapper": "^0.5.0",
-        "ethers-contracts": "^2.2.1",
+        "@0xproject/types": "^0.6.2",
+        "@0xproject/typescript-typings": "^0.3.0",
+        "@0xproject/utils": "^0.6.0",
+        "@0xproject/web3-wrapper": "^0.6.2",
+        "ethers": "^3.0.15",
        "lodash": "^4.17.4"
    },
    "publishConfig": {
--- a/packages/base-contract/src/index.ts
+++ b/packages/base-contract/src/index.ts
@@ -1,13 +1,26 @@
-import { ContractAbi, DataItem, TxData, TxDataPayable } from '@0xproject/types';
-import { BigNumber } from '@0xproject/utils';
+import {
+    AbiDefinition,
+    AbiType,
+    ContractAbi,
+    DataItem,
+    MethodAbi,
+    Provider,
+    TxData,
+    TxDataPayable,
+} from '@0xproject/types';
+import { abiUtils, BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
-import * as ethersContracts from 'ethers-contracts';
+import * as ethers from 'ethers';
 import * as _ from 'lodash';

 import { formatABIDataItem } from './utils';

+export interface EthersInterfaceByFunctionSignature {
+    [key: string]: ethers.Interface;
+}
+
 export class BaseContract {
-    protected _ethersInterface: ethersContracts.Interface;
+    protected _ethersInterfacesByFunctionSignature: EthersInterfaceByFunctionSignature;
    protected _web3Wrapper: Web3Wrapper;
    public abi: ContractAbi;
    public address: string;
@@ -49,10 +62,37 @@ export class BaseContract {
        }
        return txDataWithDefaults;
    }
-    constructor(web3Wrapper: Web3Wrapper, abi: ContractAbi, address: string) {
-        this._web3Wrapper = web3Wrapper;
+    protected _lookupEthersInterface(functionSignature: string): ethers.Interface {
+        const ethersInterface = this._ethersInterfacesByFunctionSignature[functionSignature];
+        if (_.isUndefined(ethersInterface)) {
+            throw new Error(`Failed to lookup method with function signature '${functionSignature}'`);
+        }
+        return ethersInterface;
+    }
+    protected _lookupAbi(functionSignature: string): MethodAbi {
+        const methodAbi = _.find(this.abi, (abiDefinition: AbiDefinition) => {
+            if (abiDefinition.type !== AbiType.Function) {
+                return false;
+            }
+            const abiFunctionSignature = abiUtils.getFunctionSignature(abiDefinition);
+            if (abiFunctionSignature === functionSignature) {
+                return true;
+            }
+            return false;
+        }) as MethodAbi;
+        return methodAbi;
+    }
+    constructor(abi: ContractAbi, address: string, provider: Provider, defaults?: Partial<TxData>) {
+        this._web3Wrapper = new Web3Wrapper(provider, defaults);
        this.abi = abi;
        this.address = address;
-        this._ethersInterface = new ethersContracts.Interface(abi);
+        const methodAbis = this.abi.filter(
+            (abiDefinition: AbiDefinition) => abiDefinition.type === AbiType.Function,
+        ) as MethodAbi[];
+        this._ethersInterfacesByFunctionSignature = {};
+        _.each(methodAbis, methodAbi => {
+            const functionSignature = abiUtils.getFunctionSignature(methodAbi);
+            this._ethersInterfacesByFunctionSignature[functionSignature] = new ethers.Interface([methodAbi]);
+        });
    }
 }
--- a/packages/connect/CHANGELOG.json
+++ b/packages/connect/CHANGELOG.json
@@ -1,4 +1,31 @@
 [
+    {
+        "timestamp": 1525428773,
+        "version": "0.6.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1524044013,
+        "version": "0.6.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1523462196,
+        "version": "0.6.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1522673609,
        "version": "0.6.8",
@@ -15,8 +42,7 @@
            {
                "note": "Dependencies updated"
            }
-        ],
-        "isPublished": true
+        ]
    },
    {
        "version": "0.6.4",
@@ -26,8 +52,7 @@
                "pr": 456
            }
        ],
-        "timestamp": 1521298800,
-        "isPublished": true
+        "timestamp": 1521298800
    },
    {
        "version": "0.6.2",
@@ -37,8 +62,7 @@
                "pr": 407
            }
        ],
-        "timestamp": 1518706800,
-        "isPublished": true
+        "timestamp": 1518706800
    },
    {
        "version": "0.6.0",
@@ -52,8 +76,7 @@
                "pr": 406
            }
        ],
-        "timestamp": 1518706800,
-        "isPublished": true
+        "timestamp": 1518706800
    },
    {
        "version": "0.5.7",
@@ -63,8 +86,7 @@
                "pr": 389
            }
        ],
-        "timestamp": 1518102000,
-        "isPublished": true
+        "timestamp": 1518102000
    },
    {
        "version": "0.5.0",
@@ -82,8 +104,7 @@
                "pr": 318
            }
        ],
-        "timestamp": 1516114800,
-        "isPublished": true
+        "timestamp": 1516114800
    },
    {
        "version": "0.4.0",
@@ -93,8 +114,7 @@
                "pr": 296
            }
        ],
-        "timestamp": 1515596400,
-        "isPublished": true
+        "timestamp": 1515596400
    },
    {
        "version": "0.3.0",
@@ -108,8 +128,7 @@
                "pr": 256
            }
        ],
-        "timestamp": 1512658800,
-        "isPublished": true
+        "timestamp": 1512658800
    },
    {
        "version": "0.2.0",
@@ -124,8 +143,7 @@
                "note": "Remove dependency on 0x.js"
            }
        ],
-        "timestamp": 1511881200,
-        "isPublished": true
+        "timestamp": 1511881200
    },
    {
        "version": "0.1.0",
@@ -134,7 +152,6 @@
                "note": "Provide a HttpClient class for interacting with standard relayer api compliant HTTP urls"
            }
        ],
-        "timestamp": 1511276400,
-        "isPublished": true
+        "timestamp": 1511276400
    }
 ]
--- a/packages/connect/CHANGELOG.md
+++ b/packages/connect/CHANGELOG.md
@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v0.6.11 - _May 4, 2018_
+
+    * Dependencies updated
+
+## v0.6.10 - _April 18, 2018_
+
+    * Dependencies updated
+
+## v0.6.9 - _April 11, 2018_
+
+    * Dependencies updated
+
 ## v0.6.8 - _April 2, 2018_

    * Dependencies updated
--- a/packages/connect/README.md
+++ b/packages/connect/README.md
@@ -23,11 +23,11 @@ If your project is in [TypeScript](https://www.typescriptlang.org/), add the fol

 ## Contributing

-We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+We welcome improvements and fixes from the wider community! To report bugs within this package, please create an issue in this repository.

 Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.

-### Install Dependencies
+### Install dependencies

 If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:

@@ -43,10 +43,36 @@ yarn install

 ### Build

+If this is your **first** time building this package, you must first build **all** packages within the monorepo. This is because packages that depend on other packages located inside this monorepo are symlinked when run from **within** the monorepo. This allows you to make changes across multiple packages without first publishing dependent packages to NPM. To build all packages, run the following from the monorepo root directory:
+
+```bash
+yarn lerna:rebuild
+```
+
+Or continuously rebuild on change:
+
+```bash
+yarn dev
+```
+
+You can also build this specific package by running the following from within its directory:
+
 ```bash
 yarn build
 ```

+or continuously rebuild on change:
+
+```bash
+yarn build:watch
+```
+
+### Clean
+
+```bash
+yarn clean
+```
+
 ### Lint

 ```bash
--- a/packages/connect/package.json
+++ b/packages/connect/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0xproject/connect",
-    "version": "0.6.8",
+    "version": "0.6.11",
    "description": "A javascript library for interacting with the standard relayer api",
    "keywords": [
        "connect",
@@ -17,7 +17,7 @@
        "clean": "shx rm -rf lib test_temp scripts",
        "copy_test_fixtures": "copyfiles -u 2 './test/fixtures/**/*.json' ./lib/test/fixtures",
        "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
-        "run_mocha": "mocha lib/test/**/*_test.js",
+        "run_mocha": "mocha lib/test/**/*_test.js --exit",
        "test": "run-s clean build copy_test_fixtures run_mocha",
        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
        "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
@@ -50,19 +50,19 @@
    },
    "homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md",
    "dependencies": {
-        "@0xproject/assert": "^0.2.5",
-        "@0xproject/json-schemas": "^0.7.19",
-        "@0xproject/types": "^0.5.0",
-        "@0xproject/typescript-typings": "^0.0.3",
-        "@0xproject/utils": "^0.5.0",
+        "@0xproject/assert": "^0.2.8",
+        "@0xproject/json-schemas": "^0.7.22",
+        "@0xproject/types": "^0.6.2",
+        "@0xproject/typescript-typings": "^0.3.0",
+        "@0xproject/utils": "^0.6.0",
        "isomorphic-fetch": "^2.2.1",
        "lodash": "^4.17.4",
        "query-string": "^5.0.1",
        "websocket": "^1.0.25"
    },
    "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.16",
-        "@0xproject/tslint-config": "^0.4.14",
+        "@0xproject/monorepo-scripts": "^0.1.19",
+        "@0xproject/tslint-config": "^0.4.17",
        "@types/fetch-mock": "^5.12.1",
        "@types/lodash": "4.14.104",
        "@types/mocha": "^2.2.42",
--- a/packages/connect/src/globals.d.ts
+++ b/packages/connect/src/globals.d.ts
@@ -1,5 +1,3 @@
-declare module 'async-child-process';
-
 declare module '*.json' {
    const value: any;
    export default value;
--- a/packages/connect/src/types.ts
+++ b/packages/connect/src/types.ts
@@ -15,14 +15,14 @@ export interface OrderbookChannel {
    close: () => void;
 }

-/*
+/**
 * heartbeatInterval: Interval in milliseconds that the orderbook channel should ping the underlying websocket. Default: 15000
 */
 export interface WebSocketOrderbookChannelConfig {
    heartbeatIntervalMs?: number;
 }

-/*
+/**
 * baseTokenAddress: The address of token designated as the baseToken in the currency pair calculation of price
 * quoteTokenAddress: The address of token designated as the quoteToken in the currency pair calculation of price
 * snapshot: If true, a snapshot of the orderbook will be sent before the updates to the orderbook
--- a/packages/contract_templates/contract.handlebars
+++ b/packages/contract_templates/contract.handlebars
@@ -5,10 +5,10 @@
 // tslint:disable:no-consecutive-blank-lines
 // tslint:disable-next-line:no-unused-variable
 import { BaseContract } from '@0xproject/base-contract';
-import { BlockParam, BlockParamLiteral, CallData, ContractAbi, DataItem, MethodAbi, TxData, TxDataPayable } from '@0xproject/types';
+import { BlockParam, BlockParamLiteral, CallData, ContractAbi, DataItem, MethodAbi, Provider, TxData, TxDataPayable } from '@0xproject/types';
 import { BigNumber, classUtils, promisify } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
-import * as ethersContracts from 'ethers-contracts';
+import * as ethers from 'ethers';
 import * as _ from 'lodash';

 {{#if events}}
@@ -39,8 +39,8 @@ export class {{contractName}}Contract extends BaseContract {
    {{> tx contractName=../contractName}}
    {{/this.constant}}
 {{/each}}
-    constructor(web3Wrapper: Web3Wrapper, abi: ContractAbi, address: string) {
-        super(web3Wrapper, abi, address);
-        classUtils.bindAll(this, ['_ethersInterface', 'address', 'abi', '_web3Wrapper']);
+    constructor(abi: ContractAbi, address: string, provider: Provider, defaults?: Partial<TxData>) {
+        super(abi, address, provider, defaults);
+        classUtils.bindAll(this, ['_ethersInterfacesByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
    }
 } // tslint:disable:max-file-line-count
--- a/packages/contract_templates/partials/callAsync.handlebars
+++ b/packages/contract_templates/partials/callAsync.handlebars
@@ -5,20 +5,21 @@ async callAsync(
    defaultBlock?: BlockParam,
 ): Promise<{{> return_type outputs=outputs}}> {
    const self = this as any as {{contractName}}Contract;
-    const inputAbi = (_.find(self.abi, {name: '{{this.name}}'}) as MethodAbi).inputs;
+    const functionSignature = '{{this.functionSignature}}';
+    const inputAbi = self._lookupAbi(functionSignature).inputs;
    [{{> params inputs=inputs}}] = BaseContract._formatABIDataItemList(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(self));
-    const encodedData = self._ethersInterface.functions.{{this.name}}(
+    const ethersFunction = self._lookupEthersInterface(functionSignature).functions.{{this.name}}(
        {{> params inputs=inputs}}
-    ).data;
+    ) as ethers.CallDescription;
+    const encodedData = ethersFunction.data;
    const callDataWithDefaults = await self._applyDefaultsToTxDataAsync(
        {
            data: encodedData,
        }
    )
    const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
+    let resultArray = ethersFunction.parse(rawCallResult);
    const outputAbi = (_.find(self.abi, {name: '{{this.name}}'}) as MethodAbi).outputs;
-    const outputParamsTypes = _.map(outputAbi, 'type');
-    let resultArray = ethersContracts.Interface.decodeParams(outputParamsTypes, rawCallResult) as any;
    resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
    resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
    return resultArray{{#singleReturnValue}}[0]{{/singleReturnValue}};
--- a/packages/contract_templates/partials/return_type.handlebars
+++ b/packages/contract_templates/partials/return_type.handlebars
@@ -1,6 +1,6 @@
 {{#if outputs.length}}
 {{#singleReturnValue}}
-{{#returnType outputs.0.type components}}{{/returnType}}
+{{#returnType outputs.0.type outputs.0.components}}{{/returnType}}
 {{/singleReturnValue}}
 {{^singleReturnValue}}
 [{{#each outputs}}{{#returnType type components}}{{/returnType}}{{#unless @last}}, {{/unless}}{{/each}}]
--- a/packages/contract_templates/partials/tx.handlebars
+++ b/packages/contract_templates/partials/tx.handlebars
@@ -1,4 +1,4 @@
-public {{this.name}} = {
+public {{this.tsName}} = {
    async sendTransactionAsync(
    {{> typed_params inputs=inputs}}
    {{#this.payable}}
@@ -9,17 +9,17 @@ public {{this.name}} = {
    {{/this.payable}}
    ): Promise<string> {
        const self = this as any as {{contractName}}Contract;
-        const inputAbi = (_.find(self.abi, {name: '{{this.name}}'}) as MethodAbi).inputs;
+        const inputAbi = self._lookupAbi('{{this.functionSignature}}').inputs;
        [{{> params inputs=inputs}}] = BaseContract._formatABIDataItemList(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(self));
-        const encodedData = self._ethersInterface.functions.{{this.name}}(
+        const encodedData = self._lookupEthersInterface('{{this.functionSignature}}').functions.{{this.name}}(
            {{> params inputs=inputs}}
-        ).data
+        ).data;
        const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
            {
                ...txData,
                data: encodedData,
            },
-            self.{{this.name}}.estimateGasAsync.bind(
+            self.{{this.tsName}}.estimateGasAsync.bind(
                self,
                {{> params inputs=inputs}}
            ),
@@ -32,11 +32,11 @@ public {{this.name}} = {
        txData: Partial<TxData> = {},
    ): Promise<number> {
        const self = this as any as {{contractName}}Contract;
-        const inputAbi = (_.find(self.abi, {name: '{{this.name}}'}) as MethodAbi).inputs;
+        const inputAbi = self._lookupAbi('{{this.functionSignature}}').inputs;
        [{{> params inputs=inputs}}] = BaseContract._formatABIDataItemList(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(this));
-        const encodedData = self._ethersInterface.functions.{{this.name}}(
+        const encodedData = self._lookupEthersInterface('{{this.functionSignature}}').functions.{{this.name}}(
            {{> params inputs=inputs}}
-        ).data
+        ).data;
        const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
            {
                ...txData,
@@ -50,11 +50,11 @@ public {{this.name}} = {
    {{> typed_params inputs=inputs}}
    ): string {
        const self = this as any as {{contractName}}Contract;
-        const inputAbi = (_.find(self.abi, {name: '{{this.name}}'}) as MethodAbi).inputs;
+        const inputAbi = self._lookupAbi('{{this.functionSignature}}').inputs;
        [{{> params inputs=inputs}}] = BaseContract._formatABIDataItemList(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(self));
-        const abiEncodedTransactionData = self._ethersInterface.functions.{{this.name}}(
+        const abiEncodedTransactionData = self._lookupEthersInterface('{{this.functionSignature}}').functions.{{this.name}}(
            {{> params inputs=inputs}}
-        ).data
+        ).data;
        return abiEncodedTransactionData;
    },
    {{> callAsync}}
--- a/packages/contracts/README.md
+++ b/packages/contracts/README.md
@@ -34,11 +34,25 @@ yarn install

 ### Build

+If this is your **first** time building this package, you must first build **all** packages within the monorepo. This is because packages that depend on other packages located inside this monorepo are symlinked when run from **within** the monorepo. This allows you to make changes across multiple packages without first publishing dependent packages to NPM. To build all packages, run the following from the monorepo root directory:
+
+```bash
+yarn lerna:rebuild
+```
+
+Or continuously rebuild on change:
+
+```bash
+yarn dev
+```
+
+You can also build this specific package by running the following from within its directory:
+
 ```bash
 yarn build
 ```

-or
+or continuously rebuild on change:

 ```bash
 yarn build:watch
@@ -58,17 +72,6 @@ yarn lint

 ### Run Tests

-Before running the tests, you will need to spin up a [TestRPC](https://www.npmjs.com/package/ethereumjs-testrpc) instance.
-
-In a separate terminal, start TestRPC (a convenience command is provided as part of the [0x.js monorepo](https://github.com/0xProject/0x-monorepo))
-
-```bash
-cd ../..
-yarn testrpc
-```
-
-Then in your main terminal run
-
 ```bash
 yarn test
 ```
--- a/packages/contracts/migrations/config/multisig_sample.ts
+++ b/packages/contracts/migrations/config/multisig_sample.ts
@@ -1,10 +0,0 @@
-import { MultiSigConfigByNetwork } from '../types';
-
-// Make a copy of this file named `multisig.js` and input custom params as needed
-export const multiSig: MultiSigConfigByNetwork = {
-    kovan: {
-        owners: [],
-        confirmationsRequired: 0,
-        secondsRequired: 0,
-    },
-};
--- a/packages/contracts/migrations/types.ts
+++ b/packages/contracts/migrations/types.ts
@@ -1,23 +0,0 @@
-export interface MultiSigConfig {
-    owners: string[];
-    confirmationsRequired: number;
-    secondsRequired: number;
-}
-
-export interface MultiSigConfigByNetwork {
-    [networkName: string]: MultiSigConfig;
-}
-
-export interface Token {
-    address?: string;
-    name: string;
-    symbol: string;
-    decimals: number;
-    ipfsHash: string;
-    swarmHash: string;
-}
-
-export interface TokenInfoByNetwork {
-    development: Token[];
-    live: Token[];
-}
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -1,7 +1,7 @@
 {
    "private": true,
    "name": "contracts",
-    "version": "2.1.21",
+    "version": "2.1.27",
    "description": "Smart contract components of 0x protocol",
    "main": "index.js",
    "directories": {
@@ -10,16 +10,15 @@
    "scripts": {
        "build:watch": "tsc -w",
        "prebuild": "run-s clean compile copy_artifacts generate_contract_wrappers",
-        "copy_artifacts": "copyfiles './src/artifacts/**/*' ./lib",
+        "copy_artifacts": "copyfiles -u 4 '../migrations/src/artifacts/**/*' ./lib/src/artifacts;",
        "build": "tsc",
        "test": "run-s build run_mocha",
        "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
        "run_mocha": "mocha 'lib/test/**/*.js' --timeout 100000 --bail --exit",
        "compile:comment": "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846",
-        "compile": "node ../deployer/lib/src/cli.js compile --contracts ${npm_package_config_contracts} --contracts-dir src/contracts --artifacts-dir src/artifacts",
+        "compile": "node ../deployer/lib/src/cli.js compile --contracts ${npm_package_config_contracts} --contracts-dir src/contracts --artifacts-dir ../migrations/src/artifacts",
        "clean": "shx rm -rf ./lib",
        "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis  ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'",
-        "migrate": "yarn build && yarn compile && node ./lib/migrations/index.js",
        "lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'",
        "coverage:report:text": "istanbul report text",
        "coverage:report:html": "istanbul report html && open coverage/index.html",
@@ -27,7 +26,7 @@
        "test:circleci": "yarn test:coverage"
    },
    "config": {
-        "abis": "src/artifacts/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|Arbitrage|EtherDelta|AccountLevels).json",
+        "abis": "../migrations/src/artifacts/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|Arbitrage|EtherDelta|AccountLevels).json",
        "contracts": "Exchange,DummyToken,ZRXToken,Token,WETH9,TokenTransferProxy,MultiSigWallet,MultiSigWalletWithTimeLock,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,MaliciousToken,TokenRegistry,Arbitrage,EtherDelta,AccountLevels"
    },
    "repository": {
@@ -41,12 +40,10 @@
    },
    "homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts/README.md",
    "devDependencies": {
-        "@0xproject/dev-utils": "^0.3.4",
-        "@0xproject/tslint-config": "^0.4.14",
-        "@types/bluebird": "^3.5.3",
+        "@0xproject/dev-utils": "^0.4.0",
+        "@0xproject/tslint-config": "^0.4.17",
        "@types/lodash": "4.14.104",
        "@types/node": "^8.0.53",
-        "@types/request-promise-native": "^1.0.2",
        "@types/yargs": "^10.0.0",
        "chai": "^4.0.1",
        "chai-as-promised": "^7.1.0",
@@ -57,28 +54,23 @@
        "npm-run-all": "^4.1.2",
        "prettier": "^1.11.1",
        "shx": "^0.2.2",
-        "solc": "^0.4.18",
+        "solc": "^0.4.23",
        "tslint": "5.8.0",
        "typescript": "2.7.1",
        "yargs": "^10.0.3"
    },
    "dependencies": {
-        "0x.js": "^0.35.0",
-        "@0xproject/deployer": "^0.3.5",
-        "@0xproject/json-schemas": "^0.7.19",
-        "@0xproject/types": "^0.5.0",
-        "@0xproject/typescript-typings": "^0.0.3",
-        "@0xproject/utils": "^0.5.0",
-        "@0xproject/web3-wrapper": "^0.5.0",
-        "bluebird": "^3.5.0",
+        "0x.js": "^0.37.1",
+        "@0xproject/deployer": "^0.4.2",
+        "@0xproject/types": "^0.6.2",
+        "@0xproject/typescript-typings": "^0.3.0",
+        "@0xproject/utils": "^0.6.0",
+        "@0xproject/web3-wrapper": "^0.6.2",
        "bn.js": "^4.11.8",
        "ethereumjs-abi": "^0.6.4",
        "ethereumjs-util": "^5.1.1",
        "ethers-contracts": "^2.2.1",
-        "isomorphic-fetch": "^2.2.1",
        "lodash": "^4.17.4",
-        "request": "^2.81.0",
-        "web3": "^0.20.0",
-        "web3-eth-abi": "^1.0.0-beta.24"
+        "web3": "^0.20.0"
    }
 }
--- a/packages/contracts/test/ether_token.ts
+++ b/packages/contracts/test/ether_token.ts
@@ -9,7 +9,7 @@ import { ContractName } from '../util/types';

 import { chaiSetup } from './utils/chai_setup';
 import { deployer } from './utils/deployer';
-import { web3, web3Wrapper } from './utils/web3_wrapper';
+import { provider, web3Wrapper } from './utils/web3_wrapper';

 chaiSetup.configure();
 const expect = chai.expect;
@@ -26,7 +26,7 @@ describe('EtherToken', () => {

        const etherToken = await deployer.deployAsync(ContractName.EtherToken);
        etherTokenAddress = etherToken.address;
-        zeroEx = new ZeroEx(web3.currentProvider, {
+        zeroEx = new ZeroEx(provider, {
            gasPrice,
            networkId: constants.TESTRPC_NETWORK_ID,
        });
@@ -51,7 +51,7 @@ describe('EtherToken', () => {
            const initEthBalance = await web3Wrapper.getBalanceInWeiAsync(account);
            const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);

-            const ethToDeposit = new BigNumber(web3.toWei(1, 'ether'));
+            const ethToDeposit = new BigNumber(Web3Wrapper.toWei(new BigNumber(1)));

            const txHash = await zeroEx.etherToken.depositAsync(etherTokenAddress, ethToDeposit, account);
            const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
@@ -76,7 +76,7 @@ describe('EtherToken', () => {
        });

        it('should convert ether tokens to ether with sufficient balance', async () => {
-            const ethToDeposit = new BigNumber(web3.toWei(1, 'ether'));
+            const ethToDeposit = new BigNumber(Web3Wrapper.toWei(new BigNumber(1)));
            await zeroEx.etherToken.depositAsync(etherTokenAddress, ethToDeposit, account);
            const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
            const initEthBalance = await web3Wrapper.getBalanceInWeiAsync(account);
--- a/packages/contracts/test/exchange/core.ts
+++ b/packages/contracts/test/exchange/core.ts
@@ -22,7 +22,7 @@ import { OrderFactory } from '../../util/order_factory';
 import { BalancesByOwner, ContractName, ExchangeContractErrs } from '../../util/types';
 import { chaiSetup } from '../utils/chai_setup';
 import { deployer } from '../utils/deployer';
-import { web3, web3Wrapper } from '../utils/web3_wrapper';
+import { provider, web3Wrapper } from '../utils/web3_wrapper';

 chaiSetup.configure();
 const expect = chai.expect;
@@ -59,22 +59,22 @@ describe('Exchange', () => {
            deployer.deployAsync(ContractName.DummyToken, constants.DUMMY_TOKEN_ARGS),
            deployer.deployAsync(ContractName.DummyToken, constants.DUMMY_TOKEN_ARGS),
        ]);
-        rep = new DummyTokenContract(web3Wrapper, repInstance.abi, repInstance.address);
-        dgd = new DummyTokenContract(web3Wrapper, dgdInstance.abi, dgdInstance.address);
-        zrx = new DummyTokenContract(web3Wrapper, zrxInstance.abi, zrxInstance.address);
+        rep = new DummyTokenContract(repInstance.abi, repInstance.address, provider);
+        dgd = new DummyTokenContract(dgdInstance.abi, dgdInstance.address, provider);
+        zrx = new DummyTokenContract(zrxInstance.abi, zrxInstance.address, provider);
        const tokenTransferProxyInstance = await deployer.deployAsync(ContractName.TokenTransferProxy);
        tokenTransferProxy = new TokenTransferProxyContract(
-            web3Wrapper,
            tokenTransferProxyInstance.abi,
            tokenTransferProxyInstance.address,
+            provider,
        );
        const exchangeInstance = await deployer.deployAsync(ContractName.Exchange, [
            zrx.address,
            tokenTransferProxy.address,
        ]);
-        exchange = new ExchangeContract(web3Wrapper, exchangeInstance.abi, exchangeInstance.address);
+        exchange = new ExchangeContract(exchangeInstance.abi, exchangeInstance.address, provider);
        await tokenTransferProxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { from: accounts[0] });
-        zeroEx = new ZeroEx(web3.currentProvider, {
+        zeroEx = new ZeroEx(provider, {
            exchangeContractAddress: exchange.address,
            networkId: constants.TESTRPC_NETWORK_ID,
        });
--- a/packages/contracts/test/exchange/helpers.ts
+++ b/packages/contracts/test/exchange/helpers.ts
@@ -17,7 +17,7 @@ import { OrderFactory } from '../../util/order_factory';
 import { ContractName } from '../../util/types';
 import { chaiSetup } from '../utils/chai_setup';
 import { deployer } from '../utils/deployer';
-import { web3, web3Wrapper } from '../utils/web3_wrapper';
+import { provider, web3Wrapper } from '../utils/web3_wrapper';

 chaiSetup.configure();
 const expect = chai.expect;
@@ -46,9 +46,9 @@ describe('Exchange', () => {
            zrx.address,
            tokenTransferProxy.address,
        ]);
-        const exchange = new ExchangeContract(web3Wrapper, exchangeInstance.abi, exchangeInstance.address);
+        const exchange = new ExchangeContract(exchangeInstance.abi, exchangeInstance.address, provider);
        await tokenTransferProxy.addAuthorizedAddress(exchange.address, { from: accounts[0] });
-        const zeroEx = new ZeroEx(web3.currentProvider, { networkId: constants.TESTRPC_NETWORK_ID });
+        const zeroEx = new ZeroEx(provider, { networkId: constants.TESTRPC_NETWORK_ID });
        exchangeWrapper = new ExchangeWrapper(exchange, zeroEx);
        const defaultOrderParams = {
            exchangeContractAddress: exchange.address,
--- a/packages/contracts/test/exchange/wrapper.ts
+++ b/packages/contracts/test/exchange/wrapper.ts
@@ -22,7 +22,7 @@ import { OrderFactory } from '../../util/order_factory';
 import { BalancesByOwner, ContractName } from '../../util/types';
 import { chaiSetup } from '../utils/chai_setup';
 import { deployer } from '../utils/deployer';
-import { web3, web3Wrapper } from '../utils/web3_wrapper';
+import { provider, web3Wrapper } from '../utils/web3_wrapper';

 chaiSetup.configure();
 const expect = chai.expect;
@@ -59,28 +59,24 @@ describe('Exchange', () => {
            deployer.deployAsync(ContractName.DummyToken, constants.DUMMY_TOKEN_ARGS),
            deployer.deployAsync(ContractName.DummyToken, constants.DUMMY_TOKEN_ARGS),
        ]);
-        rep = new DummyTokenContract(web3Wrapper, repInstance.abi, repInstance.address);
-        dgd = new DummyTokenContract(web3Wrapper, dgdInstance.abi, dgdInstance.address);
-        zrx = new DummyTokenContract(web3Wrapper, zrxInstance.abi, zrxInstance.address);
+        rep = new DummyTokenContract(repInstance.abi, repInstance.address, provider);
+        dgd = new DummyTokenContract(dgdInstance.abi, dgdInstance.address, provider);
+        zrx = new DummyTokenContract(zrxInstance.abi, zrxInstance.address, provider);
        const tokenRegistryInstance = await deployer.deployAsync(ContractName.TokenRegistry);
-        tokenRegistry = new TokenRegistryContract(
-            web3Wrapper,
-            tokenRegistryInstance.abi,
-            tokenRegistryInstance.address,
-        );
+        tokenRegistry = new TokenRegistryContract(tokenRegistryInstance.abi, tokenRegistryInstance.address, provider);
        const tokenTransferProxyInstance = await deployer.deployAsync(ContractName.TokenTransferProxy);
        tokenTransferProxy = new TokenTransferProxyContract(
-            web3Wrapper,
            tokenTransferProxyInstance.abi,
            tokenTransferProxyInstance.address,
+            provider,
        );
        const exchangeInstance = await deployer.deployAsync(ContractName.Exchange, [
            zrx.address,
            tokenTransferProxy.address,
        ]);
-        exchange = new ExchangeContract(web3Wrapper, exchangeInstance.abi, exchangeInstance.address);
+        exchange = new ExchangeContract(exchangeInstance.abi, exchangeInstance.address, provider);
        await tokenTransferProxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { from: accounts[0] });
-        const zeroEx = new ZeroEx(web3.currentProvider, { networkId: constants.TESTRPC_NETWORK_ID });
+        const zeroEx = new ZeroEx(provider, { networkId: constants.TESTRPC_NETWORK_ID });
        exWrapper = new ExchangeWrapper(exchange, zeroEx);

        const defaultOrderParams = {
--- a/packages/contracts/test/multi_sig_with_time_lock.ts
+++ b/packages/contracts/test/multi_sig_with_time_lock.ts
@@ -15,13 +15,13 @@ import { ContractName, SubmissionContractEventArgs } from '../util/types';

 import { chaiSetup } from './utils/chai_setup';
 import { deployer } from './utils/deployer';
-import { web3, web3Wrapper } from './utils/web3_wrapper';
+import { provider, web3Wrapper } from './utils/web3_wrapper';

 const MULTI_SIG_ABI = artifacts.MultiSigWalletWithTimeLockArtifact.networks[constants.TESTRPC_NETWORK_ID].abi;
 chaiSetup.configure();
 const expect = chai.expect;
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
-const zeroEx = new ZeroEx(web3.currentProvider, { networkId: constants.TESTRPC_NETWORK_ID });
+const zeroEx = new ZeroEx(provider, { networkId: constants.TESTRPC_NETWORK_ID });
 const abiDecoder = new AbiDecoder([MULTI_SIG_ABI]);

 describe('MultiSigWalletWithTimeLock', () => {
@@ -46,16 +46,16 @@ describe('MultiSigWalletWithTimeLock', () => {

    describe('changeTimeLock', () => {
        describe('initially non-time-locked', async () => {
-            before('deploy a walet', async () => {
+            before('deploy a wallet', async () => {
                const multiSigInstance = await deployer.deployAsync(ContractName.MultiSigWalletWithTimeLock, [
                    owners,
                    SIGNATURES_REQUIRED,
                    0,
                ]);
                multiSig = new MultiSigWalletWithTimeLockContract(
-                    web3Wrapper,
                    multiSigInstance.abi,
                    multiSigInstance.address,
+                    provider,
                );
                multiSigWrapper = new MultiSigWrapper((multiSig as any) as MultiSigWalletContract);

@@ -143,16 +143,16 @@ describe('MultiSigWalletWithTimeLock', () => {
            });
        });
        describe('initially time-locked', async () => {
-            before('deploy a walet', async () => {
+            before('deploy a wallet', async () => {
                const multiSigInstance = await deployer.deployAsync(ContractName.MultiSigWalletWithTimeLock, [
                    owners,
                    SIGNATURES_REQUIRED,
                    SECONDS_TIME_LOCKED,
                ]);
                multiSig = new MultiSigWalletWithTimeLockContract(
-                    web3Wrapper,
                    multiSigInstance.abi,
                    multiSigInstance.address,
+                    provider,
                );
                multiSigWrapper = new MultiSigWrapper((multiSig as any) as MultiSigWalletContract);

--- a/packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts
+++ b/packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts
@@ -16,7 +16,7 @@ import { ContractName, SubmissionContractEventArgs, TransactionDataParams } from

 import { chaiSetup } from './utils/chai_setup';
 import { deployer } from './utils/deployer';
-import { web3, web3Wrapper } from './utils/web3_wrapper';
+import { provider, web3Wrapper } from './utils/web3_wrapper';
 const PROXY_ABI = artifacts.TokenTransferProxyArtifact.networks[constants.TESTRPC_NETWORK_ID].abi;
 const MUTISIG_WALLET_WITH_TIME_LOCK_EXCEPT_REMOVE_AUTHORIZED_ADDRESS_ABI =
    artifacts.MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressArtifact.networks[constants.TESTRPC_NETWORK_ID]
@@ -28,7 +28,7 @@ const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
 const abiDecoder = new AbiDecoder([MUTISIG_WALLET_WITH_TIME_LOCK_EXCEPT_REMOVE_AUTHORIZED_ADDRESS_ABI]);

 describe('MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress', () => {
-    const zeroEx = new ZeroEx(web3.currentProvider, { networkId: constants.TESTRPC_NETWORK_ID });
+    const zeroEx = new ZeroEx(provider, { networkId: constants.TESTRPC_NETWORK_ID });
    let owners: string[];
    const requiredApprovals = 2;
    const SECONDS_TIME_LOCKED = 1000000;
@@ -49,9 +49,9 @@ describe('MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress', () => {
        const initialOwner = accounts[0];
        const tokenTransferProxyInstance = await deployer.deployAsync(ContractName.TokenTransferProxy);
        tokenTransferProxy = new TokenTransferProxyContract(
-            web3Wrapper,
            tokenTransferProxyInstance.abi,
            tokenTransferProxyInstance.address,
+            provider,
        );
        await tokenTransferProxy.addAuthorizedAddress.sendTransactionAsync(authorizedAddress, {
            from: initialOwner,
@@ -61,9 +61,9 @@ describe('MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress', () => {
            [owners, requiredApprovals, SECONDS_TIME_LOCKED, tokenTransferProxy.address],
        );
        multiSig = new MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressContract(
-            web3Wrapper,
            multiSigInstance.abi,
            multiSigInstance.address,
+            provider,
        );
        await tokenTransferProxy.transferOwnership.sendTransactionAsync(multiSig.address, {
            from: initialOwner,
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`* @abandeali1 @BMillman19 @dekz @fabioberger @LogvinovLeon @Recmo`