Updated CHANGELOGS

Merge pull request #456 from 0xProject/feature/connect/consolidate-types
Add SignedOrder, Order, and ECSignature types to the types package
2018-03-18 19:22:55 +01:00 · 2018-03-16 11:23:28 -07:00 · 2018-03-16 11:22:43 -07:00 · 2018-03-16 13:32:21 +01:00 · 2018-03-16 10:49:20 +01:00 · 2018-03-16 10:27:12 +01:00
696 changed files with 34891 additions and 21512 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,6 +40,10 @@ jobs:
          command: npm run testrpc -- --db testrpc_snapshot
          background: true
      - run: yarn lerna:run --scope 0x.js test:circleci
+      - save_cache:
+          key: coverage-0xjs-{{ .Environment.CIRCLE_SHA1 }}
+          paths:
+            - ~/repo/packages/0x.js/coverage/lcov.info
  test-contracts:
    docker:
      - image: circleci/node:6.12
@@ -53,6 +57,10 @@ jobs:
          command: npm run testrpc -- --db testrpc_snapshot
          background: true
      - run: yarn lerna:run --scope contracts test:circleci
+      - save_cache:
+          key: coverage-contracts-{{ .Environment.CIRCLE_SHA1 }}
+          paths:
+            - ~/repo/packages/contracts/coverage/lcov.info
  test-deployer:
    docker:
      - image: circleci/node:6.12
@@ -66,6 +74,10 @@ jobs:
          command: npm run testrpc -- --db testrpc_snapshot
          background: true
      - run: yarn lerna:run --scope @0xproject/deployer test:circleci
+      - save_cache:
+          key: coverage-deployer-{{ .Environment.CIRCLE_SHA1 }}
+          paths:
+            - ~/repo/packages/deployer/coverage/lcov.info
  test-rest:
    docker:
      - image: circleci/node:6.12
@@ -79,6 +91,30 @@ jobs:
          command: npm run testrpc -- --db testrpc_snapshot
          background: true
      - run: yarn lerna:run --ignore contracts --ignore 0x.js --ignore @0xproject/deployer test:circleci
+      - save_cache:
+          key: coverage-assert-{{ .Environment.CIRCLE_SHA1 }}
+          paths:
+            - ~/repo/packages/assert/coverage/lcov.info
+      - save_cache:
+          key: coverage-connect-{{ .Environment.CIRCLE_SHA1 }}
+          paths:
+            - ~/repo/packages/connect/coverage/lcov.info
+      - save_cache:
+          key: coverage-dev-utils-{{ .Environment.CIRCLE_SHA1 }}
+          paths:
+            - ~/repo/packages/dev-utils/coverage/lcov.info
+      - save_cache:
+          key: coverage-json-schemas-{{ .Environment.CIRCLE_SHA1 }}
+          paths:
+            - ~/repo/packages/json-schemas/coverage/lcov.info
+      - save_cache:
+          key: coverage-subproviders-{{ .Environment.CIRCLE_SHA1 }}
+          paths:
+            - ~/repo/packages/subproviders/coverage/lcov.info
+      - save_cache:
+          key: coverage-sol-cov-{{ .Environment.CIRCLE_SHA1 }}
+          paths:
+            - ~/repo/packages/sol-cov/coverage/lcov.info
  lint:
    working_directory: ~/repo
    docker:
@@ -97,6 +133,42 @@ jobs:
          keys:
            - repo-{{ .Environment.CIRCLE_SHA1 }}
      - run: yarn prettier:ci
+  submit-coverage:
+    docker:
+      - image: circleci/node:6.12
+    working_directory: ~/repo
+    steps:
+      - restore_cache:
+          keys:
+            - repo-{{ .Environment.CIRCLE_SHA1 }}
+      - restore_cache:
+          keys:
+            - coverage-contracts-{{ .Environment.CIRCLE_SHA1 }}
+      - restore_cache:
+          keys:
+            - coverage-assert-{{ .Environment.CIRCLE_SHA1 }}
+      - restore_cache:
+          keys:
+            - coverage-connect-{{ .Environment.CIRCLE_SHA1 }}
+      - restore_cache:
+          keys:
+            - coverage-dev-utils-{{ .Environment.CIRCLE_SHA1 }}
+      - restore_cache:
+          keys:
+            - coverage-json-schemas-{{ .Environment.CIRCLE_SHA1 }}
+      - restore_cache:
+          keys:
+            - coverage-subproviders-{{ .Environment.CIRCLE_SHA1 }}
+      - restore_cache:
+          keys:
+            - coverage-sol-cov-{{ .Environment.CIRCLE_SHA1 }}
+      - restore_cache:
+          keys:
+            - coverage-deployer-{{ .Environment.CIRCLE_SHA1 }}
+      - restore_cache:
+          keys:
+            - coverage-0xjs-{{ .Environment.CIRCLE_SHA1 }}
+      - run: yarn report_coverage
 workflows:
  version: 2
  main:
@@ -120,3 +192,9 @@ workflows:
      - lint:
          requires:
            - build
+      - submit-coverage:
+          requires:
+            - test-0xjs
+            - test-deployer
+            - test-rest
+            - test-contracts
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+# EditorConfig  http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# All files
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 4
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.sol linguist-language=Solidity
--- a/.gitignore
+++ b/.gitignore
@@ -68,6 +68,13 @@ generated_docs/
 TODO.md

 packages/website/public/bundle*
+packages/react-docs/example/public/bundle*

 # generated binaries
 bin/
+
+# generated contract artifacts
+packages/contracts/src/artifacts
+
+# Monorepo scripts
+packages/*/scripts/
--- a/.npmignore
+++ b/.npmignore
@@ -1,6 +0,0 @@
-.*
-tsconfig.json
-tslint.json
-webpack.config.js
-yarn.lock
-docs
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,4 +1,5 @@
 lib
-generated
 .nyc_output
-/packages/contracts/build/contracts
+/packages/contracts/src/artifacts
+package.json
+scripts/postpublish_utils.js
--- a/1
+++ b/1
@@ -0,0 +1 @@
+*        @abandeali1 @BMillman19 @dekz @fabioberger @LogvinovLeon @Recmo
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,9 +8,9 @@ If you'd like to contribute to 0x protocol, please fork the repo, fix, commit an

 We encourage a “PR early” approach so create the PR as early as possible even without the fix/feature ready, so that devs and other contributors know you have picked up the issue. These early PRs should indicate an 'in progress' status by adding the '[WIP]' prefix to the PR title. Please make sure your contributions adhere to our coding guidelines:

-* Pull requests adding features or refactoring should be opened against the `development` branch
-* Pull requests fixing bugs in the latest release version should be opened again the `master` branch
-* Write [good commit messages](https://chris.beams.io/posts/git-commit/)
+*   Pull requests adding features or refactoring should be opened against the `development` branch
+*   Pull requests fixing bugs in the latest release version should be opened again the `master` branch
+*   Write [good commit messages](https://chris.beams.io/posts/git-commit/)

 ### Code quality

@@ -23,7 +23,7 @@ If the sub-package you are modifying has a `CHANGELOG.md` file, make sure to add

 ### Styleguide

-We use [TSLint](https://palantir.github.io/tslint/) with [custom configs](https://github.com/0xProject/0x.js/tree/development/packages/tslint-config) to keep our code style consistent.
+We use [TSLint](https://palantir.github.io/tslint/) with [custom configs](https://github.com/0xProject/0x-monorepo/tree/development/packages/tslint-config) to keep our code style consistent.

 To lint your code just run: `yarn lint`

@@ -31,10 +31,10 @@ We also use [Prettier](https://prettier.io/) to auto-format our code. Be sure to

 If using the Atom text editor, we recommend you install the following packages:

-* [atom-typescript](https://atom.io/packages/atom-typescript)
-* [linter-tslint](https://atom.io/packages/linter-tslint)
-* [prettier-atom](https://atom.io/packages/prettier-atom)
-* [language-ethereum](https://atom.io/packages/language-ethereum)
+*   [atom-typescript](https://atom.io/packages/atom-typescript)
+*   [linter-tslint](https://atom.io/packages/linter-tslint)
+*   [prettier-atom](https://atom.io/packages/prettier-atom)
+*   [language-ethereum](https://atom.io/packages/language-ethereum)

 Our CI will also run TSLint and Prettier as a part of the test run when you submit your PR. Make sure that the CI tests pass for your contribution.

--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -22,15 +22,21 @@

 ## Types of changes

-<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply:
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+
+*   [ ] Bug fix (non-breaking change which fixes an issue)
+*   [ ] New feature (non-breaking change which adds functionality)
+*   [ ] Breaking change (fix or feature that would cause existing functionality to change)

 ## Checklist:
+
 <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->

 <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->

-* [ ] Change requires a change to the documentation.
-* [ ] Added tests to cover my changes.
+*   [ ] 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.
+*   [ ] 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
@@ -4,54 +4,65 @@

 [0x][website-url] is an open protocol that facilitates trustless, low friction exchange of Ethereum-based assets. A full description of the protocol may be found in our [whitepaper][whitepaper-url].

-This repository contains all the 0x developer tools written in TypeScript. Our hope is that these tools make it easy to build Relayers and other DApps that use the 0x protocol.
+This repository is a monorepo including the 0x protocol smart contracts and numerous developer tools. Each public sub-package is independently published to NPM.

 [website-url]: https://0xproject.com/
 [whitepaper-url]: https://0xproject.com/pdfs/0x_white_paper.pdf

-[![CircleCI](https://circleci.com/gh/0xProject/0x.js.svg?style=svg&circle-token=61bf7cd8c9b4e11b132089dfcffdd1be277d1e0c)](https://circleci.com/gh/0xProject/0x.js)
-[![Coverage Status](https://coveralls.io/repos/github/0xProject/0x.js/badge.svg?branch=master&t=fp0cXD)](https://coveralls.io/github/0xProject/0x.js?branch=master)
+[![CircleCI](https://circleci.com/gh/0xProject/0x-monorepo.svg?style=svg&circle-token=61bf7cd8c9b4e11b132089dfcffdd1be277d1e0c)](https://circleci.com/gh/0xProject/0x-monorepo)
+[![Coverage Status](https://coveralls.io/repos/github/0xProject/0x-monorepo/badge.svg?branch=development)](https://coveralls.io/github/0xProject/0x-monorepo?branch=development)
 [![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.js.svg?token=7c22e5c72acf39d3ead8d29c5d9bb38f9096df3e643024dcedd53ab732847be1&ts=1496426342666)](https://greenkeeper.io/)
+[![Greenkeeper badge](https://badges.greenkeeper.io/0xProject/0x-monorepo.svg?token=7c22e5c72acf39d3ead8d29c5d9bb38f9096df3e643024dcedd53ab732847be1&ts=1496426342666)](https://greenkeeper.io/)

 ### Published Packages

-| Package                                                                                | Version                                                                                                                                           | Description                                                        |
-| -------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------ |
-| [`0x.js`](/packages/0x.js)                                                             | [![npm](https://img.shields.io/npm/v/0x.js.svg)](https://www.npmjs.com/package/0x.js)                                                             | A Javascript library for interacting with the 0x protocol          |
-| [`chai-as-promised-typescript-typings`](/packages/chai-as-promised-typescript-typings) | [![npm](https://img.shields.io/npm/v/chai-as-promised-typescript-typings.svg)](https://www.npmjs.com/package/chai-as-promised-typescript-typings) | Chai as promised typescript typings                                |
-| [`chai-typescript-typings`](/packages/chai-typescript-typings)                         | [![npm](https://img.shields.io/npm/v/chai-typescript-typings.svg)](https://www.npmjs.com/package/chai-typescript-typings)                         | Chai typescript typings                                            |
-| [`web3-typescript-typings`](/packages/web3-typescript-typings)                         | [![npm](https://img.shields.io/npm/v/web3-typescript-typings.svg)](https://www.npmjs.com/package/web3-typescript-typings)                         | Web3 typescript typings                                            |
-| [`@0xproject/abi-gen`](/packages/abi-gen)                                              | [![npm](https://img.shields.io/npm/v/@0xproject/abi-gen.svg)](https://www.npmjs.com/package/@0xproject/abi-gen)                                   | Tool to generate TS wrappers from smart contract ABIs              |
-| [`@0xproject/assert`](/packages/assert)                                                | [![npm](https://img.shields.io/npm/v/@0xproject/assert.svg)](https://www.npmjs.com/package/@0xproject/assert)                                     | Type and schema assertions used by our packages                    |
-| [`@0xproject/connect`](/packages/connect)                                              | [![npm](https://img.shields.io/npm/v/@0xproject/connect.svg)](https://www.npmjs.com/package/@0xproject/connect)                                   | A Javascript library for interacting with the standard relayer api |
-| [`@0xproject/dev-utils`](/packages/dev-utils)                                          | [![npm](https://img.shields.io/npm/v/@0xproject/dev-utils.svg)](https://www.npmjs.com/package/@0xproject/dev-utils)                               | Dev utils to be shared across 0x projects and packages             |
-| [`@0xproject/json-schemas`](/packages/json-schemas)                                    | [![npm](https://img.shields.io/npm/v/@0xproject/json-schemas.svg)](https://www.npmjs.com/package/@0xproject/json-schemas)                         | 0x-related json schemas                                            |
-| [`@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                                           |
-| [`@0xproject/utils`](/packages/utils)                                                  | [![npm](https://img.shields.io/npm/v/@0xproject/utils.svg)](https://www.npmjs.com/package/@0xproject/utils)                                       | Shared utilities                                                   |
-| [`@0xproject/web3-wrapper`](/packages/web3-wrapper)                                    | [![npm](https://img.shields.io/npm/v/@0xproject/web3-wrapper.svg)](https://www.npmjs.com/package/@0xproject/web3-wrapper)                         | Web3 wrapper                                                       |
+| Package                                               | Version                                                                                                                     | Description                                                                 |
+| ----------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
+| [`0x.js`](/packages/0x.js)                            | [![npm](https://img.shields.io/npm/v/0x.js.svg)](https://www.npmjs.com/package/0x.js)                                       | A Javascript library for interacting with the 0x protocol                   |
+| [`@0xproject/abi-gen`](/packages/abi-gen)             | [![npm](https://img.shields.io/npm/v/@0xproject/abi-gen.svg)](https://www.npmjs.com/package/@0xproject/abi-gen)             | Tool to generate TS wrappers from smart contract ABIs                       |
+| [`@0xproject/assert`](/packages/assert)               | [![npm](https://img.shields.io/npm/v/@0xproject/assert.svg)](https://www.npmjs.com/package/@0xproject/assert)               | Type and schema assertions used by our packages                             |
+| [`@0xproject/base-contract`](/packages/base-contract) | [![npm](https://img.shields.io/npm/v/@0xproject/base-contract.svg)](https://www.npmjs.com/package/@0xproject/base-contract) | BaseContract used by auto-generated `abi-gen` wrapper contracts             |
+| [`@0xproject/connect`](/packages/connect)             | [![npm](https://img.shields.io/npm/v/@0xproject/connect.svg)](https://www.npmjs.com/package/@0xproject/connect)             | A Javascript library for interacting with the Standard Relayer API          |
+| [`@0xproject/deployer`](/packages/deployer)           | [![npm](https://img.shields.io/npm/v/@0xproject/deployer.svg)](https://www.npmjs.com/package/@0xproject/deployer)           | Solidity project compiler and deployer framework                            |
+| [`@0xproject/dev-utils`](/packages/dev-utils)         | [![npm](https://img.shields.io/npm/v/@0xproject/dev-utils.svg)](https://www.npmjs.com/package/@0xproject/dev-utils)         | Dev utils to be shared across 0x projects and packages                      |
+| [`@0xproject/json-schemas`](/packages/json-schemas)   | [![npm](https://img.shields.io/npm/v/@0xproject/json-schemas.svg)](https://www.npmjs.com/package/@0xproject/json-schemas)   | 0x-related json schemas                                                     |
+| [`@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/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                                                    |
+| [`@0xproject/utils`](/packages/utils)                 | [![npm](https://img.shields.io/npm/v/@0xproject/utils.svg)](https://www.npmjs.com/package/@0xproject/utils)                 | Shared utilities                                                            |
+| [`@0xproject/web3-wrapper`](/packages/web3-wrapper)   | [![npm](https://img.shields.io/npm/v/@0xproject/web3-wrapper.svg)](https://www.npmjs.com/package/@0xproject/web3-wrapper)   | Web3 wrapper                                                                |
+
+### TypeScript Typings
+
+| Package                                                                                | Version                                                                                                                                           | Description                                                             |
+| -------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------- |
+| [`chai-as-promised-typescript-typings`](/packages/chai-as-promised-typescript-typings) | [![npm](https://img.shields.io/npm/v/chai-as-promised-typescript-typings.svg)](https://www.npmjs.com/package/chai-as-promised-typescript-typings) | Chai as promised typescript typings                                     |
+| [`chai-typescript-typings`](/packages/chai-typescript-typings)                         | [![npm](https://img.shields.io/npm/v/chai-typescript-typings.svg)](https://www.npmjs.com/package/chai-typescript-typings)                         | Chai typescript typings                                                 |
+| [`ethers-typescript-typings`](/packages/ethers-typescript-typings)                     | [![npm](https://img.shields.io/npm/v/@0xproject/deployer.svg)](https://www.npmjs.com/package/ethers-typescript-typings)                           | [Ethers.js](https://github.com/ethers-io/ethers.js/) typescript typings |
+| [`web3-typescript-typings`](/packages/web3-typescript-typings)                         | [![npm](https://img.shields.io/npm/v/web3-typescript-typings.svg)](https://www.npmjs.com/package/web3-typescript-typings)                         | Web3 typescript typings                                                 |

 ### Private Packages

-| Package                                                     | Description                                                      |
-| ----------------------------------------------------------- | ---------------------------------------------------------------- |
-| [`@0xproject/contracts`](/packages/contracts)               | 0x solidity smart contracts & tests                              |
-| [`@0xproject/monorepo-scripts`](/packages/monorepo-scripts) | Shared monorepo scripts                                          |
-| [`@0xproject/testnet-faucets`](/packages/testnet-faucets)   | A faucet micro-service that dispenses test ERC20 tokens or Ether |
-| [`@0xproject/website`](/packages/website)                   | 0x website & Portal DApp                                         |
+| Package                                                         | Description                                                      |
+| --------------------------------------------------------------- | ---------------------------------------------------------------- |
+| [`@0xproject/contracts`](/packages/contracts)                   | 0x solidity smart contracts & tests                              |
+| [`@0xproject/react-docs-example`](/packages/react-docs-example) | Example documentation site created with `@0xproject/react-docs`  |
+| [`@0xproject/testnet-faucets`](/packages/testnet-faucets)       | A faucet micro-service that dispenses test ERC20 tokens or Ether |
+| [`@0xproject/website`](/packages/website)                       | 0x website & Portal DApp                                         |

 ## Usage

 Dedicated documentation pages:

-* [0x.js Library](https://0xproject.com/docs/0xjs)
-* [0x Connect](https://0xproject.com/docs/connect)
-* [Smart contracts](https://0xproject.com/docs/contracts)
-* [Standard Relayer API](https://github.com/0xProject/standard-relayer-api/blob/master/README.md)
+*   [0x.js Library](https://0xproject.com/docs/0xjs)
+*   [0x Connect](https://0xproject.com/docs/connect)
+*   [Smart contracts](https://0xproject.com/docs/contracts)
+*   [Standard Relayer API](https://github.com/0xProject/standard-relayer-api/blob/master/README.md)

 ## Contributing

@@ -81,6 +92,12 @@ Build all packages
 yarn lerna:run build
 ```

+Continuously rebuild on exchange
+
+```bash
+yarn dev
+```
+
 ### Lint

 Lint all packages
--- a/lerna.json
+++ b/lerna.json
@@ -1,7 +1,17 @@
 {
    "lerna": "2.5.1",
    "packages": ["packages/*"],
+    "commands": {
+        "publish": {
+            "allowBranch": "development"
+        }
+    },
    "version": "independent",
+    "commands": {
+        "publish": {
+            "ignore": ["test/**/*", "*.md", "scripts", "lib", "tslint.json", "tsconfig.json"]
+        }
+    },
    "npmClient": "yarn",
    "useWorkspaces": true
 }
--- a/package.json
+++ b/package.json
@@ -1,11 +1,13 @@
 {
    "private": true,
-    "name": "0x.js",
+    "name": "0x-monorepo",
    "workspaces": ["packages/*"],
    "scripts": {
+        "dev": "lerna run --parallel build:watch",
        "testrpc": "testrpc -p 8545 --networkId 50 -m \"${npm_package_config_mnemonic}\"",
        "prettier": "prettier --write '**/*.{ts,tsx,json,md}' --config .prettierrc",
        "prettier:ci": "prettier --list-different '**/*.{ts,tsx,json,md}' --config .prettierrc",
+        "report_coverage": "lcov-result-merger 'packages/*/coverage/lcov.info' | coveralls",
        "lerna:run": "lerna run",
        "lerna:rebuild": "lerna run clean; lerna run build;",
        "lerna:publish":
@@ -15,12 +17,12 @@
        "mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic"
    },
    "devDependencies": {
-        "@0xproject/utils": "^0.2.0",
+        "@0xproject/utils": "^0.4.1",
        "async-child-process": "^1.1.1",
+        "coveralls": "^3.0.0",
        "ethereumjs-testrpc": "^6.0.3",
+        "lcov-result-merger": "^2.0.0",
        "lerna": "^2.5.1",
-        "prettier": "1.9.2",
-        "publish-release": "0xproject/publish-release",
-        "semver-sort": "^0.0.4"
+        "prettier": "^1.11.1"
    }
 }
--- a/packages/0x.js/.npmignore
+++ b/packages/0x.js/.npmignore
@@ -0,0 +1,10 @@
+.*
+tsconfig.json
+webpack.config.js
+yarn-error.log
+test/
+/src/
+/_bundles/
+/contract_templates/
+/generated_docs/
+/scripts/
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -1,5 +1,40 @@
 # CHANGELOG

