Updated CHANGELOGS

Add Doc Page Check To Publish Flow

.circleci/config.yml

@@ -27,6 +27,15 @@ jobs:
           key: repo-{{ .Environment.CIRCLE_SHA1 }}
           paths:
             - ~/repo
+  test-installation:
+    docker:
+      - image: circleci/node:6.12
+    working_directory: ~/repo
+    steps:
+      - restore_cache:
+          keys:
+            - repo-{{ .Environment.CIRCLE_SHA1 }}
+      - run: yarn test:installation
   test-0xjs:
     docker:
       - image: circleci/node:6.12
@@ -174,6 +183,9 @@ workflows:
   main:
     jobs:
       - build
+      # - test-installation:
+      #     requires:
+      #       - build
       - test-0xjs:
           requires:
             - build

.gitignore

@@ -76,5 +76,13 @@ bin/
 # generated contract artifacts
 packages/contracts/src/artifacts
 
+# generated contract wrappers
+packages/0x.js/src/contract_wrappers/generated/
+packages/contracts/src/contract_wrappers/generated/
+packages/metacoin/src/contract_wrappers
+
+# solc-bin in deployer
+packages/deployer/solc_bin/
+
 # Monorepo scripts
 packages/*/scripts/

README.md

@@ -18,35 +18,27 @@ This repository is a monorepo including the 0x protocol smart contracts and nume
 
 ### 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                   |
-| [`@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/monorepo-scripts`](/packages/monorepo-scripts) | [![npm](https://img.shields.io/npm/v/@0xproject/monorepo-scripts.svg)](https://www.npmjs.com/package/@0xproject/monorepo-scripts) | Monorepo scripts                                                            |
-| [`@0xproject/react-docs`](/packages/react-docs)             | [![npm](https://img.shields.io/npm/v/@0xproject/react-docs.svg)](https://www.npmjs.com/package/@0xproject/react-docs)             | React documentation component for rendering TypeDoc & Doxity generated JSON |
-| [`@0xproject/react-shared`](/packages/react-shared)         | [![npm](https://img.shields.io/npm/v/@0xproject/react-shared.svg)](https://www.npmjs.com/package/@0xproject/react-shared)         | 0x shared react components                                                  |
-| [`@0xproject/sra-report`](/packages/sra-report)             | [![npm](https://img.shields.io/npm/v/@0xproject/sra-report.svg)](https://www.npmjs.com/package/@0xproject/sra-report)             | Generate reports for standard relayer API compliance                        |
-| [`@0xproject/sol-cov`](/packages/sol-cov)                   | [![npm](https://img.shields.io/npm/v/@0xproject/sol-cov.svg)](https://www.npmjs.com/package/@0xproject/sol-cov)                   | Solidity test coverage tool tool                                            |
-| [`@0xproject/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                                                 |
+| 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/monorepo-scripts`](/packages/monorepo-scripts)     | [![npm](https://img.shields.io/npm/v/@0xproject/monorepo-scripts.svg)](https://www.npmjs.com/package/@0xproject/monorepo-scripts)     | Monorepo scripts                                                            |
+| [`@0xproject/react-docs`](/packages/react-docs)                 | [![npm](https://img.shields.io/npm/v/@0xproject/react-docs.svg)](https://www.npmjs.com/package/@0xproject/react-docs)                 | React documentation component for rendering TypeDoc & Doxity generated JSON |
+| [`@0xproject/react-shared`](/packages/react-shared)             | [![npm](https://img.shields.io/npm/v/@0xproject/react-shared.svg)](https://www.npmjs.com/package/@0xproject/react-shared)             | 0x shared react components                                                  |
+| [`@0xproject/sra-report`](/packages/sra-report)                 | [![npm](https://img.shields.io/npm/v/@0xproject/sra-report.svg)](https://www.npmjs.com/package/@0xproject/sra-report)                 | Generate reports for standard relayer API compliance                        |
+| [`@0xproject/sol-cov`](/packages/sol-cov)                       | [![npm](https://img.shields.io/npm/v/@0xproject/sol-cov.svg)](https://www.npmjs.com/package/@0xproject/sol-cov)                       | Solidity test coverage tool tool                                            |
+| [`@0xproject/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/typescript-typings`](/packages/typescript-typings) | [![npm](https://img.shields.io/npm/v/@0xproject/typescript-typings.svg)](https://www.npmjs.com/package/@0xproject/typescript-typings) | Repository of types for external packages                                   |
+| [`@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                                                                |
 
 ### Private Packages
 
@@ -64,8 +56,20 @@ 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)
+*   [Subproviders](https://0xproject.com/docs/subproviders)
+*   [Deployer](https://0xproject.com/docs/deployer)
+*   [Web3-wrapper](https://0xproject.com/docs/web3-wrapper)
+*   [JSON-schemas](https://0xproject.com/docs/json-schemas)
+*   [Sol-cov](https://0xproject.com/docs/sol-cov)
 *   [Standard Relayer API](https://github.com/0xProject/standard-relayer-api/blob/master/README.md)
 
+Most of the packages require additional typings for external dependencies.
+You can include those by prepending @0xproject/typescript-typings package to your [`typeRoots`](http://www.typescriptlang.org/docs/handbook/tsconfig-json.html) config.
+
+```json
+"typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+```
+
 ## 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.
@@ -88,13 +92,17 @@ yarn install
 
 ### Build
 
-Build all packages
+Build all packages. You need to do this before working on any given package. Although these packages
+as independent, when run from within the monorepo, they are internally symlinked, to make development
+easier. You can change several packages and run the changes without publishing them first to NPM. When
+running `rebuild`, Lerna will figure out the dependency order of all the packages, and build them in
+this order.
 
 ```bash
-yarn lerna:run build
+yarn lerna:rebuild
 ```
 
-Continuously rebuild on exchange
+Or continuously rebuild on change:
 
 ```bash
 yarn dev

package.json

@@ -1,28 +1,37 @@
 {
     "private": true,
     "name": "0x-monorepo",
-    "workspaces": ["packages/*"],
+    "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",
+        "test:installation": "node ./packages/monorepo-scripts/lib/test_installation.js",
+        "lerna:install": "yarn install",
         "lerna:run": "lerna run",
-        "lerna:rebuild": "lerna run clean; lerna run build;",
-        "lerna:publish":
-            "yarn install; lerna run clean; lerna run build; lerna publish --registry=https://registry.npmjs.org/"
+        "lerna:clean": "lerna run clean",
+        "lerna:build": "lerna run build",
+        "lerna:rebuild": "run-s lerna:clean lerna:build",
+        "lerna:publish": "run-s lerna:install lerna:rebuild script:publish",
+        "lerna:publish:dry": "run-s lerna:install lerna:rebuild script:publish:dry",
+        "lerna:stage_docs": "lerna run docs:stage",
+        "script:publish": "node ./packages/monorepo-scripts/lib/publish.js",
+        "script:publish:dry": "IS_DRY_RUN=true yarn script:publish"
     },
     "config": {
         "mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic"
     },
     "devDependencies": {
-        "@0xproject/utils": "^0.4.2",
         "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",
+        "npm-run-all": "^4.1.2",
         "prettier": "^1.11.1"
     }
 }

packages/0x.js/.npmignore

@@ -8,3 +8,4 @@ test/
 /contract_templates/
 /generated_docs/
 /scripts/
+/lib/src/monorepo_scripts/

packages/0x.js/CHANGELOG.json

@@ -0,0 +1,977 @@
+[
+    {
+        "version": "0.36.0",
+        "changes": [
+            {
+                "note": "Moved Web3.Provider to `@0xproject/types:Provider`",
+                "pr": 501
+            }
+        ],
+        "timestamp": 1523462196
+    },
+    {
+        "version": "0.35.0",
+        "changes": [
+            {
+                "note":
+                    "Removed `ZeroExError.TransactionMiningTimeout` and moved it to '@0xproject/web3_wrapper' `Web3WrapperErrors.TransactionMiningTimeout`",
+                "pr": 485
+            }
+        ],
+        "timestamp": 1522673609
+    },
+    {
+        "version": "0.34.0",
+        "changes": [
+            {
+                "note":
+                    "Fix the bug causing `zeroEx.exchange.fillOrdersUpToAsync` validation to fail if there were some extra orders passed",
+                "pr": 470
+            },
+            {
+                "note": "Remove automatic instantiation of `zeroEx.orderStateWatcher`",
+                "pr": 488
+            },
+            {
+                "note": "Add `zeroEx.createOrderStateWatcher` to allow creating arbitrary number of OrderStateWatchers",
+                "pr": 488
+            },
+            {
+                "note":
+                    "Added `stateLayer` setting to `OrderStateWatcherConfig` so OrderStateWatcher can be set to monitor different blockchain state layers",
+                "pr": 488
+            }
+        ],
+        "timestamp": 1522658513
+    },
+    {
+        "version": "0.33.2",
+        "changes": [
+            {
+                "note": "Consolidate all `console.log` calls into `logUtils` in the `@0xproject/utils` package",
+                "pr": 452
+            },
+            {
+                "note": "Consolidate `Order`, `SignedOrder`, and `ECSignature` into the `@0xproject/types` package",
+                "pr": 456
+            }
+        ],
+        "timestamp": 1521298800
+    },
+    {
+        "version": "0.33.1",
+        "changes": [
+            {
+                "note": "Add missing EthersJs typescript typings as dependency"
+            }
+        ],
+        "timestamp": 1520434800
+    },
+    {
+        "version": "0.33.0",
+        "changes": [
+            {
+                "note": "Validate and lowercase all addresses in public methods",
+                "pr": 373
+            },
+            {
+                "note": "Improve validation to force passing contract addresses on private networks",
+                "pr": 385
+            },
+            {
+                "note": "Change `LogErrorContractEventArgs.errorId` type from `BigNumber` to `number`",
+                "pr": 413
+            },
+            {
+                "note": "Rename all public `_unsubscribeAll` methods to `unsubscribeAll`",
+                "pr": 415
+            },
+            {
+                "note": "Move web3 typings from devDep to dep since cannot use this package without it",
+                "pr": 429
+            }
+        ],
+        "timestamp": 1520089200
+    },
+    {
+        "version": "0.32.2",
+        "changes": [
+            {
+                "note": "Fix publishing issue where .npmignore was not properly excluding undesired content",
+                "pr": 389
+            }
+        ],
+        "timestamp": 1518102000
+    },
+    {
+        "version": "0.32.1",
+        "changes": [
+            {
+                "note": "Reorganized `BlockParamLiteral` export into `@0xproject/types` package",
+                "pr": 355
+            },
+            {
+                "note": "Now using `abi-gen` package to generate ContractEventArgs types",
+                "pr": 371
+            }
+        ],
+        "timestamp": 1517929200
+    },
+    {
+        "version": "0.32.0",
+        "changes": [
+            {
+                "note": "Add `zeroEx.etherToken.getContractAddressIfExists`",
+                "pr": 350
+            },
+            {
+                "note":
+                    "Fixed the bug causing order watcher to throw if there is an event with the same signature but different indexed fields",
+                "pr": 366
+            }
+        ],
+        "timestamp": 1517756400
+    },
+    {
+        "version": "0.31.1",
+        "changes": [
+            {
+                "note": "Fix the bug causing order watcher to throw if makerToken === zrx",
+                "pr": 357
+            }
+        ],
+        "timestamp": 1517410800
+    },
+    {
+        "version": "0.31.0",
+        "changes": [
+            {
+                "note":
+                    "Add the `shouldAddPersonalMessagePrefix` parameter to `signOrderHashAsync` so that the caller can decide on whether to add the personalMessage prefix before relaying the request to the signer. Parity Signer, Ledger and TestRPC add the prefix themselves, Metamask expects it to have already been added.",
+                "pr": 349
+            }
+        ],
+        "timestamp": 1517238000
+    },
+    {
+        "version": "0.30.2",
+        "changes": [
+            {
+                "note": "Add Rinkeby testnet addresses to artifacts ",
+                "pr": 337
+            },
+            {
+                "note": "Move @0xproject/types to dependencies from devDependencies fixing missing type errors"
+            }
+        ],
+        "timestamp": 1517151600
+    },
+    {
+        "version": "0.30.1",
+        "changes": [
+            {
+                "note": "Fix a bug allowing negative fill values ",
+                "pr": 212
+            },
+            {
+                "note": "Fix a bug that made it impossible to pass a custom ZRX address ",
+                "pr": 341
+            }
+        ],
+        "timestamp": 1516719600
+    },
+    {
+        "version": "0.30.0",
+        "changes": [
+            {
+                "note": "Add an error parameter to the order watcher callback",
+                "pr": 312
+            },
+            {
+                "note": "Fix a bug making it impossible to catch some errors from awaitTransactionMinedAsync",
+                "pr": 312
+            },
+            {
+                "note":
+                    "Fix a bug in fillOrdersUpTo validation making it impossible to fill up to if user doesn't have enough balance to fully fill all the orders",
+                "pr": 321
+            }
+        ],
+        "timestamp": 1516114800
+    },
+    {
+        "version": "0.29.1",
+        "changes": [
+            {
+                "note": "Fixed bignumber config issue #301",
+                "pr": 305
+            }
+        ],
+        "timestamp": 1515596400
+    },
+    {
+        "version": "0.29.0",
+        "changes": [
+            {
+                "note": "Assert baseUnit amount supplied to `toUnitAmount` is integer amount.",
+                "pr": 287
+            },
+            {
+                "note": "`toBaseUnitAmount` throws if amount supplied has too many decimals",
+                "pr": 287
+            }
+        ],
+        "timestamp": 1514386800
+    },
+    {
+        "version": "0.28.0",
+        "changes": [
+            {
+                "note":
+                    "Add `etherTokenAddress` arg to `depositAsync` and `withdrawAsync` methods on `zeroEx.etherToken`",
+                "pr": 267
+            },
+            {
+                "note":
+                    "Removed accidentally included `unsubscribeAll` method from `zeroEx.proxy`, `zeroEx.etherToken` and `zeroEx.tokenRegistry`",
+                "pr": 267
+            },
+            {
+                "note": "Removed `etherTokenContractAddress` from `ZeroEx` constructor arg `ZeroExConfig`",
+                "pr": 267
+            },
+            {
+                "note": "Rename `SubscriptionOpts` to `BlockRange`",
+                "pr": 272
+            },
+            {
+                "note":
+                    "Add `zeroEx.etherToken.subscribe`, `zeroEx.etherToken.unsubscribe`, `zeroEx.etherToken.unsubscribeAll`",
+                "pr": 277
+            },
+            {
+                "note": "Add `zeroEx.etherToken.getLogsAsync`",
+                "pr": 277
+            },
+            {
+                "note":
+                    "Add new public types `BlockParamLiteral`, `EtherTokenEvents`, `EtherTokenContractEventArgs`, `DepositContractEventArgs`, `WithdrawalContractEventArgs`",
+                "pr": 277
+            },
+            {
+                "note": "Support `Deposit` and `Withdraw` events on etherToken",
+                "pr": 277
+            },
+            {
+                "note": "Improve the error message when taker is not a string",
+                "pr": 278
+            }
+        ],
+        "timestamp": 1513695600
+    },
+    {
+        "version": "0.27.1",
+        "changes": [
+            {
+                "note": "Export `TransactionOpts` type"
+            }
+        ],
+        "timestamp": 1511794800
+    },
+    {
+        "version": "0.27.0",
+        "changes": [
+            {
+                "note": "Make `ZeroExConfig` required parameter of `ZeroEx` constructor",
+                "pr": 233
+            },
+            {
+                "note": "Add a required property `networkId` to `ZeroExConfig`",
+                "pr": 233
+            },
+            {
+                "note":
+                    "Make all `getContractAddress` functions, `zeroEx.exchange.subscribe`, `zeroEx.exchange.getZRXTokenAddress` sync",
+                "pr": 233
+            },
+            {
+                "note": "Remove `ZeroExError.ContractNotFound` and replace it with contract-specific errors",
+                "pr": 233
+            },
+            {
+                "note":
+                    "Make `DecodedLogEvent<A>` contain `LogWithDecodedArgs<A>` under log key instead of merging it in like web3 does",
+                "pr": 234
+            },
+            {
+                "note": "Rename `removed` to `isRemoved` in `DecodedLogEvent<A>`",
+                "pr": 234
+            },
+            {
+                "note": "Add config allowing to specify gasPrice and gasLimit for every transaction sending method",
+                "pr": 235
+            },
+            {
+                "note": "All transaction sending methods now call `estimateGas` if no gas amount was supplied",
+                "pr": 235
+            },
+            {
+                "note":
+                    "Modify order validation methods to validate against the `latest` block, not against the `pending` block",
+                "pr": 236
+            }
+        ],
+        "timestamp": 1511794800
+    },
+    {
+        "version": "0.26.0",
+        "changes": [
+            {
+                "note":
+                    "Add post-formatter for logs converting `blockNumber`, `logIndex`, `transactionIndex` from hexes to numbers",
+                "pr": 231
+            },
+            {
+                "note": "Remove support for Async callback types when used in Subscribe functions",
+                "pr": 222
+            },
+            {
+                "note":
+                    "In OrderWatcher subscribe to ZRX Token Transfer and Approval events when maker token is different",
+                "pr": 225
+            }
+        ],
+        "timestamp": 1511190000
+    },
+    {
+        "version": "0.25.1",
+        "changes": [
+            {
+                "note": "Standardise on Cancelled over Canceled",
+                "pr": 217
+            },
+            {
+                "note": "Add missing `DecodedLogEvent` type to exported types",
+                "pr": 205
+            },
+            {
+                "note":
+                    "Normalized the transactionReceipt status to be `null|0|1`, 1 meaning transaction execution successful, 0 unsuccessful and `null` if it is a pre-byzantinium transaction.",
+                "pr": 200
+            }
+        ],
+        "timestamp": 1510498800
+    },
+    {
+        "version": "0.23.0",
+        "changes": [
+            {
+                "note": "Fixed unhandled promise rejection error in subscribe methods",
+                "pr": 209
+            },
+            {
+                "note": "Subscribe callbacks now receive an error object as their first argument"
+            }
+        ],
+        "timestamp": 1510412400
+    },
+    {
+        "version": "0.22.6",
+        "changes": [
+            {
+                "note": "Add a timeout parameter to transaction awaiting",
+                "pr": 206
+            }
+        ],
+        "timestamp": 1510239600
+    },
+    {
+        "version": "0.22.5",
+        "changes": [
+            {
+                "note": "Re-publish v0.22.4 to fix publishing issue"
+            }
+        ],
+        "timestamp": 1509980400
+    },
+    {
+        "version": "0.22.4",
+        "changes": [
+            {
+                "note": "Upgraded bignumber.js to a new version that ships with native typings"
+            }
+        ],
+        "timestamp": 1508857200
+    },
+    {
+        "version": "0.22.3",
+        "changes": [
+            {
+                "note": "Fixed an issue with new version of testrpc and unlimited proxy allowance",
+                "pr": 199
+            }
+        ],
+        "timestamp": 1508857200
+    },
+    {
+        "version": "0.22.2",
+        "changes": [
+            {
+                "note": "Fixed rounding of maker fill amount and incorrect validation of partial fees",
+                "pr": 197
+            }
+        ],
+        "timestamp": 1508770800
+    },
+    {
+        "version": "0.22.0",
+        "changes": [
+            {
+                "note":
+                    "Started using `OrderFillRequest` interface instead of `OrderFillOrKillRequest` interface for `zeroEx.exchange.batchFillOrKill`",
+                "pr": 187
+            },
+            {
+                "note": "Removed `OrderFillOrKillRequest`",
+                "pr": 187
+            }
+        ],
+        "timestamp": 1508079600
+    },
+    {
+        "version": "0.21.4",
+        "changes": [
+            {
+                "note":
+                    "Made 0x.js more type-safe by making `getLogsAsync` and `subscribe/subscribeAsync` generics parametrized with arg type",
+                "pr": 194
+            }
+        ],
+        "timestamp": 1507820400
+    },
+    {
+        "version": "0.21.3",
+        "changes": [
+            {
+                "note": "Fixed a bug causing order fills to throw `INSUFFICIENT_TAKER_ALLOWANCE`",
+                "pr": 193
+            }
+        ],
+        "timestamp": 1507734000
+    },
+    {
+        "version": "0.21.2",
+        "changes": [
+            {
+                "note": "Exported `ContractEventArg` as a public type",
+                "pr": 190
+            }
+        ],
+        "timestamp": 1507647600
+    },
+    {
+        "version": "0.21.1",
+        "changes": [
+            {
+                "note": "Fixed a bug in subscriptions",
+                "pr": 189
+            }
+        ],
+        "timestamp": 1507647600
+    },
+    {
+        "version": "0.21.0",
+        "changes": [
+            {
+                "note": "Complete rewrite of subscription logic",
+                "pr": 182
+            },
+            {
+                "note": "Subscriptions no longer return historical logs. If you want them - use `getLogsAsync`"
+            },
+            {
+                "note":
+                    "Subscriptions now use [ethereumjs-blockstream](https://github.com/ethereumjs/ethereumjs-blockstream) under the hood"
+            },
+            {
+                "note": "Subscriptions correctly handle block re-orgs (forks)"
+            },
+            {
+                "note": "Subscriptions correctly backfill logs (connection problems)"
+            },
+            {
+                "note":
+                    "They no longer setup filters on the underlying nodes, so you can use them with infura without a filter Subprovider"
+            },
+            {
+                "note": "Removed `ContractEventEmitter` and added `LogEvent`"
+            },
+            {
+                "note": "Renamed `zeroEx.token.subscribeAsync` to `zeroEx.token.subscribe`"
+            },
+            {
+                "note": "Added `zeroEx.token.unsubscribe` and `zeroEx.exchange.unsubscribe`"
+            },
+            {
+                "note": "Renamed `zeroEx.exchange.stopWatchingAllEventsAsync` to `zeroEx.exhange.unsubscribeAll`"
+            },
+            {
+                "note": "Renamed `zeroEx.token.stopWatchingAllEventsAsync` to `zeroEx.token.unsubscribeAll`"
+            },
+            {
+                "note": "Fixed the batch fills validation by emulating all balance & proxy allowance changes",
+                "pr": 185
+            }
+        ],
+        "timestamp": 1507561200
+    },
+    {
+        "version": "0.20.0",
+        "changes": [
+            {
+                "note": "Add `zeroEx.token.getLogsAsync`",
+                "pr": 178
+            },
+            {
+                "note": "Add `zeroEx.exchange.getLogsAsync`",
+                "pr": 178
+            },
+            {
+                "note": "Fixed fees validation when one of the tokens transferred is ZRX",
+                "pr": 181
+            }
+        ],
+        "timestamp": 1507129200
+    },
+    {
+        "version": "0.19.0",
+        "changes": [
+            {
+                "note": "Made order validation optional ",
+                "pr": 172
+            },
+            {
+                "note": "Added Ropsten testnet support",
+                "pr": 173
+            },
+            {
+                "note": "Fixed a bug causing awaitTransactionMinedAsync to DDos backend nodes",
+                "pr": 175
+            }
+        ],
+        "timestamp": 1506610800
+    },
+    {
+        "version": "0.18.0",
+        "changes": [
+            {
+                "note": "Added `zeroEx.exchange.validateOrderFillableOrThrowAsync` to simplify orderbook pruning",
+                "pr": 170
+            }
+        ],
+        "timestamp": 1506351600
+    },
+    {
+        "version": "0.17.0",
+        "changes": [
+            {
+                "note": "Made `zeroEx.exchange.getZRXTokenAddressAsync` public",
+                "pr": 171
+            }
+        ],
+        "timestamp": 1506351600
+    },
+    {
+        "version": "0.16.0",
+        "changes": [
+            {
+                "note": "Added the ability to specify custom contract addresses to be used with 0x.js",
+                "pr": 165
+            },
+            {
+                "note": "ZeroExConfig.exchangeContractAddress"
+            },
+            {
+                "note": "ZeroExConfig.tokenRegistryContractAddress"
+            },
+            {
+                "note": "ZeroExConfig.etherTokenContractAddress"
+            },
+            {
+                "note": "Added `zeroEx.tokenRegistry.getContractAddressAsync`",
+                "pr": 165
+            }
+        ],
+        "timestamp": 1505833200
+    },
+    {
+        "version": "0.15.0",
+        "changes": [
+            {
+                "note":
+                    "Added the ability to specify a historical `blockNumber` at which to query the blockchain's state when calling a token or exchange method",
+                "pr": 161
+            }
+        ],
+        "timestamp": 1504796400
+    },
+    {
+        "version": "0.14.2",
+        "changes": [
+            {
+                "note": "Fixed an issue with bignumber.js types not found",
+                "pr": 160
+            }
+        ],
+        "timestamp": 1504710000
+    },
+    {
+        "version": "0.14.1",
+        "changes": [
+            {
+                "note": "Fixed an issue with Artifact type not found",
+                "pr": 159
+            }
+        ],
+        "timestamp": 1504710000
+    },
+    {
+        "version": "0.14.0",
+        "changes": [
+            {
+                "note": "Added `zeroEx.exchange.throwLogErrorsAsErrors` method to public interface",
+                "pr": 157
+            },
+            {
+                "note": "Fixed an issue with overlapping async intervals in `zeroEx.awaitTransactionMinedAsync`",
+                "pr": 157
+            },
+            {
+                "note": "Fixed an issue with log decoder returning `BigNumber`s as `strings`",
+                "pr": 157
+            }
+        ],
+        "timestamp": 1504623600
+    },
+    {
+        "version": "0.13.0",
+        "changes": [
+            {
+                "note":
+                    "Made all the functions submitting transactions to the network to immediately return transaction hash",
+                "pr": 151
+            },
+            {
+                "note": "Added `zeroEx.awaitTransactionMinedAsync`",
+                "pr": 151
+            },
+            {
+                "note":
+                    "Added `TransactionReceiptWithDecodedLogs`, `LogWithDecodedArgs`, `DecodedLogArgs` to public types",
+                "pr": 151
+            },
+            {
+                "note": "Added signature validation to `validateFillOrderThrowIfInvalidAsync`",
+                "pr": 152
+            }
+        ],
+        "timestamp": 1504623600
+    },
+    {
+        "version": "0.12.1",
+        "changes": [
+            {
+                "note": "Added the support for web3@1.x.x provider",
+                "pr": 142
+            },
+            {
+                "note": "Added the optional `zeroExConfig`  parameter to the constructor of `ZeroEx`",
+                "pr": 139
+            },
+            {
+                "note": "Added the ability to specify `gasPrice` when instantiating `ZeroEx`",
+                "pr": 139
+            }
+        ],
+        "timestamp": 1504278000
+    },
+    {
+        "version": "0.11.0",
+        "changes": [
+            {
+                "note": "Added `zeroEx.token.setUnlimitedProxyAllowanceAsync`",
+                "pr": 137
+            },
+            {
+                "note": "Added `zeroEx.token.setUnlimitedAllowanceAsync`",
+                "pr": 137
+            },
+            {
+                "note": "Added `zeroEx.token.UNLIMITED_ALLOWANCE_IN_BASE_UNITS`",
+                "pr": 137
+            }
+        ],
+        "timestamp": 1503500400
+    },
+    {
+        "version": "0.10.4",
+        "changes": [
+            {
+                "note": "Fixed a bug where checksummed addresses were being pulled from artifacts and not lower-cased.",
+                "pr": 135
+            }
+        ],
+        "timestamp": 1503500400
+    },
+    {
+        "version": "0.10.1",
+        "changes": [
+            {
+                "note": "Added `zeroEx.exchange.validateFillOrderThrowIfInvalidAsync`",
+                "pr": 128
+            },
+            {
+                "note": "Added `zeroEx.exchange.validateFillOrKillOrderThrowIfInvalidAsync`",
+                "pr": 128
+            },
+            {
+                "note": "Added `zeroEx.exchange.validateCancelOrderThrowIfInvalidAsync`",
+                "pr": 128
+            },
+            {
+                "note": "Added `zeroEx.exchange.isRoundingErrorAsync`",
+                "pr": 128
+            },
+            {
+                "note": "Added `zeroEx.proxy.getContractAddressAsync`",
+                "pr": 130
+            },
+            {
+                "note": "Added `zeroEx.tokenRegistry.getTokenAddressesAsync`",
+                "pr": 132
+            },
+            {
+                "note": "Added `zeroEx.tokenRegistry.getTokenAddressBySymbolIfExistsAsync`",
+                "pr": 132
+            },
+            {
+                "note": "Added `zeroEx.tokenRegistry.getTokenAddressByNameIfExistsAsync`",
+                "pr": 132
+            },
+            {
+                "note": "Added `zeroEx.tokenRegistry.getTokenBySymbolIfExistsAsync`",
+                "pr": 132
+            },
+            {
+                "note": "Added `zeroEx.tokenRegistry.getTokenByNameIfExistsAsync`",
+                "pr": 132
+            },
+            {
+                "note": "Added clear error message when checksummed address is passed to a public method",
+                "pr": 124
+            },
+            {
+                "note": "Fixes the description of `shouldThrowOnInsufficientBalanceOrAllowance` in docs",
+                "pr": 127
+            }
+        ],
+        "timestamp": 1503500400
+    },
+    {
+        "version": "0.9.3",
+        "changes": [
+            {
+                "note": "Update contract artifacts to include latest Kovan and Mainnet deploys",
+                "pr": 118
+            }
+        ],
+        "timestamp": 1503327600
+    },
+    {
+        "version": "0.9.2",
+        "changes": [
+            {
+                "note": "*This version was unpublished because of a publishing issue.*"
+            },
+            {
+                "note": "Update contract artifacts to include latest Kovan and Mainnet deploys",
+                "pr": 118
+            }
+        ],
+        "timestamp": 1503241200
+    },
+    {
+        "version": "0.9.1",
+        "changes": [
+            {
+                "note": "Fixed the bug causing `zeroEx.token.getBalanceAsync()` to fail if no addresses available",
+                "pr": 120
+            }
+        ],
+        "timestamp": 1502809200
+    },
+    {
+        "version": "0.9.0",
+        "changes": [
+            {
+                "note": "Migrated to the new version of smart contracts",
+                "pr": 101
+            },
+            {
+                "note": "Removed the ability to call methods on multiple authorized Exchange smart contracts",
+                "pr": 106
+            },
+            {
+                "note": "Made `zeroEx.getOrderHashHex` a static method",
+                "pr": 107
+            },
+            {
+                "note": "Cached `net_version` requests and invalidate the cache on calls to `setProvider`",
+                "pr": 95
+            },
+            {
+                "note": "Renamed `zeroEx.exchange.batchCancelOrderAsync` to `zeroEx.exchange.batchCancelOrdersAsync`"
+            },
+            {
+                "note": "Renamed `zeroEx.exchange.batchFillOrderAsync` to `zeroEx.exchange.batchFillOrdersAsync`"
+            },
+            {
+                "note": "Updated to typescript v2.4",
+                "pr": 104
+            },
+            {
+                "note":
+                    "Fixed an issue with incorrect balance/allowance validation when ZRX is one of the tokens traded",
+                "pr": 109
+            }
+        ],
+        "timestamp": 1500994800
+    },
+    {
+        "version": "0.8.0",
+        "changes": [
+            {
+                "note":
+                    "Added the ability to call methods on different authorized versions of the Exchange smart contract",
+                "pr": 82
+            },
+            {
+                "note":
+                    "Updated contract artifacts to reflect latest changes to the smart contracts (0xproject/contracts#59)"
+            },
+            {
+                "note": "Added `zeroEx.proxy.isAuthorizedAsync` and `zeroEx.proxy.getAuthorizedAddressesAsync`",
+                "pr": 89
+            },
+            {
+                "note": "Added `zeroEx.token.subscribeAsync`",
+                "pr": 90
+            },
+            {
+                "note": "Made contract invalidation functions private",
+                "pr": 90
+            },
+            {
+                "note": "`zeroEx.token.invalidateContractInstancesAsync`"
+            },
+            {
+                "note": "`zeroEx.exchange.invalidateContractInstancesAsync`"
+            },
+            {
+                "note": "`zeroEx.proxy.invalidateContractInstance`"
+            },
+            {
+                "note": "`zeroEx.tokenRegistry.invalidateContractInstance`"
+            },
+            {
+                "note": "Fixed the bug where `zeroEx.setProviderAsync` didn't invalidate etherToken contract's instance"
+            }
+        ],
+        "timestamp": 1499094000
+    },
+    {
+        "version": "0.7.1",
+        "changes": [
+            {
+                "note":
+                    "Added the ability to convert Ether to wrapped Ether tokens and back via `zeroEx.etherToken.depostAsync` and `zeroEx.etherToken.withdrawAsync`",
+                "pr": 81
+            }
+        ],
+        "timestamp": 1498402800
+    },
+    {
+        "version": "0.7.0",
+        "changes": [
+            {
+                "note": "Added Kovan smart contract artifacts",
+                "pr": 78
+            },
+            {
+                "note": "Started returning fillAmount from `fillOrderAsync` and `fillUpToAsync`",
+                "pr": 72
+            },
+            {
+                "note": "Started returning cancelledAmount from `cancelOrderAsync`",
+                "pr": 72
+            },
+            {
+                "note":
+                    "Renamed type `LogCancelArgs` to `LogCancelContractEventArgs` and `LogFillArgs` to `LogFillContractEventArgs`"
+            }
+        ],
+        "timestamp": 1498057200
+    },
+    {
+        "version": "0.6.2",
+        "changes": [
+            {
+                "note": "Reduced bundle size"
+            },
+            {
+                "note": "Improved documentation"
+            }
+        ],
+        "timestamp": 1497970800
+    },
+    {
+        "version": "0.6.1",
+        "changes": [
+            {
+                "note": "Improved documentation"
+            }
+        ],
+        "timestamp": 1497798000
+    },
+    {
+        "version": "0.6.0",
+        "changes": [
+            {
+                "note": "Made `ZeroEx` class accept `Web3Provider` instance instead of `Web3` instance"
+            },
+            {
+                "note": "Added types for contract event arguments"
+            }
+        ],
+        "timestamp": 1497798000
+    },
+    {
+        "version": "0.5.2",
+        "changes": [
+            {
+                "note":
+                    "Fixed the bug in `postpublish` script that caused that only unminified UMD bundle was uploaded to release page"
+            }
+        ],
+        "timestamp": 1497452400
+    },
+    {
+        "version": "0.5.1",
+        "changes": [
+            {
+                "note": "Added `postpublish` script to publish to Github Releases with assets."
+            }
+        ],
+        "timestamp": 1497452400
+    }
+]

packages/0x.js/CHANGELOG.md

@@ -1,15 +1,35 @@
-# CHANGELOG
+<!--
+This file is auto-generated using the monorepo-scripts package. Don't edit directly.
+Edit the package's CHANGELOG.json file only.
+-->
 
-## v0.33.2 - _March 18, 2018_
+CHANGELOG
+
+## v0.36.0 - _April 11, 2018_
+
+    * Moved Web3.Provider to `@0xproject/types:Provider` (#501)
+
+## v0.35.0 - _April 2, 2018_
+
+    * Removed `ZeroExError.TransactionMiningTimeout` and moved it to '@0xproject/web3_wrapper' `Web3WrapperErrors.TransactionMiningTimeout` (#485)
+
+## v0.34.0 - _April 2, 2018_
+
+    * Fix the bug causing `zeroEx.exchange.fillOrdersUpToAsync` validation to fail if there were some extra orders passed (#470)
+    * Remove automatic instantiation of `zeroEx.orderStateWatcher` (#488)
+    * Add `zeroEx.createOrderStateWatcher` to allow creating arbitrary number of OrderStateWatchers (#488)
+    * Added `stateLayer` setting to `OrderStateWatcherConfig` so OrderStateWatcher can be set to monitor different blockchain state layers (#488)
+
+## v0.33.2 - _March 17, 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_
+## v0.33.1 - _March 7, 2018_
 
     * Add missing EthersJs typescript typings as dependency
 
-## v0.33.0 - _March 4, 2018_
+## v0.33.0 - _March 3, 2018_
 
     * Validate and lowercase all addresses in public methods (#373)
     * Improve validation to force passing contract addresses on private networks (#385)
@@ -17,57 +37,54 @@
     * 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_
+## v0.32.2 - _February 8, 2018_
 
     * Fix publishing issue where .npmignore was not properly excluding undesired content (#389)
 
-## v0.32.1 - _February 7, 2018_
+## v0.32.1 - _February 6, 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_
+## v0.32.0 - _February 4, 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_
+## v0.31.1 - _January 31, 2018_
 
     * Fix the bug causing order watcher to throw if makerToken === zrx (#357)
 
-## v0.31.0 - _January 30, 2018_
+## v0.31.0 - _January 29, 2018_
 
-    * Add the `shouldAddPersonalMessagePrefix` parameter to `signOrderHashAsync` so that the
-    caller can decide on whether to add the personalMessage prefix before relaying the request
-    to the signer. Parity Signer, Ledger and TestRPC add the prefix themselves, Metamask expects
-    it to have already been added. (#349)
+    * Add the `shouldAddPersonalMessagePrefix` parameter to `signOrderHashAsync` so that the caller can decide on whether to add the personalMessage prefix before relaying the request to the signer. Parity Signer, Ledger and TestRPC add the prefix themselves, Metamask expects it to have already been added. (#349)
 
-## v0.30.2 - _January 29, 2018_
+## v0.30.2 - _January 28, 2018_
 
     * Add Rinkeby testnet addresses to artifacts  (#337)
     * Move @0xproject/types to dependencies from devDependencies fixing missing type errors
 
-## v0.30.1 - _January 24, 2018_
+## v0.30.1 - _January 23, 2018_
 
     * Fix a bug allowing negative fill values  (#212)
     * Fix a bug that made it impossible to pass a custom ZRX address  (#341)
 
-## v0.30.0 - _January 17, 2018_
+## v0.30.0 - _January 16, 2018_
 
     * Add an error parameter to the order watcher callback (#312)
     * Fix a bug making it impossible to catch some errors from awaitTransactionMinedAsync (#312)
     * Fix a bug in fillOrdersUpTo validation making it impossible to fill up to if user doesn't have enough balance to fully fill all the orders (#321)
 
-## v0.29.1 - _January 11, 2018_
+## v0.29.1 - _January 10, 2018_
 
     * Fixed bignumber config issue #301 (#305)
 
-## v0.29.0 - _December 28, 2017_
+## v0.29.0 - _December 27, 2017_
 
     * Assert baseUnit amount supplied to `toUnitAmount` is integer amount. (#287)
     * `toBaseUnitAmount` throws if amount supplied has too many decimals (#287)
 
-## v0.28.0 - _December 20, 2017_
+## v0.28.0 - _December 19, 2017_
 
     * Add `etherTokenAddress` arg to `depositAsync` and `withdrawAsync` methods on `zeroEx.etherToken` (#267)
     * Removed accidentally included `unsubscribeAll` method from `zeroEx.proxy`, `zeroEx.etherToken` and `zeroEx.tokenRegistry` (#267)
@@ -79,11 +96,11 @@
     * Support `Deposit` and `Withdraw` events on etherToken (#277)
     * Improve the error message when taker is not a string (#278)
 
-## v0.27.1 - _November 28, 2017_
+## v0.27.1 - _November 27, 2017_
 
     * Export `TransactionOpts` type
 
-## v0.27.0 - _November 28, 2017_
+## v0.27.0 - _November 27, 2017_
 
     * Make `ZeroExConfig` required parameter of `ZeroEx` constructor (#233)
     * Add a required property `networkId` to `ZeroExConfig` (#233)
@@ -95,149 +112,149 @@
     * All transaction sending methods now call `estimateGas` if no gas amount was supplied (#235)
     * Modify order validation methods to validate against the `latest` block, not against the `pending` block (#236)
 
-## v0.26.0 - _November 21, 2017_
+## v0.26.0 - _November 20, 2017_
 
     * Add post-formatter for logs converting `blockNumber`, `logIndex`, `transactionIndex` from hexes to numbers (#231)
     * Remove support for Async callback types when used in Subscribe functions (#222)
     * In OrderWatcher subscribe to ZRX Token Transfer and Approval events when maker token is different (#225)
 
-## v0.25.1 - _November 13, 2017_
+## v0.25.1 - _November 12, 2017_
 
     * Standardise on Cancelled over Canceled (#217)
     * Add missing `DecodedLogEvent` type to exported types (#205)
     * Normalized the transactionReceipt status to be `null|0|1`, 1 meaning transaction execution successful, 0 unsuccessful and `null` if it is a pre-byzantinium transaction. (#200)
 
-## v0.23.0 - _November 12, 2017_
+## v0.23.0 - _November 11, 2017_
 
     * Fixed unhandled promise rejection error in subscribe methods (#209)
     * Subscribe callbacks now receive an error object as their first argument
 
-## v0.22.6 - _November 10, 2017_
+## v0.22.6 - _November 9, 2017_
 
     * Add a timeout parameter to transaction awaiting (#206)
 
-## v0.22.5 - _November 7, 2017_
+## v0.22.5 - _November 6, 2017_
 
     * Re-publish v0.22.4 to fix publishing issue
 
-## v0.22.4 - _October 25, 2017_
+## v0.22.4 - _October 24, 2017_
 
     * Upgraded bignumber.js to a new version that ships with native typings
 
-## v0.22.3 - _October 25, 2017_
+## v0.22.3 - _October 24, 2017_
 
     * Fixed an issue with new version of testrpc and unlimited proxy allowance (#199)
 
-## v0.22.2 - _October 24, 2017_
+## v0.22.2 - _October 23, 2017_
 
     * Fixed rounding of maker fill amount and incorrect validation of partial fees (#197)
 
-## v0.22.0 - _October 16, 2017_
+## v0.22.0 - _October 15, 2017_
 
     * Started using `OrderFillRequest` interface instead of `OrderFillOrKillRequest` interface for `zeroEx.exchange.batchFillOrKill` (#187)
     * Removed `OrderFillOrKillRequest` (#187)
 
-## v0.21.4 - _October 13, 2017_
+## v0.21.4 - _October 12, 2017_
 
     * Made 0x.js more type-safe by making `getLogsAsync` and `subscribe/subscribeAsync` generics parametrized with arg type (#194)
 
-## v0.21.3 - _October 12, 2017_
+## v0.21.3 - _October 11, 2017_
 
     * Fixed a bug causing order fills to throw `INSUFFICIENT_TAKER_ALLOWANCE` (#193)
 
-## v0.21.2 - _October 11, 2017_
+## v0.21.2 - _October 10, 2017_
 
     * Exported `ContractEventArg` as a public type (#190)
 
-## v0.21.1 - _October 11, 2017_
+## v0.21.1 - _October 10, 2017_
 
     * Fixed a bug in subscriptions (#189)
 
-## v0.21.0 - _October 10, 2017_
+## v0.21.0 - _October 9, 2017_
 
     * Complete rewrite of subscription logic (#182)
-        * Subscriptions no longer return historical logs. If you want them - use `getLogsAsync`
-        * Subscriptions now use [ethereumjs-blockstream](https://github.com/ethereumjs/ethereumjs-blockstream) under the hood
-            * Subscriptions correctly handle block re-orgs (forks)
-            * Subscriptions correctly backfill logs (connection problems)
-            * They no longer setup filters on the underlying nodes, so you can use them with infura without a filter Subprovider
-        * Removed `ContractEventEmitter` and added `LogEvent`
-        * Renamed `zeroEx.token.subscribeAsync` to `zeroEx.token.subscribe`
-        * Added `zeroEx.token.unsubscribe` and `zeroEx.exchange.unsubscribe`
-        * Renamed `zeroEx.exchange.stopWatchingAllEventsAsync` to `zeroEx.exhange.unsubscribeAll`
-        * Renamed `zeroEx.token.stopWatchingAllEventsAsync` to `zeroEx.token.unsubscribeAll`
+    * Subscriptions no longer return historical logs. If you want them - use `getLogsAsync`
+    * Subscriptions now use [ethereumjs-blockstream](https://github.com/ethereumjs/ethereumjs-blockstream) under the hood
+    * Subscriptions correctly handle block re-orgs (forks)
+    * Subscriptions correctly backfill logs (connection problems)
+    * They no longer setup filters on the underlying nodes, so you can use them with infura without a filter Subprovider
+    * Removed `ContractEventEmitter` and added `LogEvent`
+    * Renamed `zeroEx.token.subscribeAsync` to `zeroEx.token.subscribe`
+    * Added `zeroEx.token.unsubscribe` and `zeroEx.exchange.unsubscribe`
+    * Renamed `zeroEx.exchange.stopWatchingAllEventsAsync` to `zeroEx.exhange.unsubscribeAll`
+    * Renamed `zeroEx.token.stopWatchingAllEventsAsync` to `zeroEx.token.unsubscribeAll`
     * Fixed the batch fills validation by emulating all balance & proxy allowance changes (#185)
 
-## v0.20.0 - _October 5, 2017_
+## v0.20.0 - _October 4, 2017_
 
     * Add `zeroEx.token.getLogsAsync` (#178)
     * Add `zeroEx.exchange.getLogsAsync` (#178)
     * Fixed fees validation when one of the tokens transferred is ZRX (#181)
 
-## v0.19.0 - _September 29, 2017_
+## v0.19.0 - _September 28, 2017_
 
     * Made order validation optional  (#172)
     * Added Ropsten testnet support (#173)
     * Fixed a bug causing awaitTransactionMinedAsync to DDos backend nodes (#175)
 
-## v0.18.0 - _September 26, 2017_
+## v0.18.0 - _September 25, 2017_
 
     * Added `zeroEx.exchange.validateOrderFillableOrThrowAsync` to simplify orderbook pruning (#170)
 
-## v0.17.0 - _September 26, 2017_
+## v0.17.0 - _September 25, 2017_
 
     * Made `zeroEx.exchange.getZRXTokenAddressAsync` public (#171)
 
-## v0.16.0 - _September 20, 2017_
+## v0.16.0 - _September 19, 2017_
 
     * Added the ability to specify custom contract addresses to be used with 0x.js (#165)
-        * ZeroExConfig.exchangeContractAddress
-        * ZeroExConfig.tokenRegistryContractAddress
-        * ZeroExConfig.etherTokenContractAddress
+    * ZeroExConfig.exchangeContractAddress
+    * ZeroExConfig.tokenRegistryContractAddress
+    * ZeroExConfig.etherTokenContractAddress
     * Added `zeroEx.tokenRegistry.getContractAddressAsync` (#165)
 
-## v0.15.0 - _September 8, 2017_
+## v0.15.0 - _September 7, 2017_
 
     * Added the ability to specify a historical `blockNumber` at which to query the blockchain's state when calling a token or exchange method (#161)
 
-## v0.14.2 - _September 7, 2017_
+## v0.14.2 - _September 6, 2017_
 
     * Fixed an issue with bignumber.js types not found (#160)
 
-## v0.14.1 - _September 7, 2017_
+## v0.14.1 - _September 6, 2017_
 
     * Fixed an issue with Artifact type not found (#159)
 
-## v0.14.0 - _September 6, 2017_
+## v0.14.0 - _September 5, 2017_
 
     * Added `zeroEx.exchange.throwLogErrorsAsErrors` method to public interface (#157)
     * Fixed an issue with overlapping async intervals in `zeroEx.awaitTransactionMinedAsync` (#157)
     * Fixed an issue with log decoder returning `BigNumber`s as `strings` (#157)
 
-## v0.13.0 - _September 6, 2017_
+## v0.13.0 - _September 5, 2017_
 
     * Made all the functions submitting transactions to the network to immediately return transaction hash (#151)
     * Added `zeroEx.awaitTransactionMinedAsync` (#151)
     * Added `TransactionReceiptWithDecodedLogs`, `LogWithDecodedArgs`, `DecodedLogArgs` to public types (#151)
     * Added signature validation to `validateFillOrderThrowIfInvalidAsync` (#152)
 
-## v0.12.1 - _September 2, 2017_
+## v0.12.1 - _September 1, 2017_
 
     * Added the support for web3@1.x.x provider (#142)
     * Added the optional `zeroExConfig`  parameter to the constructor of `ZeroEx` (#139)
     * Added the ability to specify `gasPrice` when instantiating `ZeroEx` (#139)
 
-## v0.11.0 - _August 24, 2017_
+## v0.11.0 - _August 23, 2017_
 
     * Added `zeroEx.token.setUnlimitedProxyAllowanceAsync` (#137)
     * Added `zeroEx.token.setUnlimitedAllowanceAsync` (#137)
     * Added `zeroEx.token.UNLIMITED_ALLOWANCE_IN_BASE_UNITS` (#137)
 
-## v0.10.4 - _Aug 24, 2017_
+## v0.10.4 - _August 23, 2017_
 
     * Fixed a bug where checksummed addresses were being pulled from artifacts and not lower-cased. (#135)
 
-## v0.10.1 - _Aug 24, 2017_
+## v0.10.1 - _August 23, 2017_
 
     * Added `zeroEx.exchange.validateFillOrderThrowIfInvalidAsync` (#128)
     * Added `zeroEx.exchange.validateFillOrKillOrderThrowIfInvalidAsync` (#128)
@@ -252,20 +269,20 @@
     * Added clear error message when checksummed address is passed to a public method (#124)
     * Fixes the description of `shouldThrowOnInsufficientBalanceOrAllowance` in docs (#127)
 
-## v0.9.3 - _Aug 22, 2017_
+## v0.9.3 - _August 21, 2017_
 
     * Update contract artifacts to include latest Kovan and Mainnet deploys (#118)
 
-## v0.9.2 - _Aug 21, 2017_
+## v0.9.2 - _August 20, 2017_
 
     * *This version was unpublished because of a publishing issue.*
     * Update contract artifacts to include latest Kovan and Mainnet deploys (#118)
 
-## v0.9.1 - _Aug. 16, 2017_
+## v0.9.1 - _August 15, 2017_
 
     * Fixed the bug causing `zeroEx.token.getBalanceAsync()` to fail if no addresses available (#120)
 
-## v0.9.0 - _Jul. 26, 2017_
+## v0.9.0 - _July 25, 2017_
 
     * Migrated to the new version of smart contracts (#101)
     * Removed the ability to call methods on multiple authorized Exchange smart contracts (#106)
@@ -276,48 +293,48 @@
     * Updated to typescript v2.4 (#104)
     * Fixed an issue with incorrect balance/allowance validation when ZRX is one of the tokens traded (#109)
 
-## v0.8.0 - _Jul. 4, 2017_
+## v0.8.0 - _July 3, 2017_
 
     * Added the ability to call methods on different authorized versions of the Exchange smart contract (#82)
     * Updated contract artifacts to reflect latest changes to the smart contracts (0xproject/contracts#59)
     * Added `zeroEx.proxy.isAuthorizedAsync` and `zeroEx.proxy.getAuthorizedAddressesAsync` (#89)
     * Added `zeroEx.token.subscribeAsync` (#90)
     * Made contract invalidation functions private (#90)
-        * `zeroEx.token.invalidateContractInstancesAsync`
-        * `zeroEx.exchange.invalidateContractInstancesAsync`
-        * `zeroEx.proxy.invalidateContractInstance`
-        * `zeroEx.tokenRegistry.invalidateContractInstance`
+    * `zeroEx.token.invalidateContractInstancesAsync`
+    * `zeroEx.exchange.invalidateContractInstancesAsync`
+    * `zeroEx.proxy.invalidateContractInstance`
+    * `zeroEx.tokenRegistry.invalidateContractInstance`
     * Fixed the bug where `zeroEx.setProviderAsync` didn't invalidate etherToken contract's instance
 
-## v0.7.1 - _Jun. 26, 2017_
+## v0.7.1 - _June 25, 2017_
 
     * Added the ability to convert Ether to wrapped Ether tokens and back via `zeroEx.etherToken.depostAsync` and `zeroEx.etherToken.withdrawAsync` (#81)
 
-## v0.7.0 - _Jun. 22, 2017_
+## v0.7.0 - _June 21, 2017_
 
     * Added Kovan smart contract artifacts (#78)
     * Started returning fillAmount from `fillOrderAsync` and `fillUpToAsync` (#72)
     * Started returning cancelledAmount from `cancelOrderAsync` (#72)
     * Renamed type `LogCancelArgs` to `LogCancelContractEventArgs` and `LogFillArgs` to `LogFillContractEventArgs`
 
-## v0.6.2 - _Jun. 21, 2017_
+## v0.6.2 - _June 20, 2017_
 
     * Reduced bundle size
     * Improved documentation
 
-## v0.6.1 - _Jun. 19, 2017_
+## v0.6.1 - _June 18, 2017_
 
     * Improved documentation
 
-## v0.6.0 - _Jun. 19, 2017_
+## v0.6.0 - _June 18, 2017_
 
     * Made `ZeroEx` class accept `Web3Provider` instance instead of `Web3` instance
     * Added types for contract event arguments
 
-## v0.5.2 - _Jun. 15, 2017_
+## v0.5.2 - _June 14, 2017_
 
     * Fixed the bug in `postpublish` script that caused that only unminified UMD bundle was uploaded to release page
 
-## v0.5.1 - _Jun. 15, 2017_
+## v0.5.1 - _June 14, 2017_
 
     * Added `postpublish` script to publish to Github Releases with assets.

packages/0x.js/README.md

@@ -1,5 +1,9 @@
 ## 0x.js
 
+A TypeScript/Javascript library for interacting with the 0x protocol.
+
+### Read the [Documentation](https://0xproject.com/docs/0xjs).
+
 ## Installation
 
 0x.js ships as both a [UMD](https://github.com/umdjs/umd) module and a [CommonJS](https://en.wikipedia.org/wiki/CommonJS) package.
@@ -20,11 +24,10 @@ 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"
-]
+```json
+"compilerOptions": {
+    "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+}
 ```
 
 #### UMD:
@@ -39,10 +42,66 @@ Download the UMD module from our [releases page](https://github.com/0xProject/0x
 <script type="text/javascript" src="0x.js"></script>
 ```
 
-## Documentation
+## Contributing
 
-Extensive documentation of 0x.js can be found on [our website][docs-url].
+We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
-[website-url]: https://0xproject.com/
-[whitepaper-url]: https://0xproject.com/pdfs/0x_white_paper.pdf
-[docs-url]: https://0xproject.com/docs/0xjs
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
+
+### Install dependencies
+
+If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
+
+```bash
+yarn config set workspaces-experimental true
+```
+
+Then install dependencies
+
+```bash
+yarn install
+```
+
+### Build
+
+If this is your **first** time building this package, you must first build **all** packages within the monorepo. This is because packages that depend on other packages located inside this monorepo are symlinked when run from **within** the monorepo. This allows you to make changes across multiple packages without first publishing dependent packages to NPM. To build all packages, run the following from the monorepo root directory:
+
+```bash
+yarn lerna:rebuild
+```
+
+Or continuously rebuild on change:
+
+```bash
+yarn dev
+```
+
+You can also build this specific package by running the following from within its directory:
+
+```bash
+yarn build
+```
+
+or continuously rebuild on change:
+
+```bash
+yarn build:watch
+```
+
+### Clean
+
+```bash
+yarn clean
+```
+
+### Lint
+
+```bash
+yarn lint
+```
+
+### Run Tests
+
+```bash
+yarn test
+```

packages/0x.js/package.json

@@ -1,6 +1,6 @@
 {
     "name": "0x.js",
-    "version": "0.33.2",
+    "version": "0.35.0",
     "description": "A javascript library for interacting with the 0x protocol",
     "keywords": [
         "0x.js",
@@ -15,8 +15,6 @@
         "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_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 --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",
@@ -28,7 +26,11 @@
         "build:umd:prod": "NODE_ENV=production webpack",
         "build:commonjs": "tsc && copyfiles -u 2 './src/artifacts/**/*.json' ./lib/src/artifacts && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
         "test:commonjs": "run-s build:commonjs run_mocha",