+## v0.33.2 - _March 18, 2018_
+
+    * Consolidate all `console.log` calls into `logUtils` in the `@0xproject/utils` package (#452)
+    * Consolidate `Order`, `SignedOrder`, and `ECSignature` into the `@0xproject/types` package (#456)
+
+## v0.33.1 - _March 8, 2018_
+
+    * Add missing EthersJs typescript typings as dependency
+
+## v0.33.0 - _March 4, 2018_
+
+    * Validate and lowercase all addresses in public methods (#373)
+    * Improve validation to force passing contract addresses on private networks (#385)
+    * Change `LogErrorContractEventArgs.errorId` type from `BigNumber` to `number` (#413)
+    * Rename all public `_unsubscribeAll` methods to `unsubscribeAll` (#415)
+    * Move web3 typings from devDep to dep since cannot use this package without it (#429)
+
+## v0.32.2 - _February 9, 2018_
+
+    * Fix publishing issue where .npmignore was not properly excluding undesired content (#389)
+
+## v0.32.1 - _February 7, 2018_
+
+    * Reorganized `BlockParamLiteral` export into `@0xproject/types` package (#355)
+    * Now using `abi-gen` package to generate ContractEventArgs types (#371)
+
+## v0.32.0 - _February 5, 2018_
+
+    * Add `zeroEx.etherToken.getContractAddressIfExists` (#350)
+    * Fixed the bug causing order watcher to throw if there is an event with the same signature but different indexed fields (#366)
+
+## v0.31.1 - _February 1, 2018_
+
+    * Fix the bug causing order watcher to throw if makerToken === zrx (#357)
+
 ## v0.31.0 - _January 30, 2018_

    * Add the `shouldAddPersonalMessagePrefix` parameter to `signOrderHashAsync` so that the
--- a/packages/0x.js/README.md
+++ b/packages/0x.js/README.md
@@ -18,11 +18,20 @@ npm install 0x.js --save
 import { ZeroEx } from '0x.js';
 ```

+If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
+
+```
+"include": [
+    "./node_modules/web3-typescript-typings/index.d.ts",
+    "./node_modules/ethers-typescript-typings/index.d.ts"
+]
+```
+
 #### UMD:

 **Install**

-Download the UMD module from our [releases page](https://github.com/0xProject/0x.js/releases) and add it to your project.
+Download the UMD module from our [releases page](https://github.com/0xProject/0x-monorepo/releases) and add it to your project.

 **Import**

--- a/packages/0x.js/contract_templates/contract.mustache
+++ b/packages/0x.js/contract_templates/contract.mustache
@@ -1,25 +0,0 @@
-/**
- * This file is auto-generated using abi-gen. Don't edit directly.
- * Templates can be found at https://github.com/0xProject/0x.js/tree/development/packages/abi-gen-templates.
- */
-// tslint:disable-next-line:no-unused-variable
-import { TxData, TxDataPayable } from '@0xproject/types';
-import { BigNumber, classUtils, promisify } from '@0xproject/utils';
-import * as Web3 from 'web3';
-
-import {BaseContract} from './base_contract';
-
-export class {{contractName}}Contract extends BaseContract {
-{{#each methods}}
-    {{#this.constant}}
-    {{> call contractName=../contractName}}
-    {{/this.constant}}
-    {{^this.constant}}
-    {{> tx contractName=../contractName}}
-    {{/this.constant}}
-{{/each}}
-    constructor(web3ContractInstance: Web3.ContractInstance, defaults: Partial<TxData>) {
-        super(web3ContractInstance, defaults);
-        classUtils.bindAll(this, ['web3ContractInstance', 'defaults']);
-    }
-} // tslint:disable:max-file-line-count
--- a/packages/0x.js/contract_templates/partials/call.mustache
+++ b/packages/0x.js/contract_templates/partials/call.mustache
@@ -1,15 +0,0 @@
-public {{this.name}} = {
-    async callAsync(
-    {{> typed_params inputs=inputs}}
-        defaultBlock?: Web3.BlockParam,
-    ): Promise<{{> return_type outputs=outputs}}> {
-        const self = this as {{contractName}}Contract;
-        const result = await promisify<{{> return_type outputs=outputs}}>(
-            self.web3ContractInstance.{{this.name}}.call,
-            self.web3ContractInstance,
-        )(
-            {{> params inputs=inputs}}
-        );
-        return result;
-    },
-};
--- a/packages/0x.js/contract_templates/partials/return_type.mustache
+++ b/packages/0x.js/contract_templates/partials/return_type.mustache
@@ -1,6 +0,0 @@
-{{#singleReturnValue}}
-{{#returnType outputs.0.type}}{{/returnType}}
-{{/singleReturnValue}}
-{{^singleReturnValue}}
-[{{#each outputs}}{{#returnType type}}{{/returnType}}{{#unless @last}}, {{/unless}}{{/each}}]
-{{/singleReturnValue}}
--- a/packages/0x.js/contract_templates/partials/tx.mustache
+++ b/packages/0x.js/contract_templates/partials/tx.mustache
@@ -1,51 +0,0 @@
-public {{this.name}} = {
-    async sendTransactionAsync(
-    {{> typed_params inputs=inputs}}
-    {{#this.payable}}
-        txData: TxDataPayable = {},
-    {{/this.payable}}
-    {{^this.payable}}
-        txData: TxData = {},
-    {{/this.payable}}
-    ): Promise<string> {
-        const self = this as {{contractName}}Contract;
-        const txDataWithDefaults = await self.applyDefaultsToTxDataAsync(
-            txData,
-            self.{{this.name}}.estimateGasAsync.bind(
-                self,
-                {{> params inputs=inputs}}
-            ),
-        );
-        const txHash = await promisify<string>(
-            self.web3ContractInstance.{{this.name}}, self.web3ContractInstance,
-        )(
-            {{> params inputs=inputs}}
-            txDataWithDefaults,
-        );
-        return txHash;
-    },
-    async estimateGasAsync(
-    {{> typed_params inputs=inputs}}
-        txData: TxData = {},
-    ): Promise<number> {
-        const self = this as {{contractName}}Contract;
-        const txDataWithDefaults = await self.applyDefaultsToTxDataAsync(
-            txData,
-        );
-        const gas = await promisify<number>(
-            self.web3ContractInstance.{{this.name}}.estimateGas, self.web3ContractInstance,
-        )(
-            {{> params inputs=inputs}}
-            txDataWithDefaults,
-        );
-        return gas;
-    },
-    getABIEncodedTransactionData(
-    {{> typed_params inputs=inputs}}
-        txData: TxData = {},
-    ): string {
-        const self = this as {{contractName}}Contract;
-        const abiEncodedTransactionData = self.web3ContractInstance.{{this.name}}.getData();
-        return abiEncodedTransactionData;
-    },
-};
--- a/packages/0x.js/contract_templates/partials/typed_params.mustache
+++ b/packages/0x.js/contract_templates/partials/typed_params.mustache
@@ -1,3 +0,0 @@
-{{#each inputs}}
-    {{name}}: {{#parameterType type}}{{/parameterType}},
-{{/each}}
--- a/packages/0x.js/coverage/.gitkeep
+++ b/packages/0x.js/coverage/.gitkeep
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
 {
    "name": "0x.js",
-    "version": "0.31.0",
+    "version": "0.33.1",
    "description": "A javascript library for interacting with the 0x protocol",
    "keywords": [
        "0x.js",
@@ -12,38 +12,48 @@
    "main": "lib/src/index.js",
    "types": "lib/src/index.d.ts",
    "scripts": {
+        "build:watch": "tsc -w",
        "prebuild": "run-s clean generate_contract_wrappers",
        "build": "run-p build:umd:prod build:commonjs; exit 0;",
-        "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_DIR",
+        "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",
-        "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abiGlob 'src/artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --templates contract_templates --output src/contract_wrappers/generated",
+        "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'",
        "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
-        "test:circleci": "run-s test:coverage report_test_coverage",
+        "test:circleci": "run-s test:coverage",
        "test": "run-s clean test:commonjs",
-        "test:coverage": "nyc npm run test --all",
-        "report_test_coverage": "nyc report --reporter=text-lcov | coveralls",
+        "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;",
-        "clean": "shx rm -rf _bundles lib test_temp",
+        "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;",
+        "build:commonjs": "tsc && copyfiles -u 2 './src/artifacts/**/*.json' ./lib/src/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"
    },
    "config": {
-        "artifacts": "TokenTransferProxy Exchange TokenRegistry Token EtherToken"
+        "artifacts": "TokenTransferProxy Exchange TokenRegistry Token EtherToken",
+        "postpublish": {
+            "assets": ["_bundles/index.js", "_bundles/index.min.js"],
+            "docPublishConfigs": {
+                "extraFileIncludes": ["../types/src/index.ts"],
+                "s3BucketPath": "s3://0xjs-docs-jsons/",
+                "s3StagingBucketPath": "s3://staging-0xjs-docs-jsons/"
+            }
+        }
    },
    "repository": {
        "type": "git",
-        "url": "https://github.com/0xProject/0x.js"
+        "url": "https://github.com/0xProject/0x-monorepo"
    },
    "license": "Apache-2.0",
    "engines": {
        "node": ">=6.0.0"
    },
    "devDependencies": {
-        "@0xproject/abi-gen": "^0.1.5",
-        "@0xproject/dev-utils": "^0.0.8",
-        "@0xproject/tslint-config": "^0.4.5",
+        "@0xproject/abi-gen": "^0.2.5",
+        "@0xproject/dev-utils": "^0.2.1",
+        "@0xproject/monorepo-scripts": "^0.1.12",
+        "@0xproject/tslint-config": "^0.4.10",
        "@types/bintrees": "^1.0.2",
        "@types/jsonschema": "^1.1.1",
        "@types/lodash": "^4.14.86",
@@ -54,44 +64,51 @@
        "awesome-typescript-loader": "^3.1.3",
        "chai": "^4.0.1",
        "chai-as-promised": "^7.1.0",
-        "chai-as-promised-typescript-typings": "^0.0.7",
+        "chai-as-promised-typescript-typings": "^0.0.10",
        "chai-bignumber": "^2.0.1",
-        "chai-typescript-typings": "^0.0.2",
+        "chai-typescript-typings": "^0.0.4",
        "copyfiles": "^1.2.0",
-        "coveralls": "^3.0.0",
        "dirty-chai": "^2.0.1",
        "json-loader": "^0.5.4",
        "mocha": "^4.0.1",
        "npm-run-all": "^4.1.2",
        "nyc": "^11.0.1",
        "opn-cli": "^3.1.0",
+        "prettier": "^1.11.1",
        "request": "^2.81.0",
-        "request-promise-native": "^1.0.4",
+        "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": "~0.8.0",
-        "typescript": "~2.6.1",
+        "typedoc": "0xProject/typedoc",
+        "types-bn": "^0.0.1",
+        "typescript": "2.7.1",
        "web3-provider-engine": "^13.0.1",
-        "web3-typescript-typings": "^0.9.7",
        "webpack": "^3.1.0"
    },
    "dependencies": {
-        "@0xproject/assert": "^0.0.14",
-        "@0xproject/json-schemas": "^0.7.6",
-        "@0xproject/types": "^0.1.7",
-        "@0xproject/utils": "^0.2.3",
-        "@0xproject/web3-wrapper": "^0.1.8",
+        "@0xproject/assert": "^0.2.0",
+        "@0xproject/base-contract": "^0.0.3",
+        "@0xproject/json-schemas": "^0.7.14",
+        "@0xproject/types": "^0.3.1",
+        "@0xproject/utils": "^0.4.1",
+        "@0xproject/web3-wrapper": "^0.2.1",
        "bintrees": "^1.0.2",
        "bn.js": "^4.11.8",
        "ethereumjs-abi": "^0.6.4",
        "ethereumjs-blockstream": "^2.0.6",
        "ethereumjs-util": "^5.1.1",
-        "js-sha3": "^0.6.1",
+        "ethers-contracts": "^2.2.1",
+        "ethers-typescript-typings": "^0.0.2",
+        "js-sha3": "^0.7.0",
        "lodash": "^4.17.4",
        "uuid": "^3.1.0",
-        "web3": "^0.20.0"
+        "web3": "^0.20.0",
+        "web3-typescript-typings": "^0.10.0"
+    },
+    "publishConfig": {
+      "access": "public"
    }
 }
--- a/packages/0x.js/scripts/postpublish.js
+++ b/packages/0x.js/scripts/postpublish.js
@@ -1,40 +0,0 @@
-const execAsync = require('async-child-process').execAsync;
-const postpublish_utils = require('../../../scripts/postpublish_utils');
-const packageJSON = require('../package.json');
-
-const cwd = __dirname + '/..';
-const subPackageName = packageJSON.name;
-const S3BucketPath = 's3://0xjs-docs-jsons/';
-
-let tag;
-let version;
-postpublish_utils
-    .getLatestTagAndVersionAsync(subPackageName)
-    .then(function(result) {
-        tag = result.tag;
-        version = result.version;
-        const releaseName = postpublish_utils.getReleaseName(subPackageName, version);
-        const assets = [__dirname + '/../_bundles/index.js', __dirname + '/../_bundles/index.min.js'];
-        return postpublish_utils.publishReleaseNotes(tag, releaseName, assets);
-    })
-    .then(function(release) {
-        console.log('POSTPUBLISH: Release successful, generating docs...');
-        const jsonFilePath = __dirname + '/../' + postpublish_utils.generatedDocsDirectoryName + '/index.json';
-        return execAsync('JSON_FILE_PATH=' + jsonFilePath + ' PROJECT_DIR=' + __dirname + '/.. yarn docs:json', {
-            cwd,
-        });
-    })
-    .then(function(result) {
-        if (result.stderr !== '') {
-            throw new Error(result.stderr);
-        }
-        const fileName = 'v' + version + '.json';
-        console.log('POSTPUBLISH: Doc generation successful, uploading docs... as ', fileName);
-        const s3Url = S3BucketPath + fileName;
-        return execAsync('S3_URL=' + s3Url + ' yarn upload_docs_json', {
-            cwd,
-        });
-    })
-    .catch(function(err) {
-        throw err;
-    });
--- a/packages/0x.js/src/0x.ts
+++ b/packages/0x.js/src/0x.ts
@@ -1,5 +1,6 @@
 import { schemas, SchemaValidator } from '@0xproject/json-schemas';
-import { BigNumber, intervalUtils } from '@0xproject/utils';
+import { ECSignature, Order, SignedOrder, TransactionReceiptWithDecodedLogs } from '@0xproject/types';
+import { AbiDecoder, BigNumber, intervalUtils } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
@@ -12,16 +13,9 @@ import { TokenTransferProxyWrapper } from './contract_wrappers/token_transfer_pr
 import { TokenWrapper } from './contract_wrappers/token_wrapper';
 import { OrderStateWatcher } from './order_watcher/order_state_watcher';
 import { zeroExConfigSchema } from './schemas/zero_ex_config_schema';
-import {
-    ECSignature,
-    Order,
-    SignedOrder,
-    TransactionReceiptWithDecodedLogs,
-    Web3Provider,
-    ZeroExConfig,
-    ZeroExError,
-} from './types';
-import { AbiDecoder } from './utils/abi_decoder';
+import { zeroExPrivateNetworkConfigSchema } from './schemas/zero_ex_private_network_config_schema';
+import { zeroExPublicNetworkConfigSchema } from './schemas/zero_ex_public_network_config_schema';
+import { Web3Provider, ZeroExConfig, ZeroExError } from './types';
 import { assert } from './utils/assert';
 import { constants } from './utils/constants';
 import { decorators } from './utils/decorators';
@@ -82,8 +76,9 @@ export class ZeroEx {
        assert.isHexString('data', data);
        assert.doesConformToSchema('signature', signature, schemas.ecSignatureSchema);
        assert.isETHAddressHex('signerAddress', signerAddress);
+        const normalizedSignerAddress = signerAddress.toLowerCase();

-        const isValidSignature = signatureUtils.isValidSignature(data, signature, signerAddress);
+        const isValidSignature = signatureUtils.isValidSignature(data, signature, normalizedSignerAddress);
        return isValidSignature;
    }
    /**
@@ -171,7 +166,10 @@ export class ZeroEx {
     */
    constructor(provider: Web3Provider, config: ZeroExConfig) {
        assert.isWeb3Provider('provider', provider);
-        assert.doesConformToSchema('config', config, zeroExConfigSchema);
+        assert.doesConformToSchema('config', config, zeroExConfigSchema, [
+            zeroExPrivateNetworkConfigSchema,
+            zeroExPublicNetworkConfigSchema,
+        ]);
        const artifactJSONs = _.values(artifacts);
        const abiArrays = _.map(artifactJSONs, artifact => artifact.abi);
        this._abiDecoder = new AbiDecoder(abiArrays);
@@ -253,6 +251,7 @@ export class ZeroEx {
    ): Promise<ECSignature> {
        assert.isHexString('orderHash', orderHash);
        await assert.isSenderAddressAsync('signerAddress', signerAddress, this._web3Wrapper);
+        const normalizedSignerAddress = signerAddress.toLowerCase();

        let msgHashHex = orderHash;
        if (shouldAddPersonalMessagePrefix) {
@@ -261,7 +260,7 @@ export class ZeroEx {
            msgHashHex = ethUtil.bufferToHex(msgHashBuff);
        }

-        const signature = await this._web3Wrapper.signTransactionAsync(signerAddress, msgHashHex);
+        const signature = await this._web3Wrapper.signTransactionAsync(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)
@@ -270,7 +269,7 @@ export class ZeroEx {
        const validVParamValues = [27, 28];
        const ecSignatureVRS = signatureUtils.parseSignatureHexAsVRS(signature);
        if (_.includes(validVParamValues, ecSignatureVRS.v)) {
-            const isValidVRSSignature = ZeroEx.isValidSignature(orderHash, ecSignatureVRS, signerAddress);
+            const isValidVRSSignature = ZeroEx.isValidSignature(orderHash, ecSignatureVRS, normalizedSignerAddress);
            if (isValidVRSSignature) {
                return ecSignatureVRS;
            }
@@ -278,7 +277,7 @@ export class ZeroEx {

        const ecSignatureRSV = signatureUtils.parseSignatureHexAsRSV(signature);
        if (_.includes(validVParamValues, ecSignatureRSV.v)) {
-            const isValidRSVSignature = ZeroEx.isValidSignature(orderHash, ecSignatureRSV, signerAddress);
+            const isValidRSVSignature = ZeroEx.isValidSignature(orderHash, ecSignatureRSV, normalizedSignerAddress);
            if (isValidRSVSignature) {
                return ecSignatureRSV;
            }
@@ -334,8 +333,8 @@ export class ZeroEx {
                );
            },
        );
-
-        return txReceiptPromise;
+        const txReceipt = await txReceiptPromise;
+        return txReceipt;
    }
    /*
     * HACK: `TokenWrapper` needs a token transfer proxy address. `TokenTransferProxy` address is fetched from
--- a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
@@ -1,4 +1,5 @@
-import { intervalUtils } from '@0xproject/utils';
+import { BlockParamLiteral, LogWithDecodedArgs, RawLog } from '@0xproject/types';
+import { AbiDecoder, intervalUtils } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import { Block, BlockAndLogStreamer } from 'ethereumjs-blockstream';
 import * as _ from 'lodash';
@@ -6,18 +7,14 @@ import * as Web3 from 'web3';

 import {
    Artifact,
-    BlockParamLiteral,
    BlockRange,
    ContractEventArgs,
    ContractEvents,
    EventCallback,
    IndexedFilterValues,
    InternalZeroExError,
-    LogWithDecodedArgs,
-    RawLog,
    ZeroExError,
 } from '../types';
-import { AbiDecoder } from '../utils/abi_decoder';
 import { constants } from '../utils/constants';
 import { filterUtils } from '../utils/filter_utils';

@@ -34,10 +31,10 @@ const CONTRACT_NAME_TO_NOT_FOUND_ERROR: {

 export class ContractWrapper {
    protected _web3Wrapper: Web3Wrapper;
-    private _networkId: number;
+    protected _networkId: number;
    private _abiDecoder?: AbiDecoder;
-    private _blockAndLogStreamerIfExists: BlockAndLogStreamer | undefined;
-    private _blockAndLogStreamInterval: NodeJS.Timer;
+    private _blockAndLogStreamerIfExists?: BlockAndLogStreamer;
+    private _blockAndLogStreamIntervalIfExists?: NodeJS.Timer;
    private _filters: { [filterToken: string]: Web3.FilterObject };
    private _filterCallbacks: {
        [filterToken: string]: EventCallback<ContractEventArgs>;
@@ -54,7 +51,7 @@ export class ContractWrapper {
        this._onLogAddedSubscriptionToken = undefined;
        this._onLogRemovedSubscriptionToken = undefined;
    }
-    protected unsubscribeAll(): void {
+    protected _unsubscribeAll(): void {
        const filterTokens = _.keys(this._filterCallbacks);
        _.each(filterTokens, filterToken => {
            this._unsubscribe(filterToken);
@@ -111,10 +108,10 @@ export class ContractWrapper {
        const logWithDecodedArgs = this._abiDecoder.tryToDecodeLogOrNoop(log);
        return logWithDecodedArgs;
    }
-    protected async _instantiateContractIfExistsAsync(
+    protected async _getContractAbiAndAddressFromArtifactsAsync(
        artifact: Artifact,
        addressIfExists?: string,
-    ): Promise<Web3.ContractInstance> {
+    ): Promise<[Web3.ContractAbi, string]> {
        let contractAddress: string;
        if (_.isUndefined(addressIfExists)) {
            if (_.isUndefined(artifact.networks[this._networkId])) {
@@ -128,8 +125,8 @@ export class ContractWrapper {
        if (!doesContractExist) {
            throw new Error(CONTRACT_NAME_TO_NOT_FOUND_ERROR[artifact.contract_name]);
        }
-        const contractInstance = this._web3Wrapper.getContractInstance(artifact.abi, contractAddress);
-        return contractInstance;
+        const abiAndAddress: [Web3.ContractAbi, string] = [artifact.abi, contractAddress];
+        return abiAndAddress;
    }
    protected _getContractAddress(artifact: Artifact, addressIfExists?: string): string {
        if (_.isUndefined(addressIfExists)) {
@@ -164,7 +161,7 @@ export class ContractWrapper {
        );
        const catchAllLogFilter = {};
        this._blockAndLogStreamerIfExists.addLogFilter(catchAllLogFilter);
-        this._blockAndLogStreamInterval = intervalUtils.setAsyncExcludingInterval(
+        this._blockAndLogStreamIntervalIfExists = intervalUtils.setAsyncExcludingInterval(
            this._reconcileBlockAsync.bind(this),
            constants.DEFAULT_BLOCK_POLLING_INTERVAL,
            this._onReconcileBlockError.bind(this),
@@ -193,7 +190,7 @@ export class ContractWrapper {
        }
        this._blockAndLogStreamerIfExists.unsubscribeFromOnLogAdded(this._onLogAddedSubscriptionToken as string);
        this._blockAndLogStreamerIfExists.unsubscribeFromOnLogRemoved(this._onLogRemovedSubscriptionToken as string);
-        intervalUtils.clearAsyncExcludingInterval(this._blockAndLogStreamInterval);
+        intervalUtils.clearAsyncExcludingInterval(this._blockAndLogStreamIntervalIfExists as NodeJS.Timer);
        delete this._blockAndLogStreamerIfExists;
    }
    private async _reconcileBlockAsync(): Promise<void> {
--- a/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts
@@ -1,24 +1,15 @@
 import { schemas } from '@0xproject/json-schemas';
-import { BigNumber } from '@0xproject/utils';
+import { LogWithDecodedArgs } from '@0xproject/types';
+import { AbiDecoder, BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';

 import { artifacts } from '../artifacts';
-import {
-    BlockRange,
-    EtherTokenContractEventArgs,
-    EtherTokenEvents,
-    EventCallback,
-    IndexedFilterValues,
-    LogWithDecodedArgs,
-    TransactionOpts,
-    ZeroExError,
-} from '../types';
-import { AbiDecoder } from '../utils/abi_decoder';
+import { BlockRange, EventCallback, IndexedFilterValues, TransactionOpts, ZeroExError } from '../types';
 import { assert } from '../utils/assert';

 import { ContractWrapper } from './contract_wrapper';
-import { EtherTokenContract } from './generated/ether_token';
+import { EtherTokenContract, EtherTokenContractEventArgs, EtherTokenEvents } from './generated/ether_token';
 import { TokenWrapper } from './token_wrapper';

 /**
@@ -50,15 +41,18 @@ export class EtherTokenWrapper extends ContractWrapper {
        depositor: string,
        txOpts: TransactionOpts = {},
    ): Promise<string> {
+        assert.isETHAddressHex('etherTokenAddress', etherTokenAddress);
        assert.isValidBaseUnitAmount('amountInWei', amountInWei);
        await assert.isSenderAddressAsync('depositor', depositor, this._web3Wrapper);
+        const normalizedEtherTokenAddress = etherTokenAddress.toLowerCase();
+        const normalizedDepositorAddress = depositor.toLowerCase();

-        const ethBalanceInWei = await this._web3Wrapper.getBalanceInWeiAsync(depositor);
+        const ethBalanceInWei = await this._web3Wrapper.getBalanceInWeiAsync(normalizedDepositorAddress);
        assert.assert(ethBalanceInWei.gte(amountInWei), ZeroExError.InsufficientEthBalanceForDeposit);

-        const wethContract = await this._getEtherTokenContractAsync(etherTokenAddress);
+        const wethContract = await this._getEtherTokenContractAsync(normalizedEtherTokenAddress);
        const txHash = await wethContract.deposit.sendTransactionAsync({
-            from: depositor,
+            from: normalizedDepositorAddress,
            value: amountInWei,
            gas: txOpts.gasLimit,
            gasPrice: txOpts.gasPrice,
@@ -81,14 +75,20 @@ export class EtherTokenWrapper extends ContractWrapper {
        txOpts: TransactionOpts = {},
    ): Promise<string> {
        assert.isValidBaseUnitAmount('amountInWei', amountInWei);
+        assert.isETHAddressHex('etherTokenAddress', etherTokenAddress);
        await assert.isSenderAddressAsync('withdrawer', withdrawer, this._web3Wrapper);
+        const normalizedEtherTokenAddress = etherTokenAddress.toLowerCase();
+        const normalizedWithdrawerAddress = withdrawer.toLowerCase();

-        const WETHBalanceInBaseUnits = await this._tokenWrapper.getBalanceAsync(etherTokenAddress, withdrawer);
+        const WETHBalanceInBaseUnits = await this._tokenWrapper.getBalanceAsync(
+            normalizedEtherTokenAddress,
+            normalizedWithdrawerAddress,
+        );
        assert.assert(WETHBalanceInBaseUnits.gte(amountInWei), ZeroExError.InsufficientWEthBalanceForWithdrawal);

-        const wethContract = await this._getEtherTokenContractAsync(etherTokenAddress);
+        const wethContract = await this._getEtherTokenContractAsync(normalizedEtherTokenAddress);
        const txHash = await wethContract.withdraw.sendTransactionAsync(amountInWei, {
-            from: withdrawer,
+            from: normalizedWithdrawerAddress,
            gas: txOpts.gasLimit,
            gasPrice: txOpts.gasPrice,
        });
@@ -110,11 +110,12 @@ export class EtherTokenWrapper extends ContractWrapper {
        indexFilterValues: IndexedFilterValues,
    ): Promise<Array<LogWithDecodedArgs<ArgsType>>> {
        assert.isETHAddressHex('etherTokenAddress', etherTokenAddress);
+        const normalizedEtherTokenAddress = etherTokenAddress.toLowerCase();
        assert.doesBelongToStringEnum('eventName', eventName, EtherTokenEvents);
        assert.doesConformToSchema('blockRange', blockRange, schemas.blockRangeSchema);
        assert.doesConformToSchema('indexFilterValues', indexFilterValues, schemas.indexFilterValuesSchema);
        const logs = await this._getLogsAsync<ArgsType>(
-            etherTokenAddress,
+            normalizedEtherTokenAddress,
            eventName,
            blockRange,
            indexFilterValues,
@@ -138,11 +139,12 @@ export class EtherTokenWrapper extends ContractWrapper {
        callback: EventCallback<ArgsType>,
    ): string {
        assert.isETHAddressHex('etherTokenAddress', etherTokenAddress);
+        const normalizedEtherTokenAddress = etherTokenAddress.toLowerCase();
        assert.doesBelongToStringEnum('eventName', eventName, EtherTokenEvents);
        assert.doesConformToSchema('indexFilterValues', indexFilterValues, schemas.indexFilterValuesSchema);
        assert.isFunction('callback', callback);
        const subscriptionToken = this._subscribe<ArgsType>(
-            etherTokenAddress,
+            normalizedEtherTokenAddress,
            eventName,
            indexFilterValues,
            artifacts.EtherTokenArtifact.abi,
@@ -161,7 +163,20 @@ export class EtherTokenWrapper extends ContractWrapper {
     * Cancels all existing subscriptions
     */
    public unsubscribeAll(): void {
-        super.unsubscribeAll();
+        super._unsubscribeAll();
+    }
+    /**
+     * Retrieves the Ethereum address of the EtherToken contract deployed on the network
+     * that the user-passed web3 provider is connected to. If it's not Kovan, Ropsten, Rinkeby, Mainnet or TestRPC
+     * (networkId: 50), it will return undefined (e.g a private network).
+     * @returns The Ethereum address of the EtherToken contract or undefined.
+     */
+    public getContractAddressIfExists(): string | undefined {
+        const networkSpecificArtifact = artifacts.EtherTokenArtifact.networks[this._networkId];
+        const contractAddressIfExists = _.isUndefined(networkSpecificArtifact)
+            ? undefined
+            : networkSpecificArtifact.address;
+        return contractAddressIfExists;
    }
    private _invalidateContractInstance(): void {
        this.unsubscribeAll();
@@ -172,11 +187,11 @@ export class EtherTokenWrapper extends ContractWrapper {
        if (!_.isUndefined(etherTokenContract)) {
            return etherTokenContract;
        }
-        const web3ContractInstance = await this._instantiateContractIfExistsAsync(
+        const [abi, address] = await this._getContractAbiAndAddressFromArtifactsAsync(
            artifacts.EtherTokenArtifact,
            etherTokenAddress,
        );
-        const contractInstance = new EtherTokenContract(web3ContractInstance, this._web3Wrapper.getContractDefaults());
+        const contractInstance = new EtherTokenContract(this._web3Wrapper, abi, address);
        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,34 +1,32 @@
 import { schemas } from '@0xproject/json-schemas';
-import { BigNumber } from '@0xproject/utils';
+import {
+    BlockParamLiteral,
+    DecodedLogArgs,
+    ECSignature,
+    LogWithDecodedArgs,
+    Order,
+    SignedOrder,
+} from '@0xproject/types';
+import { AbiDecoder, BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';
 import * as Web3 from 'web3';

 import { artifacts } from '../artifacts';
 import {
-    BlockParamLiteral,
    BlockRange,
-    DecodedLogArgs,
-    ECSignature,
    EventCallback,
    ExchangeContractErrCodes,
    ExchangeContractErrs,
-    ExchangeContractEventArgs,
-    ExchangeEvents,
    IndexedFilterValues,
-    LogErrorContractEventArgs,
-    LogWithDecodedArgs,
    MethodOpts,
-    Order,
    OrderAddresses,
    OrderCancellationRequest,
    OrderFillRequest,
    OrderTransactionOpts,
    OrderValues,
-    SignedOrder,
    ValidateOrderFillableOpts,
 } from '../types';
-import { AbiDecoder } from '../utils/abi_decoder';
 import { assert } from '../utils/assert';
 import { decorators } from '../utils/decorators';
 import { ExchangeTransferSimulator } from '../utils/exchange_transfer_simulator';
@@ -36,7 +34,12 @@ import { OrderValidationUtils } from '../utils/order_validation_utils';
 import { utils } from '../utils/utils';

 import { ContractWrapper } from './contract_wrapper';
-import { ExchangeContract } from './generated/exchange';
+import {
+    ExchangeContract,
+    ExchangeContractEventArgs,
+    ExchangeEvents,
+    LogErrorContractEventArgs,
+} from './generated/exchange';
 import { TokenWrapper } from './token_wrapper';

 const SHOULD_VALIDATE_BY_DEFAULT = true;
@@ -109,8 +112,10 @@ export class ExchangeWrapper extends ContractWrapper {

        const exchangeContract = await this._getExchangeContractAsync();
        const defaultBlock = _.isUndefined(methodOpts) ? undefined : methodOpts.defaultBlock;
+        const txData = {};
        let unavailableTakerTokenAmount = await exchangeContract.getUnavailableTakerTokenAmount.callAsync(
            orderHash,
+            txData,
            defaultBlock,
        );
        // Wrap BigNumbers returned from web3 with our own (later) version of BigNumber
@@ -128,7 +133,8 @@ export class ExchangeWrapper extends ContractWrapper {

        const exchangeContract = await this._getExchangeContractAsync();
        const defaultBlock = _.isUndefined(methodOpts) ? undefined : methodOpts.defaultBlock;
-        let fillAmountInBaseUnits = await exchangeContract.filled.callAsync(orderHash, defaultBlock);
+        const txData = {};
+        let fillAmountInBaseUnits = await exchangeContract.filled.callAsync(orderHash, txData, defaultBlock);
        // Wrap BigNumbers returned from web3 with our own (later) version of BigNumber
        fillAmountInBaseUnits = new BigNumber(fillAmountInBaseUnits);
        return fillAmountInBaseUnits;
@@ -145,7 +151,8 @@ export class ExchangeWrapper extends ContractWrapper {

        const exchangeContract = await this._getExchangeContractAsync();
        const defaultBlock = _.isUndefined(methodOpts) ? undefined : methodOpts.defaultBlock;
-        let cancelledAmountInBaseUnits = await exchangeContract.cancelled.callAsync(orderHash, defaultBlock);
+        const txData = {};
+        let cancelledAmountInBaseUnits = await exchangeContract.cancelled.callAsync(orderHash, txData, defaultBlock);
        // Wrap BigNumbers returned from web3 with our own (later) version of BigNumber
        cancelledAmountInBaseUnits = new BigNumber(cancelledAmountInBaseUnits);
        return cancelledAmountInBaseUnits;
@@ -181,6 +188,7 @@ export class ExchangeWrapper extends ContractWrapper {
        assert.isValidBaseUnitAmount('fillTakerTokenAmount', fillTakerTokenAmount);
        assert.isBoolean('shouldThrowOnInsufficientBalanceOrAllowance', shouldThrowOnInsufficientBalanceOrAllowance);
        await assert.isSenderAddressAsync('takerAddress', takerAddress, this._web3Wrapper);
+        const normalizedTakerAddress = takerAddress.toLowerCase();

        const exchangeInstance = await this._getExchangeContractAsync();
        const shouldValidate = _.isUndefined(orderTransactionOpts.shouldValidate)
@@ -193,7 +201,7 @@ export class ExchangeWrapper extends ContractWrapper {
                exchangeTradeEmulator,
                signedOrder,
                fillTakerTokenAmount,
-                takerAddress,
+                normalizedTakerAddress,
                zrxTokenAddress,
            );
        }
@@ -209,7 +217,7 @@ export class ExchangeWrapper extends ContractWrapper {
            signedOrder.ecSignature.r,
            signedOrder.ecSignature.s,
            {
-                from: takerAddress,
+                from: normalizedTakerAddress,
                gas: orderTransactionOpts.gasLimit,
                gasPrice: orderTransactionOpts.gasPrice,
            },
@@ -255,6 +263,7 @@ export class ExchangeWrapper extends ContractWrapper {
        assert.isValidBaseUnitAmount('fillTakerTokenAmount', fillTakerTokenAmount);
        assert.isBoolean('shouldThrowOnInsufficientBalanceOrAllowance', shouldThrowOnInsufficientBalanceOrAllowance);
        await assert.isSenderAddressAsync('takerAddress', takerAddress, this._web3Wrapper);
+        const normalizedTakerAddress = takerAddress.toLowerCase();

        const shouldValidate = _.isUndefined(orderTransactionOpts.shouldValidate)
            ? SHOULD_VALIDATE_BY_DEFAULT
@@ -268,7 +277,7 @@ export class ExchangeWrapper extends ContractWrapper {
                    exchangeTradeEmulator,
                    signedOrder,
                    fillTakerTokenAmount.minus(filledTakerTokenAmount),
-                    takerAddress,
+                    normalizedTakerAddress,
                    zrxTokenAddress,
                );
                filledTakerTokenAmount = filledTakerTokenAmount.plus(singleFilledTakerTokenAmount);
@@ -302,7 +311,7 @@ export class ExchangeWrapper extends ContractWrapper {
            rArray,
            sArray,
            {
-                from: takerAddress,
+                from: normalizedTakerAddress,
                gas: orderTransactionOpts.gasLimit,
                gasPrice: orderTransactionOpts.gasPrice,
            },
@@ -346,6 +355,7 @@ export class ExchangeWrapper extends ContractWrapper {
        );
        assert.isBoolean('shouldThrowOnInsufficientBalanceOrAllowance', shouldThrowOnInsufficientBalanceOrAllowance);
        await assert.isSenderAddressAsync('takerAddress', takerAddress, this._web3Wrapper);
+        const normalizedTakerAddress = takerAddress.toLowerCase();
        const shouldValidate = _.isUndefined(orderTransactionOpts.shouldValidate)
            ? SHOULD_VALIDATE_BY_DEFAULT
            : orderTransactionOpts.shouldValidate;
@@ -357,7 +367,7 @@ export class ExchangeWrapper extends ContractWrapper {
                    exchangeTradeEmulator,
                    orderFillRequest.signedOrder,
                    orderFillRequest.takerTokenFillAmount,
-                    takerAddress,
+                    normalizedTakerAddress,
                    zrxTokenAddress,
                );
            }
@@ -390,7 +400,7 @@ export class ExchangeWrapper extends ContractWrapper {
            rArray,
            sArray,
            {
-                from: takerAddress,
+                from: normalizedTakerAddress,
                gas: orderTransactionOpts.gasLimit,
                gasPrice: orderTransactionOpts.gasPrice,
            },
@@ -418,6 +428,7 @@ export class ExchangeWrapper extends ContractWrapper {
        assert.doesConformToSchema('signedOrder', signedOrder, schemas.signedOrderSchema);
        assert.isValidBaseUnitAmount('fillTakerTokenAmount', fillTakerTokenAmount);
        await assert.isSenderAddressAsync('takerAddress', takerAddress, this._web3Wrapper);
+        const normalizedTakerAddress = takerAddress.toLowerCase();

        const exchangeInstance = await this._getExchangeContractAsync();

@@ -431,7 +442,7 @@ export class ExchangeWrapper extends ContractWrapper {
                exchangeTradeEmulator,
                signedOrder,
                fillTakerTokenAmount,
-                takerAddress,
+                normalizedTakerAddress,
                zrxTokenAddress,
            );
        }
@@ -445,7 +456,7 @@ export class ExchangeWrapper extends ContractWrapper {
            signedOrder.ecSignature.r,
            signedOrder.ecSignature.s,
            {
-                from: takerAddress,
+                from: normalizedTakerAddress,
                gas: orderTransactionOpts.gasLimit,
                gasPrice: orderTransactionOpts.gasPrice,
            },
@@ -477,6 +488,7 @@ export class ExchangeWrapper extends ContractWrapper {
            ExchangeContractErrs.BatchOrdersMustHaveSameExchangeAddress,
        );
        await assert.isSenderAddressAsync('takerAddress', takerAddress, this._web3Wrapper);
+        const normalizedTakerAddress = takerAddress.toLowerCase();
        if (_.isEmpty(orderFillRequests)) {
            throw new Error(ExchangeContractErrs.BatchOrdersMustHaveAtLeastOneItem);
        }
@@ -493,7 +505,7 @@ export class ExchangeWrapper extends ContractWrapper {
                    exchangeTradeEmulator,
                    orderFillRequest.signedOrder,
                    orderFillRequest.takerTokenFillAmount,
-                    takerAddress,
+                    normalizedTakerAddress,
                    zrxTokenAddress,
                );
            }
@@ -521,7 +533,7 @@ export class ExchangeWrapper extends ContractWrapper {
            rParams,
            sParams,
            {
-                from: takerAddress,
+                from: normalizedTakerAddress,
                gas: orderTransactionOpts.gasLimit,
                gasPrice: orderTransactionOpts.gasPrice,
            },
@@ -545,6 +557,7 @@ export class ExchangeWrapper extends ContractWrapper {
        assert.doesConformToSchema('order', order, schemas.orderSchema);
        assert.isValidBaseUnitAmount('takerTokenCancelAmount', cancelTakerTokenAmount);
        await assert.isSenderAddressAsync('order.maker', order.maker, this._web3Wrapper);
+        const normalizedMakerAddress = order.maker.toLowerCase();

        const exchangeInstance = await this._getExchangeContractAsync();

@@ -567,7 +580,7 @@ export class ExchangeWrapper extends ContractWrapper {
            orderValues,
            cancelTakerTokenAmount,
            {
-                from: order.maker,
+                from: normalizedMakerAddress,
                gas: orderTransactionOpts.gasLimit,
                gasPrice: orderTransactionOpts.gasPrice,
            },
@@ -604,6 +617,8 @@ export class ExchangeWrapper extends ContractWrapper {
        assert.hasAtMostOneUniqueValue(makers, ExchangeContractErrs.MultipleMakersInSingleCancelBatchDisallowed);
        const maker = makers[0];
        await assert.isSenderAddressAsync('maker', maker, this._web3Wrapper);
+        const normalizedMakerAddress = maker.toLowerCase();
+
        const shouldValidate = _.isUndefined(orderTransactionOpts.shouldValidate)
            ? SHOULD_VALIDATE_BY_DEFAULT
            : orderTransactionOpts.shouldValidate;
@@ -637,7 +652,7 @@ export class ExchangeWrapper extends ContractWrapper {
            orderValues,
            cancelTakerTokenAmounts,
            {
-                from: maker,
+                from: normalizedMakerAddress,
                gas: orderTransactionOpts.gasLimit,
                gasPrice: orderTransactionOpts.gasPrice,
            },
@@ -681,7 +696,7 @@ export class ExchangeWrapper extends ContractWrapper {
     * Cancels all existing subscriptions
     */
    public unsubscribeAll(): void {
-        super.unsubscribeAll();
+        super._unsubscribeAll();
    }
    /**
     * Gets historical logs without creating a subscription
@@ -758,13 +773,14 @@ export class ExchangeWrapper extends ContractWrapper {
        assert.doesConformToSchema('signedOrder', signedOrder, schemas.signedOrderSchema);
        assert.isValidBaseUnitAmount('fillTakerTokenAmount', fillTakerTokenAmount);
        await assert.isSenderAddressAsync('takerAddress', takerAddress, this._web3Wrapper);
+        const normalizedTakerAddress = takerAddress.toLowerCase();
        const zrxTokenAddress = this.getZRXTokenAddress();
        const exchangeTradeEmulator = new ExchangeTransferSimulator(this._tokenWrapper, BlockParamLiteral.Latest);
        await this._orderValidationUtils.validateFillOrderThrowIfInvalidAsync(
            exchangeTradeEmulator,
            signedOrder,
            fillTakerTokenAmount,
-            takerAddress,
+            normalizedTakerAddress,
            zrxTokenAddress,
        );
    }
@@ -804,13 +820,14 @@ export class ExchangeWrapper extends ContractWrapper {
        assert.doesConformToSchema('signedOrder', signedOrder, schemas.signedOrderSchema);
        assert.isValidBaseUnitAmount('fillTakerTokenAmount', fillTakerTokenAmount);
        await assert.isSenderAddressAsync('takerAddress', takerAddress, this._web3Wrapper);
+        const normalizedTakerAddress = takerAddress.toLowerCase();
        const zrxTokenAddress = this.getZRXTokenAddress();
        const exchangeTradeEmulator = new ExchangeTransferSimulator(this._tokenWrapper, BlockParamLiteral.Latest);
        await this._orderValidationUtils.validateFillOrKillOrderThrowIfInvalidAsync(
            exchangeTradeEmulator,
            signedOrder,
            fillTakerTokenAmount,
-            takerAddress,
+            normalizedTakerAddress,
            zrxTokenAddress,
        );
    }
@@ -846,10 +863,10 @@ export class ExchangeWrapper extends ContractWrapper {
    public throwLogErrorsAsErrors(logs: Array<LogWithDecodedArgs<DecodedLogArgs> | Web3.LogEntry>): void {
        const errLog = _.find(logs, {
            event: ExchangeEvents.LogError,
-        }) as LogWithDecodedArgs<LogErrorContractEventArgs> | undefined;
+        });
        if (!_.isUndefined(errLog)) {
-            const logArgs = errLog.args;
-            const errCode = logArgs.errorId.toNumber();
+            const logArgs = (errLog as LogWithDecodedArgs<LogErrorContractEventArgs>).args;
+            const errCode = logArgs.errorId;
            const errMessage = this._exchangeContractErrCodesToMsg[errCode];
            throw new Error(errMessage);
        }
@@ -874,11 +891,12 @@ export class ExchangeWrapper extends ContractWrapper {
        assert.isHexString('dataHex', dataHex);
        assert.doesConformToSchema('ecSignature', ecSignature, schemas.ecSignatureSchema);
        assert.isETHAddressHex('signerAddressHex', signerAddressHex);
+        const normalizedSignerAddress = signerAddressHex.toLowerCase();

        const exchangeInstance = await this._getExchangeContractAsync();

        const isValidSignature = await exchangeInstance.isValidSignature.callAsync(
-            signerAddressHex,
+            normalizedSignerAddress,
            dataHex,
            ecSignature.v,
            ecSignature.r,
@@ -896,11 +914,11 @@ export class ExchangeWrapper extends ContractWrapper {
        if (!_.isUndefined(this._exchangeContractIfExists)) {
            return this._exchangeContractIfExists;
        }
-        const web3ContractInstance = await this._instantiateContractIfExistsAsync(
+        const [abi, address] = await this._getContractAbiAndAddressFromArtifactsAsync(
            artifacts.ExchangeArtifact,
            this._contractAddressIfExists,
        );
-        const contractInstance = new ExchangeContract(web3ContractInstance, this._web3Wrapper.getContractDefaults());
+        const contractInstance = new ExchangeContract(this._web3Wrapper, abi, address);
        this._exchangeContractIfExists = contractInstance;
        return this._exchangeContractIfExists;
    }
--- a/packages/0x.js/src/contract_wrappers/generated/.gitignore
+++ b/packages/0x.js/src/contract_wrappers/generated/.gitignore
@@ -1,6 +1 @@
-dummy_token.ts
-ether_token.ts
-exchange.ts
-token_registry.ts
-token_transfer_proxy.ts
-token.ts
+*
--- a/packages/0x.js/src/contract_wrappers/generated/base_contract.ts
+++ b/packages/0x.js/src/contract_wrappers/generated/base_contract.ts
@@ -1,33 +0,0 @@
-import {TxData, TxDataPayable} from '@0xproject/types';
-import * as _ from 'lodash';
-import * as Web3 from 'web3';
-
-export class BaseContract {
-    protected web3ContractInstance: Web3.ContractInstance;
-    protected defaults: Partial<TxData>;
-    protected async applyDefaultsToTxDataAsync<T extends TxData|TxDataPayable>(
-        txData: T,
-        estimateGasAsync?: (txData: T) => Promise<number>,
-    ): Promise<TxData> {
-        // Gas amount sourced with the following priorities:
-        // 1. Optional param passed in to public method call
-        // 2. Global config passed in at library instantiation
-        // 3. Gas estimate calculation + safety margin
-        const removeUndefinedProperties = _.pickBy;
-        const txDataWithDefaults = {
-            ...removeUndefinedProperties(this.defaults),
-            ...removeUndefinedProperties(txData as any),
-            // HACK: TS can't prove that T is spreadable.
-            // Awaiting https://github.com/Microsoft/TypeScript/pull/13288 to be merged
-        };
-        if (_.isUndefined(txDataWithDefaults.gas) && !_.isUndefined(estimateGasAsync)) {
-            const estimatedGas = await estimateGasAsync(txData);
-            txDataWithDefaults.gas = estimatedGas;
-        }
-        return txDataWithDefaults;
-    }
-    constructor(web3ContractInstance: Web3.ContractInstance, defaults: Partial<TxData>) {
-        this.web3ContractInstance = web3ContractInstance;
-        this.defaults = defaults;
-    }
-}
--- a/packages/0x.js/src/contract_wrappers/token_registry_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/token_registry_wrapper.ts
@@ -23,7 +23,7 @@ export class TokenRegistryWrapper extends ContractWrapper {
            address: metadata[0],
            name: metadata[1],
            symbol: metadata[2],
-            decimals: metadata[3].toNumber(),
+            decimals: metadata[3],
        };
        return token;
    }
@@ -50,7 +50,8 @@ export class TokenRegistryWrapper extends ContractWrapper {
    public async getTokenAddressesAsync(): Promise<string[]> {
        const tokenRegistryContract = await this._getTokenRegistryContractAsync();
        const addresses = await tokenRegistryContract.getTokenAddresses.callAsync();
-        return addresses;
+        const lowerCaseAddresses = _.map(addresses, address => address.toLowerCase());
+        return lowerCaseAddresses;
    }
    /**
     * Retrieves a token by address currently listed in the Token Registry smart contract
@@ -58,9 +59,10 @@ export class TokenRegistryWrapper extends ContractWrapper {
     */
    public async getTokenIfExistsAsync(address: string): Promise<Token | undefined> {
        assert.isETHAddressHex('address', address);
+        const normalizedAddress = address.toLowerCase();

        const tokenRegistryContract = await this._getTokenRegistryContractAsync();
-        const metadata = await tokenRegistryContract.getTokenMetaData.callAsync(address);
+        const metadata = await tokenRegistryContract.getTokenMetaData.callAsync(normalizedAddress);
        const token = TokenRegistryWrapper._createTokenFromMetadata(metadata);
        return token;
    }
@@ -115,14 +117,11 @@ export class TokenRegistryWrapper extends ContractWrapper {
        if (!_.isUndefined(this._tokenRegistryContractIfExists)) {
            return this._tokenRegistryContractIfExists;
        }
-        const web3ContractInstance = await this._instantiateContractIfExistsAsync(
+        const [abi, address] = await this._getContractAbiAndAddressFromArtifactsAsync(
            artifacts.TokenRegistryArtifact,
            this._contractAddressIfExists,
        );
-        const contractInstance = new TokenRegistryContract(
-            web3ContractInstance,
-            this._web3Wrapper.getContractDefaults(),
-        );
+        const contractInstance = new TokenRegistryContract(this._web3Wrapper, abi, address);
        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
@@ -2,6 +2,7 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';

 import { artifacts } from '../artifacts';
+import { assert } from '../utils/assert';

 import { ContractWrapper } from './contract_wrapper';
 import { TokenTransferProxyContract } from './generated/token_transfer_proxy';
@@ -22,8 +23,12 @@ export class TokenTransferProxyWrapper extends ContractWrapper {
     * @return  Whether the exchangeContractAddress is authorized.
     */
    public async isAuthorizedAsync(exchangeContractAddress: string): Promise<boolean> {
+        assert.isETHAddressHex('exchangeContractAddress', exchangeContractAddress);
+        const normalizedExchangeContractAddress = exchangeContractAddress.toLowerCase();
        const tokenTransferProxyContractInstance = await this._getTokenTransferProxyContractAsync();
-        const isAuthorized = await tokenTransferProxyContractInstance.authorized.callAsync(exchangeContractAddress);
+        const isAuthorized = await tokenTransferProxyContractInstance.authorized.callAsync(
+            normalizedExchangeContractAddress,
+        );
        return isAuthorized;
    }
    /**
@@ -54,14 +59,11 @@ export class TokenTransferProxyWrapper extends ContractWrapper {
        if (!_.isUndefined(this._tokenTransferProxyContractIfExists)) {
            return this._tokenTransferProxyContractIfExists;
        }
-        const web3ContractInstance = await this._instantiateContractIfExistsAsync(
+        const [abi, address] = await this._getContractAbiAndAddressFromArtifactsAsync(
            artifacts.TokenTransferProxyArtifact,
            this._contractAddressIfExists,
        );
-        const contractInstance = new TokenTransferProxyContract(
-            web3ContractInstance,
-            this._web3Wrapper.getContractDefaults(),
-        );
+        const contractInstance = new TokenTransferProxyContract(this._web3Wrapper, abi, address);
        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
@@ -1,26 +1,16 @@
 import { schemas } from '@0xproject/json-schemas';
-import { BigNumber } from '@0xproject/utils';
+import { LogWithDecodedArgs } from '@0xproject/types';
+import { AbiDecoder, BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';

 import { artifacts } from '../artifacts';
-import {
-    BlockRange,
-    EventCallback,
-    IndexedFilterValues,
-    LogWithDecodedArgs,
-    MethodOpts,
-    TokenContractEventArgs,
-    TokenEvents,
-    TransactionOpts,
-    ZeroExError,
-} from '../types';
-import { AbiDecoder } from '../utils/abi_decoder';
+import { BlockRange, EventCallback, IndexedFilterValues, MethodOpts, TransactionOpts, ZeroExError } from '../types';
 import { assert } from '../utils/assert';
 import { constants } from '../utils/constants';

 import { ContractWrapper } from './contract_wrapper';
-import { TokenContract } from './generated/token';
+import { TokenContract, TokenContractEventArgs, TokenEvents } from './generated/token';
 import { TokenTransferProxyWrapper } from './token_transfer_proxy_wrapper';

 /**
@@ -56,10 +46,13 @@ export class TokenWrapper extends ContractWrapper {
    ): Promise<BigNumber> {
        assert.isETHAddressHex('ownerAddress', ownerAddress);
        assert.isETHAddressHex('tokenAddress', tokenAddress);
+        const normalizedTokenAddress = tokenAddress.toLowerCase();
+        const normalizedOwnerAddress = ownerAddress.toLowerCase();

-        const tokenContract = await this._getTokenContractAsync(tokenAddress);
+        const tokenContract = await this._getTokenContractAsync(normalizedTokenAddress);
        const defaultBlock = _.isUndefined(methodOpts) ? undefined : methodOpts.defaultBlock;
-        let balance = await tokenContract.balanceOf.callAsync(ownerAddress, defaultBlock);
+        const txData = {};
+        let balance = await tokenContract.balanceOf.callAsync(normalizedOwnerAddress, txData, defaultBlock);
        // Wrap BigNumbers returned from web3 with our own (later) version of BigNumber
        balance = new BigNumber(balance);
        return balance;
@@ -82,14 +75,17 @@ export class TokenWrapper extends ContractWrapper {
        amountInBaseUnits: BigNumber,
        txOpts: TransactionOpts = {},
    ): Promise<string> {
-        await assert.isSenderAddressAsync('ownerAddress', ownerAddress, this._web3Wrapper);
        assert.isETHAddressHex('spenderAddress', spenderAddress);
        assert.isETHAddressHex('tokenAddress', tokenAddress);
+        await assert.isSenderAddressAsync('ownerAddress', ownerAddress, this._web3Wrapper);
+        const normalizedTokenAddress = tokenAddress.toLowerCase();
+        const normalizedSpenderAddress = spenderAddress.toLowerCase();
+        const normalizedOwnerAddress = ownerAddress.toLowerCase();
        assert.isValidBaseUnitAmount('amountInBaseUnits', amountInBaseUnits);

-        const tokenContract = await this._getTokenContractAsync(tokenAddress);
-        const txHash = await tokenContract.approve.sendTransactionAsync(spenderAddress, amountInBaseUnits, {
-            from: ownerAddress,
+        const tokenContract = await this._getTokenContractAsync(normalizedTokenAddress);
+        const txHash = await tokenContract.approve.sendTransactionAsync(normalizedSpenderAddress, amountInBaseUnits, {
+            from: normalizedOwnerAddress,
            gas: txOpts.gasLimit,
            gasPrice: txOpts.gasPrice,
        });
@@ -113,10 +109,16 @@ export class TokenWrapper extends ContractWrapper {
        spenderAddress: string,
        txOpts: TransactionOpts = {},
    ): Promise<string> {
+        assert.isETHAddressHex('ownerAddress', ownerAddress);
+        assert.isETHAddressHex('tokenAddress', tokenAddress);
+        assert.isETHAddressHex('spenderAddress', spenderAddress);
+        const normalizedTokenAddress = tokenAddress.toLowerCase();
+        const normalizedOwnerAddress = ownerAddress.toLowerCase();
+        const normalizedSpenderAddress = spenderAddress.toLowerCase();
        const txHash = await this.setAllowanceAsync(
-            tokenAddress,
-            ownerAddress,
-            spenderAddress,
+            normalizedTokenAddress,
+            normalizedOwnerAddress,
+            normalizedSpenderAddress,
            this.UNLIMITED_ALLOWANCE_IN_BASE_UNITS,
            txOpts,
        );
@@ -138,10 +140,20 @@ export class TokenWrapper extends ContractWrapper {
    ): Promise<BigNumber> {
        assert.isETHAddressHex('ownerAddress', ownerAddress);
        assert.isETHAddressHex('tokenAddress', tokenAddress);
+        assert.isETHAddressHex('spenderAddress', spenderAddress);
+        const normalizedTokenAddress = tokenAddress.toLowerCase();
+        const normalizedOwnerAddress = ownerAddress.toLowerCase();
+        const normalizedSpenderAddress = spenderAddress.toLowerCase();

-        const tokenContract = await this._getTokenContractAsync(tokenAddress);
+        const tokenContract = await this._getTokenContractAsync(normalizedTokenAddress);
        const defaultBlock = _.isUndefined(methodOpts) ? undefined : methodOpts.defaultBlock;
-        let allowanceInBaseUnits = await tokenContract.allowance.callAsync(ownerAddress, spenderAddress, defaultBlock);
+        const txData = {};
+        let allowanceInBaseUnits = await tokenContract.allowance.callAsync(
+            normalizedOwnerAddress,
+            normalizedSpenderAddress,
+            txData,
+            defaultBlock,
+        );
        // Wrap BigNumbers returned from web3 with our own (later) version of BigNumber
        allowanceInBaseUnits = new BigNumber(allowanceInBaseUnits);
        return allowanceInBaseUnits;
@@ -159,9 +171,16 @@ export class TokenWrapper extends ContractWrapper {
    ): Promise<BigNumber> {
        assert.isETHAddressHex('ownerAddress', ownerAddress);
        assert.isETHAddressHex('tokenAddress', tokenAddress);
+        const normalizedTokenAddress = tokenAddress.toLowerCase();
+        const normalizedOwnerAddress = ownerAddress.toLowerCase();

        const proxyAddress = this._tokenTransferProxyWrapper.getContractAddress();
-        const allowanceInBaseUnits = await this.getAllowanceAsync(tokenAddress, ownerAddress, proxyAddress, methodOpts);
+        const allowanceInBaseUnits = await this.getAllowanceAsync(
+            normalizedTokenAddress,
+            normalizedOwnerAddress,
+            proxyAddress,
+            methodOpts,
+        );
        return allowanceInBaseUnits;
    }
    /**
@@ -182,12 +201,14 @@ export class TokenWrapper extends ContractWrapper {
    ): Promise<string> {
        assert.isETHAddressHex('ownerAddress', ownerAddress);
        assert.isETHAddressHex('tokenAddress', tokenAddress);
+        const normalizedTokenAddress = tokenAddress.toLowerCase();
+        const normalizedOwnerAddress = ownerAddress.toLowerCase();
        assert.isValidBaseUnitAmount('amountInBaseUnits', amountInBaseUnits);

        const proxyAddress = this._tokenTransferProxyWrapper.getContractAddress();
        const txHash = await this.setAllowanceAsync(
-            tokenAddress,
-            ownerAddress,
+            normalizedTokenAddress,
+            normalizedOwnerAddress,
            proxyAddress,
            amountInBaseUnits,
            txOpts,
@@ -210,9 +231,13 @@ export class TokenWrapper extends ContractWrapper {
        ownerAddress: string,
        txOpts: TransactionOpts = {},
    ): Promise<string> {
+        assert.isETHAddressHex('ownerAddress', ownerAddress);
+        assert.isETHAddressHex('tokenAddress', tokenAddress);
+        const normalizedTokenAddress = tokenAddress.toLowerCase();
+        const normalizedOwnerAddress = ownerAddress.toLowerCase();
        const txHash = await this.setProxyAllowanceAsync(
-            tokenAddress,
-            ownerAddress,
+            normalizedTokenAddress,
+            normalizedOwnerAddress,
            this.UNLIMITED_ALLOWANCE_IN_BASE_UNITS,
            txOpts,
        );
@@ -235,19 +260,22 @@ export class TokenWrapper extends ContractWrapper {
        txOpts: TransactionOpts = {},
    ): Promise<string> {
        assert.isETHAddressHex('tokenAddress', tokenAddress);
-        await assert.isSenderAddressAsync('fromAddress', fromAddress, this._web3Wrapper);
        assert.isETHAddressHex('toAddress', toAddress);
+        await assert.isSenderAddressAsync('fromAddress', fromAddress, this._web3Wrapper);
+        const normalizedTokenAddress = tokenAddress.toLowerCase();
+        const normalizedFromAddress = fromAddress.toLowerCase();
+        const normalizedToAddress = toAddress.toLowerCase();
        assert.isValidBaseUnitAmount('amountInBaseUnits', amountInBaseUnits);

-        const tokenContract = await this._getTokenContractAsync(tokenAddress);
+        const tokenContract = await this._getTokenContractAsync(normalizedTokenAddress);

-        const fromAddressBalance = await this.getBalanceAsync(tokenAddress, fromAddress);
+        const fromAddressBalance = await this.getBalanceAsync(normalizedTokenAddress, normalizedFromAddress);
        if (fromAddressBalance.lessThan(amountInBaseUnits)) {
            throw new Error(ZeroExError.InsufficientBalanceForTransfer);
        }

-        const txHash = await tokenContract.transfer.sendTransactionAsync(toAddress, amountInBaseUnits, {
-            from: fromAddress,
+        const txHash = await tokenContract.transfer.sendTransactionAsync(normalizedToAddress, amountInBaseUnits, {
+            from: normalizedFromAddress,
            gas: txOpts.gasLimit,
            gasPrice: txOpts.gasPrice,
        });
@@ -275,30 +303,38 @@ export class TokenWrapper extends ContractWrapper {
        amountInBaseUnits: BigNumber,
        txOpts: TransactionOpts = {},
    ): Promise<string> {
-        assert.isETHAddressHex('tokenAddress', tokenAddress);
-        assert.isETHAddressHex('fromAddress', fromAddress);
        assert.isETHAddressHex('toAddress', toAddress);
+        assert.isETHAddressHex('fromAddress', fromAddress);
+        assert.isETHAddressHex('tokenAddress', tokenAddress);
        await assert.isSenderAddressAsync('senderAddress', senderAddress, this._web3Wrapper);
+        const normalizedToAddress = toAddress.toLowerCase();
+        const normalizedFromAddress = fromAddress.toLowerCase();
+        const normalizedTokenAddress = tokenAddress.toLowerCase();
+        const normalizedSenderAddress = senderAddress.toLowerCase();
        assert.isValidBaseUnitAmount('amountInBaseUnits', amountInBaseUnits);

-        const tokenContract = await this._getTokenContractAsync(tokenAddress);
+        const tokenContract = await this._getTokenContractAsync(normalizedTokenAddress);

-        const fromAddressAllowance = await this.getAllowanceAsync(tokenAddress, fromAddress, senderAddress);
+        const fromAddressAllowance = await this.getAllowanceAsync(
+            normalizedTokenAddress,
+            normalizedFromAddress,
+            normalizedSenderAddress,
+        );
        if (fromAddressAllowance.lessThan(amountInBaseUnits)) {
            throw new Error(ZeroExError.InsufficientAllowanceForTransfer);
        }

-        const fromAddressBalance = await this.getBalanceAsync(tokenAddress, fromAddress);
+        const fromAddressBalance = await this.getBalanceAsync(normalizedTokenAddress, normalizedFromAddress);
        if (fromAddressBalance.lessThan(amountInBaseUnits)) {
            throw new Error(ZeroExError.InsufficientBalanceForTransfer);
        }

        const txHash = await tokenContract.transferFrom.sendTransactionAsync(
-            fromAddress,
-            toAddress,
+            normalizedFromAddress,
+            normalizedToAddress,
            amountInBaseUnits,
            {
-                from: senderAddress,
+                from: normalizedSenderAddress,
                gas: txOpts.gasLimit,
                gasPrice: txOpts.gasPrice,
            },
@@ -321,11 +357,12 @@ export class TokenWrapper extends ContractWrapper {
        callback: EventCallback<ArgsType>,
    ): string {
        assert.isETHAddressHex('tokenAddress', tokenAddress);
+        const normalizedTokenAddress = tokenAddress.toLowerCase();
        assert.doesBelongToStringEnum('eventName', eventName, TokenEvents);
        assert.doesConformToSchema('indexFilterValues', indexFilterValues, schemas.indexFilterValuesSchema);
        assert.isFunction('callback', callback);
        const subscriptionToken = this._subscribe<ArgsType>(
-            tokenAddress,
+            normalizedTokenAddress,
            eventName,
            indexFilterValues,
            artifacts.TokenArtifact.abi,
@@ -344,7 +381,7 @@ export class TokenWrapper extends ContractWrapper {
     * Cancels all existing subscriptions
     */
    public unsubscribeAll(): void {
-        super.unsubscribeAll();
+        super._unsubscribeAll();
    }
    /**
     * Gets historical logs without creating a subscription
@@ -362,11 +399,12 @@ export class TokenWrapper extends ContractWrapper {
        indexFilterValues: IndexedFilterValues,
    ): Promise<Array<LogWithDecodedArgs<ArgsType>>> {
        assert.isETHAddressHex('tokenAddress', tokenAddress);
+        const normalizedTokenAddress = tokenAddress.toLowerCase();
        assert.doesBelongToStringEnum('eventName', eventName, TokenEvents);
        assert.doesConformToSchema('blockRange', blockRange, schemas.blockRangeSchema);
        assert.doesConformToSchema('indexFilterValues', indexFilterValues, schemas.indexFilterValuesSchema);
        const logs = await this._getLogsAsync<ArgsType>(
-            tokenAddress,
+            normalizedTokenAddress,
            eventName,
            blockRange,
            indexFilterValues,
@@ -379,17 +417,18 @@ export class TokenWrapper extends ContractWrapper {
        this._tokenContractsByAddress = {};
    }
    private async _getTokenContractAsync(tokenAddress: string): Promise<TokenContract> {
-        let tokenContract = this._tokenContractsByAddress[tokenAddress];
+        const normalizedTokenAddress = tokenAddress.toLowerCase();
+        let tokenContract = this._tokenContractsByAddress[normalizedTokenAddress];
        if (!_.isUndefined(tokenContract)) {
            return tokenContract;
        }
-        const web3ContractInstance = await this._instantiateContractIfExistsAsync(
+        const [abi, address] = await this._getContractAbiAndAddressFromArtifactsAsync(
            artifacts.TokenArtifact,
-            tokenAddress,
+            normalizedTokenAddress,
        );
-        const contractInstance = new TokenContract(web3ContractInstance, this._web3Wrapper.getContractDefaults());
+        const contractInstance = new TokenContract(this._web3Wrapper, abi, address);
        tokenContract = contractInstance;
-        this._tokenContractsByAddress[tokenAddress] = tokenContract;
+        this._tokenContractsByAddress[normalizedTokenAddress] = tokenContract;
        return tokenContract;
    }
 }
--- a/packages/0x.js/src/globals.d.ts
+++ b/packages/0x.js/src/globals.d.ts
@@ -4,6 +4,12 @@ declare module 'dirty-chai';
 declare module 'request-promise-native';
 declare module 'web3-provider-engine';
 declare module 'web3-provider-engine/subproviders/rpc';
+declare module 'publish-release';
+
+// semver-sort declarations
+declare module 'semver-sort' {
+    const desc: (versions: string[]) => string[];
+}

 // HACK: In order to merge the bignumber declaration added by chai-bignumber to the chai Assertion
 // interface we must use `namespace` as the Chai definitelyTyped definition does. Since we otherwise
@@ -41,19 +47,3 @@ declare module 'truffle-hdwallet-provider' {
    }
    export = HDWalletProvider;
 }
-
-// abi-decoder declarations
-interface DecodedLogArg {}
-interface DecodedLog {
-    name: string;
-    events: DecodedLogArg[];
-}
-declare module 'abi-decoder' {
-    import * as Web3 from 'web3';
-    const addABI: (abi: Web3.AbiDefinition) => void;
-    const decodeLogs: (logs: Web3.LogEntry[]) => DecodedLog[];
-}
-
-declare module 'web3/lib/solidity/coder' {
-    const decodeParams: (types: string[], data: string) => any[];
-}
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -1,39 +1,18 @@
 export { ZeroEx } from './0x';

 export {
-    Order,
-    BlockParamLiteral,
-    SignedOrder,
-    ECSignature,
    ZeroExError,
    EventCallback,
    ExchangeContractErrs,
    ContractEvent,
    Token,
-    ExchangeEvents,
-    TokenEvents,
    IndexedFilterValues,
    BlockRange,
-    BlockParam,
    OrderCancellationRequest,
    OrderFillRequest,
-    LogErrorContractEventArgs,
-    LogCancelContractEventArgs,
-    LogFillContractEventArgs,
-    ExchangeContractEventArgs,
-    TransferContractEventArgs,
-    ApprovalContractEventArgs,
-    TokenContractEventArgs,
-    EtherTokenContractEventArgs,
-    WithdrawalContractEventArgs,
-    DepositContractEventArgs,
    ContractEventArgs,
-    ContractEventArg,
    Web3Provider,
    ZeroExConfig,
-    EtherTokenEvents,
-    TransactionReceiptWithDecodedLogs,
-    LogWithDecodedArgs,
    MethodOpts,
    OrderTransactionOpts,
    TransactionOpts,
@@ -47,4 +26,36 @@ export {
    OrderState,
 } from './types';

-export { TransactionReceipt } from '@0xproject/types';
+export {
+    BlockParamLiteral,
+    BlockParam,
+    ContractEventArg,
+    LogWithDecodedArgs,
+    Order,
+    SignedOrder,
+    ECSignature,
+    TransactionReceipt,
+    TransactionReceiptWithDecodedLogs,
+} from '@0xproject/types';
+
+export {
+    EtherTokenContractEventArgs,
+    WithdrawalContractEventArgs,
+    DepositContractEventArgs,
+    EtherTokenEvents,
+} from './contract_wrappers/generated/ether_token';
+
+export {
+    TransferContractEventArgs,
+    ApprovalContractEventArgs,
+    TokenContractEventArgs,
+    TokenEvents,
+} from './contract_wrappers/generated/token';
+
+export {
+    LogErrorContractEventArgs,
+    LogCancelContractEventArgs,
+    LogFillContractEventArgs,
+    ExchangeContractEventArgs,
+    ExchangeEvents,
+} from './contract_wrappers/generated/exchange';
--- a/packages/0x.js/src/monorepo_scripts/postpublish.ts
+++ b/packages/0x.js/src/monorepo_scripts/postpublish.ts
@@ -0,0 +1,8 @@
+import { postpublishUtils } from '@0xproject/monorepo-scripts';
+
+import * as packageJSON from '../package.json';
+import * as tsConfigJSON from '../tsconfig.json';
+
+const cwd = `${__dirname}/..`;
+// tslint:disable-next-line:no-floating-promises
+postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd);
--- a/packages/0x.js/src/monorepo_scripts/stagedocs.ts
+++ b/packages/0x.js/src/monorepo_scripts/stagedocs.ts
@@ -0,0 +1,8 @@
+import { postpublishUtils } from '@0xproject/monorepo-scripts';
+
+import * as packageJSON from '../package.json';
+import * as tsConfigJSON from '../tsconfig.json';
+
+const cwd = `${__dirname}/..`;
+// tslint:disable-next-line:no-floating-promises
+postpublishUtils.publishDocsToStagingAsync(packageJSON, tsConfigJSON, cwd);
--- a/packages/0x.js/src/order_watcher/event_watcher.ts
+++ b/packages/0x.js/src/order_watcher/event_watcher.ts
@@ -3,7 +3,9 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';
 import * as Web3 from 'web3';

-import { BlockParamLiteral, EventWatcherCallback, ZeroExError } from '../types';
+import { BlockParamLiteral } from '@0xproject/types';
+
+import { EventWatcherCallback, ZeroExError } from '../types';
 import { assert } from '../utils/assert';

 const DEFAULT_EVENT_POLLING_INTERVAL_MS = 200;
--- a/packages/0x.js/src/order_watcher/order_state_watcher.ts
+++ b/packages/0x.js/src/order_watcher/order_state_watcher.ts
@@ -1,35 +1,38 @@
 import { schemas } from '@0xproject/json-schemas';
-import { intervalUtils } from '@0xproject/utils';
+import { BlockParamLiteral, LogWithDecodedArgs, SignedOrder } from '@0xproject/types';
+import { AbiDecoder, intervalUtils } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';

 import { ZeroEx } from '../0x';
 import { ExchangeWrapper } from '../contract_wrappers/exchange_wrapper';
+import {
+    DepositContractEventArgs,
+    EtherTokenEvents,
+    WithdrawalContractEventArgs,
+} from '../contract_wrappers/generated/ether_token';
+import {
+    ExchangeEvents,
+    LogCancelContractEventArgs,
+    LogFillContractEventArgs,
+} from '../contract_wrappers/generated/exchange';
+import {
+    ApprovalContractEventArgs,
+    TokenEvents,
+    TransferContractEventArgs,
+} from '../contract_wrappers/generated/token';
 import { TokenWrapper } from '../contract_wrappers/token_wrapper';
 import { BalanceAndProxyAllowanceLazyStore } from '../stores/balance_proxy_allowance_lazy_store';
 import { OrderFilledCancelledLazyStore } from '../stores/order_filled_cancelled_lazy_store';
 import {
-    ApprovalContractEventArgs,
-    BlockParamLiteral,
    ContractEventArgs,
-    DepositContractEventArgs,
-    EtherTokenEvents,
    ExchangeContractErrs,
-    ExchangeEvents,
-    LogCancelContractEventArgs,
    LogEvent,
-    LogFillContractEventArgs,
-    LogWithDecodedArgs,
    OnOrderStateChangeCallback,
    OrderState,
    OrderStateWatcherConfig,
-    SignedOrder,
-    TokenEvents,
-    TransferContractEventArgs,
-    WithdrawalContractEventArgs,
    ZeroExError,
 } from '../types';
-import { AbiDecoder } from '../utils/abi_decoder';
 import { assert } from '../utils/assert';
 import { OrderStateUtils } from '../utils/order_state_utils';
 import { utils } from '../utils/utils';
@@ -134,8 +137,12 @@ export class OrderStateWatcher {
        delete this._orderStateByOrderHashCache[orderHash];
        const exchange = (this._orderFilledCancelledLazyStore as any)._exchange as ExchangeWrapper;
        const zrxTokenAddress = exchange.getZRXTokenAddress();
+
        this._removeFromDependentOrderHashes(signedOrder.maker, zrxTokenAddress, orderHash);
-        this._removeFromDependentOrderHashes(signedOrder.maker, signedOrder.makerTokenAddress, orderHash);
+        if (zrxTokenAddress !== signedOrder.makerTokenAddress) {
+            this._removeFromDependentOrderHashes(signedOrder.maker, signedOrder.makerTokenAddress, orderHash);
+        }
+
        this._expirationWatcher.removeOrder(orderHash);
    }
    /**
@@ -224,12 +231,12 @@ export class OrderStateWatcher {
            return;
        }
        const log = logIfExists as LogEvent; // At this moment we are sure that no error occured and log is defined.
-        const maybeDecodedLog = this._abiDecoder.tryToDecodeLogOrNoop(log);
-        const isLogDecoded = !_.isUndefined((maybeDecodedLog as LogWithDecodedArgs<any>).event);
+        const maybeDecodedLog = this._abiDecoder.tryToDecodeLogOrNoop<ContractEventArgs>(log);
+        const isLogDecoded = !_.isUndefined(((maybeDecodedLog as any) as LogWithDecodedArgs<ContractEventArgs>).event);
        if (!isLogDecoded) {
            return; // noop
        }
-        const decodedLog = maybeDecodedLog as LogWithDecodedArgs<ContractEventArgs>;
+        const decodedLog = (maybeDecodedLog as any) as LogWithDecodedArgs<ContractEventArgs>;
        let makerToken: string;
        let makerAddress: string;
        switch (decodedLog.event) {
--- a/packages/0x.js/src/order_watcher/remaining_fillable_calculator.ts
+++ b/packages/0x.js/src/order_watcher/remaining_fillable_calculator.ts
@@ -1,7 +1,6 @@
+import { SignedOrder } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';

-import { SignedOrder } from '../types';
-
 export class RemainingFillableCalculator {
    private _signedOrder: SignedOrder;
    private _isMakerTokenZRX: boolean;
--- a/packages/0x.js/src/schemas/zero_ex_config_schema.ts
+++ b/packages/0x.js/src/schemas/zero_ex_config_schema.ts
@@ -1,27 +1,5 @@
 export const zeroExConfigSchema = {
    id: '/ZeroExConfig',
-    properties: {
-        networkId: {
-            type: 'number',
-            minimum: 0,
-        },
-        gasPrice: { $ref: '/Number' },
-        exchangeContractAddress: { $ref: '/Address' },
-        tokenRegistryContractAddress: { $ref: '/Address' },
-        orderWatcherConfig: {
-            type: 'object',
-            properties: {
-                pollingIntervalMs: {
-                    type: 'number',
-                    minimum: 0,
-                },
-                numConfirmations: {
-                    type: 'number',
-                    minimum: 0,
-                },
-            },
-        },
-    },
+    oneOf: [{ $ref: '/ZeroExPrivateNetworkConfig' }, { $ref: '/ZeroExPublicNetworkConfig' }],
    type: 'object',
-    required: ['networkId'],
 };
--- a/packages/0x.js/src/schemas/zero_ex_private_network_config_schema.ts
+++ b/packages/0x.js/src/schemas/zero_ex_private_network_config_schema.ts
@@ -0,0 +1,35 @@
+export const zeroExPrivateNetworkConfigSchema = {
+    id: '/ZeroExPrivateNetworkConfig',
+    properties: {
+        networkId: {
+            type: 'number',
+            minimum: 1,
+        },
+        gasPrice: { $ref: '/Number' },
+        zrxContractAddress: { $ref: '/Address' },
+        exchangeContractAddress: { $ref: '/Address' },
+        tokenRegistryContractAddress: { $ref: '/Address' },
+        tokenTransferProxyContractAddress: { $ref: '/Address' },
+        orderWatcherConfig: {
+            type: 'object',
+            properties: {
+                pollingIntervalMs: {
+                    type: 'number',
+                    minimum: 0,
+                },
+                numConfirmations: {
+                    type: 'number',
+                    minimum: 0,
+                },
+            },
+        },
+    },
+    type: 'object',
+    required: [
+        'networkId',
+        'zrxContractAddress',
+        'exchangeContractAddress',
+        'tokenRegistryContractAddress',
+        'tokenTransferProxyContractAddress',
+    ],
+};
--- a/packages/0x.js/src/schemas/zero_ex_public_network_config_schema.ts
+++ b/packages/0x.js/src/schemas/zero_ex_public_network_config_schema.ts
@@ -0,0 +1,29 @@
+export const zeroExPublicNetworkConfigSchema = {
+    id: '/ZeroExPublicNetworkConfig',
+    properties: {
+        networkId: {
+            type: 'number',
+            enum: [1, 3, 4, 42, 50],
+        },
+        gasPrice: { $ref: '/Number' },
+        zrxContractAddress: { $ref: '/Address' },
+        exchangeContractAddress: { $ref: '/Address' },
+        tokenRegistryContractAddress: { $ref: '/Address' },
+        tokenTransferProxyContractAddress: { $ref: '/Address' },
+        orderWatcherConfig: {
+            type: 'object',
+            properties: {
+                pollingIntervalMs: {
+                    type: 'number',
+                    minimum: 0,
+                },
+                numConfirmations: {
+                    type: 'number',
+                    minimum: 0,
+                },
+            },
+        },
+    },
+    type: 'object',
+    required: ['networkId'],
+};
--- a/packages/0x.js/src/stores/balance_proxy_allowance_lazy_store.ts
+++ b/packages/0x.js/src/stores/balance_proxy_allowance_lazy_store.ts
@@ -1,8 +1,8 @@
+import { BlockParamLiteral } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import * as _ from 'lodash';

 import { TokenWrapper } from '../contract_wrappers/token_wrapper';
-import { BlockParamLiteral } from '../types';

 /**
 * Copy on read store for balances/proxyAllowances of tokens/accounts
--- a/packages/0x.js/src/stores/order_filled_cancelled_lazy_store.ts
+++ b/packages/0x.js/src/stores/order_filled_cancelled_lazy_store.ts
@@ -1,8 +1,8 @@
+import { BlockParamLiteral } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import * as _ from 'lodash';

 import { ExchangeWrapper } from '../contract_wrappers/exchange_wrapper';
-import { BlockParamLiteral } from '../types';

 /**
 * Copy on read store for filled/cancelled taker amounts
--- a/packages/0x.js/src/types.ts
+++ b/packages/0x.js/src/types.ts
@@ -1,7 +1,20 @@
-import { TransactionReceipt } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
+
+import {
+    BlockParam,
+    BlockParamLiteral,
+    ContractEventArg,
+    LogWithDecodedArgs,
+    Order,
+    SignedOrder,
+} from '@0xproject/types';
+
 import * as Web3 from 'web3';

+import { EtherTokenContractEventArgs, EtherTokenEvents } from './contract_wrappers/generated/ether_token';
+import { ExchangeContractEventArgs, ExchangeEvents } from './contract_wrappers/generated/exchange';
+import { TokenContractEventArgs, TokenEvents } from './contract_wrappers/generated/token';
+
 export enum ZeroExError {
    ExchangeContractDoesNotExist = 'EXCHANGE_CONTRACT_DOES_NOT_EXIST',
    ZRXContractDoesNotExist = 'ZRX_CONTRACT_DOES_NOT_EXIST',
@@ -31,15 +44,6 @@ export enum InternalZeroExError {
    WethNotInTokenRegistry = 'WETH_NOT_IN_TOKEN_REGISTRY',
 }

-/**
- * Elliptic Curve signature
- */
-export interface ECSignature {
-    v: number;
-    r: string;
-    s: string;
-}
-
 export type OrderAddresses = [string, string, string, string, string];

 export type OrderValues = [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, BigNumber];
@@ -53,13 +57,6 @@ export interface DecodedLogEvent<ArgsType> {
 export type EventCallback<ArgsType> = (err: null | Error, log?: DecodedLogEvent<ArgsType>) => void;
 export type EventWatcherCallback = (err: null | Error, log?: LogEvent) => void;

-export enum SolidityTypes {
-    Address = 'address',
-    Uint256 = 'uint256',
-    Uint8 = 'uint8',
-    Uint = 'uint',
-}
-
 export enum ExchangeContractErrCodes {
    ERROR_FILL_EXPIRED, // Order has already expired
    ERROR_FILL_NO_VALUE, // Order has already been fully filled or cancelled
@@ -94,8 +91,6 @@ export enum ExchangeContractErrs {
    BatchOrdersMustHaveAtLeastOneItem = 'BATCH_ORDERS_MUST_HAVE_AT_LEAST_ONE_ITEM',
 }

-export type RawLog = Web3.LogEntry;
-
 export interface ContractEvent {
    logIndex: number;
    transactionIndex: number;
@@ -108,84 +103,10 @@ export interface ContractEvent {
    args: ContractEventArgs;
 }

-export interface LogFillContractEventArgs {
-    maker: string;
-    taker: string;
-    feeRecipient: string;
-    makerToken: string;
-    takerToken: string;
-    filledMakerTokenAmount: BigNumber;
-    filledTakerTokenAmount: BigNumber;
-    paidMakerFee: BigNumber;
-    paidTakerFee: BigNumber;
-    tokens: string;
-    orderHash: string;
-}
-export interface LogCancelContractEventArgs {
-    maker: string;
-    feeRecipient: string;
-    makerToken: string;
-    takerToken: string;
-    cancelledMakerTokenAmount: BigNumber;
-    cancelledTakerTokenAmount: BigNumber;
-    tokens: string;
-    orderHash: string;
-}
-export interface LogErrorContractEventArgs {
-    errorId: BigNumber;
-    orderHash: string;
-}
-export type ExchangeContractEventArgs =
-    | LogFillContractEventArgs
-    | LogCancelContractEventArgs
-    | LogErrorContractEventArgs;
-export interface TransferContractEventArgs {
-    _from: string;
-    _to: string;
-    _value: BigNumber;
-}
-export interface ApprovalContractEventArgs {
-    _owner: string;
-    _spender: string;
-    _value: BigNumber;
-}
-export interface DepositContractEventArgs {
-    _owner: string;
-    _value: BigNumber;
-}
-export interface WithdrawalContractEventArgs {
-    _owner: string;
-    _value: BigNumber;
-}
-export type TokenContractEventArgs = TransferContractEventArgs | ApprovalContractEventArgs;
-export type EtherTokenContractEventArgs =
-    | TokenContractEventArgs
-    | DepositContractEventArgs
-    | WithdrawalContractEventArgs;
 export type ContractEventArgs = ExchangeContractEventArgs | TokenContractEventArgs | EtherTokenContractEventArgs;
-export type ContractEventArg = string | BigNumber;
-
-export interface Order {
-    maker: string;
-    taker: string;
-    makerFee: BigNumber;
-    takerFee: BigNumber;
-    makerTokenAmount: BigNumber;
-    takerTokenAmount: BigNumber;
-    makerTokenAddress: string;
-    takerTokenAddress: string;
-    salt: BigNumber;
-    exchangeContractAddress: string;
-    feeRecipient: string;
-    expirationUnixTimestampSec: BigNumber;
-}
-
-export interface SignedOrder extends Order {
-    ecSignature: ECSignature;
-}

 //                          [address, name, symbol, decimals, ipfsHash, swarmHash]
-export type TokenMetadata = [string, string, string, BigNumber, string, string];
+export type TokenMetadata = [string, string, string, number, string, string];

 export interface Token {
    name: string;
@@ -205,40 +126,12 @@ export interface TokenAddressBySymbol {
    [symbol: string]: string;
 }

-export enum ExchangeEvents {
-    LogFill = 'LogFill',
-    LogCancel = 'LogCancel',
-    LogError = 'LogError',
-}
-
-export enum TokenEvents {
-    Transfer = 'Transfer',
-    Approval = 'Approval',
-}
-
-export enum EtherTokenEvents {
-    Transfer = 'Transfer',
-    Approval = 'Approval',
-    Deposit = 'Deposit',
-    Withdrawal = 'Withdrawal',
-}
-
 export type ContractEvents = TokenEvents | ExchangeEvents | EtherTokenEvents;

 export interface IndexedFilterValues {
    [index: string]: ContractEventArg;
 }

-// Earliest is omitted by design. It is simply an alias for the `0` constant and
-// is thus not very helpful. Moreover, this type is used in places that only accept
-// `latest` or `pending`.
-export enum BlockParamLiteral {
-    Latest = 'latest',
-    Pending = 'pending',
-}
-
-export type BlockParam = BlockParamLiteral | number;
-
 export interface BlockRange {
    fromBlock: BlockParam;
    toBlock: BlockParam;
@@ -267,11 +160,6 @@ export type SyncMethod = (...args: any[]) => any;
 */
 export type Web3Provider = Web3.Provider;

-export interface JSONRPCPayload {
-    params: any[];
-    method: string;
-}
-
 /*
 * orderExpirationCheckingIntervalMs: How often to check for expired orders. Default: 50
 * eventPollingIntervalMs: How often to poll the Ethereum node for new events. Defaults: 200
@@ -287,7 +175,7 @@ export interface OrderStateWatcherConfig {
 }

 /*
- * networkId: The id of the underlying ethereum network your provider is connected to. (1-mainnet, 42-kovan, 50-testrpc)
+ * 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
 * zrxContractAddress: The address of the ZRX contract to use
@@ -305,23 +193,6 @@ export interface ZeroExConfig {
    orderWatcherConfig?: OrderStateWatcherConfig;
 }

-export enum AbiType {
-    Function = 'function',
-    Constructor = 'constructor',
-    Event = 'event',
-    Fallback = 'fallback',
-}
-
-export interface DecodedLogArgs {
-    [argName: string]: ContractEventArg;
-}
-
-export interface LogWithDecodedArgs<ArgsType> extends Web3.DecodedLogEntry<ArgsType> {}
-
-export interface TransactionReceiptWithDecodedLogs extends TransactionReceipt {
-    logs: Array<LogWithDecodedArgs<DecodedLogArgs> | Web3.LogEntry>;
-}
-
 export type ArtifactContractName = 'ZRX' | 'TokenTransferProxy' | 'TokenRegistry' | 'Token' | 'Exchange' | 'EtherToken';

 export interface Artifact {
--- a/packages/0x.js/src/utils/assert.ts
+++ b/packages/0x.js/src/utils/assert.ts
@@ -3,11 +3,11 @@ import { assert as sharedAssert } from '@0xproject/assert';
 // tslint:disable-next-line:no-unused-variable
 import { Schema } from '@0xproject/json-schemas';
 // tslint:disable-next-line:no-unused-variable
+import { ECSignature } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';

-import { ECSignature } from '../types';
 import { signatureUtils } from '../utils/signature_utils';

 export const assert = {
--- a/packages/0x.js/src/utils/exchange_transfer_simulator.ts
+++ b/packages/0x.js/src/utils/exchange_transfer_simulator.ts
@@ -1,9 +1,10 @@
+import { BlockParamLiteral } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import * as _ from 'lodash';

 import { TokenWrapper } from '../contract_wrappers/token_wrapper';
 import { BalanceAndProxyAllowanceLazyStore } from '../stores/balance_proxy_allowance_lazy_store';
-import { BlockParamLiteral, ExchangeContractErrs, TradeSide, TransferType } from '../types';
+import { ExchangeContractErrs, TradeSide, TransferType } from '../types';

 enum FailureReason {
    Balance = 'balance',
--- a/packages/0x.js/src/utils/order_state_utils.ts
+++ b/packages/0x.js/src/utils/order_state_utils.ts
@@ -1,3 +1,4 @@
+import { SignedOrder } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import * as _ from 'lodash';

@@ -6,14 +7,7 @@ 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,
-    SignedOrder,
-} from '../types';
+import { ExchangeContractErrs, OrderRelevantState, OrderState, OrderStateInvalid, OrderStateValid } from '../types';

 const ACCEPTABLE_RELATIVE_ROUNDING_ERROR = 0.0001;

--- a/packages/0x.js/src/utils/order_validation_utils.ts
+++ b/packages/0x.js/src/utils/order_validation_utils.ts
@@ -1,9 +1,10 @@
+import { Order, SignedOrder } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import * as _ from 'lodash';

 import { ZeroEx } from '../0x';
 import { ExchangeWrapper } from '../contract_wrappers/exchange_wrapper';
-import { ExchangeContractErrs, Order, SignedOrder, TradeSide, TransferType, ZeroExError } from '../types';
+import { ExchangeContractErrs, TradeSide, TransferType, ZeroExError } from '../types';
 import { constants } from '../utils/constants';
 import { utils } from '../utils/utils';

--- a/packages/0x.js/src/utils/signature_utils.ts
+++ b/packages/0x.js/src/utils/signature_utils.ts
@@ -1,7 +1,6 @@
+import { ECSignature } from '@0xproject/types';
 import * as ethUtil from 'ethereumjs-util';

-import { ECSignature } from '../types';
-
 export const signatureUtils = {
    isValidSignature(data: string, signature: ECSignature, signerAddress: string): boolean {
        const dataBuff = ethUtil.toBuffer(data);
--- a/packages/0x.js/src/utils/utils.ts
+++ b/packages/0x.js/src/utils/utils.ts
@@ -1,11 +1,10 @@
+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';

-import { Order, SignedOrder, SolidityTypes } from '../types';
-
 export const utils = {
    /**
     * Converts BigNumber instance to BN
@@ -16,10 +15,6 @@ export const utils = {
    bigNumberToBN(value: BigNumber) {
        return new BN(value.toString(), 10);
    },
-    consoleLog(message: string): void {
-        // tslint:disable-next-line: no-console
-        console.log(message);
-    },
    spawnSwitchErr(name: string, value: any): Error {
        return new Error(`Unexpected switch value: ${value} encountered for ${name}`);
    },
--- a/packages/0x.js/test/0x.js_test.ts
+++ b/packages/0x.js/test/0x.js_test.ts
@@ -1,4 +1,4 @@
-import { BlockchainLifecycle } from '@0xproject/dev-utils';
+import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-utils';
 import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import * as _ from 'lodash';
@@ -10,16 +10,15 @@ import { ApprovalContractEventArgs, LogWithDecodedArgs, Order, TokenEvents, Zero
 import { chaiSetup } from './utils/chai_setup';
 import { constants } from './utils/constants';
 import { TokenUtils } from './utils/token_utils';
-import { web3Factory } from './utils/web3_factory';
+import { web3, web3Wrapper } from './utils/web3_wrapper';

-const blockchainLifecycle = new BlockchainLifecycle(constants.RPC_URL);
+const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
 chaiSetup.configure();
 const expect = chai.expect;

 const SHOULD_ADD_PERSONAL_MESSAGE_PREFIX = false;

 describe('ZeroEx library', () => {
-    const web3 = web3Factory.create();
    const config = {
        networkId: constants.TESTRPC_NETWORK_ID,
    };
--- a/packages/0x.js/test/assert_test.ts
+++ b/packages/0x.js/test/assert_test.ts
@@ -1,3 +1,4 @@
+import { web3Factory } from '@0xproject/dev-utils';
 import * as chai from 'chai';
 import 'mocha';

@@ -5,7 +6,6 @@ import { ZeroEx } from '../src';
 import { assert } from '../src/utils/assert';

 import { constants } from './utils/constants';
-import { web3Factory } from './utils/web3_factory';

 const expect = chai.expect;

--- a/packages/0x.js/test/ether_token_wrapper_test.ts
+++ b/packages/0x.js/test/ether_token_wrapper_test.ts
@@ -1,4 +1,4 @@
-import { BlockchainLifecycle } from '@0xproject/dev-utils';
+import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-utils';
 import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import 'mocha';
@@ -17,18 +17,17 @@ import {
    ZeroEx,
    ZeroExError,
 } from '../src';
-import { artifacts } from '../src/artifacts';
 import { DoneCallback } from '../src/types';

 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 { web3Factory } from './utils/web3_factory';
+import { web3, web3Wrapper } from './utils/web3_wrapper';

 chaiSetup.configure();
 const expect = chai.expect;
-const blockchainLifecycle = new BlockchainLifecycle(constants.RPC_URL);
+const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);

 // Since the address depositing/withdrawing ETH/WETH also needs to pay gas costs for the transaction,
 // a small amount of ETH will be used to pay this gas cost. We therefore check that the difference between
@@ -37,7 +36,6 @@ const blockchainLifecycle = new BlockchainLifecycle(constants.RPC_URL);
 const MAX_REASONABLE_GAS_COST_IN_WEI = 62517;

 describe('EtherTokenWrapper', () => {
-    let web3: Web3;
    let zeroEx: ZeroEx;
    let tokens: Token[];
    let userAddresses: string[];
@@ -56,12 +54,11 @@ describe('EtherTokenWrapper', () => {
    const depositAmount = new BigNumber(42);
    const withdrawalAmount = new BigNumber(42);
    before(async () => {
-        web3 = web3Factory.create();
        zeroEx = new ZeroEx(web3.currentProvider, zeroExConfig);
        tokens = await zeroEx.tokenRegistry.getTokensAsync();
        userAddresses = await zeroEx.getAvailableAddressesAsync();
        addressWithETH = userAddresses[0];
-        wethContractAddress = (zeroEx.etherToken as any)._getContractAddress(artifacts.EtherTokenArtifact);
+        wethContractAddress = zeroEx.etherToken.getContractAddressIfExists() as string;
        depositWeiAmount = (zeroEx as any)._web3Wrapper.toWei(new BigNumber(5));
        decimalPlaces = 7;
        addressWithoutFunds = userAddresses[1];
@@ -72,6 +69,21 @@ describe('EtherTokenWrapper', () => {
    afterEach(async () => {
        await blockchainLifecycle.revertAsync();
    });
+    describe('#getContractAddressIfExists', async () => {
+        it('should return contract address if connected to a known network', () => {
+            const contractAddressIfExists = zeroEx.etherToken.getContractAddressIfExists();
+            expect(contractAddressIfExists).to.not.be.undefined();
+        });
+        it('should throw if connected to a private network and contract addresses are not specified', () => {
+            const UNKNOWN_NETWORK_NETWORK_ID = 10;
+            expect(
+                () =>
+                    new ZeroEx(web3.currentProvider, {
+                        networkId: UNKNOWN_NETWORK_NETWORK_ID,
+                    } as any),
+            ).to.throw();
+        });
+    });
    describe('#depositAsync', () => {
        it('should successfully deposit ETH and issue Wrapped ETH tokens', async () => {
            const preETHBalance = await (zeroEx as any)._web3Wrapper.getBalanceInWeiAsync(addressWithETH);
--- a/packages/0x.js/test/event_watcher_test.ts
+++ b/packages/0x.js/test/event_watcher_test.ts
@@ -1,3 +1,4 @@
+import { web3Factory } from '@0xproject/dev-utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as chai from 'chai';
 import * as _ from 'lodash';
@@ -11,7 +12,6 @@ import { DoneCallback } from '../src/types';

 import { chaiSetup } from './utils/chai_setup';
 import { reportNodeCallbackErrors } from './utils/report_callback_errors';
-import { web3Factory } from './utils/web3_factory';

 chaiSetup.configure();
 const expect = chai.expect;
--- a/packages/0x.js/test/exchange_transfer_simulator_test.ts
+++ b/packages/0x.js/test/exchange_transfer_simulator_test.ts
@@ -1,21 +1,21 @@
-import { BlockchainLifecycle } from '@0xproject/dev-utils';
+import { BlockchainLifecycle, devConstants } from '@0xproject/dev-utils';
+import { BlockParamLiteral } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';

 import { ExchangeContractErrs, Token, ZeroEx } from '../src';
-import { BlockParamLiteral, TradeSide, TransferType } from '../src/types';
+import { TradeSide, TransferType } from '../src/types';
 import { ExchangeTransferSimulator } from '../src/utils/exchange_transfer_simulator';

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

 chaiSetup.configure();
 const expect = chai.expect;
-const blockchainLifecycle = new BlockchainLifecycle(constants.RPC_URL);
+const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);

 describe('ExchangeTransferSimulator', () => {
-    const web3 = web3Factory.create();
    const config = {
        networkId: constants.TESTRPC_NETWORK_ID,
    };
--- a/packages/0x.js/test/exchange_wrapper_test.ts
+++ b/packages/0x.js/test/exchange_wrapper_test.ts
@@ -1,4 +1,5 @@
-import { BlockchainLifecycle } from '@0xproject/dev-utils';
+import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-utils';
+import { BlockParamLiteral } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import * as _ from 'lodash';
@@ -18,23 +19,22 @@ import {
    Token,
    ZeroEx,
 } from '../src';
-import { BlockParamLiteral, DoneCallback } from '../src/types';
+import { DoneCallback } from '../src/types';

 import { chaiSetup } from './utils/chai_setup';
 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 { web3Factory } from './utils/web3_factory';
+import { web3, web3Wrapper } from './utils/web3_wrapper';

 chaiSetup.configure();
 const expect = chai.expect;
-const blockchainLifecycle = new BlockchainLifecycle(constants.RPC_URL);
+const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);

 const NON_EXISTENT_ORDER_HASH = '0x79370342234e7acd6bbeac335bd3bb1d368383294b64b8160a00f4060e4d3777';

 describe('ExchangeWrapper', () => {
-    let web3: Web3;
    let zeroEx: ZeroEx;
    let tokenUtils: TokenUtils;
    let tokens: Token[];
@@ -46,7 +46,6 @@ describe('ExchangeWrapper', () => {
        networkId: constants.TESTRPC_NETWORK_ID,
    };
    before(async () => {
-        web3 = web3Factory.create();
        zeroEx = new ZeroEx(web3.currentProvider, config);
        exchangeContractAddress = zeroEx.exchange.getContractAddress();
        userAddresses = await zeroEx.getAvailableAddressesAsync();
--- a/packages/0x.js/test/expiration_watcher_test.ts
+++ b/packages/0x.js/test/expiration_watcher_test.ts
@@ -1,4 +1,4 @@
-import { BlockchainLifecycle } from '@0xproject/dev-utils';
+import { BlockchainLifecycle, devConstants } from '@0xproject/dev-utils';
 import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import * as _ from 'lodash';
@@ -9,22 +9,20 @@ import * as Web3 from 'web3';
 import { ZeroEx } from '../src/0x';
 import { ExpirationWatcher } from '../src/order_watcher/expiration_watcher';
 import { DoneCallback, Token } from '../src/types';
-import { constants } from '../src/utils/constants';
 import { utils } from '../src/utils/utils';

 import { chaiSetup } from './utils/chai_setup';
-import { constants as testConstants } from './utils/constants';
+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 { web3Factory } from './utils/web3_factory';
+import { web3, web3Wrapper } from './utils/web3_wrapper';

 chaiSetup.configure();
 const expect = chai.expect;
-const blockchainLifecycle = new BlockchainLifecycle(testConstants.RPC_URL);
+const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);

 describe('ExpirationWatcher', () => {
-    let web3: Web3;
    let zeroEx: ZeroEx;
    let tokenUtils: TokenUtils;
    let tokens: Token[];
@@ -43,7 +41,6 @@ describe('ExpirationWatcher', () => {
    let timer: Sinon.SinonFakeTimers;
    let expirationWatcher: ExpirationWatcher;
    before(async () => {
-        web3 = web3Factory.create();
        const config = {
            networkId: constants.TESTRPC_NETWORK_ID,
        };
--- a/packages/0x.js/test/order_state_watcher_test.ts
+++ b/packages/0x.js/test/order_state_watcher_test.ts
@@ -1,4 +1,4 @@
-import { BlockchainLifecycle } from '@0xproject/dev-utils';
+import { BlockchainLifecycle, devConstants } from '@0xproject/dev-utils';
 import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import * as _ from 'lodash';
@@ -22,16 +22,15 @@ 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 { web3Factory } from './utils/web3_factory';
+import { web3, web3Wrapper } from './utils/web3_wrapper';

 const TIMEOUT_MS = 150;

 chaiSetup.configure();
 const expect = chai.expect;
-const blockchainLifecycle = new BlockchainLifecycle(constants.RPC_URL);
+const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);

 describe('OrderStateWatcher', () => {
-    let web3: Web3;
    let zeroEx: ZeroEx;
    let tokens: Token[];
    let tokenUtils: TokenUtils;
@@ -50,7 +49,6 @@ describe('OrderStateWatcher', () => {
    const decimals = constants.ZRX_DECIMALS;
    const fillableAmount = ZeroEx.toBaseUnitAmount(new BigNumber(5), decimals);
    before(async () => {
-        web3 = web3Factory.create();
        zeroEx = new ZeroEx(web3.currentProvider, config);
        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,11 +1,12 @@
-import { BlockchainLifecycle } from '@0xproject/dev-utils';
+import { BlockchainLifecycle, devConstants } from '@0xproject/dev-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 { BlockParamLiteral, TradeSide, TransferType } from '../src/types';
+import { TradeSide, TransferType } from '../src/types';
 import { ExchangeTransferSimulator } from '../src/utils/exchange_transfer_simulator';
 import { OrderValidationUtils } from '../src/utils/order_validation_utils';

@@ -13,14 +14,13 @@ import { chaiSetup } from './utils/chai_setup';
 import { constants } from './utils/constants';
 import { FillScenarios } from './utils/fill_scenarios';
 import { TokenUtils } from './utils/token_utils';
-import { web3Factory } from './utils/web3_factory';
+import { web3, web3Wrapper } from './utils/web3_wrapper';

 chaiSetup.configure();
 const expect = chai.expect;
-const blockchainLifecycle = new BlockchainLifecycle(constants.RPC_URL);
+const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);

 describe('OrderValidation', () => {
-    let web3: Web3;
    let zeroEx: ZeroEx;
    let userAddresses: string[];
    let tokens: Token[];
@@ -40,7 +40,6 @@ describe('OrderValidation', () => {
        networkId: constants.TESTRPC_NETWORK_ID,
    };
    before(async () => {
-        web3 = web3Factory.create();
        zeroEx = new ZeroEx(web3.currentProvider, config);
        exchangeContractAddress = zeroEx.exchange.getContractAddress();
        userAddresses = await zeroEx.getAvailableAddressesAsync();
--- a/packages/0x.js/test/remaining_fillable_calculator_test.ts
+++ b/packages/0x.js/test/remaining_fillable_calculator_test.ts
@@ -1,10 +1,10 @@
+import { ECSignature, SignedOrder } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import 'mocha';

 import { ZeroEx } from '../src/0x';
 import { RemainingFillableCalculator } from '../src/order_watcher/remaining_fillable_calculator';
-import { ECSignature, SignedOrder } from '../src/types';

 import { chaiSetup } from './utils/chai_setup';

--- a/packages/0x.js/test/subscription_test.ts
+++ b/packages/0x.js/test/subscription_test.ts
@@ -1,4 +1,4 @@
-import { BlockchainLifecycle } from '@0xproject/dev-utils';
+import { BlockchainLifecycle, devConstants } from '@0xproject/dev-utils';
 import { BigNumber } from '@0xproject/utils';
 import * as _ from 'lodash';
 import 'mocha';
@@ -11,13 +11,12 @@ import { DoneCallback } from '../src/types';
 import { chaiSetup } from './utils/chai_setup';
 import { constants } from './utils/constants';
 import { assertNodeCallbackError } from './utils/report_callback_errors';
-import { web3Factory } from './utils/web3_factory';
+import { web3, web3Wrapper } from './utils/web3_wrapper';

 chaiSetup.configure();
-const blockchainLifecycle = new BlockchainLifecycle(constants.RPC_URL);
+const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);

 describe('SubscriptionTest', () => {
-    let web3: Web3;
    let zeroEx: ZeroEx;
    let userAddresses: string[];
    let tokens: Token[];
@@ -27,7 +26,6 @@ describe('SubscriptionTest', () => {
        networkId: constants.TESTRPC_NETWORK_ID,
    };
    before(async () => {
-        web3 = web3Factory.create();
        zeroEx = new ZeroEx(web3.currentProvider, config);
        userAddresses = await zeroEx.getAvailableAddressesAsync();
        tokens = await zeroEx.tokenRegistry.getTokensAsync();
--- a/packages/0x.js/test/token_registry_wrapper_test.ts
+++ b/packages/0x.js/test/token_registry_wrapper_test.ts
@@ -1,4 +1,4 @@
-import { BlockchainLifecycle } from '@0xproject/dev-utils';
+import { BlockchainLifecycle, devConstants } from '@0xproject/dev-utils';
 import { schemas, SchemaValidator } from '@0xproject/json-schemas';
 import * as chai from 'chai';
 import * as _ from 'lodash';
@@ -8,11 +8,11 @@ import { Token, ZeroEx } from '../src';

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

 chaiSetup.configure();
 const expect = chai.expect;
-const blockchainLifecycle = new BlockchainLifecycle(constants.RPC_URL);
+const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);

 const TOKEN_REGISTRY_SIZE_AFTER_MIGRATION = 7;

@@ -31,7 +31,6 @@ describe('TokenRegistryWrapper', () => {
        networkId: constants.TESTRPC_NETWORK_ID,
    };
    before(async () => {
-        const web3 = web3Factory.create();
        zeroEx = new ZeroEx(web3.currentProvider, config);
        tokens = await zeroEx.tokenRegistry.getTokensAsync();
        _.map(tokens, token => {
--- a/packages/0x.js/test/token_transfer_proxy_wrapper_test.ts
+++ b/packages/0x.js/test/token_transfer_proxy_wrapper_test.ts
@@ -1,13 +1,14 @@
+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 { web3Factory } from './utils/web3_factory';

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

 describe('TokenTransferProxyWrapper', () => {
    let zeroEx: ZeroEx;
@@ -15,7 +16,6 @@ describe('TokenTransferProxyWrapper', () => {
        networkId: constants.TESTRPC_NETWORK_ID,
    };
    before(async () => {
-        const web3 = web3Factory.create();
        zeroEx = new ZeroEx(web3.currentProvider, config);
    });
    describe('#isAuthorizedAsync', () => {
--- a/packages/0x.js/test/token_wrapper_test.ts
+++ b/packages/0x.js/test/token_wrapper_test.ts
@@ -1,4 +1,4 @@
-import { BlockchainLifecycle } from '@0xproject/dev-utils';
+import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-utils';
 import { BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as chai from 'chai';
@@ -22,28 +22,24 @@ 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 { web3Factory } from './utils/web3_factory';
+import { web3, web3Wrapper } from './utils/web3_wrapper';

 chaiSetup.configure();
 const expect = chai.expect;
-const blockchainLifecycle = new BlockchainLifecycle(constants.RPC_URL);
+const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);

 describe('TokenWrapper', () => {
-    let web3: Web3;
    let zeroEx: ZeroEx;
    let userAddresses: string[];
    let tokens: Token[];
    let tokenUtils: TokenUtils;
    let coinbase: string;
    let addressWithoutFunds: string;
-    let web3Wrapper: Web3Wrapper;
    const config = {
        networkId: constants.TESTRPC_NETWORK_ID,
    };
    before(async () => {
-        web3 = web3Factory.create();
        zeroEx = new ZeroEx(web3.currentProvider, config);
-        web3Wrapper = new Web3Wrapper(web3.currentProvider);
        userAddresses = await zeroEx.getAvailableAddressesAsync();
        tokens = await zeroEx.tokenRegistry.getTokensAsync();
        tokenUtils = new TokenUtils(tokens);
@@ -195,7 +191,7 @@ describe('TokenWrapper', () => {
            let zeroExWithoutAccounts: ZeroEx;
            before(async () => {
                const hasAddresses = false;
-                const web3WithoutAccounts = web3Factory.create(hasAddresses);
+                const web3WithoutAccounts = web3Factory.create({ hasAddresses });
                zeroExWithoutAccounts = new ZeroEx(web3WithoutAccounts.currentProvider, config);
            });
            it('should return balance even when called with Web3 provider instance without addresses', async () => {
@@ -307,7 +303,7 @@ describe('TokenWrapper', () => {
            let zeroExWithoutAccounts: ZeroEx;
            before(async () => {
                const hasAddresses = false;
-                const web3WithoutAccounts = web3Factory.create(hasAddresses);
+                const web3WithoutAccounts = web3Factory.create({ hasAddresses });
                zeroExWithoutAccounts = new ZeroEx(web3WithoutAccounts.currentProvider, config);
            });
            it('should get the proxy allowance', async () => {
--- a/packages/0x.js/test/utils/constants.ts
+++ b/packages/0x.js/test/utils/constants.ts
@@ -1,11 +1,9 @@
 export const constants = {
    NULL_ADDRESS: '0x0000000000000000000000000000000000000000',
-    RPC_URL: 'http://localhost:8545',
    ROPSTEN_NETWORK_ID: 3,
    KOVAN_NETWORK_ID: 42,
    TESTRPC_NETWORK_ID: 50,
    KOVAN_RPC_URL: 'https://kovan.infura.io/',
    ROPSTEN_RPC_URL: 'https://ropsten.infura.io/',
    ZRX_DECIMALS: 18,
-    GAS_ESTIMATE: 500000,
 };
--- a/packages/0x.js/test/utils/fill_scenarios.ts
+++ b/packages/0x.js/test/utils/fill_scenarios.ts
@@ -35,12 +35,8 @@ export class FillScenarios {
        const web3Wrapper = (this._zeroEx as any)._web3Wrapper as Web3Wrapper;
        for (const token of this._tokens) {
            if (token.symbol !== 'ZRX' && token.symbol !== 'WETH') {
-                const contractInstance = web3Wrapper.getContractInstance(
-                    artifacts.DummyTokenArtifact.abi,
-                    token.address,
-                );
                const defaults = {};
-                const dummyToken = new DummyTokenContract(contractInstance, defaults);
+                const dummyToken = new DummyTokenContract(web3Wrapper, artifacts.DummyTokenArtifact.abi, token.address);
                const tokenSupply = ZeroEx.toBaseUnitAmount(INITIAL_COINBASE_TOKEN_SUPPLY_IN_UNITS, token.decimals);
                const txHash = await dummyToken.setBalance.sendTransactionAsync(this._coinbase, tokenSupply, {
                    from: this._coinbase,
--- a/packages/0x.js/test/utils/web3_factory.ts
+++ b/packages/0x.js/test/utils/web3_factory.ts
@@ -1,42 +0,0 @@
-// HACK: web3 injects XMLHttpRequest into the global scope and ProviderEngine checks XMLHttpRequest
-// to know whether it is running in a browser or node environment. We need it to be undefined since
-// we are not running in a browser env.
-// Filed issue: https://github.com/ethereum/web3.js/issues/844
-(global as any).XMLHttpRequest = undefined;
-import ProviderEngine = require('web3-provider-engine');
-import RpcSubprovider = require('web3-provider-engine/subproviders/rpc');
-
-import { EmptyWalletSubprovider } from './subproviders/empty_wallet_subprovider';
-import { FakeGasEstimateSubprovider } from './subproviders/fake_gas_estimate_subprovider';
-
-import { constants } from './constants';
-
-// HACK: web3 leaks XMLHttpRequest into the global scope and causes requests to hang
-// because they are using the wrong XHR package.
-// importing web3 after subproviders fixes this issue
-// Filed issue: https://github.com/ethereum/web3.js/issues/844
-// tslint:disable-next-line:ordered-imports
-import * as Web3 from 'web3';
-
-export const web3Factory = {
-    create(hasAddresses: boolean = true): Web3 {
-        const provider = this.getRpcProvider(hasAddresses);
-        const web3 = new Web3();
-        web3.setProvider(provider);
-        return web3;
-    },
-    getRpcProvider(hasAddresses: boolean = true): Web3.Provider {
-        const provider = new ProviderEngine();
-        if (!hasAddresses) {
-            provider.addProvider(new EmptyWalletSubprovider());
-        }
-        provider.addProvider(new FakeGasEstimateSubprovider(constants.GAS_ESTIMATE));
-        provider.addProvider(
-            new RpcSubprovider({
-                rpcUrl: constants.RPC_URL,
-            }),
-        );
-        provider.start();
-        return provider;
-    },
-};
--- a/packages/0x.js/test/utils/web3_wrapper.ts
+++ b/packages/0x.js/test/utils/web3_wrapper.ts
@@ -0,0 +1,6 @@
+import { web3Factory } from '@0xproject/dev-utils';
+import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import * as Web3 from 'web3';
+
+export const web3 = web3Factory.create();
+export const web3Wrapper = new Web3Wrapper(web3.currentProvider);
--- a/packages/0x.js/tsconfig.json
+++ b/packages/0x.js/tsconfig.json
@@ -9,6 +9,7 @@
        "./test/**/*",
        "../../node_modules/types-bn/index.d.ts",
        "../../node_modules/types-ethereumjs-util/index.d.ts",
+        "../../node_modules/ethers-typescript-typings/index.d.ts",
        "../../node_modules/web3-typescript-typings/index.d.ts",
        "../../node_modules/chai-typescript-typings/index.d.ts",
        "../../node_modules/chai-as-promised-typescript-typings/index.d.ts"
--- a/packages/abi-gen/.npmignore
+++ b/packages/abi-gen/.npmignore
@@ -0,0 +1,5 @@
+.*
+yarn-error.log
+/src/
+/scripts/
+tsconfig.json
--- a/packages/abi-gen/CHANGELOG.md
+++ b/packages/abi-gen/CHANGELOG.md
@@ -1,7 +1,26 @@
 # CHANGELOG

+## v0.2.5 - _March 18, 2018_
+
+    * Consolidate all `console.log` calls into `logUtils` in the `@0xproject/utils` package (#452)
+
+## v0.2.4 - _March 4, 2018_
+
+    * Add a `backend` parameter that allows you to specify the Ethereum library you use in your templates (`web3` or `ethers`). Ethers auto-converts small ints to numbers whereas Web3 doesn't. Defaults to `web3` (#413)
+    * Add support for [tuple types](https://solidity.readthedocs.io/en/develop/abi-spec.html#handling-tuple-types) (#413)
+    * Add `hasReturnValue` to context data (#413)
+
+## v0.2.1 - _February 9, 2018_
+
+    * Fix publishing issue where .npmignore was not properly excluding undesired content (#389)
+
+## v0.2.0 - _February 7, 2018_
+
+    * Added CLI options for explicit specifying location of partials and main template (#346)
+    * Added CLI option to specify networkId, adding support for the JSON artifact format found in @0xproject/contracts (#388)
+
 ## v0.1.0 - _January 11, 2018_

-* Fixed array typings with union types (#295)
-* Add event ABIs to context data passed to templates (#302)
-* Add constructor ABIs to context data passed to templates (#304)
+    * Fixed array typings with union types (#295)
+    * Add event ABIs to context data passed to templates (#302)
+    * Add constructor ABIs to context data passed to templates (#304)
--- a/packages/abi-gen/README.md
+++ b/packages/abi-gen/README.md
@@ -4,8 +4,8 @@ This package allows you to generate TypeScript contract wrappers from ABI files.
 It's heavily inspired by [Geth abigen](https://github.com/ethereum/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts) but takes a different approach.
 You can write your custom handlebars templates which will allow you to seamlessly integrate the generated code into your existing codebase with existing conventions.

-For an example of the generated [wrapper files](https://github.com/0xProject/0x.js/tree/development/packages/0x.js/src/contract_wrappers/generated) check out 0x.js.
-[Here](https://github.com/0xProject/0x.js/tree/development/packages/0x.js/contract_templates) are the templates used to generate those files.
+For an example of the generated [wrapper files](https://github.com/0xProject/0x-monorepo/tree/development/packages/0x.js/src/contract_wrappers/generated) check out 0x.js.
+[Here](https://github.com/0xProject/0x-monorepo/tree/development/packages/0x.js/contract_templates) are the templates used to generate those files.

 ## Installation

@@ -16,34 +16,43 @@ For an example of the generated [wrapper files](https://github.com/0xProject/0x.
 ```
 abi-gen
 Options:
-  --help           Show help                                           [boolean]
-  --version        Show version number                                 [boolean]
-  --abiGlob        Glob pattern to search for ABI JSON files [string] [required]
-  --templates      Folder where to search for templates      [string] [required]
-  --output         Folder where to put the output files      [string] [required]
+  --help               Show help                                       [boolean]
+  --version            Show version number                             [boolean]
+  --abis               Glob pattern to search for ABI JSON files
+                                                             [string] [required]
+  --output, -o, --out  Folder where to put the output files  [string] [required]
+  --partials           Glob pattern for the partial template files      [string]
+  --template           Path for the main template file that will be used to
+                       generate each contract                [string] [required]
+  --backend            The backing Ethereum library your app uses. Either 'web3'
+                       or 'ethers'. Ethers auto-converts small ints to numbers
+                       whereas Web3 doesn't.
+                          [string] [choices: "web3", "ethers"] [default: "web3"]
+  --network-id         ID of the network where contract ABIs are nested in
+                       artifacts                          [number] [default: 50]
 ```

-## ABI files
-
 You're required to pass a [glob](<https://en.wikipedia.org/wiki/Glob_(programming)>) template where your abi files are located.
 TL;DR - here is the example from 0x.js.

-`--abiGlob 'src/artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry).json`
+`--abis 'src/artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry).json`

-We could've just used `--abiGlob 'src/artifacts/*.json` but we wanted to exclude some of the abi files.
+We could've just used `--abis 'src/artifacts/*.json` but we wanted to exclude some of the abi files.

 The abi file should be either a [Truffle](http://truffleframework.com/) contract artifact (a JSON object with an abi key) or a JSON abi array.

+You need to also specify the location of your main template used for every contract `--template` as well as the partial templates `--partials` that can later be used from the main one.
+
 ## How to write custom templates?

-The best way to get started is to copy [0x.js templates](https://github.com/0xProject/0x.js/tree/development/packages/0x.js/contract_templates) and start adjusting them for your needs.
+The best way to get started is to copy [0x.js templates](https://github.com/0xProject/0x-monorepo/tree/development/packages/0x.js/contract_templates) and start adjusting them for your needs.
 We use [handlebars](http://handlebarsjs.com/) template engine under the hood.
 You need to have a master template called `contract.mustache`. it will be used to generate each contract wrapper. Although - you don't need and probably shouldn't write all your logic in a single template file. You can write [partial templates](http://handlebarsjs.com/partials.html) and as long as they are within a partials folder - they will be registered and available.

 ## Which data/context do I get in my templates?

 For now you don't get much on top of methods abi, some useful helpers and a contract name because it was enough for our use-case, but if you need something else - create a PR.
-See the [type definition](https://github.com/0xProject/0x.js/tree/development/packages/abi-gen/src/types.ts) of what we pass to the render method.
+See the [type definition](https://github.com/0xProject/0x-monorepo/tree/development/packages/abi-gen/src/types.ts) of what we pass to the render method.

 ## Output files

--- a/packages/abi-gen/package.json
+++ b/packages/abi-gen/package.json
@@ -1,28 +1,29 @@
 {
    "name": "@0xproject/abi-gen",
-    "version": "0.1.5",
+    "version": "0.2.5",
    "description": "Generate contract wrappers from ABI and handlebars templates",
    "main": "lib/index.js",
    "types": "lib/index.d.ts",
    "scripts": {
+        "build:watch": "tsc -w",
        "lint": "tslint --project . 'src/**/*.ts'",
-        "clean": "shx rm -rf lib",
-        "build": "tsc"
+        "clean": "shx rm -rf lib scripts",
+        "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts"
    },
    "bin": {
        "abi-gen": "lib/index.js"
    },
    "repository": {
        "type": "git",
-        "url": "https://github.com/0xProject/0x.js.git"
+        "url": "https://github.com/0xProject/0x-monorepo.git"
    },
    "license": "Apache-2.0",
    "bugs": {
-        "url": "https://github.com/0xProject/0x.js/issues"
+        "url": "https://github.com/0xProject/0x-monorepo/issues"
    },
-    "homepage": "https://github.com/0xProject/0x.js/packages/abi-gen/README.md",
+    "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
    "dependencies": {
-        "@0xproject/utils": "^0.2.3",
+        "@0xproject/utils": "^0.4.1",
        "chalk": "^2.3.0",
        "glob": "^7.1.2",
        "handlebars": "^4.0.11",
@@ -33,16 +34,21 @@
        "yargs": "^10.0.3"
    },
    "devDependencies": {
-        "@0xproject/tslint-config": "^0.4.5",
+        "@0xproject/monorepo-scripts": "^0.1.12",
+        "@0xproject/tslint-config": "^0.4.10",
        "@types/glob": "^5.0.33",
        "@types/handlebars": "^4.0.36",
        "@types/mkdirp": "^0.5.1",
        "@types/node": "^8.0.53",
        "@types/yargs": "^10.0.0",
+        "copyfiles": "^1.2.0",
        "npm-run-all": "^4.1.2",
        "shx": "^0.2.2",
        "tslint": "5.8.0",
-        "typescript": "~2.6.1",
-        "web3-typescript-typings": "^0.9.7"
+        "typescript": "2.7.1",
+        "web3-typescript-typings": "^0.10.0"
+    },
+    "publishConfig": {
+      "access": "public"
    }
 }
--- a/packages/abi-gen/scripts/postpublish.js
+++ b/packages/abi-gen/scripts/postpublish.js
@@ -1,15 +0,0 @@
-const postpublish_utils = require('../../../scripts/postpublish_utils');
-const packageJSON = require('../package.json');
-
-const subPackageName = packageJSON.name;
-
-postpublish_utils
-    .getLatestTagAndVersionAsync(subPackageName)
-    .then(function(result) {
-        const releaseName = postpublish_utils.getReleaseName(subPackageName, result.version);
-        const assets = [];
-        return postpublish_utils.publishReleaseNotes(result.tag, releaseName, assets);
-    })
-    .catch(function(err) {
-        throw err;
-    });
--- a/packages/abi-gen/src/globals.d.ts
+++ b/packages/abi-gen/src/globals.d.ts
@@ -2,3 +2,10 @@ declare function toSnakeCase(str: string): string;
 declare module 'to-snake-case' {
    export = toSnakeCase;
 }
+
+declare module '*.json' {
+    const json: any;
+    /* tslint:disable */
+    export default json;
+    /* tslint:enable */
+}
--- a/packages/abi-gen/src/index.ts
+++ b/packages/abi-gen/src/index.ts
@@ -1,5 +1,6 @@
 #!/usr/bin/env node

+import { logUtils } from '@0xproject/utils';
 import chalk from 'chalk';
 import * as fs from 'fs';
 import { sync as globSync } from 'glob';
@@ -11,68 +12,111 @@ import * as yargs from 'yargs';
 import toSnakeCase = require('to-snake-case');
 import * as Web3 from 'web3';

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

 const ABI_TYPE_CONSTRUCTOR = 'constructor';
 const ABI_TYPE_METHOD = 'function';
 const ABI_TYPE_EVENT = 'event';
-const MAIN_TEMPLATE_NAME = 'contract.mustache';
+const DEFAULT_NETWORK_ID = 50;
+const DEFAULT_BACKEND = 'web3';

 const args = yargs
-    .option('abiGlob', {
+    .option('abis', {
        describe: 'Glob pattern to search for ABI JSON files',
        type: 'string',
-        demand: true,
-    })
-    .option('templates', {
-        describe: 'Folder where to search for templates',
-        type: 'string',
-        demand: true,
+        demandOption: true,
    })
    .option('output', {
+        alias: ['o', 'out'],
        describe: 'Folder where to put the output files',
        type: 'string',
-        demand: true,
-    }).argv;
+        normalize: true,
+        demandOption: true,
+    })
+    .option('partials', {
+        describe: 'Glob pattern for the partial template files',
+        type: 'string',
+        implies: 'template',
+    })
+    .option('template', {
+        describe: 'Path for the main template file that will be used to generate each contract',
+        type: 'string',
+        demandOption: true,
+        normalize: true,
+    })
+    .option('backend', {
+        describe: `The backing Ethereum library your app uses. Either 'web3' or 'ethers'. Ethers auto-converts small ints to numbers whereas Web3 doesn't.`,
+        type: 'string',
+        choices: [ContractsBackend.Web3, ContractsBackend.Ethers],
+        default: DEFAULT_BACKEND,
+    })
+    .option('network-id', {
+        describe: 'ID of the network where contract ABIs are nested in artifacts',
+        type: 'number',
+        default: DEFAULT_NETWORK_ID,
+    })
+    .example(
+        "$0 --abis 'src/artifacts/**/*.json' --out 'src/contracts/generated/' --partials 'src/templates/partials/**/*.handlebars' --template 'src/templates/contract.handlebars'",
+        'Full usage example',
+    ).argv;
+
+function registerPartials(partialsGlob: string) {
+    const partialTemplateFileNames = globSync(partialsGlob);
+    logUtils.log(`Found ${chalk.green(`${partialTemplateFileNames.length}`)} ${chalk.bold('partial')} templates`);
+    for (const partialTemplateFileName of partialTemplateFileNames) {
+        const namedContent = utils.getNamedContent(partialTemplateFileName);
+        Handlebars.registerPartial(namedContent.name, namedContent.content);
+    }
+    return partialsGlob;
+}

 function writeOutputFile(name: string, renderedTsCode: string): void {
-    const fileName = toSnakeCase(name);
+    let fileName = toSnakeCase(name);
+    if (fileName === 'z_r_x_token') {
+        fileName = 'zrx_token';
+    }
    const filePath = `${args.output}/${fileName}.ts`;
    fs.writeFileSync(filePath, renderedTsCode);
-    utils.log(`Created: ${chalk.bold(filePath)}`);
+    logUtils.log(`Created: ${chalk.bold(filePath)}`);
 }

-Handlebars.registerHelper('parameterType', utils.solTypeToTsType.bind(utils, ParamKind.Input));
-Handlebars.registerHelper('returnType', utils.solTypeToTsType.bind(utils, ParamKind.Output));
-const partialTemplateFileNames = globSync(`${args.templates}/partials/**/*.mustache`);
-for (const partialTemplateFileName of partialTemplateFileNames) {
-    const namedContent = utils.getNamedContent(partialTemplateFileName);
-    Handlebars.registerPartial(namedContent.name, namedContent.content);
-}
+Handlebars.registerHelper('parameterType', utils.solTypeToTsType.bind(utils, ParamKind.Input, args.backend));
+Handlebars.registerHelper('returnType', utils.solTypeToTsType.bind(utils, ParamKind.Output, args.backend));

-const mainTemplate = utils.getNamedContent(`${args.templates}/${MAIN_TEMPLATE_NAME}`);
+if (args.partials) {
+    registerPartials(args.partials);
+}
+const mainTemplate = utils.getNamedContent(args.template);
 const template = Handlebars.compile<ContextData>(mainTemplate.content);
-const abiFileNames = globSync(args.abiGlob);
+const abiFileNames = globSync(args.abis);
+
 if (_.isEmpty(abiFileNames)) {
-    utils.log(`${chalk.red(`No ABI files found.`)}`);
-    utils.log(`Please make sure you've passed the correct folder name and that the files have
+    logUtils.log(`${chalk.red(`No ABI files found.`)}`);
+    logUtils.log(`Please make sure you've passed the correct folder name and that the files have
               ${chalk.bold('*.json')} extensions`);
    process.exit(1);
 } else {
-    utils.log(`Found ${chalk.green(`${abiFileNames.length}`)} ${chalk.bold('ABI')} files`);
+    logUtils.log(`Found ${chalk.green(`${abiFileNames.length}`)} ${chalk.bold('ABI')} files`);
    mkdirp.sync(args.output);
 }
 for (const abiFileName of abiFileNames) {
    const namedContent = utils.getNamedContent(abiFileName);
-    utils.log(`Processing: ${chalk.bold(namedContent.name)}...`);
+    logUtils.log(`Processing: ${chalk.bold(namedContent.name)}...`);
    const parsedContent = JSON.parse(namedContent.content);
-    const ABI = _.isArray(parsedContent)
-        ? parsedContent // ABI file
-        : parsedContent.abi; // Truffle contracts file
+    let ABI;
+    if (_.isArray(parsedContent)) {
+        ABI = parsedContent; // ABI file
+    } else if (!_.isUndefined(parsedContent.abi)) {
+        ABI = parsedContent.abi; // Truffle artifact
+    } else if (!_.isUndefined(parsedContent.networks) && !_.isUndefined(parsedContent.networks[args.networkId])) {
+        ABI = parsedContent.networks[args.networkId].abi; // 0x contracts package artifact
+    }
    if (_.isUndefined(ABI)) {
-        utils.log(`${chalk.red(`ABI not found in ${abiFileName}.`)}`);
-        utils.log(`Please make sure your ABI file is either an array with ABI entries or an object with the abi key`);
+        logUtils.log(`${chalk.red(`ABI not found in ${abiFileName}.`)}`);
+        logUtils.log(
+            `Please make sure your ABI file is either an array with ABI entries or a truffle artifact or 0x deployer artifact`,
+        );
        process.exit(1);
    }

@@ -83,16 +127,17 @@ for (const abiFileName of abiFileNames) {

    const methodAbis = ABI.filter((abi: Web3.AbiDefinition) => abi.type === ABI_TYPE_METHOD) as Web3.MethodAbi[];
    const methodsData = _.map(methodAbis, methodAbi => {
-        _.map(methodAbi.inputs, input => {
+        _.map(methodAbi.inputs, (input, i: number) => {
            if (_.isEmpty(input.name)) {
                // Auto-generated getters don't have parameter names
-                input.name = 'index';
+                input.name = `index_${i}`;
            }
        });
        // This will make templates simpler
        const methodData = {
            ...methodAbi,
            singleReturnValue: methodAbi.outputs.length === 1,
+            hasReturnValue: methodAbi.outputs.length !== 0,
        };
        return methodData;
    });
--- a/packages/abi-gen/src/monorepo_scripts/postpublish.ts
+++ b/packages/abi-gen/src/monorepo_scripts/postpublish.ts
@@ -0,0 +1,8 @@
+import { postpublishUtils } from '@0xproject/monorepo-scripts';
+
+import * as packageJSON from '../package.json';
+import * as tsConfigJSON from '../tsconfig.json';
+
+const cwd = `${__dirname}/..`;
+// tslint:disable-next-line:no-floating-promises
+postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd);
--- a/packages/abi-gen/src/types.ts
+++ b/packages/abi-gen/src/types.ts
@@ -12,8 +12,14 @@ export enum AbiType {
    Fallback = 'fallback',
 }

+export enum ContractsBackend {
+    Web3 = 'web3',
+    Ethers = 'ethers',
+}
+
 export interface Method extends Web3.MethodAbi {
    singleReturnValue: boolean;
+    hasReturnValue: boolean;
 }

 export interface ContextData {
--- a/packages/abi-gen/src/utils.ts
+++ b/packages/abi-gen/src/utils.ts
@@ -3,17 +3,23 @@ import * as _ from 'lodash';
 import * as path from 'path';
 import * as Web3 from 'web3';

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

 export const utils = {
-    solTypeToTsType(paramKind: ParamKind, solType: string): string {
+    solTypeToTsType(
+        paramKind: ParamKind,
+        backend: ContractsBackend,
+        solType: string,
+        components?: Web3.DataItem[],
+    ): string {
        const trailingArrayRegex = /\[\d*\]$/;
        if (solType.match(trailingArrayRegex)) {
            const arrayItemSolType = solType.replace(trailingArrayRegex, '');
-            const arrayItemTsType = utils.solTypeToTsType(paramKind, arrayItemSolType);
-            const arrayTsType = utils.isUnionType(arrayItemTsType)
-                ? `Array<${arrayItemTsType}>`
-                : `${arrayItemTsType}[]`;
+            const arrayItemTsType = utils.solTypeToTsType(paramKind, backend, arrayItemSolType, components);
+            const arrayTsType =
+                utils.isUnionType(arrayItemTsType) || utils.isObjectType(arrayItemTsType)
+                    ? `Array<${arrayItemTsType}>`
+                    : `${arrayItemTsType}[]`;
            return arrayTsType;
        } else {
            const solTypeRegexToTsType = [
@@ -24,27 +30,48 @@ export const utils = {
                { regex: '^bytes\\d*$', tsType: 'string' },
            ];
            if (paramKind === ParamKind.Input) {
-                // web3 allows to pass those an non-bignumbers and that's nice
-                // but it always returns stuff as BigNumbers
+                // web3 and ethers allow to pass those as numbers instead of bignumbers
                solTypeRegexToTsType.unshift({
                    regex: '^u?int(8|16|32)?$',
                    tsType: 'number|BigNumber',
                });
            }
+            if (backend === ContractsBackend.Ethers && paramKind === ParamKind.Output) {
+                // ethers-contracts automatically converts small BigNumbers to numbers
+                solTypeRegexToTsType.unshift({
+                    regex: '^u?int(8|16|32|48)?$',
+                    tsType: 'number',
+                });
+            }
            for (const regexAndTxType of solTypeRegexToTsType) {
                const { regex, tsType } = regexAndTxType;
                if (solType.match(regex)) {
                    return tsType;
                }
            }
+            const TUPLE_TYPE_REGEX = '^tuple$';
+            if (solType.match(TUPLE_TYPE_REGEX)) {
+                const componentsType = _.map(components, component => {
+                    const componentValueType = utils.solTypeToTsType(
+                        paramKind,
+                        backend,
+                        component.type,
+                        component.components,
+                    );
+                    const componentType = `${component.name}: ${componentValueType}`;
+                    return componentType;
+                });
+                const tsType = `{${componentsType}}`;
+                return tsType;
+            }
            throw new Error(`Unknown Solidity type found: ${solType}`);
        }
    },
    isUnionType(tsType: string): boolean {
        return tsType === 'number|BigNumber';
    },
-    log(...args: any[]): void {
-        console.log(...args); // tslint:disable-line:no-console
+    isObjectType(tsType: string): boolean {
+        return /^{.*}$/.test(tsType);
    },
    getPartialNameFromFileName(filename: string): string {
        const name = path.parse(filename).name;
--- a/packages/assert/.npmignore
+++ b/packages/assert/.npmignore
@@ -0,0 +1,6 @@
+.*
+yarn-error.log
+/src/
+/scripts/
+test/
+tsconfig.json
--- a/packages/assert/CHANGELOG.md
+++ b/packages/assert/CHANGELOG.md
@@ -1,6 +1,19 @@
 # CHANGELOG

-## v0.0.4 - _Nov. 14, 2017_
+## v0.2.0 - _March 8, 2018_
+
+    * Rename `isHttpUrl` to `isWebUri` (#412)
+
+## v0.1.0 - _March 4, 2018_
+
+    * Remove isETHAddressHex checksum address check and assume address will be lowercased  (#373)
+    * Add an optional parameter `subSchemas` to `doesConformToSchema` method (#385)
+
+## v0.0.18 - _February 9, 2017_
+
+    * Fix publishing issue where .npmignore was not properly excluding undesired content (#389)
+
+## v0.0.4 - _November 14, 2017_

    * Re-publish Assert previously published under NPM package @0xproject/0x-assert
    * Added assertion isValidBaseUnitAmount which checks both that the value is a valid bigNumber and that it does not contain decimals.
--- a/packages/assert/README.md
+++ b/packages/assert/README.md
@@ -8,6 +8,14 @@ Standard type and schema assertions to be used across all 0x projects and packag
 yarn add @0xproject/assert
 ```

+If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
+
+```
+"include": [
+    "./node_modules/web3-typescript-typings/index.d.ts",
+]
+```
+
 ## Usage

 ```typescript
--- a/packages/assert/coverage/.gitkeep
+++ b/packages/assert/coverage/.gitkeep
--- a/packages/assert/package.json
+++ b/packages/assert/package.json
@@ -1,45 +1,54 @@
 {
    "name": "@0xproject/assert",
-    "version": "0.0.14",
+    "version": "0.2.0",
    "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",
    "scripts": {
-        "build": "tsc",
-        "clean": "shx rm -rf _bundles lib test_temp",
+        "build:watch": "tsc -w",
+        "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
+        "clean": "shx rm -rf _bundles lib test_temp scripts",
        "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
        "run_mocha": "mocha lib/test/**/*_test.js",
        "prepublishOnly": "run-p build",
        "test": "run-s clean build run_mocha",
-        "test:circleci": "yarn test"
+        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
+        "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
+        "test:circleci": "yarn test:coverage"
    },
    "license": "Apache-2.0",
    "repository": {
        "type": "git",
-        "url": "https://github.com/0xProject/0x.js.git"
+        "url": "https://github.com/0xProject/0x-monorepo.git"
    },
    "bugs": {
-        "url": "https://github.com/0xProject/0x.js/issues"
+        "url": "https://github.com/0xProject/0x-monorepo/issues"
    },
-    "homepage": "https://github.com/0xProject/0x.js/packages/assert/README.md",
+    "homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md",
    "devDependencies": {
-        "@0xproject/tslint-config": "^0.4.5",
+        "@0xproject/monorepo-scripts": "^0.1.12",
+        "@0xproject/tslint-config": "^0.4.10",
        "@types/lodash": "^4.14.86",
        "@types/mocha": "^2.2.42",
        "@types/valid-url": "^1.0.2",
+        "nyc": "^11.0.1",
        "chai": "^4.0.1",
-        "chai-typescript-typings": "^0.0.2",
+        "chai-typescript-typings": "^0.0.4",
+        "copyfiles": "^1.2.0",
        "dirty-chai": "^2.0.1",
        "mocha": "^4.0.1",
        "npm-run-all": "^4.1.2",
        "shx": "^0.2.2",
        "tslint": "5.8.0",
-        "typescript": "~2.6.1"
+        "typescript": "2.7.1"
    },
    "dependencies": {
-        "@0xproject/json-schemas": "^0.7.6",
-        "@0xproject/utils": "^0.2.3",
+        "@0xproject/json-schemas": "^0.7.14",
+        "@0xproject/utils": "^0.4.1",
        "lodash": "^4.17.4",
        "valid-url": "^1.0.9"
+    },
+    "publishConfig": {
+      "access": "public"
    }
 }
--- a/packages/assert/scripts/postpublish.js
+++ b/packages/assert/scripts/postpublish.js
@@ -1,15 +0,0 @@
-const postpublish_utils = require('../../../scripts/postpublish_utils');
-const packageJSON = require('../package.json');
-
-const subPackageName = packageJSON.name;
-
-postpublish_utils
-    .getLatestTagAndVersionAsync(subPackageName)
-    .then(function(result) {
-        const releaseName = postpublish_utils.getReleaseName(subPackageName, result.version);
-        const assets = [];
-        return postpublish_utils.publishReleaseNotes(result.tag, releaseName, assets);
-    })
-    .catch(function(err) {
-        throw err;
-    });
--- a/packages/assert/src/globals.d.ts
+++ b/packages/assert/src/globals.d.ts
@@ -1 +1,8 @@
 declare module 'dirty-chai';
+
+declare module '*.json' {
+    const json: any;
+    /* tslint:disable */
+    export default json;
+    /* tslint:enable */
+}
--- a/packages/assert/src/index.ts
+++ b/packages/assert/src/index.ts
@@ -33,11 +33,8 @@ export const assert = {
        );
    },
    isETHAddressHex(variableName: string, value: string): void {
+        this.assert(_.isString(value), this.typeAssertionMessage(variableName, 'string', value));
        this.assert(addressUtils.isAddress(value), this.typeAssertionMessage(variableName, 'ETHAddressHex', value));
-        this.assert(
-            addressUtils.isAddress(value) && value.toLowerCase() === value,
-            `Checksummed addresses are not supported. Convert ${variableName} to lower case before passing`,
-        );
    },
    doesBelongToStringEnum(
        variableName: string,
@@ -66,8 +63,11 @@ export const assert = {
        const isWeb3Provider = _.isFunction(value.send) || _.isFunction(value.sendAsync);
        this.assert(isWeb3Provider, this.typeAssertionMessage(variableName, 'Web3.Provider', value));
    },
-    doesConformToSchema(variableName: string, value: any, schema: Schema): void {
+    doesConformToSchema(variableName: string, value: any, schema: Schema, subSchemas?: Schema[]): void {
        const schemaValidator = new SchemaValidator();
+        if (!_.isUndefined(subSchemas)) {
+            _.map(subSchemas, schemaValidator.addSchema.bind(schemaValidator));
+        }
        const validationResult = schemaValidator.validate(value, schema);
        const hasValidationErrors = validationResult.errors.length > 0;
        const msg = `Expected ${variableName} to conform to schema ${schema.id}
@@ -75,9 +75,9 @@ Encountered: ${JSON.stringify(value, null, '\t')}
 Validation errors: ${validationResult.errors.join(', ')}`;
        this.assert(!hasValidationErrors, msg);
    },
-    isHttpUrl(variableName: string, value: any): void {
+    isWebUri(variableName: string, value: any): void {
        const isValidUrl = !_.isUndefined(validUrl.isWebUri(value));
-        this.assert(isValidUrl, this.typeAssertionMessage(variableName, 'http url', value));
+        this.assert(isValidUrl, this.typeAssertionMessage(variableName, 'web uri', value));
    },
    isUri(variableName: string, value: any): void {
        const isValidUri = !_.isUndefined(validUrl.isUri(value));
--- a/packages/assert/src/monorepo_scripts/postpublish.ts
+++ b/packages/assert/src/monorepo_scripts/postpublish.ts
@@ -0,0 +1,8 @@
+import { postpublishUtils } from '@0xproject/monorepo-scripts';
+
+import * as packageJSON from '../package.json';
+import * as tsConfigJSON from '../tsconfig.json';
+
+const cwd = `${__dirname}/..`;
+// tslint:disable-next-line:no-floating-promises
+postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd);
--- a/packages/assert/test/assert_test.ts
+++ b/packages/assert/test/assert_test.ts
@@ -183,7 +183,7 @@ describe('Assertions', () => {
            );
        });
    });
-    describe('#isHttpUrl', () => {
+    describe('#isWebUri', () => {
        it('should not throw for valid input', () => {
            const validInputs = [
                'http://www.google.com',
@@ -191,7 +191,7 @@ describe('Assertions', () => {
                'https://api.radarrelay.com/0x/v0/',
                'https://zeroex.beta.radarrelay.com:8000/0x/v0/',
            ];
-            validInputs.forEach(input => expect(assert.isHttpUrl.bind(assert, variableName, input)).to.not.throw());
+            validInputs.forEach(input => expect(assert.isWebUri.bind(assert, variableName, input)).to.not.throw());
        });
        it('should throw for invalid input', () => {
            const invalidInputs = [
@@ -205,7 +205,7 @@ describe('Assertions', () => {
                'user:password@api.example-relayer.net',
                '//api.example-relayer.net',
            ];
-            invalidInputs.forEach(input => expect(assert.isHttpUrl.bind(assert, variableName, input)).to.throw());
+            invalidInputs.forEach(input => expect(assert.isWebUri.bind(assert, variableName, input)).to.throw());
        });
    });
    describe('#isUri', () => {
--- a/packages/assert/tsconfig.json
+++ b/packages/assert/tsconfig.json
@@ -3,5 +3,10 @@
    "compilerOptions": {
        "outDir": "lib"
    },
-    "include": ["./src/**/*", "./test/**/*", "../../node_modules/chai-typescript-typings/index.d.ts"]
+    "include": [
+        "./src/**/*",
+        "./test/**/*",
+        "../../node_modules/web3-typescript-typings/index.d.ts",
+        "../../node_modules/chai-typescript-typings/index.d.ts"
+    ]
 }
--- a/packages/base-contract/.npmignore
+++ b/packages/base-contract/.npmignore
@@ -0,0 +1,5 @@
+.*
+yarn-error.log
+/scripts/
+/src/
+tsconfig.json
--- a/packages/base-contract/CHANGELOG.md
+++ b/packages/base-contract/CHANGELOG.md
@@ -0,0 +1,5 @@
+# CHANGELOG
+
+## v0.0.2 - _March 4, 2018_
+
+    * Initial release
--- a/packages/base-contract/README.md
+++ b/packages/base-contract/README.md
@@ -0,0 +1,62 @@
+## @0xproject/base-contract
+
+BaseContract to derive all auto-generated wrappers from
+
+## Installation
+
+```bash
+yarn add @0xproject/base-contract
+```
+
+If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
+
+```
+"include": [
+    "./node_modules/web3-typescript-typings/index.d.ts",
+    "./node_modules/ethers-typescript-typings/index.d.ts"
+]
+```
+
+## Usage
+
+```javascript
+import { BaseContract } from '@0xproject/base-contract';
+```
+
+## 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.
+
+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
+
+```bash
+yarn build
+```
+
+or
+
+```bash
+yarn build:watch
+```
+
+### Lint
+
+```bash
+yarn lint
+```
--- a/packages/base-contract/package.json
+++ b/packages/base-contract/package.json
@@ -0,0 +1,44 @@
+{
+    "name": "@0xproject/base-contract",
+    "version": "0.0.3",
+    "description": "0x Base TS contract",
+    "main": "lib/index.js",
+    "types": "lib/index.d.ts",
+    "scripts": {
+        "build:watch": "tsc -w",
+        "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
+        "clean": "shx rm -rf lib scripts",
+        "lint": "tslint --project . 'src/**/*.ts'"
+    },
+    "license": "Apache-2.0",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/0xProject/0x-monorepo.git"
+    },
+    "bugs": {
+        "url": "https://github.com/0xProject/0x-monorepo/issues"
+    },
+    "homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md",
+    "devDependencies": {
+        "@0xproject/monorepo-scripts": "^0.1.12",
+        "@0xproject/tslint-config": "^0.4.10",
+        "@types/lodash": "^4.14.86",
+        "copyfiles": "^1.2.0",
+        "npm-run-all": "^4.1.2",
+        "shx": "^0.2.2",
+        "tslint": "5.8.0",
+        "typescript": "2.7.1"
+    },
+    "dependencies": {
+        "@0xproject/types": "^0.3.1",
+        "@0xproject/web3-wrapper": "^0.2.1",
+        "ethers-contracts": "^2.2.1",
+        "ethers-typescript-typings": "^0.0.2",
+        "lodash": "^4.17.4",
+        "web3": "^0.20.0",
+        "web3-typescript-typings": "^0.10.0"
+    },
+    "publishConfig": {
+      "access": "public"
+    }
+}
--- a/packages/base-contract/src/globals.d.ts
+++ b/packages/base-contract/src/globals.d.ts
@@ -0,0 +1,6 @@
+declare module '*.json' {
+    const json: any;
+    /* tslint:disable */
+    export default json;
+    /* tslint:enable */
+}
--- a/packages/base-contract/src/index.ts
+++ b/packages/base-contract/src/index.ts
@@ -0,0 +1,68 @@
+import { TxData, TxDataPayable } from '@0xproject/types';
+import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import * as ethersContracts from 'ethers-contracts';
+import * as _ from 'lodash';
+import * as Web3 from 'web3';
+
+export class BaseContract {
+    protected _ethersInterface: ethersContracts.Interface;
+    protected _web3Wrapper: Web3Wrapper;
+    public abi: Web3.ContractAbi;
+    public address: string;
+    protected static _transformABIData(
+        abis: Web3.DataItem[],
+        values: any[],
+        transformation: (type: string, value: any) => any,
+    ): any {
+        return _.map(values, (value: any, i: number) =>
+            BaseContract._transformTypedData(abis[i].type, value, transformation),
+        );
+    }
+    protected static _lowercaseAddress(type: string, value: string): string {
+        return type === 'address' ? value.toLowerCase() : value;
+    }
+    protected static _bigNumberToString(type: string, value: string): string {
+        return _.isObject(value) && (value as any).isBigNumber ? value.toString() : value;
+    }
+    private static _transformTypedData(
+        type: string,
+        values: any,
+        transformation: (type: string, value: any) => any,
+    ): any {
+        const trailingArrayRegex = /\[\d*\]$/;
+        if (type.match(trailingArrayRegex)) {
+            const arrayItemType = type.replace(trailingArrayRegex, '');
+            return _.map(values, value => this._transformTypedData(arrayItemType, value, transformation));
+        } else {
+            return transformation(type, values);
+        }
+    }
+    protected async _applyDefaultsToTxDataAsync<T extends Partial<TxData | TxDataPayable>>(
+        txData: T,
+        estimateGasAsync?: (txData: T) => Promise<number>,
+    ): Promise<TxData> {
+        // Gas amount sourced with the following priorities:
+        // 1. Optional param passed in to public method call
+        // 2. Global config passed in at library instantiation
+        // 3. Gas estimate calculation + safety margin
+        const removeUndefinedProperties = _.pickBy;
+        const txDataWithDefaults = {
+            to: this.address,
+            ...removeUndefinedProperties(this._web3Wrapper.getContractDefaults()),
+            ...removeUndefinedProperties(txData as any),
+            // HACK: TS can't prove that T is spreadable.
+            // Awaiting https://github.com/Microsoft/TypeScript/pull/13288 to be merged
+        };
+        if (_.isUndefined(txDataWithDefaults.gas) && !_.isUndefined(estimateGasAsync)) {
+            const estimatedGas = await estimateGasAsync(txData);
+            txDataWithDefaults.gas = estimatedGas;
+        }
+        return txDataWithDefaults;
+    }
+    constructor(web3Wrapper: Web3Wrapper, abi: Web3.ContractAbi, address: string) {
+        this._web3Wrapper = web3Wrapper;
+        this.abi = abi;
+        this.address = address;
+        this._ethersInterface = new ethersContracts.Interface(abi);
+    }
+}
--- a/packages/base-contract/src/monorepo_scripts/postpublish.ts
+++ b/packages/base-contract/src/monorepo_scripts/postpublish.ts
@@ -0,0 +1,8 @@
+import { postpublishUtils } from '@0xproject/monorepo-scripts';
+
+import * as packageJSON from '../package.json';
+import * as tsConfigJSON from '../tsconfig.json';
+
+const cwd = `${__dirname}/..`;
+// tslint:disable-next-line:no-floating-promises
+postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd);
--- a/packages/base-contract/tsconfig.json
+++ b/packages/base-contract/tsconfig.json
@@ -0,0 +1,11 @@
+{
+    "extends": "../../tsconfig",
+    "compilerOptions": {
+        "outDir": "lib"
+    },
+    "include": [
+        "./src/**/*",
+        "../../node_modules/web3-typescript-typings/index.d.ts",
+        "../../node_modules/ethers-typescript-typings/index.d.ts"
+    ]
+}
--- a/packages/base-contract/tslint.json
+++ b/packages/base-contract/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": ["@0xproject/tslint-config"]
+}
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`* @abandeali1 @BMillman19 @dekz @fabioberger @LogvinovLeon @Recmo`