-        "run_mocha": "mocha lib/test/**/*_test.js --timeout 10000 --bail --exit"
+        "run_mocha": "mocha lib/test/**/*_test.js --timeout 10000 --bail --exit",
+        "manual:postpublish": "yarn build; node ./scripts/postpublish.js",
+        "docs:stage": "yarn build && node ./scripts/stage_docs.js",
+        "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES",
+        "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json"
     },
     "config": {
         "artifacts": "TokenTransferProxy Exchange TokenRegistry Token EtherToken",
@@ -39,10 +41,13 @@
             ],
             "docPublishConfigs": {
                 "extraFileIncludes": [
-                    "../types/src/index.ts"
+                    "../types/src/index.ts",
+                    "./src/contract_wrappers/generated/ether_token.ts",
+                    "./src/contract_wrappers/generated/token.ts",
+                    "./src/contract_wrappers/generated/exchange.ts"
                 ],
-                "s3BucketPath": "s3://0xjs-docs-jsons/",
-                "s3StagingBucketPath": "s3://staging-0xjs-docs-jsons/"
+                "s3BucketPath": "s3://doc-jsons/0x.js/",
+                "s3StagingBucketPath": "s3://staging-doc-jsons/0x.js/"
             }
         }
     },
@@ -55,23 +60,20 @@
         "node": ">=6.0.0"
     },
     "devDependencies": {
-        "@0xproject/abi-gen": "^0.2.6",
-        "@0xproject/dev-utils": "^0.3.0",
-        "@0xproject/monorepo-scripts": "^0.1.13",
-        "@0xproject/tslint-config": "^0.4.11",
+        "@0xproject/dev-utils": "^0.3.4",
+        "@0xproject/monorepo-scripts": "^0.1.16",
+        "@0xproject/tslint-config": "^0.4.14",
         "@types/bintrees": "^1.0.2",
-        "@types/jsonschema": "^1.1.1",
-        "@types/lodash": "^4.14.86",
+        "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/node": "^8.0.53",
+        "@types/request": "2.47.0",
         "@types/sinon": "^2.2.2",
         "@types/uuid": "^3.4.2",
         "awesome-typescript-loader": "^3.1.3",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
-        "chai-as-promised-typescript-typings": "^0.0.11",
         "chai-bignumber": "^2.0.1",
-        "chai-typescript-typings": "^0.0.5",
         "copyfiles": "^1.2.0",
         "dirty-chai": "^2.0.1",
         "json-loader": "^0.5.4",
@@ -81,37 +83,33 @@
         "opn-cli": "^3.1.0",
         "prettier": "^1.11.1",
         "request": "^2.81.0",
-        "request-promise-native": "^1.0.5",
         "shx": "^0.2.2",
         "sinon": "^4.0.0",
         "source-map-support": "^0.5.0",
         "truffle-hdwallet-provider": "^0.0.3",
         "tslint": "5.8.0",
         "typedoc": "0xProject/typedoc",
-        "types-bn": "^0.0.1",
         "typescript": "2.7.1",
-        "web3-provider-engine": "^13.0.1",
         "webpack": "^3.1.0"
     },
     "dependencies": {
-        "@0xproject/assert": "^0.2.1",
-        "@0xproject/base-contract": "^0.0.4",
-        "@0xproject/json-schemas": "^0.7.15",
-        "@0xproject/types": "^0.4.0",
-        "@0xproject/utils": "^0.4.2",
-        "@0xproject/web3-wrapper": "^0.3.0",
+        "@0xproject/assert": "^0.2.5",
+        "@0xproject/base-contract": "^0.1.0",
+        "@0xproject/json-schemas": "^0.7.19",
+        "@0xproject/types": "^0.5.0",
+        "@0xproject/typescript-typings": "^0.0.3",
+        "@0xproject/utils": "^0.5.0",
+        "@0xproject/web3-wrapper": "^0.5.0",
         "bintrees": "^1.0.2",
         "bn.js": "^4.11.8",
         "ethereumjs-abi": "^0.6.4",
         "ethereumjs-blockstream": "^2.0.6",
         "ethereumjs-util": "^5.1.1",
         "ethers-contracts": "^2.2.1",
-        "ethers-typescript-typings": "^0.0.3",
         "js-sha3": "^0.7.0",
         "lodash": "^4.17.4",
         "uuid": "^3.1.0",
-        "web3": "^0.20.0",
-        "web3-typescript-typings": "^0.10.1"
+        "web3": "^0.20.0"
     },
     "publishConfig": {
         "access": "public"

packages/0x.js/src/0x.ts

@@ -1,5 +1,5 @@
 import { schemas, SchemaValidator } from '@0xproject/json-schemas';
-import { ECSignature, Order, SignedOrder, TransactionReceiptWithDecodedLogs } from '@0xproject/types';
+import { ECSignature, Order, Provider, SignedOrder, TransactionReceiptWithDecodedLogs } from '@0xproject/types';
 import { AbiDecoder, BigNumber, intervalUtils } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as ethUtil from 'ethereumjs-util';
@@ -15,7 +15,7 @@ import { OrderStateWatcher } from './order_watcher/order_state_watcher';
 import { zeroExConfigSchema } from './schemas/zero_ex_config_schema';
 import { zeroExPrivateNetworkConfigSchema } from './schemas/zero_ex_private_network_config_schema';
 import { zeroExPublicNetworkConfigSchema } from './schemas/zero_ex_public_network_config_schema';
-import { Web3Provider, ZeroExConfig, ZeroExError } from './types';
+import { OrderStateWatcherConfig, ZeroExConfig, ZeroExError } from './types';
 import { assert } from './utils/assert';
 import { constants } from './utils/constants';
 import { decorators } from './utils/decorators';
@@ -57,13 +57,7 @@ export class ZeroEx {
      * tokenTransferProxy smart contract.
      */
     public proxy: TokenTransferProxyWrapper;
-    /**
-     * An instance of the OrderStateWatcher class containing methods for watching a set of orders for relevant
-     * blockchain state changes.
-     */
-    public orderStateWatcher: OrderStateWatcher;
     private _web3Wrapper: Web3Wrapper;
-    private _abiDecoder: AbiDecoder;
     /**
      * Verifies that the elliptic curve signature `signature` was generated
      * by signing `data` with the private key corresponding to the `signerAddress` address.
@@ -83,7 +77,7 @@ export class ZeroEx {
     }
     /**
      * Generates a pseudo-random 256-bit salt.
-     * The salt can be included in an 0x order, ensuring that the order generates a unique orderHash
+     * The salt can be included in a 0x order, ensuring that the order generates a unique orderHash
      * and will not collide with other outstanding orders that are identical in all other parameters.
      * @return  A pseudo-random 256-bit number that can be used as a salt.
      */
@@ -121,10 +115,8 @@ export class ZeroEx {
     public static toUnitAmount(amount: BigNumber, decimals: number): BigNumber {
         assert.isValidBaseUnitAmount('amount', amount);
         assert.isNumber('decimals', decimals);
-
-        const aUnit = new BigNumber(10).pow(decimals);
-        const unit = amount.div(aUnit);
-        return unit;
+        const unitAmount = Web3Wrapper.toUnitAmount(amount, decimals);
+        return unitAmount;
     }
     /**
      * A baseUnit is defined as the smallest denomination of a token. An amount expressed in baseUnits
@@ -137,13 +129,7 @@ export class ZeroEx {
     public static toBaseUnitAmount(amount: BigNumber, decimals: number): BigNumber {
         assert.isBigNumber('amount', amount);
         assert.isNumber('decimals', decimals);
-
-        const unit = new BigNumber(10).pow(decimals);
-        const baseUnitAmount = amount.times(unit);
-        const hasDecimals = baseUnitAmount.decimalPlaces() !== 0;
-        if (hasDecimals) {
-            throw new Error(`Invalid unit amount: ${amount.toString()} - Too many decimal places`);
-        }
+        const baseUnitAmount = Web3Wrapper.toBaseUnitAmount(amount, decimals);
         return baseUnitAmount;
     }
     /**
@@ -159,12 +145,12 @@ export class ZeroEx {
     }
     /**
      * Instantiates a new ZeroEx instance that provides the public interface to the 0x.js library.
-     * @param   provider    The Web3.js Provider instance you would like the 0x.js library to use for interacting with
+     * @param   provider    The Provider instance you would like the 0x.js library to use for interacting with
      *                      the Ethereum network.
      * @param   config      The configuration object. Look up the type for the description.
      * @return  An instance of the 0x.js ZeroEx class.
      */
-    constructor(provider: Web3Provider, config: ZeroExConfig) {
+    constructor(provider: Provider, config: ZeroExConfig) {
         assert.isWeb3Provider('provider', provider);
         assert.doesConformToSchema('config', config, zeroExConfigSchema, [
             zeroExPrivateNetworkConfigSchema,
@@ -172,21 +158,22 @@ export class ZeroEx {
         ]);
         const artifactJSONs = _.values(artifacts);
         const abiArrays = _.map(artifactJSONs, artifact => artifact.abi);
-        this._abiDecoder = new AbiDecoder(abiArrays);
         const defaults = {
             gasPrice: config.gasPrice,
         };
         this._web3Wrapper = new Web3Wrapper(provider, defaults);
+        _.forEach(abiArrays, abi => {
+            this._web3Wrapper.abiDecoder.addABI(abi);
+        });
         this.proxy = new TokenTransferProxyWrapper(
             this._web3Wrapper,
             config.networkId,
             config.tokenTransferProxyContractAddress,
         );
-        this.token = new TokenWrapper(this._web3Wrapper, config.networkId, this._abiDecoder, this.proxy);
+        this.token = new TokenWrapper(this._web3Wrapper, config.networkId, this.proxy);
         this.exchange = new ExchangeWrapper(
             this._web3Wrapper,
             config.networkId,
-            this._abiDecoder,
             this.token,
             config.exchangeContractAddress,
             config.zrxContractAddress,
@@ -196,14 +183,7 @@ export class ZeroEx {
             config.networkId,
             config.tokenRegistryContractAddress,
         );
-        this.etherToken = new EtherTokenWrapper(this._web3Wrapper, config.networkId, this._abiDecoder, this.token);
-        this.orderStateWatcher = new OrderStateWatcher(
-            this._web3Wrapper,
-            this._abiDecoder,
-            this.token,
-            this.exchange,
-            config.orderWatcherConfig,
-        );
+        this.etherToken = new EtherTokenWrapper(this._web3Wrapper, config.networkId, this.token);
     }
     /**
      * Sets a new web3 provider for 0x.js. Updating the provider will stop all
@@ -211,7 +191,7 @@ export class ZeroEx {
      * @param   provider    The Web3Provider you would like the 0x.js library to use from now on.
      * @param   networkId   The id of the network your provider is connected to
      */
-    public setProvider(provider: Web3Provider, networkId: number): void {
+    public setProvider(provider: Provider, networkId: number): void {
         this._web3Wrapper.setProvider(provider);
         (this.exchange as any)._invalidateContractInstances();
         (this.exchange as any)._setNetworkId(networkId);
@@ -237,7 +217,7 @@ export class ZeroEx {
      * This method currently supports TestRPC, Geth and Parity above and below V1.6.6
      * @param   orderHash       Hex encoded orderHash to sign.
      * @param   signerAddress   The hex encoded Ethereum address you wish to sign it with. This address
-     *          must be available via the Web3.Provider supplied to 0x.js.
+     *          must be available via the Provider supplied to 0x.js.
      * @param   shouldAddPersonalMessagePrefix  Some signers add the personal message prefix `\x19Ethereum Signed Message`
      *          themselves (e.g Parity Signer, Ledger, TestRPC) and others expect it to already be done by the client
      *          (e.g Metamask). Depending on which signer this request is going to, decide on whether to add the prefix
@@ -260,7 +240,7 @@ export class ZeroEx {
             msgHashHex = ethUtil.bufferToHex(msgHashBuff);
         }
 
-        const signature = await this._web3Wrapper.signTransactionAsync(normalizedSignerAddress, msgHashHex);
+        const signature = await this._web3Wrapper.signMessageAsync(normalizedSignerAddress, msgHashHex);
 
         // HACK: There is no consensus on whether the signatureHex string should be formatted as
         // v + r + s OR r + s + v, and different clients (even different versions of the same client)
@@ -297,44 +277,21 @@ export class ZeroEx {
         pollingIntervalMs = 1000,
         timeoutMs?: number,
     ): Promise<TransactionReceiptWithDecodedLogs> {
-        let timeoutExceeded = false;
-        if (timeoutMs) {
-            setTimeout(() => (timeoutExceeded = true), timeoutMs);
-        }
-
-        const txReceiptPromise = new Promise(
-            (resolve: (receipt: TransactionReceiptWithDecodedLogs) => void, reject) => {
-                const intervalId = intervalUtils.setAsyncExcludingInterval(
-                    async () => {
-                        if (timeoutExceeded) {
-                            intervalUtils.clearAsyncExcludingInterval(intervalId);
-                            return reject(ZeroExError.TransactionMiningTimeout);
-                        }
-
-                        const transactionReceipt = await this._web3Wrapper.getTransactionReceiptAsync(txHash);
-                        if (!_.isNull(transactionReceipt)) {
-                            intervalUtils.clearAsyncExcludingInterval(intervalId);
-                            const logsWithDecodedArgs = _.map(
-                                transactionReceipt.logs,
-                                this._abiDecoder.tryToDecodeLogOrNoop.bind(this._abiDecoder),
-                            );
-                            const transactionReceiptWithDecodedLogArgs: TransactionReceiptWithDecodedLogs = {
-                                ...transactionReceipt,
-                                logs: logsWithDecodedArgs,
-                            };
-                            resolve(transactionReceiptWithDecodedLogArgs);
-                        }
-                    },
-                    pollingIntervalMs,
-                    (err: Error) => {
-                        intervalUtils.clearAsyncExcludingInterval(intervalId);
-                        reject(err);
-                    },
-                );
-            },
+        const transactionReceiptWithDecodedLogs = await this._web3Wrapper.awaitTransactionMinedAsync(
+            txHash,
+            pollingIntervalMs,
+            timeoutMs,
         );
-        const txReceipt = await txReceiptPromise;
-        return txReceipt;
+        return transactionReceiptWithDecodedLogs;
+    }
+    /**
+     * Instantiates and returns a new OrderStateWatcher instance.
+     * Defaults to watching the pending state.
+     * @param   config      The configuration object. Look up the type for the description.
+     * @return  An instance of the 0x.js OrderStateWatcher class.
+     */
+    public createOrderStateWatcher(config?: OrderStateWatcherConfig) {
+        return new OrderStateWatcher(this._web3Wrapper, this.token, this.exchange, config);
     }
     /*
      * HACK: `TokenWrapper` needs a token transfer proxy address. `TokenTransferProxy` address is fetched from

packages/0x.js/src/contract_wrappers/contract_wrapper.ts

@@ -1,4 +1,4 @@
-import { BlockParamLiteral, LogWithDecodedArgs, RawLog } from '@0xproject/types';
+import { BlockParamLiteral, ContractAbi, FilterObject, LogEntry, LogWithDecodedArgs, RawLog } from '@0xproject/types';
 import { AbiDecoder, intervalUtils } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import { Block, BlockAndLogStreamer } from 'ethereumjs-blockstream';
@@ -32,19 +32,17 @@ const CONTRACT_NAME_TO_NOT_FOUND_ERROR: {
 export class ContractWrapper {
     protected _web3Wrapper: Web3Wrapper;
     protected _networkId: number;
-    private _abiDecoder?: AbiDecoder;
     private _blockAndLogStreamerIfExists?: BlockAndLogStreamer;
     private _blockAndLogStreamIntervalIfExists?: NodeJS.Timer;
-    private _filters: { [filterToken: string]: Web3.FilterObject };
+    private _filters: { [filterToken: string]: FilterObject };
     private _filterCallbacks: {
         [filterToken: string]: EventCallback<ContractEventArgs>;
     };
     private _onLogAddedSubscriptionToken: string | undefined;
     private _onLogRemovedSubscriptionToken: string | undefined;
-    constructor(web3Wrapper: Web3Wrapper, networkId: number, abiDecoder?: AbiDecoder) {
+    constructor(web3Wrapper: Web3Wrapper, networkId: number) {
         this._web3Wrapper = web3Wrapper;
         this._networkId = networkId;
-        this._abiDecoder = abiDecoder;
         this._filters = {};
         this._filterCallbacks = {};
         this._blockAndLogStreamerIfExists = undefined;
@@ -75,7 +73,7 @@ export class ContractWrapper {
         address: string,
         eventName: ContractEvents,
         indexFilterValues: IndexedFilterValues,
-        abi: Web3.ContractAbi,
+        abi: ContractAbi,
         callback: EventCallback<ArgsType>,
     ): string {
         const filter = filterUtils.getFilter(address, eventName, indexFilterValues, abi);
@@ -92,7 +90,7 @@ export class ContractWrapper {
         eventName: ContractEvents,
         blockRange: BlockRange,
         indexFilterValues: IndexedFilterValues,
-        abi: Web3.ContractAbi,
+        abi: ContractAbi,
     ): Promise<Array<LogWithDecodedArgs<ArgsType>>> {
         const filter = filterUtils.getFilter(address, eventName, indexFilterValues, abi, blockRange);
         const logs = await this._web3Wrapper.getLogsAsync(filter);
@@ -100,18 +98,18 @@ export class ContractWrapper {
         return logsWithDecodedArguments;
     }
     protected _tryToDecodeLogOrNoop<ArgsType extends ContractEventArgs>(
-        log: Web3.LogEntry,
+        log: LogEntry,
     ): LogWithDecodedArgs<ArgsType> | RawLog {
-        if (_.isUndefined(this._abiDecoder)) {
+        if (_.isUndefined(this._web3Wrapper.abiDecoder)) {
             throw new Error(InternalZeroExError.NoAbiDecoder);
         }
-        const logWithDecodedArgs = this._abiDecoder.tryToDecodeLogOrNoop(log);
+        const logWithDecodedArgs = this._web3Wrapper.abiDecoder.tryToDecodeLogOrNoop(log);
         return logWithDecodedArgs;
     }
     protected async _getContractAbiAndAddressFromArtifactsAsync(
         artifact: Artifact,
         addressIfExists?: string,
-    ): Promise<[Web3.ContractAbi, string]> {
+    ): Promise<[ContractAbi, string]> {
         let contractAddress: string;
         if (_.isUndefined(addressIfExists)) {
             if (_.isUndefined(artifact.networks[this._networkId])) {
@@ -125,7 +123,7 @@ export class ContractWrapper {
         if (!doesContractExist) {
             throw new Error(CONTRACT_NAME_TO_NOT_FOUND_ERROR[artifact.contract_name]);
         }
-        const abiAndAddress: [Web3.ContractAbi, string] = [artifact.abi, contractAddress];
+        const abiAndAddress: [ContractAbi, string] = [artifact.abi, contractAddress];
         return abiAndAddress;
     }
     protected _getContractAddress(artifact: Artifact, addressIfExists?: string): string {
@@ -139,8 +137,8 @@ export class ContractWrapper {
             return addressIfExists;
         }
     }
-    private _onLogStateChanged<ArgsType extends ContractEventArgs>(isRemoved: boolean, log: Web3.LogEntry): void {
-        _.forEach(this._filters, (filter: Web3.FilterObject, filterToken: string) => {
+    private _onLogStateChanged<ArgsType extends ContractEventArgs>(isRemoved: boolean, log: LogEntry): void {
+        _.forEach(this._filters, (filter: FilterObject, filterToken: string) => {
             if (filterUtils.matchesFilter(log, filter)) {
                 const decodedLog = this._tryToDecodeLogOrNoop(log) as LogWithDecodedArgs<ArgsType>;
                 const logEvent = {

packages/0x.js/src/contract_wrappers/ether_token_wrapper.ts

@@ -21,8 +21,8 @@ export class EtherTokenWrapper extends ContractWrapper {
         [address: string]: EtherTokenContract;
     } = {};
     private _tokenWrapper: TokenWrapper;
-    constructor(web3Wrapper: Web3Wrapper, networkId: number, abiDecoder: AbiDecoder, tokenWrapper: TokenWrapper) {
-        super(web3Wrapper, networkId, abiDecoder);
+    constructor(web3Wrapper: Web3Wrapper, networkId: number, tokenWrapper: TokenWrapper) {
+        super(web3Wrapper, networkId);
         this._tokenWrapper = tokenWrapper;
     }
     /**
@@ -64,7 +64,7 @@ export class EtherTokenWrapper extends ContractWrapper {
      * equivalent number of wrapped ETH tokens.
      * @param   etherTokenAddress   EtherToken address you wish to withdraw from.
      * @param   amountInWei  Amount of ETH in Wei the caller wishes to withdraw.
-     * @param   withdrawer   The hex encoded user Ethereum address that would like to make the withdrawl.
+     * @param   withdrawer   The hex encoded user Ethereum address that would like to make the withdrawal.
      * @param   txOpts       Transaction parameters.
      * @return Transaction hash.
      */
@@ -96,7 +96,7 @@ export class EtherTokenWrapper extends ContractWrapper {
     }
     /**
      * Gets historical logs without creating a subscription
-     * @param   etherTokenAddress   An address of the ether token that emmited the logs.
+     * @param   etherTokenAddress   An address of the ether token that emitted the logs.
      * @param   eventName           The ether token contract event you would like to subscribe to.
      * @param   blockRange          Block range to get logs from.
      * @param   indexFilterValues   An object where the keys are indexed args returned by the event and
@@ -191,7 +191,12 @@ export class EtherTokenWrapper extends ContractWrapper {
             artifacts.EtherTokenArtifact,
             etherTokenAddress,
         );
-        const contractInstance = new EtherTokenContract(this._web3Wrapper, abi, address);
+        const contractInstance = new EtherTokenContract(
+            abi,
+            address,
+            this._web3Wrapper.getProvider(),
+            this._web3Wrapper.getContractDefaults(),
+        );
         etherTokenContract = contractInstance;
         this._etherTokenContractsByAddress[etherTokenAddress] = etherTokenContract;
         return etherTokenContract;

packages/0x.js/src/contract_wrappers/exchange_wrapper.ts

@@ -3,6 +3,7 @@ import {
     BlockParamLiteral,
     DecodedLogArgs,
     ECSignature,
+    LogEntry,
     LogWithDecodedArgs,
     Order,
     SignedOrder,
@@ -10,7 +11,6 @@ import {
 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 {
@@ -87,12 +87,11 @@ export class ExchangeWrapper extends ContractWrapper {
     constructor(
         web3Wrapper: Web3Wrapper,
         networkId: number,
-        abiDecoder: AbiDecoder,
         tokenWrapper: TokenWrapper,
         contractAddressIfExists?: string,
         zrxContractAddressIfExists?: string,
     ) {
-        super(web3Wrapper, networkId, abiDecoder);
+        super(web3Wrapper, networkId);
         this._tokenWrapper = tokenWrapper;
         this._orderValidationUtils = new OrderValidationUtils(this);
         this._contractAddressIfExists = contractAddressIfExists;
@@ -171,7 +170,7 @@ export class ExchangeWrapper extends ContractWrapper {
      * @param   shouldThrowOnInsufficientBalanceOrAllowance Whether or not you wish for the contract call to throw
      *                                                      if upon execution the tokens cannot be transferred.
      * @param   takerAddress                                The user Ethereum address who would like to fill this order.
-     *                                                      Must be available via the supplied Web3.Provider
+     *                                                      Must be available via the supplied Provider
      *                                                      passed to 0x.js.
      * @param   orderTransactionOpts                        Optional arguments this method accepts.
      * @return  Transaction hash.
@@ -236,7 +235,7 @@ export class ExchangeWrapper extends ContractWrapper {
      *                                                      If set to false, the call will continue to fill subsequent
      *                                                      signedOrders even when some cannot be filled.
      * @param   takerAddress                                The user Ethereum address who would like to fill these
-     *                                                      orders. Must be available via the supplied Web3.Provider
+     *                                                      orders. Must be available via the supplied Provider
      *                                                      passed to 0x.js.
      * @param   orderTransactionOpts                        Optional arguments this method accepts.
      * @return  Transaction hash.
@@ -281,6 +280,9 @@ export class ExchangeWrapper extends ContractWrapper {
                     zrxTokenAddress,
                 );
                 filledTakerTokenAmount = filledTakerTokenAmount.plus(singleFilledTakerTokenAmount);
+                if (filledTakerTokenAmount.eq(fillTakerTokenAmount)) {
+                    break;
+                }
             }
         }
 
@@ -333,7 +335,7 @@ export class ExchangeWrapper extends ContractWrapper {
      *                                                          cannot be filled.
      * @param   takerAddress                                    The user Ethereum address who would like to fill
      *                                                          these orders. Must be available via the supplied
-     *                                                          Web3.Provider passed to 0x.js.
+     *                                                          Provider passed to 0x.js.
      * @param   orderTransactionOpts                            Optional arguments this method accepts.
      * @return  Transaction hash.
      */
@@ -414,7 +416,7 @@ export class ExchangeWrapper extends ContractWrapper {
      *                                  signedOrder you wish to fill.
      * @param   fillTakerTokenAmount    The total amount of the takerTokens you would like to fill.
      * @param   takerAddress            The user Ethereum address who would like to fill this order.
-     *                                  Must be available via the supplied Web3.Provider passed to 0x.js.
+     *                                  Must be available via the supplied Provider passed to 0x.js.
      * @param   orderTransactionOpts    Optional arguments this method accepts.
      * @return  Transaction hash.
      */
@@ -468,7 +470,7 @@ export class ExchangeWrapper extends ContractWrapper {
      * filled (each to the specified fillAmount) or aborted.
      * @param   orderFillRequests           An array of objects that conform to the OrderFillRequest interface.
      * @param   takerAddress                The user Ethereum address who would like to fill there orders.
-     *                                      Must be available via the supplied Web3.Provider passed to 0x.js.
+     *                                      Must be available via the supplied Provider passed to 0x.js.
      * @param   orderTransactionOpts        Optional arguments this method accepts.
      * @return  Transaction hash.
      */
@@ -763,7 +765,7 @@ export class ExchangeWrapper extends ContractWrapper {
      *                                  signedOrder you wish to fill.
      * @param   fillTakerTokenAmount    The total amount of the takerTokens you would like to fill.
      * @param   takerAddress            The user Ethereum address who would like to fill this order.
-     *                                  Must be available via the supplied Web3.Provider passed to 0x.js.
+     *                                  Must be available via the supplied Provider passed to 0x.js.
      */
     public async validateFillOrderThrowIfInvalidAsync(
         signedOrder: SignedOrder,
@@ -810,7 +812,7 @@ export class ExchangeWrapper extends ContractWrapper {
      *                                  signedOrder you wish to fill.
      * @param   fillTakerTokenAmount    The total amount of the takerTokens you would like to fill.
      * @param   takerAddress            The user Ethereum address who would like to fill this order.
-     *                                  Must be available via the supplied Web3.Provider passed to 0x.js.
+     *                                  Must be available via the supplied Provider passed to 0x.js.
      */
     public async validateFillOrKillOrderThrowIfInvalidAsync(
         signedOrder: SignedOrder,
@@ -857,10 +859,10 @@ export class ExchangeWrapper extends ContractWrapper {
         return isRoundingError;
     }
     /**
-     * Checks if logs contain LogError, which is emmited by Exchange contract on transaction failure.
+     * Checks if logs contain LogError, which is emitted by Exchange contract on transaction failure.
      * @param   logs   Transaction logs as returned by `zeroEx.awaitTransactionMinedAsync`
      */
-    public throwLogErrorsAsErrors(logs: Array<LogWithDecodedArgs<DecodedLogArgs> | Web3.LogEntry>): void {
+    public throwLogErrorsAsErrors(logs: Array<LogWithDecodedArgs<DecodedLogArgs> | LogEntry>): void {
         const errLog = _.find(logs, {
             event: ExchangeEvents.LogError,
         });
@@ -918,7 +920,12 @@ export class ExchangeWrapper extends ContractWrapper {
             artifacts.ExchangeArtifact,
             this._contractAddressIfExists,
         );
-        const contractInstance = new ExchangeContract(this._web3Wrapper, abi, address);
+        const contractInstance = new ExchangeContract(
+            abi,
+            address,
+            this._web3Wrapper.getProvider(),
+            this._web3Wrapper.getContractDefaults(),
+        );
         this._exchangeContractIfExists = contractInstance;
         return this._exchangeContractIfExists;
     }

packages/0x.js/src/contract_wrappers/generated/.gitignore

@@ -1 +0,0 @@
-*

packages/0x.js/src/contract_wrappers/token_registry_wrapper.ts

@@ -121,7 +121,12 @@ export class TokenRegistryWrapper extends ContractWrapper {
             artifacts.TokenRegistryArtifact,
             this._contractAddressIfExists,
         );
-        const contractInstance = new TokenRegistryContract(this._web3Wrapper, abi, address);
+        const contractInstance = new TokenRegistryContract(
+            abi,
+            address,
+            this._web3Wrapper.getProvider(),
+            this._web3Wrapper.getContractDefaults(),
+        );
         this._tokenRegistryContractIfExists = contractInstance;
         return this._tokenRegistryContractIfExists;
     }

packages/0x.js/src/contract_wrappers/token_transfer_proxy_wrapper.ts

@@ -63,7 +63,12 @@ export class TokenTransferProxyWrapper extends ContractWrapper {
             artifacts.TokenTransferProxyArtifact,
             this._contractAddressIfExists,
         );
-        const contractInstance = new TokenTransferProxyContract(this._web3Wrapper, abi, address);
+        const contractInstance = new TokenTransferProxyContract(
+            abi,
+            address,
+            this._web3Wrapper.getProvider(),
+            this._web3Wrapper.getContractDefaults(),
+        );
         this._tokenTransferProxyContractIfExists = contractInstance;
         return this._tokenTransferProxyContractIfExists;
     }

packages/0x.js/src/contract_wrappers/token_wrapper.ts

@@ -22,13 +22,8 @@ export class TokenWrapper extends ContractWrapper {
     public UNLIMITED_ALLOWANCE_IN_BASE_UNITS = constants.UNLIMITED_ALLOWANCE_IN_BASE_UNITS;
     private _tokenContractsByAddress: { [address: string]: TokenContract };
     private _tokenTransferProxyWrapper: TokenTransferProxyWrapper;
-    constructor(
-        web3Wrapper: Web3Wrapper,
-        networkId: number,
-        abiDecoder: AbiDecoder,
-        tokenTransferProxyWrapper: TokenTransferProxyWrapper,
-    ) {
-        super(web3Wrapper, networkId, abiDecoder);
+    constructor(web3Wrapper: Web3Wrapper, networkId: number, tokenTransferProxyWrapper: TokenTransferProxyWrapper) {
+        super(web3Wrapper, networkId);
         this._tokenContractsByAddress = {};
         this._tokenTransferProxyWrapper = tokenTransferProxyWrapper;
     }
@@ -385,7 +380,7 @@ export class TokenWrapper extends ContractWrapper {
     }
     /**
      * Gets historical logs without creating a subscription
-     * @param   tokenAddress        An address of the token that emmited the logs.
+     * @param   tokenAddress        An address of the token that emitted the logs.
      * @param   eventName           The token contract event you would like to subscribe to.
      * @param   blockRange          Block range to get logs from.
      * @param   indexFilterValues   An object where the keys are indexed args returned by the event and
@@ -426,7 +421,12 @@ export class TokenWrapper extends ContractWrapper {
             artifacts.TokenArtifact,
             normalizedTokenAddress,
         );
-        const contractInstance = new TokenContract(this._web3Wrapper, abi, address);
+        const contractInstance = new TokenContract(
+            abi,
+            address,
+            this._web3Wrapper.getProvider(),
+            this._web3Wrapper.getContractDefaults(),
+        );
         tokenContract = contractInstance;
         this._tokenContractsByAddress[normalizedTokenAddress] = tokenContract;
         return tokenContract;

packages/0x.js/src/globals.d.ts

@@ -1,49 +1,6 @@
-declare module 'web3_beta';
-declare module 'chai-bignumber';
-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
-// disallow `namespace`, we disable tslint for the following.
-/* tslint:disable */
-declare namespace Chai {
-    interface Assertion {
-        bignumber: Assertion;
-        // HACK: In order to comply with chai-as-promised we make eventually a `PromisedAssertion` not an `Assertion`
-        eventually: PromisedAssertion;
-    }
-}
-/* tslint:enable */
-
 declare module '*.json' {
     const json: any;
     /* tslint:disable */
     export default json;
     /* tslint:enable */
 }
-
-declare module 'ethereumjs-abi' {
-    const soliditySHA3: (argTypes: string[], args: any[]) => Buffer;
-}
-
-// truffle-hdwallet-provider declarations
-declare module 'truffle-hdwallet-provider' {
-    import * as Web3 from 'web3';
-    class HDWalletProvider implements Web3.Provider {
-        constructor(mnemonic: string, rpcUrl: string);
-        public sendAsync(
-            payload: Web3.JSONRPCRequestPayload,
-            callback: (err: Error, result: Web3.JSONRPCResponsePayload) => void,
-        ): void;
-    }
-    export = HDWalletProvider;
-}

packages/0x.js/src/globalsAugment.d.ts

@@ -1,23 +0,0 @@
-import { BigNumber } from '@0xproject/utils';
-
-// HACK: This module overrides the Chai namespace so that we can use BigNumber types inside.
-// Source: https://github.com/Microsoft/TypeScript/issues/7352#issuecomment-191547232
-declare global {
-    // 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
-    // disallow `namespace`, we disable tslint for the following.
-    /* tslint:disable */
-    namespace Chai {
-        interface NumberComparer {
-            (value: number | BigNumber, message?: string): Assertion;
-        }
-        interface NumericComparison {
-            greaterThan: NumberComparer;
-        }
-    }
-    /* tslint:enable */
-    interface DecodedLogArg {
-        name: string;
-        value: string | BigNumber;
-    }
-}

packages/0x.js/src/index.ts

@@ -11,12 +11,10 @@ export {
     OrderCancellationRequest,
     OrderFillRequest,
     ContractEventArgs,
-    Web3Provider,
     ZeroExConfig,
     MethodOpts,
     OrderTransactionOpts,
     TransactionOpts,
-    FilterObject,
     LogEvent,
     DecodedLogEvent,
     EventWatcherCallback,
@@ -28,10 +26,12 @@ export {
 
 export {
     BlockParamLiteral,
+    FilterObject,
     BlockParam,
     ContractEventArg,
     LogWithDecodedArgs,
     Order,
+    Provider,
     SignedOrder,
     ECSignature,
     TransactionReceipt,

packages/0x.js/src/order_watcher/event_watcher.ts

@@ -1,9 +1,7 @@
+import { BlockParamLiteral, LogEntry } from '@0xproject/types';
 import { intervalUtils } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';
-import * as Web3 from 'web3';
-
-import { BlockParamLiteral } from '@0xproject/types';
 
 import { EventWatcherCallback, ZeroExError } from '../types';
 import { assert } from '../utils/assert';
@@ -23,9 +21,15 @@ export class EventWatcher {
     private _web3Wrapper: Web3Wrapper;
     private _pollingIntervalMs: number;
     private _intervalIdIfExists?: NodeJS.Timer;
-    private _lastEvents: Web3.LogEntry[] = [];
-    constructor(web3Wrapper: Web3Wrapper, pollingIntervalIfExistsMs: undefined | number) {
+    private _lastEvents: LogEntry[] = [];
+    private _stateLayer: BlockParamLiteral;
+    constructor(
+        web3Wrapper: Web3Wrapper,
+        pollingIntervalIfExistsMs: undefined | number,
+        stateLayer: BlockParamLiteral = BlockParamLiteral.Latest,
+    ) {
         this._web3Wrapper = web3Wrapper;
+        this._stateLayer = stateLayer;
         this._pollingIntervalMs = _.isUndefined(pollingIntervalIfExistsMs)
             ? DEFAULT_EVENT_POLLING_INTERVAL_MS
             : pollingIntervalIfExistsMs;
@@ -69,16 +73,16 @@ export class EventWatcher {
         await this._emitDifferencesAsync(newEvents, LogEventState.Added, callback);
         this._lastEvents = pendingEvents;
     }
-    private async _getEventsAsync(): Promise<Web3.LogEntry[]> {
+    private async _getEventsAsync(): Promise<LogEntry[]> {
         const eventFilter = {
-            fromBlock: BlockParamLiteral.Pending,
-            toBlock: BlockParamLiteral.Pending,
+            fromBlock: this._stateLayer,
+            toBlock: this._stateLayer,
         };
         const events = await this._web3Wrapper.getLogsAsync(eventFilter);
         return events;
     }
     private async _emitDifferencesAsync(
-        logs: Web3.LogEntry[],
+        logs: LogEntry[],
         logEventState: LogEventState,
         callback: EventWatcherCallback,
     ): Promise<void> {

packages/0x.js/src/order_watcher/order_state_watcher.ts

@@ -59,7 +59,7 @@ const DEFAULT_CLEANUP_JOB_INTERVAL_MS = 1000 * 60 * 60; // 1h
 /**
  * This class includes all the functionality related to watching a set of orders
  * for potential changes in order validity/fillability. The orderWatcher notifies
- * the subscriber of these changes so that a final decison can be made on whether
+ * the subscriber of these changes so that a final decision can be made on whether
  * the order should be deemed invalid.
  */
 export class OrderStateWatcher {
@@ -69,7 +69,6 @@ export class OrderStateWatcher {
     private _callbackIfExists?: OnOrderStateChangeCallback;
     private _eventWatcher: EventWatcher;
     private _web3Wrapper: Web3Wrapper;
-    private _abiDecoder: AbiDecoder;
     private _expirationWatcher: ExpirationWatcher;
     private _orderStateUtils: OrderStateUtils;
     private _orderFilledCancelledLazyStore: OrderFilledCancelledLazyStore;
@@ -78,19 +77,16 @@ export class OrderStateWatcher {
     private _cleanupJobIntervalIdIfExists?: NodeJS.Timer;
     constructor(
         web3Wrapper: Web3Wrapper,
-        abiDecoder: AbiDecoder,
         token: TokenWrapper,
         exchange: ExchangeWrapper,
         config?: OrderStateWatcherConfig,
     ) {
-        this._abiDecoder = abiDecoder;
         this._web3Wrapper = web3Wrapper;
         const pollingIntervalIfExistsMs = _.isUndefined(config) ? undefined : config.eventPollingIntervalMs;
-        this._eventWatcher = new EventWatcher(web3Wrapper, pollingIntervalIfExistsMs);
-        this._balanceAndProxyAllowanceLazyStore = new BalanceAndProxyAllowanceLazyStore(
-            token,
-            BlockParamLiteral.Pending,
-        );
+        const stateLayer =
+            _.isUndefined(config) || _.isUndefined(config.stateLayer) ? BlockParamLiteral.Latest : config.stateLayer;
+        this._eventWatcher = new EventWatcher(web3Wrapper, pollingIntervalIfExistsMs, stateLayer);
+        this._balanceAndProxyAllowanceLazyStore = new BalanceAndProxyAllowanceLazyStore(token, stateLayer);
         this._orderFilledCancelledLazyStore = new OrderFilledCancelledLazyStore(exchange);
         this._orderStateUtils = new OrderStateUtils(
             this._balanceAndProxyAllowanceLazyStore,
@@ -231,7 +227,7 @@ 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<ContractEventArgs>(log);
+        const maybeDecodedLog = this._web3Wrapper.abiDecoder.tryToDecodeLogOrNoop<ContractEventArgs>(log);
         const isLogDecoded = !_.isUndefined(((maybeDecodedLog as any) as LogWithDecodedArgs<ContractEventArgs>).event);
         if (!isLogDecoded) {
             return; // noop

packages/0x.js/src/types.ts

@@ -3,7 +3,10 @@ import { BigNumber } from '@0xproject/utils';
 import {
     BlockParam,
     BlockParamLiteral,
+    ContractAbi,
     ContractEventArg,
+    FilterObject,
+    LogEntryEvent,
     LogWithDecodedArgs,
     Order,
     SignedOrder,
@@ -35,7 +38,6 @@ export enum ZeroExError {
     NoNetworkId = 'NO_NETWORK_ID',
     SubscriptionNotFound = 'SUBSCRIPTION_NOT_FOUND',
     SubscriptionAlreadyPresent = 'SUBSCRIPTION_ALREADY_PRESENT',
-    TransactionMiningTimeout = 'TRANSACTION_MINING_TIMEOUT',
 }
 
 export enum InternalZeroExError {
@@ -48,7 +50,7 @@ export type OrderAddresses = [string, string, string, string, string];
 
 export type OrderValues = [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, BigNumber];
 
-export type LogEvent = Web3.LogEntryEvent;
+export type LogEvent = LogEntryEvent;
 export interface DecodedLogEvent<ArgsType> {
     isRemoved: boolean;
     log: LogWithDecodedArgs<ArgsType>;
@@ -152,26 +154,20 @@ export interface OrderFillRequest {
 export type AsyncMethod = (...args: any[]) => Promise<any>;
 export type SyncMethod = (...args: any[]) => any;
 
-/**
- * We re-export the `Web3.Provider` type specified in the Web3 Typescript typings
- * since it is the type of the `provider` argument to the `ZeroEx` constructor.
- * It is however a `Web3` library type, not a native `0x.js` type. To learn more
- * about providers, visit https://0xproject.com/wiki#Web3-Provider-Explained
- */
-export type Web3Provider = Web3.Provider;
-
 /*
  * orderExpirationCheckingIntervalMs: How often to check for expired orders. Default: 50
- * eventPollingIntervalMs: How often to poll the Ethereum node for new events. Defaults: 200
+ * eventPollingIntervalMs: How often to poll the Ethereum node for new events. Default: 200
  * expirationMarginMs: Amount of time before order expiry that you'd like to be notified
- * of an orders expiration. Defaults: 0
+ * of an orders expiration. Default: 0
  * cleanupJobIntervalMs: How often to run a cleanup job which revalidates all the orders. Defaults: 1h
+ * stateLayer: Optional blockchain state layer OrderWatcher will monitor for new events. Default: latest
  */
 export interface OrderStateWatcherConfig {
     orderExpirationCheckingIntervalMs?: number;
     eventPollingIntervalMs?: number;
     expirationMarginMs?: number;
     cleanupJobIntervalMs?: number;
+    stateLayer: BlockParamLiteral;
 }
 
 /*
@@ -197,7 +193,7 @@ export type ArtifactContractName = 'ZRX' | 'TokenTransferProxy' | 'TokenRegistry
 
 export interface Artifact {
     contract_name: ArtifactContractName;
-    abi: Web3.ContractAbi;
+    abi: ContractAbi;
     networks: {
         [networkId: number]: {
             address: string;
@@ -222,7 +218,7 @@ export interface ValidateOrderFillableOpts {
  * flag when  running Parity).
  */
 export interface MethodOpts {
-    defaultBlock?: Web3.BlockParam;
+    defaultBlock?: BlockParam;
 }
 
 /*
@@ -242,8 +238,6 @@ export interface OrderTransactionOpts extends TransactionOpts {
     shouldValidate?: boolean;
 }
 
-export type FilterObject = Web3.FilterObject;
-
 export enum TradeSide {
     Maker = 'maker',
     Taker = 'taker',

packages/0x.js/src/utils/filter_utils.ts

@@ -1,8 +1,16 @@
+import {
+    ConstructorAbi,
+    ContractAbi,
+    EventAbi,
+    FallbackAbi,
+    FilterObject,
+    LogEntry,
+    MethodAbi,
+} from '@0xproject/types';
 import * as ethUtil from 'ethereumjs-util';
 import * as jsSHA3 from 'js-sha3';
 import * as _ from 'lodash';
 import * as uuid from 'uuid/v4';
-import * as Web3 from 'web3';
 
 import { BlockRange, ContractEvents, IndexedFilterValues } from '../types';
 
@@ -16,15 +24,15 @@ export const filterUtils = {
         address: string,
         eventName: ContractEvents,
         indexFilterValues: IndexedFilterValues,
-        abi: Web3.ContractAbi,
+        abi: ContractAbi,
         blockRange?: BlockRange,
-    ): Web3.FilterObject {
-        const eventAbi = _.find(abi, { name: eventName }) as Web3.EventAbi;
+    ): FilterObject {
+        const eventAbi = _.find(abi, { name: eventName }) as EventAbi;
         const eventSignature = filterUtils.getEventSignatureFromAbiByName(eventAbi, eventName);
         const topicForEventSignature = ethUtil.addHexPrefix(jsSHA3.keccak256(eventSignature));
         const topicsForIndexedArgs = filterUtils.getTopicsForIndexedArgs(eventAbi, indexFilterValues);
         const topics = [topicForEventSignature, ...topicsForIndexedArgs];
-        let filter: Web3.FilterObject = {
+        let filter: FilterObject = {
             address,
             topics,
         };
@@ -36,12 +44,12 @@ export const filterUtils = {
         }
         return filter;
     },
-    getEventSignatureFromAbiByName(eventAbi: Web3.EventAbi, eventName: ContractEvents): string {
+    getEventSignatureFromAbiByName(eventAbi: EventAbi, eventName: ContractEvents): string {
         const types = _.map(eventAbi.inputs, 'type');
         const signature = `${eventAbi.name}(${types.join(',')})`;
         return signature;
     },
-    getTopicsForIndexedArgs(abi: Web3.EventAbi, indexFilterValues: IndexedFilterValues): Array<string | null> {
+    getTopicsForIndexedArgs(abi: EventAbi, indexFilterValues: IndexedFilterValues): Array<string | null> {
         const topics: Array<string | null> = [];
         for (const eventInput of abi.inputs) {
             if (!eventInput.indexed) {
@@ -60,7 +68,7 @@ export const filterUtils = {
         }
         return topics;
     },
-    matchesFilter(log: Web3.LogEntry, filter: Web3.FilterObject): boolean {
+    matchesFilter(log: LogEntry, filter: FilterObject): boolean {
         if (!_.isUndefined(filter.address) && log.address !== filter.address) {
             return false;
         }

packages/0x.js/test/0x.js_test.ts

@@ -41,11 +41,11 @@ describe('ZeroEx library', () => {
             expect((zeroEx.tokenRegistry as any)._tokenRegistryContractIfExists).to.be.undefined();
 
             // Check that all nested web3 wrapper instances return the updated provider
-            const nestedWeb3WrapperProvider = (zeroEx as any)._web3Wrapper.getCurrentProvider();
+            const nestedWeb3WrapperProvider = (zeroEx as any)._web3Wrapper.getProvider();
             expect(nestedWeb3WrapperProvider.zeroExTestId).to.be.a('number');
-            const exchangeWeb3WrapperProvider = (zeroEx.exchange as any)._web3Wrapper.getCurrentProvider();
+            const exchangeWeb3WrapperProvider = (zeroEx.exchange as any)._web3Wrapper.getProvider();
             expect(exchangeWeb3WrapperProvider.zeroExTestId).to.be.a('number');
-            const tokenRegistryWeb3WrapperProvider = (zeroEx.tokenRegistry as any)._web3Wrapper.getCurrentProvider();
+            const tokenRegistryWeb3WrapperProvider = (zeroEx.tokenRegistry as any)._web3Wrapper.getProvider();
             expect(tokenRegistryWeb3WrapperProvider.zeroExTestId).to.be.a('number');
         });
     });
@@ -216,7 +216,7 @@ describe('ZeroEx library', () => {
                 s: '0x050aa3cc1f2c435e67e114cdce54b9527b4f50548342401bc5d2b77adbdacb02',
             };
             stubs = [
-                Sinon.stub((zeroEx as any)._web3Wrapper, 'signTransactionAsync').returns(Promise.resolve(signature)),
+                Sinon.stub((zeroEx as any)._web3Wrapper, 'signMessageAsync').returns(Promise.resolve(signature)),
                 Sinon.stub(ZeroEx, 'isValidSignature').returns(true),
             ];
 
@@ -237,7 +237,7 @@ describe('ZeroEx library', () => {
                 s: '0x2dea66f25a608bbae457e020fb6decb763deb8b7192abab624997242da248960',
             };
             stubs = [
-                Sinon.stub((zeroEx as any)._web3Wrapper, 'signTransactionAsync').returns(Promise.resolve(signature)),
+                Sinon.stub((zeroEx as any)._web3Wrapper, 'signMessageAsync').returns(Promise.resolve(signature)),
                 Sinon.stub(ZeroEx, 'isValidSignature').returns(true),
             ];
 

packages/0x.js/test/ether_token_wrapper_test.ts

@@ -1,5 +1,6 @@
 import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-utils';
 import { BigNumber } from '@0xproject/utils';
+import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as chai from 'chai';
 import 'mocha';
 import * as Web3 from 'web3';
@@ -59,7 +60,7 @@ describe('EtherTokenWrapper', () => {
         userAddresses = await zeroEx.getAvailableAddressesAsync();
         addressWithETH = userAddresses[0];
         wethContractAddress = zeroEx.etherToken.getContractAddressIfExists() as string;
-        depositWeiAmount = (zeroEx as any)._web3Wrapper.toWei(new BigNumber(5));
+        depositWeiAmount = Web3Wrapper.toWei(new BigNumber(5));
         decimalPlaces = 7;
         addressWithoutFunds = userAddresses[1];
     });
@@ -105,7 +106,7 @@ describe('EtherTokenWrapper', () => {
         it('should throw if user has insufficient ETH balance for deposit', async () => {
             const preETHBalance = await (zeroEx as any)._web3Wrapper.getBalanceInWeiAsync(addressWithETH);
 
-            const extraETHBalance = (zeroEx as any)._web3Wrapper.toWei(5, 'ether');
+            const extraETHBalance = Web3Wrapper.toWei(new BigNumber(5));
             const overETHBalanceinWei = preETHBalance.add(extraETHBalance);
 
             return expect(
@@ -137,7 +138,7 @@ describe('EtherTokenWrapper', () => {
             gasCost = expectedETHBalance.minus(postETHBalance);
             expect(gasCost).to.be.bignumber.lte(MAX_REASONABLE_GAS_COST_IN_WEI);
         });
-        it('should throw if user has insufficient WETH balance for withdrawl', async () => {
+        it('should throw if user has insufficient WETH balance for withdrawal', async () => {
             const preWETHBalance = await zeroEx.token.getBalanceAsync(wethContractAddress, addressWithETH);
             expect(preWETHBalance).to.be.bignumber.equal(0);
 

packages/0x.js/test/event_watcher_test.ts

@@ -1,4 +1,5 @@
 import { web3Factory } from '@0xproject/dev-utils';
+import { LogEntry } from '@0xproject/types';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as chai from 'chai';
 import * as _ from 'lodash';
@@ -21,7 +22,7 @@ describe('EventWatcher', () => {
     let stubs: Sinon.SinonStub[] = [];
     let eventWatcher: EventWatcher;
     let web3Wrapper: Web3Wrapper;
-    const logA: Web3.LogEntry = {
+    const logA: LogEntry = {
         address: '0x71d271f8b14adef568f8f28f1587ce7271ac4ca5',
         blockHash: null,
         blockNumber: null,
@@ -31,7 +32,7 @@ describe('EventWatcher', () => {
         transactionHash: '0x004881d38cd4a8f72f1a0d68c8b9b8124504706041ff37019c1d1ed6bfda8e17',
         transactionIndex: 0,
     };
-    const logB: Web3.LogEntry = {
+    const logB: LogEntry = {
         address: '0x8d12a197cb00d4747a1fe03395095ce2a5cc6819',
         blockHash: null,
         blockNumber: null,
@@ -41,7 +42,7 @@ describe('EventWatcher', () => {
         transactionHash: '0x01ef3c048b18d9b09ea195b4ed94cf8dd5f3d857a1905ff886b152cfb1166f25',
         transactionIndex: 0,
     };
-    const logC: Web3.LogEntry = {
+    const logC: LogEntry = {
         address: '0x1d271f8b174adef58f1587ce68f8f27271ac4ca5',
         blockHash: null,
         blockNumber: null,
@@ -64,7 +65,7 @@ describe('EventWatcher', () => {
         eventWatcher.unsubscribe();
     });
     it('correctly emits initial log events', (done: DoneCallback) => {
-        const logs: Web3.LogEntry[] = [logA, logB];
+        const logs: LogEntry[] = [logA, logB];
         const expectedLogEvents = [
             {
                 removed: false,
@@ -89,8 +90,8 @@ describe('EventWatcher', () => {
         eventWatcher.subscribe(callback);
     });
     it('correctly computes the difference and emits only changes', (done: DoneCallback) => {
-        const initialLogs: Web3.LogEntry[] = [logA, logB];
-        const changedLogs: Web3.LogEntry[] = [logA, logC];
+        const initialLogs: LogEntry[] = [logA, logB];
+        const changedLogs: LogEntry[] = [logA, logC];
         const expectedLogEvents = [
             {
                 removed: false,

packages/0x.js/test/exchange_wrapper_test.ts

@@ -596,6 +596,19 @@ describe('ExchangeWrapper', () => {
                     const remainingFillAmount = fillableAmount.minus(1);
                     expect(anotherFilledAmount).to.be.bignumber.equal(remainingFillAmount);
                 });
+                it('should successfully fill up to specified amount and leave the rest of the orders untouched', async () => {
+                    const txHash = await zeroEx.exchange.fillOrdersUpToAsync(
+                        signedOrders,
+                        fillableAmount,
+                        shouldThrowOnInsufficientBalanceOrAllowance,
+                        takerAddress,
+                    );
+                    await zeroEx.awaitTransactionMinedAsync(txHash);
+                    const filledAmount = await zeroEx.exchange.getFilledTakerAmountAsync(signedOrderHashHex);
+                    const zeroAmount = await zeroEx.exchange.getFilledTakerAmountAsync(anotherOrderHashHex);
+                    expect(filledAmount).to.be.bignumber.equal(fillableAmount);
+                    expect(zeroAmount).to.be.bignumber.equal(0);
+                });
                 it('should successfully fill up to specified amount even if filling all orders would fail', async () => {
                     const missingBalance = new BigNumber(1); // User will still have enough balance to fill up to 9,
                     // but won't have 10 to fully fill all orders in a batch.

packages/0x.js/test/order_state_watcher_test.ts

@@ -15,6 +15,7 @@ import {
     ZeroEx,
     ZeroExError,
 } from '../src';
+import { OrderStateWatcher } from '../src/order_watcher/order_state_watcher';
 import { DoneCallback } from '../src/types';
 
 import { chaiSetup } from './utils/chai_setup';
@@ -43,6 +44,7 @@ describe('OrderStateWatcher', () => {
     let maker: string;
     let taker: string;
     let signedOrder: SignedOrder;
+    let orderStateWatcher: OrderStateWatcher;
     const config = {
         networkId: constants.TESTRPC_NETWORK_ID,
     };
@@ -50,6 +52,7 @@ describe('OrderStateWatcher', () => {
     const fillableAmount = ZeroEx.toBaseUnitAmount(new BigNumber(5), decimals);
     before(async () => {
         zeroEx = new ZeroEx(web3.currentProvider, config);
+        orderStateWatcher = zeroEx.createOrderStateWatcher();
         exchangeContractAddress = zeroEx.exchange.getContractAddress();
         userAddresses = await zeroEx.getAvailableAddressesAsync();
         [, maker, taker] = userAddresses;
@@ -76,17 +79,17 @@ describe('OrderStateWatcher', () => {
                 fillableAmount,
             );
             const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-            zeroEx.orderStateWatcher.addOrder(signedOrder);
-            expect((zeroEx.orderStateWatcher as any)._orderByOrderHash).to.include({
+            orderStateWatcher.addOrder(signedOrder);
+            expect((orderStateWatcher as any)._orderByOrderHash).to.include({
                 [orderHash]: signedOrder,
             });
-            let dependentOrderHashes = (zeroEx.orderStateWatcher as any)._dependentOrderHashes;
+            let dependentOrderHashes = (orderStateWatcher as any)._dependentOrderHashes;
             expect(dependentOrderHashes[signedOrder.maker][signedOrder.makerTokenAddress]).to.have.keys(orderHash);
-            zeroEx.orderStateWatcher.removeOrder(orderHash);
-            expect((zeroEx.orderStateWatcher as any)._orderByOrderHash).to.not.include({
+            orderStateWatcher.removeOrder(orderHash);
+            expect((orderStateWatcher as any)._orderByOrderHash).to.not.include({
                 [orderHash]: signedOrder,
             });
-            dependentOrderHashes = (zeroEx.orderStateWatcher as any)._dependentOrderHashes;
+            dependentOrderHashes = (orderStateWatcher as any)._dependentOrderHashes;
             expect(dependentOrderHashes[signedOrder.maker]).to.be.undefined();
         });
         it('should no-op when removing a non-existing order', async () => {
@@ -103,23 +106,23 @@ describe('OrderStateWatcher', () => {
                 .split('')
                 .reverse()
                 .join('')}`;
-            zeroEx.orderStateWatcher.removeOrder(nonExistentOrderHash);
+            orderStateWatcher.removeOrder(nonExistentOrderHash);
         });
     });
     describe('#subscribe', async () => {
         afterEach(async () => {
-            zeroEx.orderStateWatcher.unsubscribe();
+            orderStateWatcher.unsubscribe();
         });
         it('should fail when trying to subscribe twice', async () => {
-            zeroEx.orderStateWatcher.subscribe(_.noop);
-            expect(() => zeroEx.orderStateWatcher.subscribe(_.noop)).to.throw(ZeroExError.SubscriptionAlreadyPresent);
+            orderStateWatcher.subscribe(_.noop);
+            expect(() => orderStateWatcher.subscribe(_.noop)).to.throw(ZeroExError.SubscriptionAlreadyPresent);
         });
     });
     describe('tests with cleanup', async () => {
         afterEach(async () => {
-            zeroEx.orderStateWatcher.unsubscribe();
+            orderStateWatcher.unsubscribe();
             const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-            zeroEx.orderStateWatcher.removeOrder(orderHash);
+            orderStateWatcher.removeOrder(orderHash);
         });
         it('should emit orderStateInvalid when maker allowance set to 0 for watched order', (done: DoneCallback) => {
             (async () => {
@@ -131,14 +134,14 @@ describe('OrderStateWatcher', () => {
                     fillableAmount,
                 );
                 const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-                zeroEx.orderStateWatcher.addOrder(signedOrder);
+                orderStateWatcher.addOrder(signedOrder);
                 const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
                     expect(orderState.isValid).to.be.false();
                     const invalidOrderState = orderState as OrderStateInvalid;
                     expect(invalidOrderState.orderHash).to.be.equal(orderHash);
                     expect(invalidOrderState.error).to.be.equal(ExchangeContractErrs.InsufficientMakerAllowance);
                 });
-                zeroEx.orderStateWatcher.subscribe(callback);
+                orderStateWatcher.subscribe(callback);
                 await zeroEx.token.setProxyAllowanceAsync(makerToken.address, maker, new BigNumber(0));
             })().catch(done);
         });
@@ -151,11 +154,11 @@ describe('OrderStateWatcher', () => {
                     taker,
                     fillableAmount,
                 );
-                zeroEx.orderStateWatcher.addOrder(signedOrder);
+                orderStateWatcher.addOrder(signedOrder);
                 const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
                     throw new Error('OrderState callback fired for irrelevant order');
                 });
-                zeroEx.orderStateWatcher.subscribe(callback);
+                orderStateWatcher.subscribe(callback);
                 const notTheMaker = userAddresses[0];
                 const anyRecipient = taker;
                 const transferAmount = new BigNumber(2);
@@ -175,14 +178,14 @@ describe('OrderStateWatcher', () => {
                     fillableAmount,
                 );
                 const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-                zeroEx.orderStateWatcher.addOrder(signedOrder);
+                orderStateWatcher.addOrder(signedOrder);
                 const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
                     expect(orderState.isValid).to.be.false();
                     const invalidOrderState = orderState as OrderStateInvalid;
                     expect(invalidOrderState.orderHash).to.be.equal(orderHash);
                     expect(invalidOrderState.error).to.be.equal(ExchangeContractErrs.InsufficientMakerBalance);
                 });
-                zeroEx.orderStateWatcher.subscribe(callback);
+                orderStateWatcher.subscribe(callback);
                 const anyRecipient = taker;
                 const makerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, maker);
                 await zeroEx.token.transferAsync(makerToken.address, maker, anyRecipient, makerBalance);
@@ -198,7 +201,7 @@ describe('OrderStateWatcher', () => {
                     fillableAmount,
                 );
                 const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-                zeroEx.orderStateWatcher.addOrder(signedOrder);
+                orderStateWatcher.addOrder(signedOrder);
 
                 const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
                     expect(orderState.isValid).to.be.false();
@@ -206,7 +209,7 @@ describe('OrderStateWatcher', () => {
                     expect(invalidOrderState.orderHash).to.be.equal(orderHash);
                     expect(invalidOrderState.error).to.be.equal(ExchangeContractErrs.OrderRemainingFillAmountZero);
                 });
-                zeroEx.orderStateWatcher.subscribe(callback);
+                orderStateWatcher.subscribe(callback);
 
                 const shouldThrowOnInsufficientBalanceOrAllowance = true;
                 await zeroEx.exchange.fillOrderAsync(
@@ -230,7 +233,7 @@ describe('OrderStateWatcher', () => {
                 const makerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, maker);
                 const fillAmountInBaseUnits = new BigNumber(2);
                 const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-                zeroEx.orderStateWatcher.addOrder(signedOrder);
+                orderStateWatcher.addOrder(signedOrder);
 
                 const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
                     expect(orderState.isValid).to.be.true();
@@ -247,7 +250,7 @@ describe('OrderStateWatcher', () => {
                     );
                     expect(orderRelevantState.makerBalance).to.be.bignumber.equal(remainingMakerBalance);
                 });
-                zeroEx.orderStateWatcher.subscribe(callback);
+                orderStateWatcher.subscribe(callback);
                 const shouldThrowOnInsufficientBalanceOrAllowance = true;
                 await zeroEx.exchange.fillOrderAsync(
                     signedOrder,
@@ -272,8 +275,8 @@ describe('OrderStateWatcher', () => {
                     taker,
                 );
                 const callback = reportNodeCallbackErrors(done)();
-                zeroEx.orderStateWatcher.addOrder(signedOrder);
-                zeroEx.orderStateWatcher.subscribe(callback);
+                orderStateWatcher.addOrder(signedOrder);
+                orderStateWatcher.subscribe(callback);
                 await zeroEx.token.setProxyAllowanceAsync(zrxTokenAddress, maker, new BigNumber(0));
             })().catch(done);
         });
@@ -292,7 +295,7 @@ describe('OrderStateWatcher', () => {
                     );
                     const fillAmountInBaseUnits = ZeroEx.toBaseUnitAmount(new BigNumber(2), decimals);
                     const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-                    zeroEx.orderStateWatcher.addOrder(signedOrder);
+                    orderStateWatcher.addOrder(signedOrder);
                     const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
                         expect(orderState.isValid).to.be.true();
                         const validOrderState = orderState as OrderStateValid;
@@ -305,7 +308,7 @@ describe('OrderStateWatcher', () => {
                             ZeroEx.toBaseUnitAmount(new BigNumber(8), decimals),
                         );
                     });
-                    zeroEx.orderStateWatcher.subscribe(callback);
+                    orderStateWatcher.subscribe(callback);
                     const shouldThrowOnInsufficientBalanceOrAllowance = true;
                     await zeroEx.exchange.fillOrderAsync(
                         signedOrder,
@@ -326,7 +329,7 @@ describe('OrderStateWatcher', () => {
                     );
 
                     const changedMakerApprovalAmount = ZeroEx.toBaseUnitAmount(new BigNumber(3), decimals);
-                    zeroEx.orderStateWatcher.addOrder(signedOrder);
+                    orderStateWatcher.addOrder(signedOrder);
 
                     const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
                         const validOrderState = orderState as OrderStateValid;
@@ -338,7 +341,7 @@ describe('OrderStateWatcher', () => {
                             changedMakerApprovalAmount,
                         );
                     });
-                    zeroEx.orderStateWatcher.subscribe(callback);
+                    orderStateWatcher.subscribe(callback);
                     await zeroEx.token.setProxyAllowanceAsync(makerToken.address, maker, changedMakerApprovalAmount);
                 })().catch(done);
             });
@@ -356,7 +359,7 @@ describe('OrderStateWatcher', () => {
 
                     const remainingAmount = ZeroEx.toBaseUnitAmount(new BigNumber(1), decimals);
                     const transferAmount = makerBalance.sub(remainingAmount);
-                    zeroEx.orderStateWatcher.addOrder(signedOrder);
+                    orderStateWatcher.addOrder(signedOrder);
 
                     const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
                         expect(orderState.isValid).to.be.true();
@@ -369,7 +372,7 @@ describe('OrderStateWatcher', () => {
                             remainingAmount,
                         );
                     });
-                    zeroEx.orderStateWatcher.subscribe(callback);
+                    orderStateWatcher.subscribe(callback);
                     await zeroEx.token.transferAsync(makerToken.address, maker, ZeroEx.NULL_ADDRESS, transferAmount);
                 })().catch(done);
             });
@@ -391,7 +394,7 @@ describe('OrderStateWatcher', () => {
 
                     const remainingTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(4), decimals);
                     const transferTokenAmount = makerFee.sub(remainingTokenAmount);
-                    zeroEx.orderStateWatcher.addOrder(signedOrder);
+                    orderStateWatcher.addOrder(signedOrder);
 
                     const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
                         expect(orderState.isValid).to.be.true();
@@ -401,7 +404,7 @@ describe('OrderStateWatcher', () => {
                             remainingTokenAmount,
                         );
                     });
-                    zeroEx.orderStateWatcher.subscribe(callback);
+                    orderStateWatcher.subscribe(callback);
                     await zeroEx.exchange.cancelOrderAsync(signedOrder, transferTokenAmount);
                 })().catch(done);
             });
@@ -425,7 +428,7 @@ describe('OrderStateWatcher', () => {
 
                     const remainingTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(4), decimals);
                     const transferTokenAmount = makerFee.sub(remainingTokenAmount);
-                    zeroEx.orderStateWatcher.addOrder(signedOrder);
+                    orderStateWatcher.addOrder(signedOrder);
 
                     const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
                         const validOrderState = orderState as OrderStateValid;
@@ -434,7 +437,7 @@ describe('OrderStateWatcher', () => {
                             remainingFeeAmount,
                         );
                     });
-                    zeroEx.orderStateWatcher.subscribe(callback);
+                    orderStateWatcher.subscribe(callback);
                     await zeroEx.token.setProxyAllowanceAsync(zrxTokenAddress, maker, remainingFeeAmount);
                     await zeroEx.token.transferAsync(
                         makerToken.address,
@@ -460,7 +463,7 @@ describe('OrderStateWatcher', () => {
                         feeRecipient,
                     );
 
-                    zeroEx.orderStateWatcher.addOrder(signedOrder);
+                    orderStateWatcher.addOrder(signedOrder);
 
                     const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
                         const validOrderState = orderState as OrderStateValid;
@@ -469,7 +472,7 @@ describe('OrderStateWatcher', () => {
                             fillableAmount,
                         );
                     });
-                    zeroEx.orderStateWatcher.subscribe(callback);
+                    orderStateWatcher.subscribe(callback);
                     await zeroEx.token.setProxyAllowanceAsync(
                         makerToken.address,
                         maker,
@@ -488,7 +491,7 @@ describe('OrderStateWatcher', () => {
                     fillableAmount,
                 );
                 const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-                zeroEx.orderStateWatcher.addOrder(signedOrder);
+                orderStateWatcher.addOrder(signedOrder);
 
                 const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
                     expect(orderState.isValid).to.be.false();
@@ -496,7 +499,7 @@ describe('OrderStateWatcher', () => {
                     expect(invalidOrderState.orderHash).to.be.equal(orderHash);
                     expect(invalidOrderState.error).to.be.equal(ExchangeContractErrs.OrderRemainingFillAmountZero);
                 });
-                zeroEx.orderStateWatcher.subscribe(callback);
+                orderStateWatcher.subscribe(callback);
 
                 await zeroEx.exchange.cancelOrderAsync(signedOrder, fillableAmount);
             })().catch(done);
@@ -512,7 +515,7 @@ describe('OrderStateWatcher', () => {
                     fillableAmount,
                 );
                 const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-                zeroEx.orderStateWatcher.addOrder(signedOrder);
+                orderStateWatcher.addOrder(signedOrder);
 
                 const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
                     expect(orderState.isValid).to.be.false();
@@ -520,7 +523,7 @@ describe('OrderStateWatcher', () => {
                     expect(invalidOrderState.orderHash).to.be.equal(orderHash);
                     expect(invalidOrderState.error).to.be.equal(ExchangeContractErrs.OrderFillRoundingError);
                 });
-                zeroEx.orderStateWatcher.subscribe(callback);
+                orderStateWatcher.subscribe(callback);
                 await zeroEx.exchange.cancelOrderAsync(
                     signedOrder,
                     fillableAmount.minus(remainingFillableAmountInBaseUnits),
@@ -539,7 +542,7 @@ describe('OrderStateWatcher', () => {
 
                 const cancelAmountInBaseUnits = new BigNumber(2);
                 const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-                zeroEx.orderStateWatcher.addOrder(signedOrder);
+                orderStateWatcher.addOrder(signedOrder);
 
                 const callback = reportNodeCallbackErrors(done)((orderState: OrderState) => {
                     expect(orderState.isValid).to.be.true();
@@ -548,7 +551,7 @@ describe('OrderStateWatcher', () => {
                     const orderRelevantState = validOrderState.orderRelevantState;
                     expect(orderRelevantState.cancelledTakerTokenAmount).to.be.bignumber.equal(cancelAmountInBaseUnits);
                 });
-                zeroEx.orderStateWatcher.subscribe(callback);
+                orderStateWatcher.subscribe(callback);
                 await zeroEx.exchange.cancelOrderAsync(signedOrder, cancelAmountInBaseUnits);
             })().catch(done);
         });

packages/0x.js/test/utils/fill_scenarios.ts

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

packages/0x.js/tsconfig.json

@@ -1,17 +1,7 @@
 {
     "extends": "../../tsconfig",
     "compilerOptions": {
-        "outDir": "lib",
-        "noImplicitThis": false
+        "outDir": "lib"
     },
-    "include": [
-        "./src/**/*",
-        "./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"
-    ]
+    "include": ["./src/**/*", "./test/**/*"]
 }

packages/abi-gen/.npmignore

@@ -3,3 +3,4 @@ yarn-error.log
 /src/
 /scripts/
 tsconfig.json
+/lib/monorepo_scripts/

packages/abi-gen/CHANGELOG.json

@@ -0,0 +1,102 @@
+[
+    {
+        "timestamp": 1523462196,
+        "version": "0.2.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1522673609,
+        "version": "0.2.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1522658513,
+        "version": "0.2.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "0.2.5",
+        "changes": [
+            {
+                "note": "Consolidate all `console.log` calls into `logUtils` in the `@0xproject/utils` package",
+                "pr": 452
+            }
+        ],
+        "timestamp": 1521298800
+    },
+    {
+        "version": "0.2.4",
+        "changes": [
+            {
+                "note":
+                    "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`",
+                "pr": 413
+            },
+            {
+                "note":
+                    "Add support for [tuple types](https://solidity.readthedocs.io/en/develop/abi-spec.html#handling-tuple-types)",
+                "pr": 413
+            },
+            {
+                "note": "Add `hasReturnValue` to context data",
+                "pr": 413
+            }
+        ],
+        "timestamp": 1520089200
+    },
+    {
+        "version": "0.2.1",
+        "changes": [
+            {
+                "note": "Fix publishing issue where .npmignore was not properly excluding undesired content",
+                "pr": 389
+            }
+        ],
+        "timestamp": 1518102000
+    },
+    {
+        "version": "0.2.0",
+        "changes": [
+            {
+                "note": "Added CLI options for explicit specifying location of partials and main template",
+                "pr": 346
+            },
+            {
+                "note":
+                    "Added CLI option to specify networkId, adding support for the JSON artifact format found in @0xproject/contracts",
+                "pr": 388
+            }
+        ],
+        "timestamp": 1517929200
+    },
+    {
+        "version": "0.1.0",
+        "changes": [
+            {
+                "note": "Fixed array typings with union types",
+                "pr": 295
+            },
+            {
+                "note": "Add event ABIs to context data passed to templates",
+                "pr": 302
+            },
+            {
+                "note": "Add constructor ABIs to context data passed to templates",
+                "pr": 304
+            }
+        ],
+        "timestamp": 1515596400
+    }
+]

packages/abi-gen/CHANGELOG.md

@@ -1,25 +1,42 @@
-# CHANGELOG
+<!--
+This file is auto-generated using the monorepo-scripts package. Don't edit directly.
+Edit the package's CHANGELOG.json file only.
+-->
 
-## v0.2.5 - _March 18, 2018_
+CHANGELOG
+
+## v0.2.10 - _April 11, 2018_
+
+    * Dependencies updated
+
+## v0.2.9 - _April 2, 2018_
+
+    * Dependencies updated
+
+## v0.2.8 - _April 2, 2018_
+
+    * Dependencies updated
+
+## v0.2.5 - _March 17, 2018_
 
     * Consolidate all `console.log` calls into `logUtils` in the `@0xproject/utils` package (#452)
 
-## v0.2.4 - _March 4, 2018_
+## v0.2.4 - _March 3, 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_
+## v0.2.1 - _February 8, 2018_
 
     * Fix publishing issue where .npmignore was not properly excluding undesired content (#389)
 
-## v0.2.0 - _February 7, 2018_
+## v0.2.0 - _February 6, 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_
+## v0.1.0 - _January 10, 2018_
 
     * Fixed array typings with union types (#295)
     * Add event ABIs to context data passed to templates (#302)

packages/abi-gen/README.md

@@ -57,3 +57,61 @@ See the [type definition](https://github.com/0xProject/0x-monorepo/tree/developm
 ## Output files
 
 Output files will be generated within an output folder with names converted to camel case and taken from abi file names. If you already have some files in that folder they will be overwritten.
+
+## Contributing
+
+We welcome improvements and fixes from the wider community! To report bugs within this package, please create an issue in this repository.
+
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
+
+### Install dependencies
+
+If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
+
+```bash
+yarn config set workspaces-experimental true
+```
+
+Then install dependencies
+
+```bash
+yarn install
+```
+
+### Build
+
+If this is your **first** time building this package, you must first build **all** packages within the monorepo. This is because packages that depend on other packages located inside this monorepo are symlinked when run from **within** the monorepo. This allows you to make changes across multiple packages without first publishing dependent packages to NPM. To build all packages, run the following from the monorepo root directory:
+
+```bash
+yarn lerna:rebuild
+```
+
+Or continuously rebuild on change:
+
+```bash
+yarn dev
+```
+
+You can also build this specific package by running the following from within its directory:
+
+```bash
+yarn build
+```
+
+or continuously rebuild on change:
+
+```bash
+yarn build:watch
+```
+
+### Clean
+
+```bash
+yarn clean
+```
+
+### Lint
+
+```bash
+yarn lint
+```

packages/abi-gen/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/abi-gen",
-    "version": "0.2.6",
+    "version": "0.2.9",
     "description": "Generate contract wrappers from ABI and handlebars templates",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -8,7 +8,8 @@
         "build:watch": "tsc -w",
         "lint": "tslint --project . 'src/**/*.ts'",
         "clean": "shx rm -rf lib scripts",
-        "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts"
+        "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
+        "manual:postpublish": "yarn build; node ./scripts/postpublish.js"
     },
     "bin": {
         "abi-gen": "lib/index.js"
@@ -23,19 +24,20 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md",
     "dependencies": {
-        "@0xproject/utils": "^0.4.2",
+        "@0xproject/types": "^0.5.0",
+        "@0xproject/typescript-typings": "^0.0.3",
+        "@0xproject/utils": "^0.5.0",
         "chalk": "^2.3.0",
         "glob": "^7.1.2",
         "handlebars": "^4.0.11",
         "lodash": "^4.17.4",
         "mkdirp": "^0.5.1",
         "to-snake-case": "^1.0.0",
-        "web3": "^0.20.0",
         "yargs": "^10.0.3"
     },
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.13",
-        "@0xproject/tslint-config": "^0.4.11",
+        "@0xproject/monorepo-scripts": "^0.1.16",
+        "@0xproject/tslint-config": "^0.4.14",
         "@types/glob": "^5.0.33",
         "@types/handlebars": "^4.0.36",
         "@types/mkdirp": "^0.5.1",
@@ -45,8 +47,7 @@
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "tslint": "5.8.0",
-        "typescript": "2.7.1",
-        "web3-typescript-typings": "^0.10.1"
+        "typescript": "2.7.1"
     },
     "publishConfig": {
         "access": "public"

packages/abi-gen/src/globals.d.ts

@@ -1,8 +1,3 @@
-declare function toSnakeCase(str: string): string;
-declare module 'to-snake-case' {
-    export = toSnakeCase;
-}
-
 declare module '*.json' {
     const json: any;
     /* tslint:disable */

packages/abi-gen/src/index.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
-import { logUtils } from '@0xproject/utils';
+import { AbiDefinition, ConstructorAbi, EventAbi, MethodAbi } from '@0xproject/types';
+import { abiUtils, logUtils } from '@0xproject/utils';
 import chalk from 'chalk';
 import * as fs from 'fs';
 import { sync as globSync } from 'glob';
@@ -10,9 +11,8 @@ import * as mkdirp from 'mkdirp';
 import * as yargs from 'yargs';
 
 import toSnakeCase = require('to-snake-case');
-import * as Web3 from 'web3';
 
-import { ContextData, ContractsBackend, ParamKind } from './types';
+import { ContextData, ContractsBackend, Method, ParamKind } from './types';
 import { utils } from './utils';
 
 const ABI_TYPE_CONSTRUCTOR = 'constructor';
@@ -83,7 +83,6 @@ function writeOutputFile(name: string, renderedTsCode: string): void {
 
 Handlebars.registerHelper('parameterType', utils.solTypeToTsType.bind(utils, ParamKind.Input, args.backend));
 Handlebars.registerHelper('returnType', utils.solTypeToTsType.bind(utils, ParamKind.Output, args.backend));
-
 if (args.partials) {
     registerPartials(args.partials);
 }
@@ -120,17 +119,18 @@ for (const abiFileName of abiFileNames) {
         process.exit(1);
     }
 
-    let ctor = ABI.find((abi: Web3.AbiDefinition) => abi.type === ABI_TYPE_CONSTRUCTOR) as Web3.ConstructorAbi;
+    let ctor = ABI.find((abi: AbiDefinition) => abi.type === ABI_TYPE_CONSTRUCTOR) as ConstructorAbi;
     if (_.isUndefined(ctor)) {
         ctor = utils.getEmptyConstructor(); // The constructor exists, but it's implicit in JSON's ABI definition
     }
 
-    const methodAbis = ABI.filter((abi: Web3.AbiDefinition) => abi.type === ABI_TYPE_METHOD) as Web3.MethodAbi[];
-    const methodsData = _.map(methodAbis, methodAbi => {
-        _.map(methodAbi.inputs, (input, i: number) => {
+    const methodAbis = ABI.filter((abi: AbiDefinition) => abi.type === ABI_TYPE_METHOD) as MethodAbi[];
+    const sanitizedMethodAbis = abiUtils.renameOverloadedMethods(methodAbis) as MethodAbi[];
+    const methodsData = _.map(methodAbis, (methodAbi, methodAbiIndex: number) => {
+        _.forEach(methodAbi.inputs, (input, inputIndex: number) => {
             if (_.isEmpty(input.name)) {
                 // Auto-generated getters don't have parameter names
-                input.name = `index_${i}`;
+                input.name = `index_${inputIndex}`;
             }
         });
         // This will make templates simpler
@@ -138,11 +138,13 @@ for (const abiFileName of abiFileNames) {
             ...methodAbi,
             singleReturnValue: methodAbi.outputs.length === 1,
             hasReturnValue: methodAbi.outputs.length !== 0,
+            tsName: sanitizedMethodAbis[methodAbiIndex].name,
+            functionSignature: abiUtils.getFunctionSignature(methodAbi),
         };
         return methodData;
     });
 
-    const eventAbis = ABI.filter((abi: Web3.AbiDefinition) => abi.type === ABI_TYPE_EVENT) as Web3.EventAbi[];
+    const eventAbis = ABI.filter((abi: AbiDefinition) => abi.type === ABI_TYPE_EVENT) as EventAbi[];
 
     const contextData = {
         contractName: namedContent.name,

packages/abi-gen/src/types.ts

@@ -1,29 +1,24 @@
-import * as Web3 from 'web3';
+import { EventAbi, MethodAbi } from '@0xproject/types';
 
 export enum ParamKind {
     Input = 'input',
     Output = 'output',
 }
 
-export enum AbiType {
-    Function = 'function',
-    Constructor = 'constructor',
-    Event = 'event',
-    Fallback = 'fallback',
-}
-
 export enum ContractsBackend {
     Web3 = 'web3',
     Ethers = 'ethers',
 }
 
-export interface Method extends Web3.MethodAbi {
+export interface Method extends MethodAbi {
     singleReturnValue: boolean;
     hasReturnValue: boolean;
+    tsName: string;
+    functionSignature: string;
 }
 
 export interface ContextData {
     contractName: string;
     methods: Method[];
-    events: Web3.EventAbi[];
+    events: EventAbi[];
 }

packages/abi-gen/src/utils.ts

@@ -1,17 +1,12 @@
+import { AbiType, ConstructorAbi, DataItem } from '@0xproject/types';
 import * as fs from 'fs';
 import * as _ from 'lodash';
 import * as path from 'path';
-import * as Web3 from 'web3';
 
-import { AbiType, ContractsBackend, ParamKind } from './types';
+import { ContractsBackend, ParamKind } from './types';
 
 export const utils = {
-    solTypeToTsType(
-        paramKind: ParamKind,
-        backend: ContractsBackend,
-        solType: string,
-        components?: Web3.DataItem[],
-    ): string {
+    solTypeToTsType(paramKind: ParamKind, backend: ContractsBackend, solType: string, components?: DataItem[]): string {
         const trailingArrayRegex = /\[\d*\]$/;
         if (solType.match(trailingArrayRegex)) {
             const arrayItemSolType = solType.replace(trailingArrayRegex, '');
@@ -89,7 +84,7 @@ export const utils = {
             throw new Error(`Failed to read ${filename}: ${err}`);
         }
     },
-    getEmptyConstructor(): Web3.ConstructorAbi {
+    getEmptyConstructor(): ConstructorAbi {
         return {
             type: AbiType.Constructor,
             stateMutability: 'nonpayable',

packages/abi-gen/tsconfig.json

@@ -3,5 +3,5 @@
     "compilerOptions": {
         "outDir": "lib"
     },
-    "include": ["./src/**/*", "./test/**/*", "../../node_modules/web3-typescript-typings/index.d.ts"]
+    "include": ["./src/**/*", "./test/**/*"]
 }

packages/assert/.npmignore

@@ -4,3 +4,4 @@ yarn-error.log
 /scripts/
 test/
 tsconfig.json
+/lib/src/monorepo_scripts/

packages/assert/CHANGELOG.json

@@ -0,0 +1,76 @@
+[
+    {
+        "timestamp": 1523462196,
+        "version": "0.2.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1522673609,
+        "version": "0.2.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1522658513,
+        "version": "0.2.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "0.2.0",
+        "changes": [
+            {
+                "note": "Rename `isHttpUrl` to `isWebUri`",
+                "pr": 412
+            }
+        ],
+        "timestamp": 1520434800
+    },
+    {
+        "version": "0.1.0",
+        "changes": [
+            {
+                "note": "Remove isETHAddressHex checksum address check and assume address will be lowercased ",
+                "pr": 373
+            },
+            {
+                "note": "Add an optional parameter `subSchemas` to `doesConformToSchema` method",
+                "pr": 385
+            }
+        ],
+        "timestamp": 1520089200
+    },
+    {
+        "version": "0.0.18",
+        "changes": [
+            {
+                "note": "Fix publishing issue where .npmignore was not properly excluding undesired content",
+                "pr": 389
+            }
+        ],
+        "timestamp": 1486566000
+    },
+    {
+        "version": "0.0.4",
+        "changes": [
+            {
+                "note": "Re-publish Assert previously published under NPM package @0xproject/0x-assert"
+            },
+            {
+                "note":
+                    "Added assertion isValidBaseUnitAmount which checks both that the value is a valid bigNumber and that it does not contain decimals."
+            }
+        ],
+        "timestamp": 1510585200
+    }
+]

packages/assert/CHANGELOG.md

@@ -1,19 +1,36 @@
-# CHANGELOG
+<!--
+This file is auto-generated using the monorepo-scripts package. Don't edit directly.
+Edit the package's CHANGELOG.json file only.
+-->
 
-## v0.2.0 - _March 8, 2018_
+CHANGELOG
+
+## v0.2.6 - _April 11, 2018_
+
+    * Dependencies updated
+
+## v0.2.5 - _April 2, 2018_
+
+    * Dependencies updated
+
+## v0.2.4 - _April 2, 2018_
+
+    * Dependencies updated
+
+## v0.2.0 - _March 7, 2018_
 
     * Rename `isHttpUrl` to `isWebUri` (#412)
 
-## v0.1.0 - _March 4, 2018_
+## v0.1.0 - _March 3, 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_
+## v0.0.18 - _February 8, 2017_
 
     * Fix publishing issue where .npmignore was not properly excluding undesired content (#389)
 
-## v0.0.4 - _November 14, 2017_
+## v0.0.4 - _November 13, 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.

packages/assert/README.md

@@ -8,14 +8,6 @@ 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
@@ -24,13 +16,21 @@ import { assert } from '@0xproject/assert';
 assert.isValidBaseUnitAmount('baseUnitAmount', baseUnitAmount);
 ```
 
+If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
+
+```json
+"compilerOptions": {
+    "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+}
+```
+
 ## Contributing
 
-We strongly encourage that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+We welcome improvements and fixes from the wider community! To report bugs within this package, please create an issue in this repository.
 
 Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
-### Install Dependencies
+### Install dependencies
 
 If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
 
@@ -46,10 +46,36 @@ yarn install
 
 ### Build
 
+If this is your **first** time building this package, you must first build **all** packages within the monorepo. This is because packages that depend on other packages located inside this monorepo are symlinked when run from **within** the monorepo. This allows you to make changes across multiple packages without first publishing dependent packages to NPM. To build all packages, run the following from the monorepo root directory:
+
+```bash
+yarn lerna:rebuild
+```
+
+Or continuously rebuild on change:
+
+```bash
+yarn dev
+```
+
+You can also build this specific package by running the following from within its directory:
+
 ```bash
 yarn build
 ```
 
+or continuously rebuild on change:
+
+```bash
+yarn build:watch
+```
+
+### Clean
+
+```bash
+yarn clean
+```
+
 ### Lint
 
 ```bash

packages/assert/package.json

@@ -1,20 +1,21 @@
 {
     "name": "@0xproject/assert",
-    "version": "0.2.1",
+    "version": "0.2.5",
     "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:watch": "tsc -w",
         "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
-        "clean": "shx rm -rf _bundles lib test_temp scripts",
+        "clean": "shx rm -rf 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: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"
+        "test:circleci": "yarn test:coverage",
+        "manual:postpublish": "yarn build; node ./scripts/postpublish.js"
     },
     "license": "Apache-2.0",
     "repository": {
@@ -26,13 +27,12 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.13",
-        "@0xproject/tslint-config": "^0.4.11",
-        "@types/lodash": "^4.14.86",
+        "@0xproject/monorepo-scripts": "^0.1.16",
+        "@0xproject/tslint-config": "^0.4.14",
+        "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/valid-url": "^1.0.2",
         "chai": "^4.0.1",
-        "chai-typescript-typings": "^0.0.5",
         "copyfiles": "^1.2.0",
         "dirty-chai": "^2.0.1",
         "mocha": "^4.0.1",
@@ -43,8 +43,9 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/json-schemas": "^0.7.15",
-        "@0xproject/utils": "^0.4.2",
+        "@0xproject/json-schemas": "^0.7.19",
+        "@0xproject/typescript-typings": "^0.0.3",
+        "@0xproject/utils": "^0.5.0",
         "lodash": "^4.17.4",
         "valid-url": "^1.0.9"
     },

packages/assert/src/globals.d.ts

@@ -1,5 +1,3 @@
-declare module 'dirty-chai';
-
 declare module '*.json' {
     const json: any;
     /* tslint:disable */

packages/assert/src/index.ts

@@ -61,7 +61,7 @@ export const assert = {
     },
     isWeb3Provider(variableName: string, value: any): void {
         const isWeb3Provider = _.isFunction(value.send) || _.isFunction(value.sendAsync);
-        this.assert(isWeb3Provider, this.typeAssertionMessage(variableName, 'Web3.Provider', value));
+        this.assert(isWeb3Provider, this.typeAssertionMessage(variableName, 'Provider', value));
     },
     doesConformToSchema(variableName: string, value: any, schema: Schema, subSchemas?: Schema[]): void {
         const schemaValidator = new SchemaValidator();

packages/assert/tsconfig.json

@@ -3,10 +3,5 @@
     "compilerOptions": {
         "outDir": "lib"
     },
-    "include": [
-        "./src/**/*",
-        "./test/**/*",
-        "../../node_modules/web3-typescript-typings/index.d.ts",
-        "../../node_modules/chai-typescript-typings/index.d.ts"
-    ]
+    "include": ["./src/**/*", "./test/**/*"]
 }

packages/base-contract/.npmignore

@@ -3,3 +3,4 @@ yarn-error.log
 /scripts/
 /src/
 tsconfig.json
+/lib/monorepo_scripts/

packages/base-contract/CHANGELOG.json

@@ -0,0 +1,48 @@
+[
+    {
+        "version": "0.2.0",
+        "changes": [
+            {
+                "note": "Contract wrappers now accept Provider and defaults instead of Web3Wrapper",
+                "pr": 501
+            }
+        ],
+        "timestamp": 1523462196
+    },
+    {
+        "version": "0.1.0",
+        "changes": [
+            {
+                "note": "Add tests for traversing ABI tree",
+                "pr": 485
+            },
+            {
+                "note": "Fix ABI tuples traversing",
+                "pr": 485
+            },
+            {
+                "note": "Fix ABI arrays traversing",
+                "pr": 485
+            }
+        ],
+        "timestamp": 1522673609
+    },
+    {
+        "timestamp": 1522658513,
+        "version": "0.0.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "0.0.2",
+        "changes": [
+            {
+                "note": "Initial release"
+            }
+        ],
+        "timestamp": 1520089200
+    }
+]

packages/base-contract/CHANGELOG.md

@@ -1,5 +1,24 @@
-# CHANGELOG
+<!--
+This file is auto-generated using the monorepo-scripts package. Don't edit directly.
+Edit the package's CHANGELOG.json file only.
+-->
 
-## v0.0.2 - _March 4, 2018_
+CHANGELOG
+
+## v0.2.0 - _April 11, 2018_
+
+    * Contract wrappers now accept Provider and defaults instead of Web3Wrapper (#501)
+
+## v0.1.0 - _April 2, 2018_
+
+    * Add tests for traversing ABI tree (#485)
+    * Fix ABI tuples traversing (#485)
+    * Fix ABI arrays traversing (#485)
+
+## v0.0.6 - _April 2, 2018_
+
+    * Dependencies updated
+
+## v0.0.2 - _March 3, 2018_
 
     * Initial release

packages/base-contract/README.md

@@ -10,11 +10,10 @@ 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"
-]
+```json
+"compilerOptions": {
+    "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+}
 ```
 
 ## Usage

packages/base-contract/package.json

@@ -1,14 +1,20 @@
 {
     "name": "@0xproject/base-contract",
-    "version": "0.0.4",
+    "version": "0.1.0",
     "description": "0x Base TS contract",
-    "main": "lib/index.js",
-    "types": "lib/index.d.ts",
+    "main": "lib/src/index.js",
+    "types": "lib/src/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'"
+        "test": "run-s clean build run_mocha",
+        "test:circleci": "yarn test:coverage",
+        "run_mocha": "mocha lib/test/**/*_test.js --bail --exit",
+        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
+        "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
+        "lint": "tslint --project .",
+        "manual:postpublish": "yarn build; node ./scripts/postpublish.js"
     },
     "license": "Apache-2.0",
     "repository": {
@@ -20,23 +26,24 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.13",
-        "@0xproject/tslint-config": "^0.4.11",
-        "@types/lodash": "^4.14.86",
+        "@0xproject/monorepo-scripts": "^0.1.16",
+        "@0xproject/tslint-config": "^0.4.14",
+        "@types/lodash": "4.14.104",
+        "chai": "^4.0.1",
         "copyfiles": "^1.2.0",
+        "mocha": "^4.0.1",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "tslint": "5.8.0",
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/types": "^0.4.0",
-        "@0xproject/web3-wrapper": "^0.3.0",
+        "@0xproject/types": "^0.5.0",
+        "@0xproject/typescript-typings": "^0.0.3",
+        "@0xproject/utils": "^0.5.0",
+        "@0xproject/web3-wrapper": "^0.5.0",
         "ethers-contracts": "^2.2.1",
-        "ethers-typescript-typings": "^0.0.3",
-        "lodash": "^4.17.4",
-        "web3": "^0.20.0",
-        "web3-typescript-typings": "^0.10.1"
+        "lodash": "^4.17.4"
     },
     "publishConfig": {
         "access": "public"

packages/base-contract/src/index.ts

@@ -1,41 +1,44 @@
-import { TxData, TxDataPayable } from '@0xproject/types';
+import {
+    AbiDefinition,
+    AbiType,
+    ContractAbi,
+    DataItem,
+    MethodAbi,
+    Provider,
+    TxData,
+    TxDataPayable,
+} from '@0xproject/types';
+import { abiUtils, BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as ethersContracts from 'ethers-contracts';
 import * as _ from 'lodash';
-import * as Web3 from 'web3';
+
+import { formatABIDataItem } from './utils';
+
+export interface EthersInterfaceByFunctionSignature {
+    [key: string]: ethersContracts.Interface;
+}
 
 export class BaseContract {
-    protected _ethersInterface: ethersContracts.Interface;
+    protected _ethersInterfacesByFunctionSignature: EthersInterfaceByFunctionSignature;
     protected _web3Wrapper: Web3Wrapper;
-    public abi: Web3.ContractAbi;
+    public abi: ContractAbi;
     public address: string;
-    protected static _transformABIData(
-        abis: Web3.DataItem[],
+    protected static _formatABIDataItemList(
+        abis: DataItem[],
         values: any[],
-        transformation: (type: string, value: any) => any,
+        formatter: (type: string, value: any) => any,
     ): any {
-        return _.map(values, (value: any, i: number) =>
-            BaseContract._transformTypedData(abis[i].type, value, transformation),
-        );
+        return _.map(values, (value: any, i: number) => formatABIDataItem(abis[i], value, formatter));
     }
     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;
+    protected static _bigNumberToString(type: string, value: any): any {
+        return _.isObject(value) && value.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 static _bnToBigNumber(type: string, value: any): any {
+        return _.isObject(value) && value._bn ? new BigNumber(value.toString()) : value;
     }
     protected async _applyDefaultsToTxDataAsync<T extends Partial<TxData | TxDataPayable>>(
         txData: T,
@@ -46,23 +49,50 @@ export class BaseContract {
         // 2. Global config passed in at library instantiation
         // 3. Gas estimate calculation + safety margin
         const removeUndefinedProperties = _.pickBy;
-        const txDataWithDefaults = {
+        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
-        };
+        } as any) as TxData;
         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;
+    protected _lookupEthersInterface(functionSignature: string): ethersContracts.Interface {
+        const ethersInterface = this._ethersInterfacesByFunctionSignature[functionSignature];
+        if (_.isUndefined(ethersInterface)) {
+            throw new Error(`Failed to lookup method with function signature '${functionSignature}'`);
+        }
+        return ethersInterface;
+    }
+    protected _lookupAbi(functionSignature: string): MethodAbi {
+        const methodAbi = _.find(this.abi, (abiDefinition: AbiDefinition) => {
+            if (abiDefinition.type !== AbiType.Function) {
+                return false;
+            }
+            const abiFunctionSignature = abiUtils.getFunctionSignature(abiDefinition);
+            if (abiFunctionSignature === functionSignature) {
+                return true;
+            }
+            return false;
+        }) as MethodAbi;
+        return methodAbi;
+    }
+    constructor(abi: ContractAbi, address: string, provider: Provider, defaults?: Partial<TxData>) {
+        this._web3Wrapper = new Web3Wrapper(provider, defaults);
         this.abi = abi;
         this.address = address;
-        this._ethersInterface = new ethersContracts.Interface(abi);
+        const methodAbis = this.abi.filter(
+            (abiDefinition: AbiDefinition) => abiDefinition.type === AbiType.Function,
+        ) as MethodAbi[];
+        this._ethersInterfacesByFunctionSignature = {};
+        _.each(methodAbis, methodAbi => {
+            const functionSignature = abiUtils.getFunctionSignature(methodAbi);
+            this._ethersInterfacesByFunctionSignature[functionSignature] = new ethersContracts.Interface([methodAbi]);
+        });
     }
 }

packages/base-contract/src/utils.ts

@@ -0,0 +1,25 @@
+import { DataItem } from '@0xproject/types';
+import * as _ from 'lodash';
+
+// tslint:disable-next-line:completed-docs
+export function formatABIDataItem(abi: DataItem, value: any, formatter: (type: string, value: any) => any): any {
+    const trailingArrayRegex = /\[\d*\]$/;
+    if (abi.type.match(trailingArrayRegex)) {
+        const arrayItemType = abi.type.replace(trailingArrayRegex, '');
+        return _.map(value, val => {
+            const arrayItemAbi = {
+                ...abi,
+                type: arrayItemType,
+            };
+            return formatABIDataItem(arrayItemAbi, val, formatter);
+        });
+    } else if (abi.type === 'tuple') {
+        const formattedTuple: { [componentName: string]: DataItem } = {};
+        _.forEach(abi.components, componentABI => {
+            formattedTuple[componentABI.name] = formatABIDataItem(componentABI, value[componentABI.name], formatter);
+        });
+        return formattedTuple;
+    } else {
+        return formatter(abi.type, value);
+    }
+}

packages/base-contract/test/utils_test.ts

@@ -0,0 +1,108 @@
+import { BigNumber } from '@0xproject/utils';
+import * as chai from 'chai';
+import 'mocha';
+
+import { formatABIDataItem } from '../src/utils';
+
+const { expect } = chai;
+
+describe('Utils tests', () => {
+    describe('#formatABIDataItem', () => {
+        it('correctly handles arrays', () => {
+            const calls: Array<{ type: string; value: any }> = [];
+            const abi = {
+                name: 'values',
+                type: 'uint256[]',
+            };
+            const val = [1, 2, 3];
+            const formatted = formatABIDataItem(abi, val, (type: string, value: any) => {
+                calls.push({ type, value });
+                return value; // no-op
+            });
+            expect(formatted).to.be.deep.equal(val);
+            expect(calls).to.be.deep.equal([
+                { type: 'uint256', value: 1 },
+                { type: 'uint256', value: 2 },
+                { type: 'uint256', value: 3 },
+            ]);
+        });
+        it('correctly handles tuples', () => {
+            const calls: Array<{ type: string; value: any }> = [];
+            const abi = {
+                components: [
+                    {
+                        name: 'to',
+                        type: 'address',
+                    },
+                    {
+                        name: 'amount',
+                        type: 'uint256',
+                    },
+                ],
+                name: 'data',
+                type: 'tuple',
+            };
+            const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
+            const val = { to: ZERO_ADDRESS, amount: new BigNumber(1) };
+            const formatted = formatABIDataItem(abi, val, (type: string, value: any) => {
+                calls.push({ type, value });
+                return value; // no-op
+            });
+            expect(formatted).to.be.deep.equal(val);
+            expect(calls).to.be.deep.equal([
+                {
+                    type: 'address',
+                    value: val.to,
+                },
+                {
+                    type: 'uint256',
+                    value: val.amount,
+                },
+            ]);
+        });
+        it('correctly handles nested arrays of tuples', () => {
+            const calls: Array<{ type: string; value: any }> = [];
+            const abi = {
+                components: [
+                    {
+                        name: 'to',
+                        type: 'address',
+                    },
+                    {
+                        name: 'amount',
+                        type: 'uint256',
+                    },
+                ],
+                name: 'data',
+                type: 'tuple[2][]',
+            };
+            const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
+            const val = [
+                [{ to: ZERO_ADDRESS, amount: new BigNumber(1) }, { to: ZERO_ADDRESS, amount: new BigNumber(2) }],
+            ];
+            const formatted = formatABIDataItem(abi, val, (type: string, value: any) => {
+                calls.push({ type, value });
+                return value; // no-op
+            });
+            expect(formatted).to.be.deep.equal(val);
+            expect(calls).to.be.deep.equal([
+                {
+                    type: 'address',
+                    value: val[0][0].to,
+                },
+                {
+                    type: 'uint256',
+                    value: val[0][0].amount,
+                },
+                {
+                    type: 'address',
+                    value: val[0][1].to,
+                },
+                {
+                    type: 'uint256',
+                    value: val[0][1].amount,
+                },
+            ]);
+        });
+    });
+});

packages/base-contract/tsconfig.json

@@ -3,9 +3,5 @@
     "compilerOptions": {
         "outDir": "lib"
     },
-    "include": [
-        "./src/**/*",
-        "../../node_modules/web3-typescript-typings/index.d.ts",
-        "../../node_modules/ethers-typescript-typings/index.d.ts"
-    ]
+    "include": ["src/**/*", "test/**/*"]
 }

packages/chai-as-promised-typescript-typings/.npmignore

@@ -1,3 +0,0 @@
-.*
-yarn-error.log
-/scripts/

packages/chai-as-promised-typescript-typings/CHANGELOG.md

@@ -1,3 +0,0 @@
-# CHANGELOG
-
-## v0.x.x - _TBD, 2018_

packages/chai-as-promised-typescript-typings/README.md

@@ -1,43 +0,0 @@
-## chai-as-promised-typescript-typings
-
-Fork of type definitions for chai-as-promised that includes changes made by dirty-chai
-
-## Installation
-
-```bash
-yarn add -D chai-as-promised-typescript-typings
-```
-
-## Usage
-
-Add the following line within an `include` section of your `tsconfig.json`
-
-```json
-"./node_modules/chai-as-promised-typescript-typings/index.d.ts"
-```
-
-## Contributing
-
-We strongly encourage that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
-
-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
-```
-
-### Lint
-
-```bash
-yarn lint
-```

packages/chai-typescript-typings/CHANGELOG.md

@@ -1,3 +0,0 @@
-# CHANGELOG
-
-## v0.x.x - _TBD, 2018_

packages/chai-typescript-typings/README.md

@@ -1,43 +0,0 @@
-## chai-typescript-typings
-
-Fork of type definitions for chai that includes changes made by dirty-chai
-
-## Installation
-
-```bash
-yarn add -D chai-typescript-typings
-```
-
-## Usage
-
-Add the following line within an `include` section of your `tsconfig.json`
-
-```json
-"./node_modules/chai-typescript-typings/index.d.ts"
-```
-
-## Contributing
-
-We strongly encourage that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
-
-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
-```
-
-### Lint
-
-```bash
-yarn lint
-```

packages/chai-typescript-typings/monorepo_scripts/globals.d.ts

@@ -1,6 +0,0 @@
-declare module '*.json' {
-    const json: any;
-    /* tslint:disable */
-    export default json;
-    /* tslint:enable */
-}

packages/chai-typescript-typings/package.json

@@ -1,28 +0,0 @@
-{
-    "name": "chai-typescript-typings",
-    "version": "0.0.5",
-    "description": "Typescript type definitions for chai",
-    "main": "index.d.ts",
-    "types": "index.d.ts",
-    "scripts": {
-        "build": "tsc && copyfiles -u 1 './lib/**/*' ./scripts",
-        "clean": "shx rm -rf scripts"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/0xProject/0x-monorepo.git"
-    },
-    "license": "Apache-2.0",
-    "bugs": {
-        "url": "https://github.com/0xProject/0x-monorepo/issues"
-    },
-    "homepage": "https://github.com/0xProject/0x-monorepo/packages/chai-typescript-typings#readme",
-    "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.13",
-        "copyfiles": "^1.2.0",
-        "shx": "^0.2.2"
-    },
-    "publishConfig": {
-        "access": "public"
-    }
-}

packages/chai-typescript-typings/tsconfig.json

@@ -1,7 +0,0 @@
-{
-    "extends": "../../tsconfig",
-    "compilerOptions": {
-        "outDir": "lib"
-    },
-    "include": ["./monorepo_scripts/**/*"]
-}

packages/chai-typescript-typings/tslint.json

@@ -1,3 +0,0 @@
-{
-    "extends": ["tslint-config-0xproject"]
-}

packages/connect/.npmignore

@@ -5,3 +5,4 @@ yarn-error.log
 /generated_docs/
 test/
 tsconfig.json
+/lib/src/monorepo_scripts/

packages/connect/CHANGELOG.json

@@ -0,0 +1,139 @@
+[
+    {
+        "timestamp": 1523462196,
+        "version": "0.6.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1522673609,
+        "version": "0.6.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1522658513,
+        "version": "0.6.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "0.6.4",
+        "changes": [
+            {
+                "note": "Consolidate `Order`, `SignedOrder`, and `ECSignature` into the `@0xproject/types` package",
+                "pr": 456
+            }
+        ],
+        "timestamp": 1521298800
+    },
+    {
+        "version": "0.6.2",
+        "changes": [
+            {
+                "note": "Fix JSON parse empty response",
+                "pr": 407
+            }
+        ],
+        "timestamp": 1518706800
+    },
+    {
+        "version": "0.6.0",
+        "changes": [
+            {
+                "note": "Add pagination options to HttpClient methods",
+                "pr": 393
+            },
+            {
+                "note": "Add heartbeat configuration to WebSocketOrderbookChannel constructor",
+                "pr": 406
+            }
+        ],
+        "timestamp": 1518706800
+    },
+    {
+        "version": "0.5.7",
+        "changes": [
+            {
+                "note": "Fix publishing issue where .npmignore was not properly excluding undesired content",
+                "pr": 389
+            }
+        ],
+        "timestamp": 1518102000
+    },
+    {
+        "version": "0.5.0",
+        "changes": [
+            {
+                "note": "Sanitize api endpoint url and remove trailing slashes",
+                "pr": 318
+            },
+            {
+                "note": "Improve error message text in HttpClient",
+                "pr": 318
+            },
+            {
+                "note": "Stop appending '/v0' to api endpoint url in HttpClient",
+                "pr": 318
+            }
+        ],
+        "timestamp": 1516114800
+    },
+    {
+        "version": "0.4.0",
+        "changes": [
+            {
+                "note": "Prevent getFeesAsync method on HttpClient from mutating input",
+                "pr": 296
+            }
+        ],
+        "timestamp": 1515596400
+    },
+    {
+        "version": "0.3.0",
+        "changes": [
+            {
+                "note": "Expose WebSocketOrderbookChannel and associated types to public interface",
+                "pr": 251
+            },
+            {
+                "note": "Remove tokenA and tokenB fields from OrdersRequest",
+                "pr": 256
+            }
+        ],
+        "timestamp": 1512658800
+    },
+    {
+        "version": "0.2.0",
+        "changes": [
+            {
+                "note": "Add SignedOrder and TokenTradeInfo to the public interface"
+            },
+            {
+                "note": "Add ECSignature and Order to the public interface"
+            },
+            {
+                "note": "Remove dependency on 0x.js"
+            }
+        ],
+        "timestamp": 1511881200
+    },
+    {
+        "version": "0.1.0",
+        "changes": [
+            {
+                "note": "Provide a HttpClient class for interacting with standard relayer api compliant HTTP urls"
+            }
+        ],
+        "timestamp": 1511276400
+    }
+]

packages/connect/CHANGELOG.md

@@ -1,43 +1,60 @@
-# CHANGELOG
+<!--
+This file is auto-generated using the monorepo-scripts package. Don't edit directly.
+Edit the package's CHANGELOG.json file only.
+-->
 
-## v0.6.4 - _March 18, 2018_
+CHANGELOG
+
+## v0.6.9 - _April 11, 2018_
+
+    * Dependencies updated
+
+## v0.6.8 - _April 2, 2018_
+
+    * Dependencies updated
+
+## v0.6.7 - _April 2, 2018_
+
+    * Dependencies updated
+
+## v0.6.4 - _March 17, 2018_
 
     * Consolidate `Order`, `SignedOrder`, and `ECSignature` into the `@0xproject/types` package (#456)
 
-## v0.6.2 - _February 16, 2018_
+## v0.6.2 - _February 15, 2018_
 
     * Fix JSON parse empty response (#407)
 
-## v0.6.0 - _February 16, 2018_
+## v0.6.0 - _February 15, 2018_
 
     * Add pagination options to HttpClient methods (#393)
     * Add heartbeat configuration to WebSocketOrderbookChannel constructor (#406)
 
-## v0.5.7 - _February 9, 2018_
+## v0.5.7 - _February 8, 2018_
 
     * Fix publishing issue where .npmignore was not properly excluding undesired content (#389)
 
-## v0.5.0 - _January 17, 2018_
+## v0.5.0 - _January 16, 2018_
 
     * Sanitize api endpoint url and remove trailing slashes (#318)
     * Improve error message text in HttpClient (#318)
     * Stop appending '/v0' to api endpoint url in HttpClient (#318)
 
-## v0.4.0 - _January 11, 2018_
+## v0.4.0 - _January 10, 2018_
 
     * Prevent getFeesAsync method on HttpClient from mutating input (#296)
 
-## v0.3.0 - _December 8, 2017_
+## v0.3.0 - _December 7, 2017_
 
     * Expose WebSocketOrderbookChannel and associated types to public interface (#251)
     * Remove tokenA and tokenB fields from OrdersRequest (#256)
 
-## v0.2.0 - _November 29, 2017_
+## v0.2.0 - _November 28, 2017_
 
     * Add SignedOrder and TokenTradeInfo to the public interface
     * Add ECSignature and Order to the public interface
     * Remove dependency on 0x.js
 
-## v0.1.0 - _November 22, 2017_
+## v0.1.0 - _November 21, 2017_
 
     * Provide a HttpClient class for interacting with standard relayer api compliant HTTP urls

packages/connect/README.md

@@ -10,10 +10,10 @@ yarn add @0xproject/connect
 
 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",
-]
+```json
+"compilerOptions": {
+    "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+}
 ```
 
 ## Usage
@@ -23,11 +23,11 @@ If your project is in [TypeScript](https://www.typescriptlang.org/), add the fol
 
 ## Contributing
 
-We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+We welcome improvements and fixes from the wider community! To report bugs within this package, please create an issue in this repository.
 
 Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
 
-### Install Dependencies
+### Install dependencies
 
 If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
 
@@ -43,10 +43,36 @@ yarn install
 
 ### Build
 
+If this is your **first** time building this package, you must first build **all** packages within the monorepo. This is because packages that depend on other packages located inside this monorepo are symlinked when run from **within** the monorepo. This allows you to make changes across multiple packages without first publishing dependent packages to NPM. To build all packages, run the following from the monorepo root directory:
+
+```bash
+yarn lerna:rebuild
+```
+
+Or continuously rebuild on change:
+
+```bash
+yarn dev
+```
+
+You can also build this specific package by running the following from within its directory:
+
 ```bash
 yarn build
 ```
 
+or continuously rebuild on change:
+
+```bash
+yarn build:watch
+```
+
+### Clean
+
+```bash
+yarn clean
+```
+
 ### Lint
 
 ```bash

packages/connect/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/connect",
-    "version": "0.6.4",
+    "version": "0.6.8",
     "description": "A javascript library for interacting with the standard relayer api",
     "keywords": [
         "connect",
@@ -14,26 +14,25 @@
     "scripts": {
         "build:watch": "tsc -w",
         "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
-        "clean": "shx rm -rf _bundles lib test_temp scripts",
-        "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",
+        "clean": "shx rm -rf lib test_temp scripts",
         "copy_test_fixtures": "copyfiles -u 2 './test/fixtures/**/*.json' ./lib/test/fixtures",
         "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
         "run_mocha": "mocha lib/test/**/*_test.js",
         "test": "run-s clean build copy_test_fixtures run_mocha",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
         "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
-        "test:circleci": "yarn test:coverage"
+        "test:circleci": "yarn test:coverage",
+        "manual:postpublish": "yarn build; node ./scripts/postpublish.js",
+        "docs:stage": "yarn build && node ./scripts/stage_docs.js",
+        "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES",
+        "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json"
     },
     "config": {
         "postpublish": {
-            "assets": [
-                "packages/connect/_bundles/index.js",
-                "packages/connect/_bundles/index.min.js"
-            ],
+            "assets": [],
             "docPublishConfigs": {
-                "s3BucketPath": "s3://connect-docs-jsons/",
-                "s3StagingBucketPath": "s3://staging-connect-docs-jsons/"
+                "s3BucketPath": "s3://doc-jsons/connect/",
+                "s3StagingBucketPath": "s3://staging-doc-jsons/connect/"
             }
         }
     },
@@ -51,28 +50,27 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md",
     "dependencies": {
-        "@0xproject/assert": "^0.2.1",
-        "@0xproject/json-schemas": "^0.7.15",
-        "@0xproject/types": "^0.4.0",
-        "@0xproject/utils": "^0.4.2",
+        "@0xproject/assert": "^0.2.5",
+        "@0xproject/json-schemas": "^0.7.19",
+        "@0xproject/types": "^0.5.0",
+        "@0xproject/typescript-typings": "^0.0.3",
+        "@0xproject/utils": "^0.5.0",
         "isomorphic-fetch": "^2.2.1",
         "lodash": "^4.17.4",
         "query-string": "^5.0.1",
         "websocket": "^1.0.25"
     },
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^0.1.13",
-        "@0xproject/tslint-config": "^0.4.11",
+        "@0xproject/monorepo-scripts": "^0.1.16",
+        "@0xproject/tslint-config": "^0.4.14",
         "@types/fetch-mock": "^5.12.1",
-        "@types/lodash": "^4.14.86",
+        "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/query-string": "^5.0.1",
         "@types/websocket": "^0.0.34",
         "async-child-process": "^1.1.1",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
-        "chai-as-promised-typescript-typings": "^0.0.11",
-        "chai-typescript-typings": "^0.0.5",
         "copyfiles": "^1.2.0",
         "dirty-chai": "^2.0.1",
         "fetch-mock": "^5.13.1",
@@ -82,8 +80,7 @@
         "shx": "^0.2.2",
         "tslint": "5.8.0",
         "typedoc": "~0.8.0",
-        "typescript": "2.7.1",
-        "web3-typescript-typings": "^0.10.1"
+        "typescript": "2.7.1"
     },
     "publishConfig": {
         "access": "public"

packages/connect/src/globals.d.ts

@@ -1,6 +1,3 @@
-declare module 'async-child-process';
-declare module 'dirty-chai';
-
 declare module '*.json' {
     const value: any;
     export default value;

packages/connect/tsconfig.json

@@ -3,11 +3,5 @@
     "compilerOptions": {
         "outDir": "lib"
     },
-    "include": [
-        "./src/**/*",
-        "./test/**/*",
-        "../../node_modules/web3-typescript-typings/index.d.ts",
-        "../../node_modules/chai-as-promised-typescript-typings/index.d.ts",
-        "../../node_modules/chai-typescript-typings/index.d.ts"
-    ]
+    "include": ["./src/**/*", "./test/**/*"]
 }

packages/contract_templates/contract.handlebars

@@ -5,12 +5,11 @@
 // tslint:disable:no-consecutive-blank-lines
 // tslint:disable-next-line:no-unused-variable
 import { BaseContract } from '@0xproject/base-contract';
-import { TxData, TxDataPayable } from '@0xproject/types';
+import { BlockParam, BlockParamLiteral, CallData, ContractAbi, DataItem, MethodAbi, Provider, TxData, TxDataPayable } from '@0xproject/types';
 import { BigNumber, classUtils, promisify } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as ethersContracts from 'ethers-contracts';
 import * as _ from 'lodash';
-import * as Web3 from 'web3';
 
 {{#if events}}
 export type {{contractName}}ContractEventArgs =
@@ -40,8 +39,8 @@ export class {{contractName}}Contract extends BaseContract {
     {{> tx contractName=../contractName}}
     {{/this.constant}}
 {{/each}}
-    constructor(web3Wrapper: Web3Wrapper, abi: Web3.ContractAbi, address: string) {
-        super(web3Wrapper, abi, address);
-        classUtils.bindAll(this, ['_ethersInterface', 'address', 'abi', '_web3Wrapper']);
+    constructor(abi: ContractAbi, address: string, provider: Provider, defaults?: Partial<TxData>) {
+        super(abi, address, provider, defaults);
+        classUtils.bindAll(this, ['_ethersInterfacesByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
     }
 } // tslint:disable:max-file-line-count

packages/contract_templates/partials/callAsync.handlebars

@@ -1,30 +1,26 @@
 {{#hasReturnValue}}
 async callAsync(
 {{> typed_params inputs=inputs}}
-{{#this.payable}}
-    txData: TxDataPayable = {},
-{{/this.payable}}
-{{^this.payable}}
-    txData: TxData = {},
-{{/this.payable}}
-    defaultBlock?: Web3.BlockParam,
+    callData: Partial<CallData> = {},
+    defaultBlock?: BlockParam,
 ): Promise<{{> return_type outputs=outputs}}> {
-    const self = this as {{contractName}}Contract;
-    const inputAbi = _.find(this.abi, {name: '{{this.name}}'}).inputs;
-    [{{> params inputs=inputs}}] = BaseContract._transformABIData(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(this));
-    const encodedData = self._ethersInterface.functions.{{this.name}}(
+    const self = this as any as {{contractName}}Contract;
+    const inputAbi = self._lookupAbi('{{this.functionSignature}}').inputs;
+    [{{> params inputs=inputs}}] = BaseContract._formatABIDataItemList(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(self));
+    const encodedData = self._lookupEthersInterface('{{this.functionSignature}}').functions.{{this.name}}(
         {{> params inputs=inputs}}
     ).data;
-    const callData = await self._applyDefaultsToTxDataAsync(
+    const callDataWithDefaults = await self._applyDefaultsToTxDataAsync(
         {
             data: encodedData,
         }
     )
-    const rawCallResult = await self._web3Wrapper.callAsync(callData, defaultBlock);
-    const outputAbi = _.find(this.abi, {name: '{{this.name}}'}).outputs as Web3.DataItem[];
+    const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
+    const outputAbi = (_.find(self.abi, {name: '{{this.name}}'}) as MethodAbi).outputs;
     const outputParamsTypes = _.map(outputAbi, 'type');
     let resultArray = ethersContracts.Interface.decodeParams(outputParamsTypes, rawCallResult) as any;
-    resultArray = BaseContract._transformABIData(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+    resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+    resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this));
     return resultArray{{#singleReturnValue}}[0]{{/singleReturnValue}};
 },
 {{/hasReturnValue}}

packages/contract_templates/partials/tx.handlebars

@@ -1,61 +1,60 @@
-public {{this.name}} = {
+public {{this.tsName}} = {
     async sendTransactionAsync(
     {{> typed_params inputs=inputs}}
     {{#this.payable}}
-        txData: TxDataPayable = {},
+        txData: Partial<TxDataPayable> = {},
     {{/this.payable}}
     {{^this.payable}}
-        txData: TxData = {},
+        txData: Partial<TxData> = {},
     {{/this.payable}}
     ): Promise<string> {
-        const self = this as {{contractName}}Contract;
-        const inputAbi = _.find(this.abi, {name: '{{this.name}}'}).inputs;
-        [{{> params inputs=inputs}}] = BaseContract._transformABIData(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(this));
-        const encodedData = this._ethersInterface.functions.{{this.name}}(
+        const self = this as any as {{contractName}}Contract;
+        const inputAbi = self._lookupAbi('{{this.functionSignature}}').inputs;
+        [{{> params inputs=inputs}}] = BaseContract._formatABIDataItemList(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(self));
+        const encodedData = self._lookupEthersInterface('{{this.functionSignature}}').functions.{{this.name}}(
             {{> params inputs=inputs}}
-        ).data
+        ).data;
         const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
             {
                 ...txData,
                 data: encodedData,
             },
-            self.{{this.name}}.estimateGasAsync.bind(
+            self.{{this.tsName}}.estimateGasAsync.bind(
                 self,
                 {{> params inputs=inputs}}
             ),
         );
-        const txHash = await this._web3Wrapper.sendTransactionAsync(txDataWithDefaults);
+        const txHash = await self._web3Wrapper.sendTransactionAsync(txDataWithDefaults);
         return txHash;
     },
     async estimateGasAsync(
     {{> typed_params inputs=inputs}}
-        txData: TxData = {},
+        txData: Partial<TxData> = {},
     ): Promise<number> {
-        const self = this as {{contractName}}Contract;
-        const inputAbi = _.find(this.abi, {name: '{{this.name}}'}).inputs;
-        [{{> params inputs=inputs}}] = BaseContract._transformABIData(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(this));
-        const encodedData = this._ethersInterface.functions.{{this.name}}(
+        const self = this as any as {{contractName}}Contract;
+        const inputAbi = self._lookupAbi('{{this.functionSignature}}').inputs;
+        [{{> params inputs=inputs}}] = BaseContract._formatABIDataItemList(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(this));
+        const encodedData = self._lookupEthersInterface('{{this.functionSignature}}').functions.{{this.name}}(
             {{> params inputs=inputs}}
-        ).data
+        ).data;
         const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
             {
                 ...txData,
                 data: encodedData,
             }
         );
-        const gas = await this._web3Wrapper.estimateGasAsync(txDataWithDefaults);
+        const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
         return gas;
     },
     getABIEncodedTransactionData(
     {{> typed_params inputs=inputs}}
-        txData: TxData = {},
     ): string {
-        const self = this as {{contractName}}Contract;
-        const inputAbi = _.find(this.abi, {name: '{{this.name}}'}).inputs;
-        [{{> params inputs=inputs}}] = BaseContract._transformABIData(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(this));
-        const abiEncodedTransactionData = this._ethersInterface.functions.{{this.name}}(
+        const self = this as any as {{contractName}}Contract;
+        const inputAbi = self._lookupAbi('{{this.functionSignature}}').inputs;
+        [{{> params inputs=inputs}}] = BaseContract._formatABIDataItemList(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(self));
+        const abiEncodedTransactionData = self._lookupEthersInterface('{{this.name}}').functions.{{this.name}}(
             {{> params inputs=inputs}}
-        ).data
+        ).data;
         return abiEncodedTransactionData;
     },
     {{> callAsync}}

packages/contracts/README.md

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

packages/contracts/globals.d.ts

@@ -1,35 +1,6 @@
-declare module 'chai-bignumber';
-declare module 'dirty-chai';
-
-// 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
-// disallow `namespace`, we disable tslint for the following.
-/* tslint:disable */
-declare namespace Chai {
-    interface Assertion {
-        bignumber: Assertion;
-    }
-}
-/* tslint:enable */
-
 declare module '*.json' {
     const json: any;
     /* tslint:disable */
     export default json;
     /* tslint:enable */
 }
-
-declare module 'solc' {
-    export function compile(sources: any, optimizerEnabled: number, findImports: (importPath: string) => any): any;
-    export function setupMethods(solcBin: any): any;
-}
-
-declare module 'web3-eth-abi' {
-    export function encodeParameters(typesArray: string[], parameters: any[]): string;
-}
-
-declare module 'ethereumjs-abi' {
-    const soliditySHA3: (argTypes: string[], args: any[]) => Buffer;
-    const soliditySHA256: (argTypes: string[], args: any[]) => Buffer;
-    const methodID: (name: string, types: string[]) => Buffer;
-}

packages/contracts/globalsAugment.d.ts

@@ -1,19 +0,0 @@
-import { BigNumber } from '@0xproject/utils';
-
-// HACK: This module overrides the Chai namespace so that we can use BigNumber types inside.
-// Source: https://github.com/Microsoft/TypeScript/issues/7352#issuecomment-191547232
-declare global {
-    // 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
-    // disallow `namespace`, we disable tslint for the following.
-    /* tslint:disable */
-    namespace Chai {
-        interface NumberComparer {
-            (value: number | BigNumber, message?: string): Assertion;
-        }
-        interface NumericComparison {
-            greaterThan: NumberComparer;
-        }
-    }
-    /* tslint:enable */
-}

packages/contracts/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "contracts",
-    "version": "2.1.16",
+    "version": "2.1.21",
     "description": "Smart contract components of 0x protocol",
     "main": "index.js",
     "directories": {
@@ -16,9 +16,9 @@
         "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
         "run_mocha": "mocha 'lib/test/**/*.js' --timeout 100000 --bail --exit",
         "compile:comment": "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846",
-        "compile": "node ../deployer/lib/src/cli.js compile --contracts ${npm_package_config_contracts} --contracts-dir src/contracts --artifacts-dir src/artifacts",
+        "compile": "node ../deployer/lib/src/cli.js compile --contracts ${npm_package_config_contracts} --contract-dirs src/contracts --artifacts-dir src/artifacts",
         "clean": "shx rm -rf ./lib",
-        "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis 'src/artifacts/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|Arbitrage|EtherDelta|AccountLevels).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'",
+        "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis  ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'",
         "migrate": "yarn build && yarn compile && node ./lib/migrations/index.js",
         "lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'",
         "coverage:report:text": "istanbul report text",
@@ -27,6 +27,7 @@
         "test:circleci": "yarn test:coverage"
     },
     "config": {
+        "abis": "src/artifacts/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|Arbitrage|EtherDelta|AccountLevels).json",
         "contracts": "Exchange,DummyToken,ZRXToken,Token,WETH9,TokenTransferProxy,MultiSigWallet,MultiSigWalletWithTimeLock,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,MaliciousToken,TokenRegistry,Arbitrage,EtherDelta,AccountLevels"
     },
     "repository": {
@@ -40,48 +41,37 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts/README.md",
     "devDependencies": {
-        "@0xproject/dev-utils": "^0.3.0",
-        "@0xproject/tslint-config": "^0.4.11",
-        "@types/bluebird": "^3.5.3",
-        "@types/lodash": "^4.14.86",
+        "@0xproject/dev-utils": "^0.3.4",
+        "@0xproject/tslint-config": "^0.4.14",
+        "@types/lodash": "4.14.104",
         "@types/node": "^8.0.53",
-        "@types/request-promise-native": "^1.0.2",
         "@types/yargs": "^10.0.0",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
-        "chai-as-promised-typescript-typings": "^0.0.11",
         "chai-bignumber": "^2.0.1",
-        "chai-typescript-typings": "^0.0.5",
         "copyfiles": "^1.2.0",
         "dirty-chai": "^2.0.1",
-        "ethers-typescript-typings": "^0.0.3",
         "mocha": "^4.0.1",
         "npm-run-all": "^4.1.2",
+        "prettier": "^1.11.1",
         "shx": "^0.2.2",
         "solc": "^0.4.18",
         "tslint": "5.8.0",
-        "types-bn": "^0.0.1",
-        "types-ethereumjs-util": "0xProject/types-ethereumjs-util",
         "typescript": "2.7.1",
-        "web3-typescript-typings": "^0.10.1",
         "yargs": "^10.0.3"
     },
     "dependencies": {
-        "0x.js": "^0.33.2",
-        "@0xproject/deployer": "^0.3.0",
-        "@0xproject/json-schemas": "^0.7.15",
-        "@0xproject/types": "^0.4.0",
-        "@0xproject/utils": "^0.4.2",
-        "@0xproject/web3-wrapper": "^0.3.0",
-        "bluebird": "^3.5.0",
+        "0x.js": "^0.35.0",
+        "@0xproject/deployer": "^0.3.5",
+        "@0xproject/types": "^0.5.0",
+        "@0xproject/typescript-typings": "^0.0.3",
+        "@0xproject/utils": "^0.5.0",
+        "@0xproject/web3-wrapper": "^0.5.0",
         "bn.js": "^4.11.8",
         "ethereumjs-abi": "^0.6.4",
         "ethereumjs-util": "^5.1.1",
         "ethers-contracts": "^2.2.1",
-        "isomorphic-fetch": "^2.2.1",
         "lodash": "^4.17.4",
-        "request": "^2.81.0",
-        "web3": "^0.20.0",
-        "web3-eth-abi": "^1.0.0-beta.24"
+        "web3": "^0.20.0"
     }
 }

packages/contracts/src/contract_wrappers/generated/.gitignore

@@ -1 +0,0 @@
-*

packages/contracts/test/ether_token.ts

@@ -9,7 +9,7 @@ import { ContractName } from '../util/types';
 
 import { chaiSetup } from './utils/chai_setup';
 import { deployer } from './utils/deployer';
-import { web3, web3Wrapper } from './utils/web3_wrapper';
+import { provider, web3Wrapper } from './utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -26,7 +26,7 @@ describe('EtherToken', () => {
 
         const etherToken = await deployer.deployAsync(ContractName.EtherToken);
         etherTokenAddress = etherToken.address;
-        zeroEx = new ZeroEx(web3.currentProvider, {
+        zeroEx = new ZeroEx(provider, {
             gasPrice,
             networkId: constants.TESTRPC_NETWORK_ID,
         });
@@ -51,7 +51,7 @@ describe('EtherToken', () => {
             const initEthBalance = await web3Wrapper.getBalanceInWeiAsync(account);
             const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
 
-            const ethToDeposit = new BigNumber(web3.toWei(1, 'ether'));
+            const ethToDeposit = new BigNumber(Web3Wrapper.toWei(new BigNumber(1)));
 
             const txHash = await zeroEx.etherToken.depositAsync(etherTokenAddress, ethToDeposit, account);
             const receipt = await zeroEx.awaitTransactionMinedAsync(txHash);
@@ -76,7 +76,7 @@ describe('EtherToken', () => {
         });
 
         it('should convert ether tokens to ether with sufficient balance', async () => {
-            const ethToDeposit = new BigNumber(web3.toWei(1, 'ether'));
+            const ethToDeposit = new BigNumber(Web3Wrapper.toWei(new BigNumber(1)));
             await zeroEx.etherToken.depositAsync(etherTokenAddress, ethToDeposit, account);
             const initEthTokenBalance = await zeroEx.token.getBalanceAsync(etherTokenAddress, account);
             const initEthBalance = await web3Wrapper.getBalanceInWeiAsync(account);

packages/contracts/test/exchange/core.ts

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

packages/contracts/test/exchange/helpers.ts

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

packages/contracts/test/exchange/wrapper.ts

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

packages/contracts/test/multi_sig_with_time_lock.ts

@@ -15,13 +15,13 @@ import { ContractName, SubmissionContractEventArgs } from '../util/types';
 
 import { chaiSetup } from './utils/chai_setup';
 import { deployer } from './utils/deployer';
-import { web3, web3Wrapper } from './utils/web3_wrapper';
+import { provider, web3Wrapper } from './utils/web3_wrapper';
 
 const MULTI_SIG_ABI = artifacts.MultiSigWalletWithTimeLockArtifact.networks[constants.TESTRPC_NETWORK_ID].abi;
 chaiSetup.configure();
 const expect = chai.expect;
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
-const zeroEx = new ZeroEx(web3.currentProvider, { networkId: constants.TESTRPC_NETWORK_ID });
+const zeroEx = new ZeroEx(provider, { networkId: constants.TESTRPC_NETWORK_ID });
 const abiDecoder = new AbiDecoder([MULTI_SIG_ABI]);
 
 describe('MultiSigWalletWithTimeLock', () => {
@@ -53,9 +53,9 @@ describe('MultiSigWalletWithTimeLock', () => {
                     0,
                 ]);
                 multiSig = new MultiSigWalletWithTimeLockContract(
-                    web3Wrapper,
                     multiSigInstance.abi,
                     multiSigInstance.address,
+                    provider,
                 );
                 multiSigWrapper = new MultiSigWrapper((multiSig as any) as MultiSigWalletContract);
 
@@ -150,9 +150,9 @@ describe('MultiSigWalletWithTimeLock', () => {
                     SECONDS_TIME_LOCKED,
                 ]);
                 multiSig = new MultiSigWalletWithTimeLockContract(
-                    web3Wrapper,
                     multiSigInstance.abi,
                     multiSigInstance.address,
+                    provider,
                 );
                 multiSigWrapper = new MultiSigWrapper((multiSig as any) as MultiSigWalletContract);
 

packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts

@@ -16,7 +16,7 @@ import { ContractName, SubmissionContractEventArgs, TransactionDataParams } from
 
 import { chaiSetup } from './utils/chai_setup';
 import { deployer } from './utils/deployer';
-import { web3, web3Wrapper } from './utils/web3_wrapper';
+import { provider, web3Wrapper } from './utils/web3_wrapper';
 const PROXY_ABI = artifacts.TokenTransferProxyArtifact.networks[constants.TESTRPC_NETWORK_ID].abi;
 const MUTISIG_WALLET_WITH_TIME_LOCK_EXCEPT_REMOVE_AUTHORIZED_ADDRESS_ABI =
     artifacts.MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressArtifact.networks[constants.TESTRPC_NETWORK_ID]
@@ -28,7 +28,7 @@ const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
 const abiDecoder = new AbiDecoder([MUTISIG_WALLET_WITH_TIME_LOCK_EXCEPT_REMOVE_AUTHORIZED_ADDRESS_ABI]);
 
 describe('MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress', () => {
-    const zeroEx = new ZeroEx(web3.currentProvider, { networkId: constants.TESTRPC_NETWORK_ID });
+    const zeroEx = new ZeroEx(provider, { networkId: constants.TESTRPC_NETWORK_ID });
     let owners: string[];
     const requiredApprovals = 2;
     const SECONDS_TIME_LOCKED = 1000000;
@@ -49,9 +49,9 @@ describe('MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress', () => {
         const initialOwner = accounts[0];
         const tokenTransferProxyInstance = await deployer.deployAsync(ContractName.TokenTransferProxy);
         tokenTransferProxy = new TokenTransferProxyContract(
-            web3Wrapper,
             tokenTransferProxyInstance.abi,
             tokenTransferProxyInstance.address,
+            provider,
         );
         await tokenTransferProxy.addAuthorizedAddress.sendTransactionAsync(authorizedAddress, {
             from: initialOwner,
@@ -61,9 +61,9 @@ describe('MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress', () => {
             [owners, requiredApprovals, SECONDS_TIME_LOCKED, tokenTransferProxy.address],
         );
         multiSig = new MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressContract(
-            web3Wrapper,
             multiSigInstance.abi,
             multiSigInstance.address,
+            provider,
         );
         await tokenTransferProxy.transferOwnership.sendTransactionAsync(multiSig.address, {
             from: initialOwner,

packages/contracts/test/token_registry.ts

@@ -14,7 +14,7 @@ import { ContractName } from '../util/types';
 
 import { chaiSetup } from './utils/chai_setup';
 import { deployer } from './utils/deployer';
-import { web3, web3Wrapper } from './utils/web3_wrapper';
+import { provider, web3Wrapper } from './utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -30,7 +30,7 @@ describe('TokenRegistry', () => {
         owner = accounts[0];
         notOwner = accounts[1];
         const tokenRegInstance = await deployer.deployAsync(ContractName.TokenRegistry);
-        tokenReg = new TokenRegistryContract(web3Wrapper, tokenRegInstance.abi, tokenRegInstance.address);
+        tokenReg = new TokenRegistryContract(tokenRegInstance.abi, tokenRegInstance.address, provider);
         tokenRegWrapper = new TokenRegWrapper(tokenReg);
     });
     beforeEach(async () => {

packages/contracts/test/token_transfer_proxy/auth.ts

@@ -8,7 +8,7 @@ import { constants } from '../../util/constants';
 import { ContractName } from '../../util/types';
 import { chaiSetup } from '../utils/chai_setup';
 import { deployer } from '../utils/deployer';
-import { web3, web3Wrapper } from '../utils/web3_wrapper';
+import { provider, web3Wrapper } from '../utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -25,9 +25,9 @@ describe('TokenTransferProxy', () => {
         notOwner = accounts[1];
         const tokenTransferProxyInstance = await deployer.deployAsync(ContractName.TokenTransferProxy);
         tokenTransferProxy = new TokenTransferProxyContract(
-            web3Wrapper,
             tokenTransferProxyInstance.abi,
             tokenTransferProxyInstance.address,
+            provider,
         );
     });
     beforeEach(async () => {

packages/contracts/test/token_transfer_proxy/transfer_from.ts

@@ -11,7 +11,7 @@ import { constants } from '../../util/constants';
 import { ContractName } from '../../util/types';
 import { chaiSetup } from '../utils/chai_setup';
 import { deployer } from '../utils/deployer';
-import { web3, web3Wrapper } from '../utils/web3_wrapper';
+import { provider, web3Wrapper } from '../utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -33,12 +33,12 @@ describe('TokenTransferProxy', () => {
         owner = notAuthorized = accounts[0];
         const tokenTransferProxyInstance = await deployer.deployAsync(ContractName.TokenTransferProxy);
         tokenTransferProxy = new TokenTransferProxyContract(
-            web3Wrapper,
             tokenTransferProxyInstance.abi,
             tokenTransferProxyInstance.address,
+            provider,
         );
         const repInstance = await deployer.deployAsync(ContractName.DummyToken, constants.DUMMY_TOKEN_ARGS);
-        rep = new DummyTokenContract(web3Wrapper, repInstance.abi, repInstance.address);
+        rep = new DummyTokenContract(repInstance.abi, repInstance.address, provider);
 
         dmyBalances = new Balances([rep], [accounts[0], accounts[1]]);
         await Promise.all([

packages/contracts/test/tutorials/arbitrage.ts

@@ -17,7 +17,7 @@ import { OrderFactory } from '../../util/order_factory';
 import { BalancesByOwner, ContractName, ExchangeContractErrs } from '../../util/types';
 import { chaiSetup } from '../utils/chai_setup';
 import { deployer } from '../utils/deployer';
-import { web3, web3Wrapper } from '../utils/web3_wrapper';
+import { provider, web3Wrapper } from '../utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -69,18 +69,18 @@ describe('Arbitrage', () => {
             edTakerFee,
             edFeeRebate,
         ]);
-        etherDelta = new EtherDeltaContract(web3Wrapper, etherDeltaInstance.abi, etherDeltaInstance.address);
+        etherDelta = new EtherDeltaContract(etherDeltaInstance.abi, etherDeltaInstance.address, provider);
         const tokenTransferProxy = await deployer.deployAsync(ContractName.TokenTransferProxy);
         const exchangeInstance = await deployer.deployAsync(ContractName.Exchange, [
             zrx.address,
             tokenTransferProxy.address,
         ]);
         await tokenTransferProxy.addAuthorizedAddress(exchangeInstance.address, { from: accounts[0] });
-        zeroEx = new ZeroEx(web3.currentProvider, {
+        zeroEx = new ZeroEx(provider, {
             exchangeContractAddress: exchangeInstance.address,
             networkId: constants.TESTRPC_NETWORK_ID,
         });
-        const exchange = new ExchangeContract(web3Wrapper, exchangeInstance.abi, exchangeInstance.address);
+        const exchange = new ExchangeContract(exchangeInstance.abi, exchangeInstance.address, provider);
         exWrapper = new ExchangeWrapper(exchange, zeroEx);
 
         makerTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(1), 18);
@@ -102,7 +102,7 @@ describe('Arbitrage', () => {
             etherDelta.address,
             tokenTransferProxy.address,
         ]);
-        arbitrage = new ArbitrageContract(web3Wrapper, arbitrageInstance.abi, arbitrageInstance.address);
+        arbitrage = new ArbitrageContract(arbitrageInstance.abi, arbitrageInstance.address, provider);
         // Enable arbitrage and withdrawals of tokens
         await arbitrage.setAllowances.sendTransactionAsync(weth.address, { from: coinbase });
         await arbitrage.setAllowances.sendTransactionAsync(zrx.address, { from: coinbase });

packages/contracts/test/unlimited_allowance_token.ts

@@ -11,7 +11,7 @@ import { ContractName } from '../util/types';
 
 import { chaiSetup } from './utils/chai_setup';
 import { deployer } from './utils/deployer';
-import { web3, web3Wrapper } from './utils/web3_wrapper';
+import { provider, web3Wrapper } from './utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -23,7 +23,7 @@ describe('UnlimitedAllowanceToken', () => {
     const config = {
         networkId: constants.TESTRPC_NETWORK_ID,
     };
-    const zeroEx = new ZeroEx(web3.currentProvider, config);
+    const zeroEx = new ZeroEx(provider, config);
 
     const MAX_MINT_VALUE = new BigNumber(100000000000000000000);
     let tokenAddress: string;
@@ -34,7 +34,7 @@ describe('UnlimitedAllowanceToken', () => {
         owner = accounts[0];
         spender = accounts[1];
         const tokenInstance = await deployer.deployAsync(ContractName.DummyToken, constants.DUMMY_TOKEN_ARGS);
-        token = new DummyTokenContract(web3Wrapper, tokenInstance.abi, tokenInstance.address);
+        token = new DummyTokenContract(tokenInstance.abi, tokenInstance.address, provider);
         await token.mint.sendTransactionAsync(MAX_MINT_VALUE, { from: owner });
         tokenAddress = token.address;
     });

packages/contracts/test/utils/deployer.ts

@@ -7,9 +7,8 @@ import { constants } from '../../util/constants';
 import { web3 } from './web3_wrapper';
 
 const deployerOpts = {
-    web3Provider: web3.currentProvider,
+    provider: web3.currentProvider,
     artifactsDir: path.resolve('src', 'artifacts'),
-    jsonrpcUrl: devConstants.RPC_URL,
     networkId: constants.TESTRPC_NETWORK_ID,
     defaults: {
         gas: devConstants.GAS_ESTIMATE,

packages/contracts/test/utils/web3_wrapper.ts

@@ -3,4 +3,5 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper';
 
 const web3ProviderConfig = { shouldUseInProcessGanache: true };
 export const web3 = web3Factory.create(web3ProviderConfig);
-export const web3Wrapper = new Web3Wrapper(web3.currentProvider);
+export const provider = web3.currentProvider;
+export const web3Wrapper = new Web3Wrapper(provider);

packages/contracts/test/zrx_token.ts

@@ -11,7 +11,7 @@ import { ContractName } from '../util/types';
 
 import { chaiSetup } from './utils/chai_setup';
 import { deployer } from './utils/deployer';
-import { web3, web3Wrapper } from './utils/web3_wrapper';
+import { provider, web3Wrapper } from './utils/web3_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -31,11 +31,11 @@ describe('ZRXToken', () => {
         const accounts = await web3Wrapper.getAvailableAddressesAsync();
         owner = accounts[0];
         spender = accounts[1];
-        zeroEx = new ZeroEx(web3.currentProvider, {
+        zeroEx = new ZeroEx(provider, {
             networkId: constants.TESTRPC_NETWORK_ID,
         });
         const zrxInstance = await deployer.deployAsync(ContractName.ZRXToken);
-        zrx = new ZRXTokenContract(web3Wrapper, zrxInstance.abi, zrxInstance.address);
+        zrx = new ZRXTokenContract(zrxInstance.abi, zrxInstance.address, provider);
         zrxAddress = zrx.address;
         MAX_UINT = zeroEx.token.UNLIMITED_ALLOWANCE_IN_BASE_UNITS;
     });

packages/contracts/tsconfig.json

@@ -4,22 +4,8 @@
         "outDir": "lib",
         "baseUrl": ".",
         "declaration": false,
-        "noImplicitThis": false,
         "allowJs": true
     },
-    "include": [
-        "../../node_modules/types-ethereumjs-util/index.d.ts",
-        "../../node_modules/chai-typescript-typings/index.d.ts",
-        "../../node_modules/web3-typescript-typings/index.d.ts",
-        "../../node_modules/ethers-typescript-typings/index.d.ts",
-        "../../node_modules/chai-as-promised-typescript-typings/index.d.ts",
-        "../../node_modules/types-ethereumjs-util/index.d.ts",
-        "../../node_modules/types-bn/index.d.ts",
-        "./globals.d.ts",
-        "./src/**/*",
-        "./util/**/*",
-        "./test/**/*",
-        "./migrations/**/*"
-    ],
+    "include": ["./globals.d.ts", "./src/**/*", "./util/**/*", "./test/**/*", "./migrations/**/*"],
     "exclude": ["./deploy/solc/solc_bin"]
 }