Publish

- @0x/contracts-asset-proxy@2.2.7
 - @0x/contracts-coordinator@2.0.12
 - @0x/contracts-dev-utils@0.0.9
 - @0x/contracts-erc1155@1.1.14
 - @0x/contracts-erc20@2.2.13
 - @0x/contracts-erc721@2.1.14
 - @0x/contracts-exchange-forwarder@3.0.11
 - @0x/contracts-exchange-libs@3.0.7
 - @0x/contracts-exchange@2.1.13
 - @0x/contracts-extensions@4.0.7
 - @0x/contracts-multisig@3.1.13
 - @0x/contracts-test-utils@3.1.15
 - @0x/contracts-utils@3.2.3
 - 0x.js@7.0.1
 - @0x/abi-gen-wrappers@5.3.1
 - @0x/abi-gen@4.2.0
 - @0x/assert@2.1.5
 - @0x/asset-buyer@6.1.13
 - @0x/asset-swapper@1.0.3
 - @0x/base-contract@5.3.3
 - @0x/connect@5.0.18
 - @0x/contract-artifacts@2.2.1
 - @0x/contract-wrappers@12.0.0
 - @0x/contracts-gen@1.0.14
 - @0x/dev-tools-pages@0.0.30
 - @0x/dev-utils@2.3.2
 - ethereum-types@2.1.5
 - @0x/fill-scenarios@3.0.18
 - @0x/instant@1.0.30
 - @0x/json-schemas@4.0.1
 - @0x/migrations@4.3.1
 - @0x/monorepo-scripts@1.0.36
 - @0x/order-utils@8.3.1
 - @0x/sol-compiler@3.1.14
 - @0x/sol-coverage@3.0.11
 - @0x/sol-doc@2.0.18
 - @0x/sol-profiler@3.1.13
 - @0x/sol-resolver@2.0.10
 - @0x/sol-trace@2.0.19
 - @0x/sol-tracing-utils@6.0.18
 - @0x/sra-spec@2.0.16
 - @0x/subproviders@5.0.3
 - @0x/testnet-faucets@1.0.86
 - @0x/types@2.4.2
 - @0x/typescript-typings@4.2.5
 - @0x/utils@4.5.1
 - @0x/web3-wrapper@6.0.12
 - @0x/website@0.0.89

.circleci/config.yml

@@ -23,7 +23,7 @@ jobs:
             #       command: npm set prefix=/home/circleci/npm && echo 'export PATH=$HOME/circleci/npm/bin:$PATH' >> /home/circleci/.bashrc
             - run:
                   name: install-yarn
-                  command: npm install --global yarn@1.9.4
+                  command: npm install --global yarn@1.17.0
             - run:
                   name: yarn
                   command: yarn --frozen-lockfile --ignore-engines install || yarn --frozen-lockfile --ignore-engines install
@@ -34,12 +34,6 @@ jobs:
                   key: repo-{{ .Environment.CIRCLE_SHA1 }}
                   paths:
                       - ~/repo
-            - save_cache:
-                  key: python-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/packages/python-contract-wrappers/generated
-            - store_artifacts:
-                  path: ~/repo/packages/python-contract-wrappers/generated
             - store_artifacts:
                   path: ~/repo/packages/abi-gen/test-cli/output
             - store_artifacts:
@@ -195,7 +189,8 @@ jobs:
             - restore_cache:
                   key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
             - restore_cache:
-                  key: python-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
+                  keys:
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
             - run:
                   command: |
                       cd python-packages
@@ -237,9 +232,7 @@ jobs:
                   paths:
                       - ~/repo/python-packages/sra_client/.coverage
             - store_artifacts:
-                  path: ~/repo/python-packages/contract_wrappers/src/zero_ex/contract_wrappers/erc20_token/__init__.py
-            - store_artifacts:
-                  path: ~/repo/python-packages/contract_wrappers/src/zero_ex/contract_wrappers/exchange/__init__.py
+                  path: ~/repo/python-packages/contract_wrappers/src/zero_ex/contract_wrappers/*/__init__.py
             - store_artifacts:
                   path: ~/repo/python-packages/contract_addresses/build
             - store_artifacts:
@@ -289,7 +282,8 @@ jobs:
             - restore_cache:
                   key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
             - restore_cache:
-                  key: python-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
+                  keys:
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
             - run:
                   command: |
                       python -m ensurepip
@@ -308,6 +302,7 @@ jobs:
             - run: yarn lerna run lint
             - run: yarn prettier:ci
             - run: yarn deps_versions:ci
+            - run: yarn diff_md_docs:ci
             - run: cd packages/0x.js && yarn build:umd:prod
             - run: yarn bundlewatch
     submit-coverage:

.gitignore

@@ -40,9 +40,12 @@ build/Release
 node_modules/
 jspm_packages/
 
-# Typescript v1 declaration files
+# TypeScript v1 declaration files
 typings/
 
+# NVM config
+.nvmrc
+
 # Optional npm cache directory
 .npm
 .npmrc
@@ -98,7 +101,6 @@ packages/sol-tracing-utils/test/fixtures/artifacts/
 python-packages/contract_artifacts/src/zero_ex/contract_artifacts/artifacts/
 
 # generated contract wrappers
-packages/abi-gen-wrappers/src/generated-wrappers/
 packages/python-contract-wrappers/generated/
 contracts/coordinator/generated-wrappers/
 contracts/exchange/generated-wrappers/
@@ -133,15 +135,9 @@ python-packages/contract_wrappers/src/zero_ex/contract_wrappers/order_validator/
 python-packages/contract_wrappers/src/zero_ex/contract_wrappers/weth9/__init__.py
 python-packages/contract_wrappers/src/zero_ex/contract_wrappers/zrx_token/__init__.py
 
-# cli test output
-packages/abi-gen/test-cli/output
-
 # solc-bin in sol-compiler
 packages/sol-compiler/solc_bin/
 
-# Monorepo scripts
-packages/*/scripts/
-
 # python stuff
 .eggs
 .mypy_cache
@@ -154,3 +150,9 @@ python-packages/*/.coverage
 
 # python keeps package-local copies of json schemas
 python-packages/json_schemas/src/zero_ex/json_schemas/schemas
+
+# Doc README copy
+packages/*/docs/README.md
+
+# Tool MDX files authoritatively live on S3
+packages/website/mdx/tools/*

.prettierignore

@@ -38,3 +38,5 @@ packages/sol-coverage/test/fixtures/artifacts
 packages/abi-gen/test-cli/fixtures/artifacts/AbiGenDummy.json
 packages/abi-gen/test-cli/fixtures/artifacts/LibDummy.json
 packages/abi-gen/test-cli/fixtures/artifacts/TestLibDummy.json
+packages/*/docs
+packages/website/mdx/tools

CONTRIBUTING.md

@@ -55,7 +55,7 @@ If an entry without a `timestamp` already exists, this means other changes have
 
 ### Development Tooling
 
-We strongly recommend you use the [VSCode](https://code.visualstudio.com/) text editor since most of our code is written in Typescript and it offers amazing support for the language.
+We strongly recommend you use the [VSCode](https://code.visualstudio.com/) text editor since most of our code is written in TypeScript and it offers amazing support for the language.
 
 #### Linter
 
@@ -89,7 +89,7 @@ A few of our coding conventions are not yet enforced by the linter/auto-formatte
 1.  Do not import from a project's `index.ts` (e.g import { Token } from '../src';). Always import from the source file itself.
 1.  Generic error variables should be named `err` instead of `e` or `error`.
 1.  If you _must_ cast a variable to any - try to type it back as fast as possible. (e.g., `const cw = ((zeroEx as any)._contractWrappers as ContractWrappers);`). This ensures subsequent code is type-safe.
-1.  Our enum conventions coincide with the recommended Typescript conventions, using capitalized keys, and all-caps snake-case values. Eg `GetStats = 'GET_STATS'`
+1.  Our enum conventions coincide with the recommended TypeScript conventions, using capitalized keys, and all-caps snake-case values. Eg `GetStats = 'GET_STATS'`
 1.  All public, exported methods/functions/classes must have associated Javadoc-style comments.
 
 ### Fix `submit-coverage` CI failure

README.md

@@ -6,21 +6,16 @@
 
 This repository is a monorepo including the 0x protocol smart contracts and numerous developer tools. Each public sub-package is independently published to NPM.
 
-If you're developing on 0x now or are interested in using 0x infrastructure in the future, please join our [developer mailing list][dev-mailing-list-url] for updates.
-
-[website-url]: https://0xproject.com
-[whitepaper-url]: https://0xproject.com/pdfs/0x_white_paper.pdf
-[dev-mailing-list-url]: http://eepurl.com/dx4cPf
+[website-url]: https://0x.org
 
 [![CircleCI](https://circleci.com/gh/0xProject/0x-monorepo.svg?style=svg&circle-token=61bf7cd8c9b4e11b132089dfcffdd1be277d1e0c)](https://circleci.com/gh/0xProject/0x-monorepo)
 [![Coverage Status](https://coveralls.io/repos/github/0xProject/0x-monorepo/badge.svg?branch=development)](https://coveralls.io/github/0xProject/0x-monorepo?branch=development)
-[![Discord](https://img.shields.io/badge/chat-rocket.chat-yellow.svg?style=flat)](https://chat.0xproject.com)
-[![Join the chat at https://gitter.im/0xProject/Lobby](https://badges.gitter.im/0xProject/Lobby.svg)](https://gitter.im/0xProject/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Discord](https://img.shields.io/badge/chat-discord.chat-yellow.svg?style=flat)](https://discordapp.com/invite/d3FTX3M)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
 ## Packages
 
-Visit our [developer portal](https://0xproject.com/docs/order-utils) for a comprehensive list of core & community maintained packages. All packages maintained with this monorepo are listed below.
+Visit our [developer portal](https://0x.org/docs/tools/order-utils) for a comprehensive list of core & community maintained packages. All packages maintained with this monorepo are listed below.
 
 ### Python Packages
 
@@ -48,12 +43,12 @@ These packages are all under development. See [/contracts/README.md](/contracts/
 | [`@0x/contracts-exchange-libs`](/contracts/exchange-libs)           | [![npm](https://img.shields.io/npm/v/@0x/contracts-exchange-libs.svg)](https://www.npmjs.com/package/@0x/contracts-exchange-libs)           | Protocol specific libraries used within the [`Exchange`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#exchange) contract                                                                                 |
 | [`@0x/contracts-extensions`](/contracts/extensions)                 | [![npm](https://img.shields.io/npm/v/@0x/contracts-extensions.svg)](https://www.npmjs.com/package/@0x/contracts-extensions)                 | Contracts that interact with and extend the functionality of the core protocol                                                                                                                                                                        |
 | [`@0x/contracts-multisig`](/contracts/multisig)                     | [![npm](https://img.shields.io/npm/v/@0x/contracts-multisig.svg)](https://www.npmjs.com/package/@0x/contracts-multisig)                     | Various implementations of multisignature wallets, including the [`AssetProxyOwner`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#assetproxyowner) contract that has permissions to upgrade the protocol |
-| [`@0x/contracts-test-utils`](/contracts/test-utils)                 | [![npm](https://img.shields.io/npm/v/@0x/contracts-test-utils.svg)](https://www.npmjs.com/package/@0x/contracts-test-utils)                 | Typescript/Javascript shared utilities used for testing contracts                                                                                                                                                                                     |
+| [`@0x/contracts-test-utils`](/contracts/test-utils)                 | [![npm](https://img.shields.io/npm/v/@0x/contracts-test-utils.svg)](https://www.npmjs.com/package/@0x/contracts-test-utils)                 | TypeScript/Javascript shared utilities used for testing contracts                                                                                                                                                                                     |
 | [`@0x/contracts-utils`](/contracts/utils)                           | [![npm](https://img.shields.io/npm/v/@0x/contracts-utils.svg)](https://www.npmjs.com/package/@0x/contracts-utils)                           | Generic libraries and utilities used throughout all of the contracts                                                                                                                                                                                  |
 | [`@0x/contracts-coordinator`](/contracts/coordinator)               | [![npm](https://img.shields.io/npm/v/@0x/contracts-coordinator.svg)](https://www.npmjs.com/package/@0x/contracts-coordinator)               | A contract that allows users to execute 0x transactions with permission from a Coordinator                                                                                                                                                            |
 | [`@0x/contracts-dev-utils`](/contracts/dev-utils)                   | [![npm](https://img.shields.io/npm/v/@0x/contracts-dev-utils.svg)](https://www.npmjs.com/package/@0x/contracts-dev-utils)                   | A contract contains utility functions for developers (such as validating many orders using a single eth_call)                                                                                                                                         |
 
-### Typescript/Javascript Packages
+### TypeScript/Javascript Packages
 
 #### 0x-specific packages
 
@@ -109,7 +104,7 @@ These packages are all under development. See [/contracts/README.md](/contracts/
 
 ## Usage
 
-Node version >= 6.12 is required.
+Node version 6.x or 8.x is required.
 
 Most of the packages require additional typings for external dependencies.
 You can include those by prepending the `@0x/typescript-typings` package to your [`typeRoots`](http://www.typescriptlang.org/docs/handbook/tsconfig-json.html) config.
@@ -138,6 +133,8 @@ Then install dependencies
 yarn install
 ```
 
+You will also need to have Python 3 installed, in order to build and run the tests of `abi-gen`'s command-line interface, which is integrated with the yarn build, yarn test, and yarn lint commands described below. More specifically, your local pip should resolve to the Python 3 version of pip, not a Python 2.x version.
+
 ### Build
 
 To build all packages:

contracts/asset-proxy/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1567521715,
+        "version": "2.2.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1566446343,
+        "version": "2.2.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1565296576,
         "version": "2.2.5",

contracts/asset-proxy/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.2.7 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v2.2.6 - _August 22, 2019_
+
+    * Dependencies updated
+
 ## v2.2.5 - _August 8, 2019_
 
     * Dependencies updated

contracts/asset-proxy/README.md

@@ -1,6 +1,6 @@
 ## AssetProxy
 
-This package contains the implementations of all of the [`AssetProxy`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#assetproxy) contracts available within the 0x protocol. These contracts are responsible for decoding the `assetData` sent to them and performing the actual transfer of assets. Addresses of the deployed contracts can be found in the 0x [wiki](https://0xproject.com/wiki#Deployed-Addresses) or the [DEPLOYS](./DEPLOYS.json) file within this package.
+This package contains the implementations of all of the [`AssetProxy`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#assetproxy) contracts available within the 0x protocol. These contracts are responsible for decoding the `assetData` sent to them and performing the actual transfer of assets. Addresses of the deployed contracts can be found in this 0x [guide](https://0x.org/docs/guides/0x-cheat-sheet) or the [DEPLOYS](./DEPLOYS.json) file within this package.
 
 ## Installation
 
@@ -12,7 +12,7 @@ npm install @0x/contracts-asset-proxy --save
 
 ## Bug bounty
 
-A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0xproject.com/wiki#Bug-Bounty).
+A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0x.org/docs/guides/bug-bounty-program).
 
 ## Contributing
 

contracts/asset-proxy/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-asset-proxy",
-    "version": "2.2.5",
+    "version": "2.2.7",
     "engines": {
         "node": ">=6.12"
     },
@@ -22,7 +22,7 @@
         "compile": "sol-compiler",
         "watch": "sol-compiler -w",
         "clean": "shx rm -rf lib generated-artifacts generated-wrappers",
-        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
+        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --output generated-wrappers --backend ethers",
         "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "coverage:report:text": "istanbul report text",
@@ -47,11 +47,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^4.1.0",
-        "@0x/contracts-gen": "^1.0.13",
-        "@0x/contracts-test-utils": "^3.1.13",
-        "@0x/dev-utils": "^2.3.0",
-        "@0x/sol-compiler": "^3.1.12",
+        "@0x/abi-gen": "^4.2.0",
+        "@0x/contracts-gen": "^1.0.14",
+        "@0x/contracts-test-utils": "^3.1.15",
+        "@0x/dev-utils": "^2.3.2",
+        "@0x/sol-compiler": "^3.1.14",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
@@ -69,17 +69,17 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.3.1",
-        "@0x/contracts-erc1155": "^1.1.12",
-        "@0x/contracts-erc20": "^2.2.11",
-        "@0x/contracts-erc721": "^2.1.12",
-        "@0x/contracts-utils": "^3.2.1",
-        "@0x/order-utils": "^8.2.5",
-        "@0x/types": "^2.4.1",
-        "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.5.0",
-        "@0x/web3-wrapper": "^6.0.10",
-        "ethereum-types": "^2.1.4",
+        "@0x/base-contract": "^5.3.3",
+        "@0x/contracts-erc1155": "^1.1.14",
+        "@0x/contracts-erc20": "^2.2.13",
+        "@0x/contracts-erc721": "^2.1.14",
+        "@0x/contracts-utils": "^3.2.3",
+        "@0x/order-utils": "^8.3.1",
+        "@0x/types": "^2.4.2",
+        "@0x/typescript-typings": "^4.2.5",
+        "@0x/utils": "^4.5.1",
+        "@0x/web3-wrapper": "^6.0.12",
+        "ethereum-types": "^2.1.5",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.11"
     },

contracts/coordinator/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1567521715,
+        "version": "2.0.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1566446343,
+        "version": "2.0.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1565296576,
         "version": "2.0.10",

contracts/coordinator/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.0.12 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v2.0.11 - _August 22, 2019_
+
+    * Dependencies updated
+
 ## v2.0.10 - _August 8, 2019_
 
     * Dependencies updated

contracts/coordinator/README.md

@@ -1,6 +1,6 @@
 ## Coordinator
 
-This package contains a contract that allows users to call arbitrary functions on the Exchange contract with permission from one or more Coordinators. Addresses of the deployed contracts can be found in the 0x [wiki](https://0xproject.com/wiki#Deployed-Addresses) or the [DEPLOYS](./DEPLOYS.json) file within this package.
+This package contains a contract that allows users to call arbitrary functions on the Exchange contract with permission from one or more Coordinators. Addresses of the deployed contracts can be found in this 0x [guide](https://0x.org/docs/guides/0x-cheat-sheet) or the [DEPLOYS](./DEPLOYS.json) file within this package.
 
 ## Installation
 
@@ -12,7 +12,7 @@ npm install @0x/contracts-coordinator --save
 
 ## Bug bounty
 
-A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0xproject.com/wiki#Bug-Bounty).
+A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0x.org/docs/guides/bug-bounty-program).
 
 ## Contributing
 

contracts/coordinator/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-coordinator",
-    "version": "2.0.10",
+    "version": "2.0.12",
     "engines": {
         "node": ">=6.12"
     },
@@ -22,7 +22,7 @@
         "compile": "sol-compiler",
         "watch": "sol-compiler -w",
         "clean": "shx rm -rf lib generated-artifacts generated-wrappers",
-        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
+        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --output generated-wrappers --backend ethers",
         "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "coverage:report:text": "istanbul report text",
@@ -47,11 +47,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^4.1.0",
-        "@0x/contracts-gen": "^1.0.13",
-        "@0x/contracts-test-utils": "^3.1.13",
-        "@0x/dev-utils": "^2.3.0",
-        "@0x/sol-compiler": "^3.1.12",
+        "@0x/abi-gen": "^4.2.0",
+        "@0x/contracts-gen": "^1.0.14",
+        "@0x/contracts-test-utils": "^3.1.15",
+        "@0x/dev-utils": "^2.3.2",
+        "@0x/sol-compiler": "^3.1.14",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
@@ -69,18 +69,18 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.3.1",
-        "@0x/contracts-asset-proxy": "^2.2.5",
-        "@0x/contracts-erc20": "^2.2.11",
-        "@0x/contracts-exchange": "^2.1.11",
-        "@0x/contracts-exchange-libs": "^3.0.5",
-        "@0x/contracts-utils": "^3.2.1",
-        "@0x/order-utils": "^8.2.5",
-        "@0x/types": "^2.4.1",
-        "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.5.0",
-        "@0x/web3-wrapper": "^6.0.10",
-        "ethereum-types": "^2.1.4",
+        "@0x/base-contract": "^5.3.3",
+        "@0x/contracts-asset-proxy": "^2.2.7",
+        "@0x/contracts-erc20": "^2.2.13",
+        "@0x/contracts-exchange": "^2.1.13",
+        "@0x/contracts-exchange-libs": "^3.0.7",
+        "@0x/contracts-utils": "^3.2.3",
+        "@0x/order-utils": "^8.3.1",
+        "@0x/types": "^2.4.2",
+        "@0x/typescript-typings": "^4.2.5",
+        "@0x/utils": "^4.5.1",
+        "@0x/web3-wrapper": "^6.0.12",
+        "ethereum-types": "^2.1.5",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.11"
     },

contracts/dev-utils/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1567521715,
+        "version": "0.0.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1566446343,
+        "version": "0.0.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1565296576,
         "version": "0.0.7",

contracts/dev-utils/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.0.9 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v0.0.8 - _August 22, 2019_
+
+    * Dependencies updated
+
 ## v0.0.7 - _August 8, 2019_
 
     * Dependencies updated

contracts/dev-utils/README.md

@@ -1,6 +1,6 @@
 ## Dev-Utils
 
-This package implements various utilities for developers. For example, the `DevUtils` contract can query batches of balances or allowances given some `assetData`, can validate batches of orders, and can decode 0x-specific calldata. Addresses of the deployed contracts can be found in the 0x [wiki](https://0xproject.com/wiki#Deployed-Addresses) or the [DEPLOYS](./DEPLOYS.json) file within this package.
+This package implements various utilities for developers. For example, the `DevUtils` contract can query batches of balances or allowances given some `assetData`, can validate batches of orders, and can decode 0x-specific calldata. Addresses of the deployed contracts can be found in this 0x [guide](https://0x.org/docs/guides/0x-cheat-sheet) or the [DEPLOYS](./DEPLOYS.json) file within this package.
 
 ## Installation
 
@@ -12,7 +12,7 @@ npm install @0x/contracts-dev-utils --save
 
 ## Bug bounty
 
-A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0xproject.com/wiki#Bug-Bounty).
+A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0x.org/docs/guides/bug-bounty-program).
 
 ## Contributing
 

contracts/dev-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-dev-utils",
-    "version": "0.0.7",
+    "version": "0.0.9",
     "engines": {
         "node": ">=6.12"
     },
@@ -22,7 +22,7 @@
         "compile": "sol-compiler",
         "watch": "sol-compiler -w",
         "clean": "shx rm -rf lib generated-artifacts generated-wrappers",
-        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
+        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --output generated-wrappers --backend ethers",
         "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "coverage:report:text": "istanbul report text",
@@ -47,11 +47,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/dev-utils/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^4.1.0",
-        "@0x/contracts-gen": "^1.0.13",
-        "@0x/contracts-test-utils": "^3.1.13",
-        "@0x/dev-utils": "^2.3.0",
-        "@0x/sol-compiler": "^3.1.12",
+        "@0x/abi-gen": "^4.2.0",
+        "@0x/contracts-gen": "^1.0.14",
+        "@0x/contracts-test-utils": "^3.1.15",
+        "@0x/dev-utils": "^2.3.2",
+        "@0x/sol-compiler": "^3.1.14",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
@@ -69,20 +69,20 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.3.1",
-        "@0x/contracts-asset-proxy": "^2.2.5",
-        "@0x/contracts-erc1155": "^1.1.12",
-        "@0x/contracts-erc20": "^2.2.11",
-        "@0x/contracts-erc721": "^2.1.12",
-        "@0x/contracts-exchange": "^2.1.11",
-        "@0x/contracts-exchange-libs": "^3.0.5",
-        "@0x/contracts-utils": "^3.2.1",
-        "@0x/order-utils": "^8.2.5",
-        "@0x/types": "^2.4.1",
-        "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.5.0",
-        "@0x/web3-wrapper": "^6.0.10",
-        "ethereum-types": "^2.1.4",
+        "@0x/base-contract": "^5.3.3",
+        "@0x/contracts-asset-proxy": "^2.2.7",
+        "@0x/contracts-erc1155": "^1.1.14",
+        "@0x/contracts-erc20": "^2.2.13",
+        "@0x/contracts-erc721": "^2.1.14",
+        "@0x/contracts-exchange": "^2.1.13",
+        "@0x/contracts-exchange-libs": "^3.0.7",
+        "@0x/contracts-utils": "^3.2.3",
+        "@0x/order-utils": "^8.3.1",
+        "@0x/types": "^2.4.2",
+        "@0x/typescript-typings": "^4.2.5",
+        "@0x/utils": "^4.5.1",
+        "@0x/web3-wrapper": "^6.0.12",
+        "ethereum-types": "^2.1.5",
         "ethereumjs-util": "^5.1.1"
     },
     "publishConfig": {

contracts/erc1155/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1567521715,
+        "version": "1.1.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1566446343,
+        "version": "1.1.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1565296576,
         "version": "1.1.12",

contracts/erc1155/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.1.14 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v1.1.13 - _August 22, 2019_
+
+    * Dependencies updated
+
 ## v1.1.12 - _August 8, 2019_
 
     * Dependencies updated

contracts/erc1155/README.md

@@ -1,6 +1,6 @@
 ## ERC1155 Tokens
 
-This package contains implementations of various [ERC1155](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1155.md) tokens. Addresses of the deployed contracts can be found in the 0x [wiki](https://0xproject.com/wiki#Deployed-Addresses) or the [DEPLOYS](./DEPLOYS.json) file within this package.
+This package contains implementations of various [ERC1155](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1155.md) tokens. Addresses of the deployed contracts can be found in this 0x [guide](https://0x.org/docs/guides/0x-cheat-sheet) or the [DEPLOYS](./DEPLOYS.json) file within this package.
 
 ## Installation
 
@@ -12,7 +12,7 @@ npm install @0x/contracts-erc1155 --save
 
 ## Bug bounty
 
-A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0xproject.com/wiki#Bug-Bounty).
+A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0x.org/docs/guides/bug-bounty-program).
 
 ## Contributing
 

contracts/erc1155/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc1155",
-    "version": "1.1.12",
+    "version": "1.1.14",
     "engines": {
         "node": ">=6.12"
     },
@@ -22,7 +22,7 @@
         "compile": "sol-compiler",
         "watch": "sol-compiler -w",
         "clean": "shx rm -rf lib generated-artifacts generated-wrappers",
-        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
+        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --output generated-wrappers --backend ethers",
         "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "coverage:report:text": "istanbul report text",
@@ -47,10 +47,10 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^4.1.0",
-        "@0x/contracts-gen": "^1.0.13",
-        "@0x/dev-utils": "^2.3.0",
-        "@0x/sol-compiler": "^3.1.12",
+        "@0x/abi-gen": "^4.2.0",
+        "@0x/contracts-gen": "^1.0.14",
+        "@0x/dev-utils": "^2.3.2",
+        "@0x/sol-compiler": "^3.1.14",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
@@ -68,14 +68,14 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.3.1",
-        "@0x/contracts-test-utils": "^3.1.13",
-        "@0x/contracts-utils": "^3.2.1",
-        "@0x/types": "^2.4.1",
-        "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.5.0",
-        "@0x/web3-wrapper": "^6.0.10",
-        "ethereum-types": "^2.1.4",
+        "@0x/base-contract": "^5.3.3",
+        "@0x/contracts-test-utils": "^3.1.15",
+        "@0x/contracts-utils": "^3.2.3",
+        "@0x/types": "^2.4.2",
+        "@0x/typescript-typings": "^4.2.5",
+        "@0x/utils": "^4.5.1",
+        "@0x/web3-wrapper": "^6.0.12",
+        "ethereum-types": "^2.1.5",
         "lodash": "^4.17.11"
     },
     "publishConfig": {

contracts/erc20/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1567521715,
+        "version": "2.2.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1566446343,
+        "version": "2.2.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1565296576,
         "version": "2.2.11",

contracts/erc20/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.2.13 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v2.2.12 - _August 22, 2019_
+
+    * Dependencies updated
+
 ## v2.2.11 - _August 8, 2019_
 
     * Dependencies updated

contracts/erc20/README.md

@@ -1,6 +1,6 @@
 ## ERC20 Tokens
 
-This package contains implementations of various [ERC20](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md) tokens, including WETH (Wrapped Ether) and ZRX. Addresses of the deployed contracts can be found in the 0x [wiki](https://0xproject.com/wiki#Deployed-Addresses) or the [DEPLOYS](./DEPLOYS.json) file within this package.
+This package contains implementations of various [ERC20](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md) tokens, including WETH (Wrapped Ether) and ZRX. Addresses of the deployed contracts can be found in this 0x [guide](https://0x.org/docs/guides/0x-cheat-sheet) or the [DEPLOYS](./DEPLOYS.json) file within this package.
 
 ## Installation
 
@@ -12,7 +12,7 @@ npm install @0x/contracts-erc20 --save
 
 ## Bug bounty
 
-A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0xproject.com/wiki#Bug-Bounty).
+A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0x.org/docs/guides/bug-bounty-program).
 
 ## Contributing
 

contracts/erc20/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc20",
-    "version": "2.2.11",
+    "version": "2.2.13",
     "engines": {
         "node": ">=6.12"
     },
@@ -22,7 +22,7 @@
         "compile": "sol-compiler",
         "watch": "sol-compiler -w",
         "clean": "shx rm -rf lib generated-artifacts generated-wrappers",
-        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
+        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --output generated-wrappers --backend ethers",
         "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "coverage:report:text": "istanbul report text",
@@ -47,11 +47,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^4.1.0",
-        "@0x/contracts-gen": "^1.0.13",
-        "@0x/contracts-test-utils": "^3.1.13",
-        "@0x/dev-utils": "^2.3.0",
-        "@0x/sol-compiler": "^3.1.12",
+        "@0x/abi-gen": "^4.2.0",
+        "@0x/contracts-gen": "^1.0.14",
+        "@0x/contracts-test-utils": "^3.1.15",
+        "@0x/dev-utils": "^2.3.2",
+        "@0x/sol-compiler": "^3.1.14",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
@@ -69,13 +69,13 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.3.1",
-        "@0x/contracts-utils": "^3.2.1",
-        "@0x/types": "^2.4.1",
-        "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.5.0",
-        "@0x/web3-wrapper": "^6.0.10",
-        "ethereum-types": "^2.1.4",
+        "@0x/base-contract": "^5.3.3",
+        "@0x/contracts-utils": "^3.2.3",
+        "@0x/types": "^2.4.2",
+        "@0x/typescript-typings": "^4.2.5",
+        "@0x/utils": "^4.5.1",
+        "@0x/web3-wrapper": "^6.0.12",
+        "ethereum-types": "^2.1.5",
         "lodash": "^4.17.11"
     },
     "publishConfig": {

contracts/erc721/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1567521715,
+        "version": "2.1.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1566446343,
+        "version": "2.1.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1565296576,
         "version": "2.1.12",

contracts/erc721/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.1.14 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v2.1.13 - _August 22, 2019_
+
+    * Dependencies updated
+
 ## v2.1.12 - _August 8, 2019_
 
     * Dependencies updated

contracts/erc721/README.md

@@ -1,6 +1,6 @@
 ## ERC721 Tokens
 
-This package contains implementations of various [ERC721](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md) tokens. Addresses of the deployed contracts can be found in the 0x [wiki](https://0xproject.com/wiki#Deployed-Addresses) or the [DEPLOYS](./DEPLOYS.json) file within this package.
+This package contains implementations of various [ERC721](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md) tokens. Addresses of the deployed contracts can be found in this 0x [guide](https://0x.org/docs/guides/0x-cheat-sheet) or the [DEPLOYS](./DEPLOYS.json) file within this package.
 
 ## Installation
 
@@ -12,7 +12,7 @@ npm install @0x/contracts-erc721 --save
 
 ## Bug bounty
 
-A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0xproject.com/wiki#Bug-Bounty).
+A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0x.org/docs/guides/bug-bounty-program).
 
 ## Contributing
 

contracts/erc721/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc721",
-    "version": "2.1.12",
+    "version": "2.1.14",
     "engines": {
         "node": ">=6.12"
     },
@@ -22,7 +22,7 @@
         "compile": "sol-compiler",
         "watch": "sol-compiler -w",
         "clean": "shx rm -rf lib generated-artifacts generated-wrappers",
-        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
+        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --output generated-wrappers --backend ethers",
         "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "coverage:report:text": "istanbul report text",
@@ -47,11 +47,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^4.1.0",
-        "@0x/contracts-gen": "^1.0.13",
-        "@0x/contracts-test-utils": "^3.1.13",
-        "@0x/dev-utils": "^2.3.0",
-        "@0x/sol-compiler": "^3.1.12",
+        "@0x/abi-gen": "^4.2.0",
+        "@0x/contracts-gen": "^1.0.14",
+        "@0x/contracts-test-utils": "^3.1.15",
+        "@0x/dev-utils": "^2.3.2",
+        "@0x/sol-compiler": "^3.1.14",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
@@ -69,13 +69,13 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.3.1",
-        "@0x/contracts-utils": "^3.2.1",
-        "@0x/types": "^2.4.1",
-        "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.5.0",
-        "@0x/web3-wrapper": "^6.0.10",
-        "ethereum-types": "^2.1.4",
+        "@0x/base-contract": "^5.3.3",
+        "@0x/contracts-utils": "^3.2.3",
+        "@0x/types": "^2.4.2",
+        "@0x/typescript-typings": "^4.2.5",
+        "@0x/utils": "^4.5.1",
+        "@0x/web3-wrapper": "^6.0.12",
+        "ethereum-types": "^2.1.5",
         "lodash": "^4.17.11"
     },
     "publishConfig": {

contracts/exchange-forwarder/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1567521715,
+        "version": "3.0.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1566446343,
+        "version": "3.0.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1565296576,
         "version": "3.0.9",

contracts/exchange-forwarder/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.0.11 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v3.0.10 - _August 22, 2019_
+
+    * Dependencies updated
+
 ## v3.0.9 - _August 8, 2019_
 
     * Dependencies updated

contracts/exchange-forwarder/README.md

@@ -1,6 +1,6 @@
 ## Exchange Forwarder
 
-This package contains the implementation of the [`Forwarder`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/forwarder-specification.md) contract. This contract is intended to improve the UX of interacting with the 0x [`Exchange`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#exchange) contract by abstracting user approvals, converting ETH to WETH, and paying fees. Addresses of the deployed contracts can be found in the 0x [wiki](https://0xproject.com/wiki#Deployed-Addresses) or the [DEPLOYS](./DEPLOYS.json) file within this package.
+This package contains the implementation of the [`Forwarder`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/forwarder-specification.md) contract. This contract is intended to improve the UX of interacting with the 0x [`Exchange`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#exchange) contract by abstracting user approvals, converting ETH to WETH, and paying fees. Addresses of the deployed contracts can be found in this 0x [guide](https://0x.org/docs/guides/0x-cheat-sheet) or the [DEPLOYS](./DEPLOYS.json) file within this package.
 
 ## Installation
 
@@ -12,7 +12,7 @@ npm install @0x/contracts-exchange-forwarder --save
 
 ## Bug bounty
 
-A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0xproject.com/wiki#Bug-Bounty).
+A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0x.org/docs/guides/bug-bounty-program).
 
 ## Contributing
 

contracts/exchange-forwarder/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-exchange-forwarder",
-    "version": "3.0.9",
+    "version": "3.0.11",
     "engines": {
         "node": ">=6.12"
     },
@@ -22,7 +22,7 @@
         "compile": "sol-compiler",
         "watch": "sol-compiler -w",
         "clean": "shx rm -rf lib generated-artifacts generated-wrappers",
-        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
+        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --output generated-wrappers --backend ethers",
         "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "coverage:report:text": "istanbul report text",
         "coverage:report:html": "istanbul report html && open coverage/index.html",
@@ -46,11 +46,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^4.1.0",
-        "@0x/contracts-gen": "^1.0.13",
-        "@0x/contracts-test-utils": "^3.1.13",
-        "@0x/dev-utils": "^2.3.0",
-        "@0x/sol-compiler": "^3.1.12",
+        "@0x/abi-gen": "^4.2.0",
+        "@0x/contracts-gen": "^1.0.14",
+        "@0x/contracts-test-utils": "^3.1.15",
+        "@0x/dev-utils": "^2.3.2",
+        "@0x/sol-compiler": "^3.1.14",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
@@ -68,19 +68,19 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.3.1",
-        "@0x/contracts-asset-proxy": "^2.2.5",
-        "@0x/contracts-erc20": "^2.2.11",
-        "@0x/contracts-erc721": "^2.1.12",
-        "@0x/contracts-exchange": "^2.1.11",
-        "@0x/contracts-exchange-libs": "^3.0.5",
-        "@0x/contracts-utils": "^3.2.1",
-        "@0x/order-utils": "^8.2.5",
-        "@0x/types": "^2.4.1",
-        "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.5.0",
-        "@0x/web3-wrapper": "^6.0.10",
-        "ethereum-types": "^2.1.4",
+        "@0x/base-contract": "^5.3.3",
+        "@0x/contracts-asset-proxy": "^2.2.7",
+        "@0x/contracts-erc20": "^2.2.13",
+        "@0x/contracts-erc721": "^2.1.14",
+        "@0x/contracts-exchange": "^2.1.13",
+        "@0x/contracts-exchange-libs": "^3.0.7",
+        "@0x/contracts-utils": "^3.2.3",
+        "@0x/order-utils": "^8.3.1",
+        "@0x/types": "^2.4.2",
+        "@0x/typescript-typings": "^4.2.5",
+        "@0x/utils": "^4.5.1",
+        "@0x/web3-wrapper": "^6.0.12",
+        "ethereum-types": "^2.1.5",
         "lodash": "^4.17.11"
     },
     "publishConfig": {

contracts/exchange-libs/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1567521715,
+        "version": "3.0.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1566446343,
+        "version": "3.0.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1565296576,
         "version": "3.0.5",

contracts/exchange-libs/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.0.7 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v3.0.6 - _August 22, 2019_
+
+    * Dependencies updated
+
 ## v3.0.5 - _August 8, 2019_
 
     * Dependencies updated

contracts/exchange-libs/README.md

@@ -1,6 +1,6 @@
 ## Exchange Libraries
 
-This package contains the implementations of various libraries and utilities used within the [`Exchange`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#exchange) contract. These libraries may be useful when creating external contracts that interact with the `Exchange` contract. Addresses of the deployed contracts can be found in the 0x [wiki](https://0xproject.com/wiki#Deployed-Addresses) or the [DEPLOYS](./DEPLOYS.json) file within this package.
+This package contains the implementations of various libraries and utilities used within the [`Exchange`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#exchange) contract. These libraries may be useful when creating external contracts that interact with the `Exchange` contract. Addresses of the deployed contracts can be found in this 0x [guide](https://0x.org/docs/guides/0x-cheat-sheet) or the [DEPLOYS](./DEPLOYS.json) file within this package.
 
 ## Installation
 

contracts/exchange-libs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-exchange-libs",
-    "version": "3.0.5",
+    "version": "3.0.7",
     "engines": {
         "node": ">=6.12"
     },
@@ -22,7 +22,7 @@
         "compile": "sol-compiler",
         "watch": "sol-compiler -w",
         "clean": "shx rm -rf lib generated-artifacts generated-wrappers",
-        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
+        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --output generated-wrappers --backend ethers",
         "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "coverage:report:text": "istanbul report text",
@@ -47,11 +47,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/libs/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^4.1.0",
-        "@0x/contracts-gen": "^1.0.13",
-        "@0x/contracts-test-utils": "^3.1.13",
-        "@0x/dev-utils": "^2.3.0",
-        "@0x/sol-compiler": "^3.1.12",
+        "@0x/abi-gen": "^4.2.0",
+        "@0x/contracts-gen": "^1.0.14",
+        "@0x/contracts-test-utils": "^3.1.15",
+        "@0x/dev-utils": "^2.3.2",
+        "@0x/sol-compiler": "^3.1.14",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
@@ -69,14 +69,14 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.3.1",
-        "@0x/contracts-utils": "^3.2.1",
-        "@0x/order-utils": "^8.2.5",
-        "@0x/types": "^2.4.1",
-        "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.5.0",
-        "@0x/web3-wrapper": "^6.0.10",
-        "ethereum-types": "^2.1.4",
+        "@0x/base-contract": "^5.3.3",
+        "@0x/contracts-utils": "^3.2.3",
+        "@0x/order-utils": "^8.3.1",
+        "@0x/types": "^2.4.2",
+        "@0x/typescript-typings": "^4.2.5",
+        "@0x/utils": "^4.5.1",
+        "@0x/web3-wrapper": "^6.0.12",
+        "ethereum-types": "^2.1.5",
         "lodash": "^4.17.11"
     },
     "publishConfig": {

contracts/exchange/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1567521715,
+        "version": "2.1.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1566446343,
+        "version": "2.1.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1565296576,
         "version": "2.1.11",

contracts/exchange/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.1.13 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v2.1.12 - _August 22, 2019_
+
+    * Dependencies updated
+
 ## v2.1.11 - _August 8, 2019_
 
     * Dependencies updated

contracts/exchange/README.md

@@ -1,6 +1,6 @@
 ## Exchange
 
-This package contains the implementation of the [`Exchange`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#exchange). This contract is responsible for settling trades and is typically the entry point for all transactions that interact with the 0x protocol. Lightweight examples of how external contracts can interct with the `Exchange` contract can be found in the [examples](./contracts/examples) directory. Addresses of the deployed contracts can be found in the 0x [wiki](https://0xproject.com/wiki#Deployed-Addresses) or the [DEPLOYS](./DEPLOYS.json) file within this package.
+This package contains the implementation of the [`Exchange`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#exchange). This contract is responsible for settling trades and is typically the entry point for all transactions that interact with the 0x protocol. Lightweight examples of how external contracts can interct with the `Exchange` contract can be found in the [examples](./contracts/examples) directory. Addresses of the deployed contracts can be found in this 0x [guide](https://0x.org/docs/guides/0x-cheat-sheet) or the [DEPLOYS](./DEPLOYS.json) file within this package.
 
 ## Installation
 
@@ -12,7 +12,7 @@ npm install @0x/contracts-exchange --save
 
 ## Bug bounty
 
-A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0xproject.com/wiki#Bug-Bounty).
+A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0x.org/docs/guides/bug-bounty-program).
 
 ## Contributing
 

contracts/exchange/contracts/examples/Validator.sol

@@ -21,7 +21,7 @@ pragma solidity ^0.5.5;
 import "../src/interfaces/IValidator.sol";
 
 
-contract Validator is 
+contract Validator is
     IValidator
 {
 
@@ -39,7 +39,7 @@ contract Validator is
     /// @param hash Message hash that is signed.
     /// @param signerAddress Address that should have signed the given hash.
     /// @param signature Proof of signing.
-    /// @return Validity of signature.
+    /// @return Returns a known magic value if the signature is valid.
     // solhint-disable no-unused-vars
     function isValidSignature(
         bytes32 hash,
@@ -48,9 +48,11 @@ contract Validator is
     )
         external
         view
-        returns (bool isValid)
+        returns (bytes4)
     {
-        return (signerAddress == VALID_SIGNER);
+        require(signerAddress == VALID_SIGNER, "INVALID_SIGNER");
+        bytes4 magicValue = bytes4(keccak256("isValidValidatorSignature(address,bytes32,address,bytes)"));
+        return magicValue;
     }
     // solhint-enable no-unused-vars
 }

contracts/exchange/contracts/examples/Wallet.sol

@@ -22,7 +22,7 @@ import "../src/interfaces/IWallet.sol";
 import "@0x/contracts-utils/contracts/src/LibBytes.sol";
 
 
-contract Wallet is 
+contract Wallet is
     IWallet
 {
     using LibBytes for bytes;
@@ -41,14 +41,14 @@ contract Wallet is
     ///      The signer must match the owner of this wallet.
     /// @param hash Message hash that is signed.
     /// @param eip712Signature Proof of signing.
-    /// @return Validity of signature.
+    /// @return Returns a known magic value if the signature is valid.
     function isValidSignature(
         bytes32 hash,
         bytes calldata eip712Signature
     )
         external
         view
-        returns (bool isValid)
+        returns (bytes4)
     {
         require(
             eip712Signature.length == 65,
@@ -59,7 +59,8 @@ contract Wallet is
         bytes32 r = eip712Signature.readBytes32(1);
         bytes32 s = eip712Signature.readBytes32(33);
         address recoveredAddress = ecrecover(hash, v, r, s);
-        isValid = WALLET_OWNER == recoveredAddress;
-        return isValid;
+        require(WALLET_OWNER == recoveredAddress, "INVALID_SIGNATURE");
+        bytes4 magicValue = bytes4(keccak256("isValidWalletSignature(bytes32,address,bytes)"));
+        return magicValue;
     }
 }

contracts/exchange/contracts/examples/Whitelist.sol

@@ -73,10 +73,12 @@ contract Whitelist is
     )
         external
         view
-        returns (bool isValid)
+        returns (bytes4)
     {
         // solhint-disable-next-line avoid-tx-origin
-        return signerAddress == tx.origin;
+        require(signerAddress == tx.origin, "INVALID_SIGNER");
+        bytes4 magicValue = bytes4(keccak256("isValidValidatorSignature(address,bytes32,address,bytes)"));
+        return magicValue;
     }
     // solhint-enable no-unused-vars
 

contracts/exchange/contracts/src/MixinSignatureValidator.sol

@@ -32,7 +32,7 @@ contract MixinSignatureValidator is
     MTransactions
 {
     using LibBytes for bytes;
-    
+
     // Mapping of hash => signer => signed
     mapping (bytes32 => mapping (address => bool)) public preSigned;
 
@@ -197,7 +197,7 @@ contract MixinSignatureValidator is
         } else if (signatureType == SignatureType.Validator) {
             // Pop last 20 bytes off of signature byte array.
             address validatorAddress = signature.popLast20Bytes();
-            
+
             // Ensure signer has approved validator.
             if (!allowedValidators[signerAddress][validatorAddress]) {
                 return false;
@@ -224,7 +224,8 @@ contract MixinSignatureValidator is
         revert("SIGNATURE_UNSUPPORTED");
     }
 
-    /// @dev Verifies signature using logic defined by Wallet contract.
+    /// @dev Verifies signature using logic defined by Wallet contract. Wallet contract
+    ///      must return `bytes4(keccak256("isValidWalletSignature(bytes32,address,bytes)"))`
     /// @param hash Any 32 byte hash.
     /// @param walletAddress Address that should have signed the given hash
     ///                      and defines its own signature verification method.
@@ -244,7 +245,19 @@ contract MixinSignatureValidator is
             hash,
             signature
         );
+        // bytes4 0xb0671381
+        bytes32 magicValue = bytes32(bytes4(keccak256("isValidWalletSignature(bytes32,address,bytes)")));
         assembly {
+            // extcodesize added as an extra safety measure
+            if iszero(extcodesize(walletAddress)) {
+                // Revert with `Error("WALLET_ERROR")`
+                mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
+                mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
+                mstore(64, 0x0000000c57414c4c45545f4552524f5200000000000000000000000000000000)
+                mstore(96, 0)
+                revert(0, 100)
+            }
+
             let cdStart := add(callData, 32)
             let success := staticcall(
                 gas,              // forward all gas
@@ -255,6 +268,15 @@ contract MixinSignatureValidator is
                 32                // output size is 32 bytes
             )
 
+            if iszero(eq(returndatasize(), 32)) {
+                // Revert with `Error("WALLET_ERROR")`
+                mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
+                mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
+                mstore(64, 0x0000000c57414c4c45545f4552524f5200000000000000000000000000000000)
+                mstore(96, 0)
+                revert(0, 100)
+            }
+
             switch success
             case 0 {
                 // Revert with `Error("WALLET_ERROR")`
@@ -266,13 +288,17 @@ contract MixinSignatureValidator is
             }
             case 1 {
                 // Signature is valid if call did not revert and returned true
-                isValid := mload(cdStart)
+                isValid := eq(
+                    and(mload(cdStart), 0xffffffff00000000000000000000000000000000000000000000000000000000),
+                    and(magicValue, 0xffffffff00000000000000000000000000000000000000000000000000000000)
+                )
             }
         }
         return isValid;
     }
 
     /// @dev Verifies signature using logic defined by Validator contract.
+    ///      Validator must return `bytes4(keccak256("isValidValidatorSignature(address,bytes32,address,bytes)"))`
     /// @param validatorAddress Address of validator contract.
     /// @param hash Any 32 byte hash.
     /// @param signerAddress Address that should have signed the given hash.
@@ -294,7 +320,19 @@ contract MixinSignatureValidator is
             signerAddress,
             signature
         );
+        // bytes4 0x42b38674
+        bytes32 magicValue = bytes32(bytes4(keccak256("isValidValidatorSignature(address,bytes32,address,bytes)")));
         assembly {
+            // extcodesize added as an extra safety measure
+            if iszero(extcodesize(validatorAddress)) {
+                // Revert with `Error("VALIDATOR_ERROR")`
+                mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
+                mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
+                mstore(64, 0x0000000f56414c494441544f525f4552524f5200000000000000000000000000)
+                mstore(96, 0)
+                revert(0, 100)
+            }
+
             let cdStart := add(callData, 32)
             let success := staticcall(
                 gas,               // forward all gas
@@ -305,6 +343,15 @@ contract MixinSignatureValidator is
                 32                 // output size is 32 bytes
             )
 
+            if iszero(eq(returndatasize(), 32)) {
+                // Revert with `Error("VALIDATOR_ERROR")`
+                mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
+                mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
+                mstore(64, 0x0000000f56414c494441544f525f4552524f5200000000000000000000000000)
+                mstore(96, 0)
+                revert(0, 100)
+            }
+
             switch success
             case 0 {
                 // Revert with `Error("VALIDATOR_ERROR")`
@@ -316,7 +363,10 @@ contract MixinSignatureValidator is
             }
             case 1 {
                 // Signature is valid if call did not revert and returned true
-                isValid := mload(cdStart)
+                isValid := eq(
+                    and(mload(cdStart), 0xffffffff00000000000000000000000000000000000000000000000000000000),
+                    and(magicValue, 0xffffffff00000000000000000000000000000000000000000000000000000000)
+                )
             }
         }
         return isValid;

contracts/exchange/contracts/src/interfaces/IValidator.sol

@@ -25,7 +25,8 @@ contract IValidator {
     /// @param hash Message hash that is signed.
     /// @param signerAddress Address that should have signed the given hash.
     /// @param signature Proof of signing.
-    /// @return Validity of order signature.
+    /// @return Magic bytes4 value if the signature is valid.
+    ///         Magic value is bytes4(keccak256("isValidValidatorSignature(address,bytes32,address,bytes)"))
     function isValidSignature(
         bytes32 hash,
         address signerAddress,
@@ -33,5 +34,5 @@ contract IValidator {
     )
         external
         view
-        returns (bool isValid);
+        returns (bytes4);
 }

contracts/exchange/contracts/src/interfaces/IWallet.sol

@@ -24,12 +24,13 @@ contract IWallet {
     /// @dev Verifies that a signature is valid.
     /// @param hash Message hash that is signed.
     /// @param signature Proof of signing.
-    /// @return Validity of order signature.
+    /// @return Magic bytes4 value if the signature is valid.
+    ///         Magic value is bytes4(keccak256("isValidWalletSignature(bytes32,address,bytes)"))
     function isValidSignature(
         bytes32 hash,
         bytes calldata signature
     )
         external
         view
-        returns (bool isValid);
+        returns (bytes4);
 }

contracts/exchange/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-exchange",
-    "version": "2.1.11",
+    "version": "2.1.13",
     "engines": {
         "node": ">=6.12"
     },
@@ -22,7 +22,7 @@
         "compile": "sol-compiler",
         "watch": "sol-compiler -w",
         "clean": "shx rm -rf lib generated-artifacts generated-wrappers",
-        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
+        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --output generated-wrappers --backend ethers",
         "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "coverage:report:text": "istanbul report text",
@@ -47,11 +47,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^4.1.0",
-        "@0x/contracts-gen": "^1.0.13",
-        "@0x/contracts-test-utils": "^3.1.13",
-        "@0x/dev-utils": "^2.3.0",
-        "@0x/sol-compiler": "^3.1.12",
+        "@0x/abi-gen": "^4.2.0",
+        "@0x/contracts-gen": "^1.0.14",
+        "@0x/contracts-test-utils": "^3.1.15",
+        "@0x/dev-utils": "^2.3.2",
+        "@0x/sol-compiler": "^3.1.14",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
@@ -69,19 +69,19 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.3.1",
-        "@0x/contracts-asset-proxy": "^2.2.5",
-        "@0x/contracts-erc1155": "^1.1.12",
-        "@0x/contracts-erc20": "^2.2.11",
-        "@0x/contracts-erc721": "^2.1.12",
-        "@0x/contracts-exchange-libs": "^3.0.5",
-        "@0x/contracts-utils": "^3.2.1",
-        "@0x/order-utils": "^8.2.5",
-        "@0x/types": "^2.4.1",
-        "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.5.0",
-        "@0x/web3-wrapper": "^6.0.10",
-        "ethereum-types": "^2.1.4",
+        "@0x/base-contract": "^5.3.3",
+        "@0x/contracts-asset-proxy": "^2.2.7",
+        "@0x/contracts-erc1155": "^1.1.14",
+        "@0x/contracts-erc20": "^2.2.13",
+        "@0x/contracts-erc721": "^2.1.14",
+        "@0x/contracts-exchange-libs": "^3.0.7",
+        "@0x/contracts-utils": "^3.2.3",
+        "@0x/order-utils": "^8.3.1",
+        "@0x/types": "^2.4.2",
+        "@0x/typescript-typings": "^4.2.5",
+        "@0x/utils": "^4.5.1",
+        "@0x/web3-wrapper": "^6.0.12",
+        "ethereum-types": "^2.1.5",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.11"
     },

contracts/exchange/test/signature_validator.ts

@@ -100,6 +100,12 @@ describe('MixinSignatureValidator', () => {
             ),
             constants.AWAIT_TRANSACTION_MINED_MS,
         );
+        await web3Wrapper.awaitTransactionSuccessAsync(
+            await signatureValidator.setSignatureValidatorApproval.sendTransactionAsync(testValidator.address, true, {
+                from: notSignerAddress,
+            }),
+            constants.AWAIT_TRANSACTION_MINED_MS,
+        );
 
         const defaultOrderParams = {
             ...constants.STATIC_ORDER_PARAMS,
@@ -307,7 +313,7 @@ describe('MixinSignatureValidator', () => {
             expect(isValidSignature).to.be.true();
         });
 
-        it('should return false when SignatureType=Wallet and signature is invalid', async () => {
+        it('should revert when SignatureType=Wallet and signature is invalid', async () => {
             // Create EIP712 signature using a private key that does not belong to the wallet owner.
             const orderHashHex = orderHashUtils.getOrderHashHex(signedOrder);
             const orderHashBuffer = ethUtil.toBuffer(orderHashHex);
@@ -322,12 +328,10 @@ describe('MixinSignatureValidator', () => {
             ]);
             const signatureHex = ethUtil.bufferToHex(signature);
             // Validate signature
-            const isValidSignature = await signatureValidator.publicIsValidSignature.callAsync(
-                orderHashHex,
-                testWallet.address,
-                signatureHex,
+            return expectContractCallFailedAsync(
+                signatureValidator.publicIsValidSignature.callAsync(orderHashHex, testWallet.address, signatureHex),
+                RevertReason.WalletError,
             );
-            expect(isValidSignature).to.be.false();
         });
 
         it('should revert when `isValidSignature` attempts to update state and SignatureType=Wallet', async () => {
@@ -365,6 +369,15 @@ describe('MixinSignatureValidator', () => {
                 signatureHex,
             );
             expect(isValidSignature).to.be.true();
+
+            const isValidSignatureTs = await signatureUtils.isValidSignatureAsync(
+                provider,
+                orderHashHex,
+                signatureHex,
+                signerAddress,
+                signatureValidator.address,
+            );
+            expect(isValidSignatureTs).to.be.true();
         });
 
         it('should return false when SignatureType=Validator, signature is invalid and validator is approved', async () => {
@@ -375,12 +388,19 @@ describe('MixinSignatureValidator', () => {
             const orderHashHex = orderHashUtils.getOrderHashHex(signedOrder);
             // This will return false because we signed the message with `signerAddress`, but
             // are validating against `notSignerAddress`
-            const isValidSignature = await signatureValidator.publicIsValidSignature.callAsync(
-                orderHashHex,
-                notSignerAddress,
-                signatureHex,
+            await expectContractCallFailedAsync(
+                signatureValidator.publicIsValidSignature.callAsync(orderHashHex, notSignerAddress, signatureHex),
+                RevertReason.ValidatorError,
             );
-            expect(isValidSignature).to.be.false();
+
+            const isValidSignatureTs = await signatureUtils.isValidSignatureAsync(
+                provider,
+                orderHashHex,
+                signatureHex,
+                notSignerAddress,
+                signatureValidator.address,
+            );
+            expect(isValidSignatureTs).to.be.false();
         });
 
         it('should revert when `isValidSignature` attempts to update state and SignatureType=Validator', async () => {
@@ -416,6 +436,16 @@ describe('MixinSignatureValidator', () => {
                 signatureHex,
             );
             expect(isValidSignature).to.be.false();
+
+            expect(
+                signatureUtils.isValidSignatureAsync(
+                    provider,
+                    orderHashHex,
+                    signatureHex,
+                    signerAddress,
+                    signatureValidator.address,
+                ),
+            ).to.be.rejected();
         });
 
         it('should return true when SignatureType=Presigned and signer has presigned hash', async () => {

contracts/extensions/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1567521715,
+        "version": "4.0.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1566446343,
+        "version": "4.0.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1565296576,
         "version": "4.0.5",

contracts/extensions/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.0.7 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v4.0.6 - _August 22, 2019_
+
+    * Dependencies updated
+
 ## v4.0.5 - _August 8, 2019_
 
     * Dependencies updated

contracts/extensions/README.md

@@ -1,6 +1,6 @@
 ## Extensions
 
-This package implements various extensions to the 0x protocol. Extension contracts can add various rules around how orders are settled while still getting the interoperability and security benefits of using the underlying 0x protocol contracts. Addresses of the deployed contracts can be found in the 0x [wiki](https://0xproject.com/wiki#Deployed-Addresses) or the [DEPLOYS](./DEPLOYS.json) file within this package.
+This package implements various extensions to the 0x protocol. Extension contracts can add various rules around how orders are settled while still getting the interoperability and security benefits of using the underlying 0x protocol contracts. Addresses of the deployed contracts can be found in this 0x [guide](https://0x.org/docs/guides/0x-cheat-sheet) or the [DEPLOYS](./DEPLOYS.json) file within this package.
 
 ## Installation
 
@@ -12,7 +12,7 @@ npm install @0x/contracts-extensions --save
 
 ## Bug bounty
 
-A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0xproject.com/wiki#Bug-Bounty).
+A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0x.org/docs/guides/bug-bounty-program).
 
 ## Contributing
 

contracts/extensions/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-extensions",
-    "version": "4.0.5",
+    "version": "4.0.7",
     "engines": {
         "node": ">=6.12"
     },
@@ -22,7 +22,7 @@
         "compile": "sol-compiler",
         "watch": "sol-compiler -w",
         "clean": "shx rm -rf lib generated-artifacts generated-wrappers",
-        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
+        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --output generated-wrappers --backend ethers",
         "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "coverage:report:text": "istanbul report text",
@@ -47,11 +47,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^4.1.0",
-        "@0x/contracts-gen": "^1.0.13",
-        "@0x/contracts-test-utils": "^3.1.13",
-        "@0x/dev-utils": "^2.3.0",
-        "@0x/sol-compiler": "^3.1.12",
+        "@0x/abi-gen": "^4.2.0",
+        "@0x/contracts-gen": "^1.0.14",
+        "@0x/contracts-test-utils": "^3.1.15",
+        "@0x/dev-utils": "^2.3.2",
+        "@0x/sol-compiler": "^3.1.14",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
@@ -69,19 +69,19 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.3.1",
-        "@0x/contracts-asset-proxy": "^2.2.5",
-        "@0x/contracts-erc20": "^2.2.11",
-        "@0x/contracts-erc721": "^2.1.12",
-        "@0x/contracts-exchange": "^2.1.11",
-        "@0x/contracts-exchange-libs": "^3.0.5",
-        "@0x/contracts-utils": "^3.2.1",
-        "@0x/order-utils": "^8.2.5",
-        "@0x/types": "^2.4.1",
-        "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.5.0",
-        "@0x/web3-wrapper": "^6.0.10",
-        "ethereum-types": "^2.1.4",
+        "@0x/base-contract": "^5.3.3",
+        "@0x/contracts-asset-proxy": "^2.2.7",
+        "@0x/contracts-erc20": "^2.2.13",
+        "@0x/contracts-erc721": "^2.1.14",
+        "@0x/contracts-exchange": "^2.1.13",
+        "@0x/contracts-exchange-libs": "^3.0.7",
+        "@0x/contracts-utils": "^3.2.3",
+        "@0x/order-utils": "^8.3.1",
+        "@0x/types": "^2.4.2",
+        "@0x/typescript-typings": "^4.2.5",
+        "@0x/utils": "^4.5.1",
+        "@0x/web3-wrapper": "^6.0.12",
+        "ethereum-types": "^2.1.5",
         "lodash": "^4.17.11"
     },
     "publishConfig": {

contracts/multisig/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1567521715,
+        "version": "3.1.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1566446343,
+        "version": "3.1.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1565296576,
         "version": "3.1.11",

contracts/multisig/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.1.13 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v3.1.12 - _August 22, 2019_
+
+    * Dependencies updated
+
 ## v3.1.11 - _August 8, 2019_
 
     * Dependencies updated

contracts/multisig/README.md

@@ -1,6 +1,6 @@
 ## MultiSignature Contracts
 
-This package contains various types of multisignature wallet contracts, including the [`AssetProxyOwner`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#assetproxyowner) contract that is responsible for upgrading the 0x protocol smart contracts. Addresses of the deployed contracts can be found in the 0x [wiki](https://0xproject.com/wiki#Deployed-Addresses) or the [DEPLOYS](./DEPLOYS.json) file within this package.
+This package contains various types of multisignature wallet contracts, including the [`AssetProxyOwner`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#assetproxyowner) contract that is responsible for upgrading the 0x protocol smart contracts. Addresses of the deployed contracts can be found in this 0x [guide](https://0x.org/docs/guides/0x-cheat-sheet) or the [DEPLOYS](./DEPLOYS.json) file within this package.
 
 ## Installation
 

contracts/multisig/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-multisig",
-    "version": "3.1.11",
+    "version": "3.1.13",
     "engines": {
         "node": ">=6.12"
     },
@@ -22,7 +22,7 @@
         "compile": "sol-compiler",
         "watch": "sol-compiler -w",
         "clean": "shx rm -rf lib generated-artifacts generated-wrappers",
-        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../../packages/abi-gen-templates/contract.handlebars --partials '../../packages/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
+        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --output generated-wrappers --backend ethers",
         "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "coverage:report:text": "istanbul report text",
@@ -47,11 +47,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^4.1.0",
-        "@0x/contracts-gen": "^1.0.13",
-        "@0x/contracts-test-utils": "^3.1.13",
-        "@0x/dev-utils": "^2.3.0",
-        "@0x/sol-compiler": "^3.1.12",
+        "@0x/abi-gen": "^4.2.0",
+        "@0x/contracts-gen": "^1.0.14",
+        "@0x/contracts-test-utils": "^3.1.15",
+        "@0x/dev-utils": "^2.3.2",
+        "@0x/sol-compiler": "^3.1.14",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
@@ -69,15 +69,15 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.3.1",
-        "@0x/contracts-asset-proxy": "^2.2.5",
-        "@0x/contracts-erc20": "^2.2.11",
+        "@0x/base-contract": "^5.3.3",
+        "@0x/contracts-asset-proxy": "^2.2.7",
+        "@0x/contracts-erc20": "^2.2.13",
         "@0x/contracts-utils": "2.0.1",
-        "@0x/types": "^2.4.1",
-        "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.5.0",
-        "@0x/web3-wrapper": "^6.0.10",
-        "ethereum-types": "^2.1.4",
+        "@0x/types": "^2.4.2",
+        "@0x/typescript-typings": "^4.2.5",
+        "@0x/utils": "^4.5.1",
+        "@0x/web3-wrapper": "^6.0.12",
+        "ethereum-types": "^2.1.5",
         "lodash": "^4.17.11"
     },
     "publishConfig": {

contracts/test-utils/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1567521715,
+        "version": "3.1.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1566446343,
+        "version": "3.1.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1565296576,
         "version": "3.1.13",

contracts/test-utils/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.1.15 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v3.1.14 - _August 22, 2019_
+
+    * Dependencies updated
+
 ## v3.1.13 - _August 8, 2019_
 
     * Dependencies updated

contracts/test-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-test-utils",
-    "version": "3.1.13",
+    "version": "3.1.15",
     "engines": {
         "node": ">=6.12"
     },
@@ -42,18 +42,18 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/dev-utils": "^2.3.0",
-        "@0x/order-utils": "^8.2.5",
-        "@0x/sol-compiler": "^3.1.12",
-        "@0x/sol-coverage": "^3.0.9",
-        "@0x/sol-profiler": "^3.1.11",
-        "@0x/sol-trace": "^2.0.17",
-        "@0x/subproviders": "^5.0.1",
+        "@0x/dev-utils": "^2.3.2",
+        "@0x/order-utils": "^8.3.1",
+        "@0x/sol-compiler": "^3.1.14",
+        "@0x/sol-coverage": "^3.0.11",
+        "@0x/sol-profiler": "^3.1.13",
+        "@0x/sol-trace": "^2.0.19",
+        "@0x/subproviders": "^5.0.3",
         "@0x/tslint-config": "^3.0.1",
-        "@0x/types": "^2.4.1",
-        "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.5.0",
-        "@0x/web3-wrapper": "^6.0.10",
+        "@0x/types": "^2.4.2",
+        "@0x/typescript-typings": "^4.2.5",
+        "@0x/utils": "^4.5.1",
+        "@0x/web3-wrapper": "^6.0.12",
         "@types/bn.js": "^4.11.0",
         "@types/js-combinatorics": "^0.5.29",
         "@types/lodash": "4.14.104",
@@ -63,7 +63,7 @@
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
-        "ethereum-types": "^2.1.4",
+        "ethereum-types": "^2.1.5",
         "ethereumjs-util": "^5.1.1",
         "ethers": "~4.0.4",
         "js-combinatorics": "^0.5.3",

contracts/utils/CHANGELOG.json

@@ -1,4 +1,22 @@
 [
+    {
+        "timestamp": 1567521715,
+        "version": "3.2.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1566446343,
+        "version": "3.2.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1565296576,
         "version": "3.2.1",

contracts/utils/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.2.3 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v3.2.2 - _August 22, 2019_
+
+    * Dependencies updated
+
 ## v3.2.1 - _August 8, 2019_
 
     * Dependencies updated

contracts/utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-utils",
-    "version": "3.2.1",
+    "version": "3.2.3",
     "engines": {
         "node": ">=6.12"
     },
@@ -22,7 +22,7 @@
         "compile": "sol-compiler",
         "watch": "sol-compiler -w",
         "clean": "shx rm -rf lib generated-artifacts generated-wrappers",
-        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
+        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --output generated-wrappers --backend ethers",
         "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
         "coverage:report:text": "istanbul report text",
@@ -47,11 +47,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/utils/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^4.1.0",
-        "@0x/contracts-gen": "^1.0.13",
-        "@0x/contracts-test-utils": "^3.1.13",
-        "@0x/dev-utils": "^2.3.0",
-        "@0x/sol-compiler": "^3.1.12",
+        "@0x/abi-gen": "^4.2.0",
+        "@0x/contracts-gen": "^1.0.14",
+        "@0x/contracts-test-utils": "^3.1.15",
+        "@0x/dev-utils": "^2.3.2",
+        "@0x/sol-compiler": "^3.1.14",
         "@0x/tslint-config": "^3.0.1",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
@@ -70,14 +70,14 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.3.1",
-        "@0x/order-utils": "^8.2.5",
-        "@0x/types": "^2.4.1",
-        "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.5.0",
-        "@0x/web3-wrapper": "^6.0.10",
+        "@0x/base-contract": "^5.3.3",
+        "@0x/order-utils": "^8.3.1",
+        "@0x/types": "^2.4.2",
+        "@0x/typescript-typings": "^4.2.5",
+        "@0x/utils": "^4.5.1",
+        "@0x/web3-wrapper": "^6.0.12",
         "bn.js": "^4.11.8",
-        "ethereum-types": "^2.1.4",
+        "ethereum-types": "^2.1.5",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.11"
     },

package.json

@@ -25,9 +25,9 @@
         "install:all": "yarn install",
         "wsrun": "wsrun",
         "lerna": "lerna",
-        "build": "lerna link && wsrun build $PKG --fast-exit -r --stages --exclude @0x/pipeline --exclude-missing",
-        "build:no_website": "lerna link && wsrun build $PKG --fast-exit -r --stages --exclude @0x/website --exclude @0x/pipeline --exclude-missing",
-        "build:ci:no_website": "lerna link && wsrun build:ci $PKG --fast-exit -r --stages --exclude @0x/website --exclude @0x/pipeline --exclude-missing",
+        "build": "lerna link && wsrun build $PKG --fast-exit -r --stages --exclude-missing",
+        "build:no_website": "lerna link && wsrun build $PKG --fast-exit -r --stages --exclude @0x/website --exclude-missing",
+        "build:ci:no_website": "lerna link && wsrun build:ci $PKG --fast-exit -r --stages --exclude @0x/website --exclude-missing",
         "build:contracts": "lerna link && wsrun build -p ${npm_package_config_contractsPackages} -c --fast-exit -r --stages --exclude-missing",
         "build:monorepo_scripts": "PKG=@0x/monorepo-scripts yarn build",
         "build:ts": "tsc -b",
@@ -42,15 +42,17 @@
         "rebuild:no_website": "run-s clean build:no_website",
         "test": "wsrun test $PKG --fast-exit --serial --exclude-missing",
         "test:contracts": "wsrun test -p ${npm_package_config_contractsPackages} -c --fast-exit --serial --exclude-missing",
-        "generate_doc": "node ./packages/monorepo-scripts/lib/doc_generate_and_upload.js",
-        "test:generate_docs:circleci": "for i in ${npm_package_config_packagesWithDocPages}; do yarn generate_doc --package $i --shouldUpload false --isStaging true || break -1; done;",
+        "generate_doc": "node ./packages/monorepo-scripts/lib/doc_generate.js",
+        "upload_md_docs": "wsrun s3:sync_md_docs --exclude-missing",
+        "diff_md_docs:ci": "wsrun diff_docs --exclude-missing",
+        "test:generate_docs:circleci": "for i in ${npm_package_config_packagesWithDocPages}; do yarn generate_doc --package $i || break -1; done;",
         "bundlewatch": "bundlewatch",
         "lint": "wsrun lint $PKG --fast-exit --parallel --exclude-missing"
     },
     "config": {
         "contractsPackages": "@0x/contracts-asset-proxy @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-exchange-libs @0x/contracts-extensions @0x/contracts-multisig @0x/contracts-test-utils @0x/contracts-utils @0x/contracts-coordinator @0x/contracts-dev-utils",
         "mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic",
-        "packagesWithDocPages": "0x.js connect json-schemas subproviders web3-wrapper order-utils sol-compiler sol-coverage sol-profiler sol-trace ethereum-types asset-buyer migrations",
+        "packagesWithDocPages": "contract-wrappers 0x.js connect json-schemas subproviders web3-wrapper order-utils sol-compiler sol-coverage sol-profiler sol-trace ethereum-types asset-buyer asset-swapper migrations",
         "ignoreDependencyVersions": "@types/styled-components @types/node",
         "ignoreDependencyVersionsForPackage": "website instant dev-tools-pages contract-wrappers"
     },
@@ -73,9 +75,6 @@
             "repoBranchBase": "development"
         }
     },
-    "resolutions": {
-        "graceful-fs": "4.1.15"
-    },
     "devDependencies": {
         "@0x-lerna-fork/lerna": "3.16.10",
         "@0xproject/npm-cli-login": "^0.0.11",

packages/0x.js/CHANGELOG.json

@@ -1,7 +1,20 @@
 [
+    {
+        "timestamp": 1567521715,
+        "version": "7.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "7.0.0",
         "changes": [
+            {
+                "note": "Add optional `exchangeAddress` parameter to `signatureUtils.isValidSignatureAsync` to fix `Validator` type signatures.",
+                "pr": 2017
+            },
             {
                 "note": "Removed @0x/order-watcher"
             },
@@ -9,7 +22,8 @@
                 "note": "Update to latest @0x/contract-wrappers v11",
                 "pr": 2068
             }
-        ]
+        ],
+        "timestamp": 1566446343
     },
     {
         "timestamp": 1565296576,

packages/0x.js/CHANGELOG.md

@@ -5,6 +5,16 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v7.0.1 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v7.0.0 - _August 22, 2019_
+
+    * Add optional `exchangeAddress` parameter to `signatureUtils.isValidSignatureAsync` to fix `Validator` type signatures. (#2017)
+    * Removed @0x/order-watcher
+    * Update to latest @0x/contract-wrappers v11 (#2068)
+
 ## v6.0.15 - _August 8, 2019_
 
     * Dependencies updated

packages/0x.js/README.md

@@ -2,7 +2,7 @@
 
 A TypeScript/Javascript library for interacting with the 0x protocol. It is a high level package which combines a number of underlying packages such as order-utils and asset-data-utils.
 
-### Read the [Documentation](https://0xproject.com/docs/0x.js).
+### Read the [Documentation](https://0x.org/docs/tools/0x.js).
 
 ## Installation
 

packages/0x.js/package.json

@@ -1,6 +1,6 @@
 {
     "name": "0x.js",
-    "version": "6.0.15",
+    "version": "7.0.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -27,7 +27,10 @@
         "clean": "shx rm -rf _bundles lib test_temp src/generated_contract_wrappers generated_docs",
         "build:umd:prod": "NODE_ENV=production node --max_old_space_size=8192 ../../node_modules/.bin/webpack --mode production",
         "build:commonjs": "tsc -b",
-        "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES"
+        "diff_docs": "git diff --exit-code ./docs",
+        "s3:sync_md_docs": "aws s3 sync ./docs s3://docs-markdown/${npm_package_name}/v${npm_package_version} --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers",
+        "docs:md": "ts-doc-gen --sourceDir='$PROJECT_FILES' --output=$MD_FILE_DIR --fileExtension=mdx --tsconfig=./typedoc-tsconfig.json",
+        "docs:json": "typedoc --excludePrivate --excludeExternals --excludeProtected --ignoreCompilerErrors --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES"
     },
     "config": {
         "postpublish": {
@@ -43,9 +46,10 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@0x/contract-addresses": "^3.0.3",
-        "@0x/dev-utils": "^2.3.0",
-        "@0x/migrations": "^4.2.0",
+        "@0x/contract-addresses": "^3.1.0",
+        "@0x/dev-utils": "^2.3.2",
+        "@0x/migrations": "^4.3.1",
+        "@0x/ts-doc-gen": "^0.0.21",
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
@@ -66,24 +70,25 @@
         "sinon": "^4.0.0",
         "source-map-support": "^0.5.0",
         "tslint": "5.11.0",
-        "typedoc": "0.13.0",
+        "typedoc": "^0.15.0",
         "typescript": "3.0.1",
         "uglifyjs-webpack-plugin": "^2.0.1",
         "webpack": "^4.20.2"
     },
     "dependencies": {
-        "@0x/assert": "^2.1.3",
-        "@0x/asset-swapper": "^1.0.1",
-        "@0x/base-contract": "^5.3.1",
-        "@0x/contract-wrappers": "^11.0.0",
-        "@0x/order-utils": "^8.2.5",
-        "@0x/subproviders": "^5.0.1",
-        "@0x/types": "^2.4.1",
-        "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.5.0",
-        "@0x/web3-wrapper": "^6.0.10",
+        "@0x/abi-gen-wrappers": "^5.3.1",
+        "@0x/assert": "^2.1.5",
+        "@0x/asset-swapper": "^1.0.3",
+        "@0x/base-contract": "^5.3.3",
+        "@0x/contract-wrappers": "^12.0.0",
+        "@0x/order-utils": "^8.3.1",
+        "@0x/subproviders": "^5.0.3",
+        "@0x/types": "^2.4.2",
+        "@0x/typescript-typings": "^4.2.5",
+        "@0x/utils": "^4.5.1",
+        "@0x/web3-wrapper": "^6.0.12",
         "@types/web3-provider-engine": "^14.0.0",
-        "ethereum-types": "^2.1.4",
+        "ethereum-types": "^2.1.5",
         "ethers": "~4.0.4",
         "lodash": "^4.17.11",
         "web3-provider-engine": "14.0.6"

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

@@ -21,38 +21,78 @@ export {
     EventCallback,
     DecodedLogEvent,
     OrderStatus,
-    DutchAuctionContract,
-    ERC20ProxyContract,
-    ERC20TokenContract,
-    ERC721ProxyContract,
-    ERC721TokenContract,
-    ExchangeContract,
-    ForwarderContract,
-    OrderValidatorContract,
-    WETH9Contract,
-    WETH9Events,
-    WETH9WithdrawalEventArgs,
-    WETH9ApprovalEventArgs,
-    WETH9EventArgs,
-    WETH9DepositEventArgs,
-    WETH9TransferEventArgs,
-    ERC20TokenTransferEventArgs,
-    ERC20TokenApprovalEventArgs,
-    ERC20TokenEvents,
-    ERC20TokenEventArgs,
-    ERC721TokenApprovalEventArgs,
-    ERC721TokenApprovalForAllEventArgs,
-    ERC721TokenTransferEventArgs,
-    ERC721TokenEvents,
-    ERC721TokenEventArgs,
-    ExchangeCancelUpToEventArgs,
-    ExchangeAssetProxyRegisteredEventArgs,
+} from '@0x/contract-wrappers';
+
+export {
+    ExchangeEventArgs,
+    ExchangeEvents,
     ExchangeSignatureValidatorApprovalEventArgs,
     ExchangeFillEventArgs,
     ExchangeCancelEventArgs,
-    ExchangeEventArgs,
-    ExchangeEvents,
-} from '@0x/contract-wrappers';
+    ExchangeCancelUpToEventArgs,
+    ExchangeAssetProxyRegisteredEventArgs,
+    ExchangeContract,
+    DevUtilsContract,
+    ForwarderContract,
+    DutchAuctionContract,
+    CoordinatorContract,
+    CoordinatorRegistryEventArgs,
+    CoordinatorRegistryEvents,
+    CoordinatorRegistryCoordinatorEndpointSetEventArgs,
+    CoordinatorRegistryContract,
+    IValidatorContract,
+    IWalletContract,
+    WETH9EventArgs,
+    WETH9Events,
+    WETH9ApprovalEventArgs,
+    WETH9TransferEventArgs,
+    WETH9DepositEventArgs,
+    WETH9WithdrawalEventArgs,
+    WETH9Contract,
+    ERC20TokenEventArgs,
+    ERC20TokenEvents,
+    ERC20TokenTransferEventArgs,
+    ERC20TokenApprovalEventArgs,
+    ERC20TokenContract,
+    ERC721TokenEventArgs,
+    ERC721TokenEvents,
+    ERC721TokenTransferEventArgs,
+    ERC721TokenApprovalEventArgs,
+    ERC721TokenApprovalForAllEventArgs,
+    ERC721TokenContract,
+    ERC1155ProxyEventArgs,
+    ERC1155ProxyEvents,
+    ERC1155ProxyAuthorizedAddressAddedEventArgs,
+    ERC1155ProxyAuthorizedAddressRemovedEventArgs,
+    ERC1155ProxyContract,
+    ZRXTokenEventArgs,
+    ZRXTokenEvents,
+    ZRXTokenTransferEventArgs,
+    ZRXTokenApprovalEventArgs,
+    ZRXTokenContract,
+    DummyERC20TokenEventArgs,
+    DummyERC20TokenEvents,
+    DummyERC20TokenTransferEventArgs,
+    DummyERC20TokenApprovalEventArgs,
+    DummyERC20TokenContract,
+    DummyERC721TokenEventArgs,
+    DummyERC721TokenEvents,
+    DummyERC721TokenTransferEventArgs,
+    DummyERC721TokenApprovalEventArgs,
+    DummyERC721TokenApprovalForAllEventArgs,
+    DummyERC721TokenContract,
+    ERC20ProxyEventArgs,
+    ERC20ProxyEvents,
+    ERC20ProxyContract,
+    ERC20ProxyAuthorizedAddressAddedEventArgs,
+    ERC20ProxyAuthorizedAddressRemovedEventArgs,
+    ERC721ProxyEventArgs,
+    ERC721ProxyEvents,
+    ERC721ProxyAuthorizedAddressAddedEventArgs,
+    ERC721ProxyAuthorizedAddressRemovedEventArgs,
+    ERC721ProxyContract,
+    OrderValidatorContract,
+} from '@0x/abi-gen-wrappers';
 
 export import Web3ProviderEngine = require('web3-provider-engine');
 
@@ -64,9 +104,7 @@ export {
     MetamaskSubprovider,
 } from '@0x/subproviders';
 
-export { AbiDecoder, DecodedCalldata } from '@0x/utils';
-
-export { BigNumber } from '@0x/utils';
+export { AbiDecoder, DecodedCalldata, BigNumber } from '@0x/utils';
 
 export {
     Order,
@@ -85,9 +123,15 @@ export {
     SignatureType,
     ZeroExTransaction,
     SignedZeroExTransaction,
+    ValidatorSignature,
+    SimpleContractArtifact,
+    SimpleStandardContractOutput,
+    SimpleEvmOutput,
+    SimpleEvmBytecodeOutput,
 } from '@0x/types';
 
 export {
+    BlockRange,
     ContractAbi,
     LogWithDecodedArgs,
     ContractEventArg,
@@ -121,4 +165,22 @@ export {
     Web3JsV1Provider,
     Web3JsV2Provider,
     Web3JsV3Provider,
+    TxData,
+    ContractArtifact,
+    CallData,
+    BlockParam,
+    CompilerOpts,
+    StandardContractOutput,
+    ContractNetworks,
+    TxDataPayable,
+    BlockParamLiteral,
+    CompilerSettings,
+    ContractNetworkData,
+    DevdocOutput,
+    EvmOutput,
+    CompilerSettingsMetadata,
+    OptimizerSettings,
+    OutputField,
+    ParamDescription,
+    EvmBytecodeOutput,
 } from 'ethereum-types';

packages/abi-gen-templates/CHANGELOG.json

@@ -1,139 +0,0 @@
-[
-    {
-        "timestamp": 1565296576,
-        "version": "2.4.1",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "version": "2.4.0",
-        "changes": [
-            {
-                "note": "Updated interface to `deployFrom0xArtifactAsync` to include log decode dependencies.",
-                "pr": 1995
-            },
-            {
-                "note": "Updated interface to `deployAsync` to include log decode dependencies.",
-                "pr": 1995
-            }
-        ],
-        "timestamp": 1564604963
-    },
-    {
-        "version": "2.3.0",
-        "changes": [
-            {
-                "note": "Python: fix broken event handling",
-                "pr": 1919
-            },
-            {
-                "note": "Python: custom validator class support",
-                "pr": 1919
-            },
-            {
-                "note": "Python: linter fixes",
-                "pr": 1919
-            },
-            {
-                "note": "Python: normalize bytes parameters in wrapper methods",
-                "pr": 1919
-            }
-        ],
-        "timestamp": 1563957393
-    },
-    {
-        "timestamp": 1563006338,
-        "version": "2.2.1",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "version": "2.2.0",
-        "changes": [
-            {
-                "note": "add parameter assertions to methods",
-                "pr": 1823
-            },
-            {
-                "note": "Move `getABITransactionData` to `callAsync` template",
-                "pr": 1863
-            },
-            {
-                "note": "Initial support for Python",
-                "pr": 1878
-            }
-        ],
-        "timestamp": 1562967251
-    },
-    {
-        "version": "2.1.0",
-        "changes": [
-            {
-                "note": "add `awaitTransactionSuccessAsync()` to `tx.handlebars`",
-                "pr": 1797
-            }
-        ],
-        "timestamp": 1557507213
-    },
-    {
-        "version": "2.0.2",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ],
-        "timestamp": 1554997931
-    },
-    {
-        "timestamp": 1551130135,
-        "version": "2.0.1",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "version": "2.0.0",
-        "changes": [
-            {
-                "note": "Upgrade the bignumber.js to v8.0.2",
-                "pr": 1517
-            }
-        ],
-        "timestamp": 1549373905
-    },
-    {
-        "timestamp": 1547561734,
-        "version": "1.0.2",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1543401373,
-        "version": "1.0.1",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "version": "1.0.0",
-        "changes": [
-            {
-                "note": "Initial publish",
-                "pr": 1305
-            }
-        ]
-    }
-]

packages/abi-gen-templates/CHANGELOG.md

@@ -1,60 +0,0 @@
-<!--
-changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
-Edit the package's CHANGELOG.json file only.
--->
-
-CHANGELOG
-
-## v2.4.1 - _August 8, 2019_
-
-    * Dependencies updated
-
-## v2.4.0 - _July 31, 2019_
-
-    * Updated interface to `deployFrom0xArtifactAsync` to include log decode dependencies. (#1995)
-    * Updated interface to `deployAsync` to include log decode dependencies. (#1995)
-
-## v2.3.0 - _July 24, 2019_
-
-    * Python: fix broken event handling (#1919)
-    * Python: custom validator class support (#1919)
-    * Python: linter fixes (#1919)
-    * Python: normalize bytes parameters in wrapper methods (#1919)
-
-## v2.2.1 - _July 13, 2019_
-
-    * Dependencies updated
-
-## v2.2.0 - _July 12, 2019_
-
-    * add parameter assertions to methods (#1823)
-    * Move `getABITransactionData` to `callAsync` template (#1863)
-    * Initial support for Python (#1878)
-
-## v2.1.0 - _May 10, 2019_
-
-    * add `awaitTransactionSuccessAsync()` to `tx.handlebars` (#1797)
-
-## v2.0.2 - _April 11, 2019_
-
-    * Dependencies updated
-
-## v2.0.1 - _February 25, 2019_
-
-    * Dependencies updated
-
-## v2.0.0 - _February 5, 2019_
-
-    * Upgrade the bignumber.js to v8.0.2 (#1517)
-
-## v1.0.2 - _January 15, 2019_
-
-    * Dependencies updated
-
-## v1.0.1 - _November 28, 2018_
-
-    * Dependencies updated
-
-## v1.0.0 - _Invalid date_
-
-    * Initial publish (#1305)

packages/abi-gen-templates/README.md

@@ -1,17 +0,0 @@
-These templates are used with [abi-gen](https://github.com/0xProject/0x-monorepo/tree/development/packages/abi-gen).
-
-To successfully compile the generated TypeScript contract wrappers, you must:
-
--   Install the packages on which the main contract template directly depends: `yarn add @0x/base-contract @0x/sol-compiler @0x/utils @0x/web3-wrapper ethereum-types ethers lodash`
--   Install the packages on which the main contract template *in*directly depends: `yarn add @types/lodash`
--   Ensure that your TypeScript configuration includes the following:
-
-```
-"compilerOptions": {
-  "lib": ["ES2015"],
-  "typeRoots": [
-    "node_modules/@0x/typescript-typings/types",
-    "node_modules/@types"
-  ]
-}
-```

packages/abi-gen-templates/package.json

@@ -1,20 +0,0 @@
-{
-    "name": "@0x/abi-gen-templates",
-    "version": "2.4.1",
-    "engines": {
-        "node": ">=6.12"
-    },
-    "description": "Handlebars templates used by abi-gen to generate contract-wrappers",
-    "repository": {
-        "type": "git",
-        "url": "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/abi-gen-templates/README.md",
-    "publishConfig": {
-        "access": "public"
-    }
-}

packages/abi-gen-wrappers/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1567521715,
+        "version": "5.3.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "5.3.0",
         "changes": [
@@ -6,7 +15,8 @@
                 "note": "Added DevUtils",
                 "pr": 2060
             }
-        ]
+        ],
+        "timestamp": 1566446343
     },
     {
         "version": "5.2.0",

packages/abi-gen-wrappers/CHANGELOG.md

@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v5.3.1 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v5.3.0 - _August 22, 2019_
+
+    * Added DevUtils (#2060)
+
 ## v5.2.0 - _August 8, 2019_
 
     * Updated to include `getABIDecodedTransactionData` and `getABIDecodedReturnData` (#2018)

packages/abi-gen-wrappers/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/abi-gen-wrappers",
-    "version": "5.2.0",
+    "version": "5.3.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -10,7 +10,7 @@
         "test": "test"
     },
     "scripts": {
-        "build": "yarn pre_build && tsc -b && yarn docs",
+        "build": "yarn pre_build && tsc -b",
         "build:ci": "yarn build",
         "lint": "tslint --format stylish --project .",
         "fix": "tslint --fix --format stylish --project .",
@@ -18,8 +18,7 @@
         "prettier": "prettier --write src/**/* --config ../../.prettierrc",
         "prettier_contract_wrappers": "prettier --write src/generated-wrappers/* --config ../../.prettierrc",
         "clean": "shx rm -rf lib src/generated-wrappers",
-        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output src/generated-wrappers --backend ethers",
-        "docs": "typedoc --excludePrivate --excludeExternals --target ES5 --tsconfig typedoc-tsconfig.json --out generated_docs ./src/generated-wrappers/*"
+        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --output src/generated-wrappers --backend ethers"
     },
     "config": {
         "abis": "../contract-artifacts/artifacts/@(AssetProxyOwner|DevUtils|DutchAuction|DummyERC20Token|DummyERC721Token|ERC20Proxy|ERC20Token|ERC721Proxy|ERC721Token|Exchange|Forwarder|IAssetProxy|IValidator|IWallet|MultiAssetProxy|OrderValidator|WETH9|ZRXToken|Coordinator|CoordinatorRegistry|EthBalanceChecker|ERC1155Proxy|StaticCallProxy).json"
@@ -34,23 +33,22 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen-wrappers/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^4.1.0",
-        "@0x/abi-gen-templates": "^2.4.1",
-        "@0x/assert": "^2.1.3",
-        "@0x/json-schemas": "^3.1.13",
+        "@0x/abi-gen": "^4.2.0",
+        "@0x/assert": "^2.1.5",
+        "@0x/json-schemas": "^4.0.1",
         "@0x/tslint-config": "^3.0.1",
-        "@0x/types": "^2.4.1",
-        "@0x/utils": "^4.5.0",
-        "@0x/web3-wrapper": "^6.0.10",
-        "ethereum-types": "^2.1.4",
+        "@0x/types": "^2.4.2",
+        "@0x/utils": "^4.5.1",
+        "@0x/web3-wrapper": "^6.0.12",
+        "ethereum-types": "^2.1.5",
         "ethers": "~4.0.4",
         "lodash": "^4.17.11",
         "shx": "^0.2.2"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.3.1",
-        "@0x/contract-addresses": "^3.0.3",
-        "@0x/contract-artifacts": "^2.0.4"
+        "@0x/base-contract": "^5.3.3",
+        "@0x/contract-addresses": "^3.1.0",
+        "@0x/contract-artifacts": "^2.2.1"
     },
     "publishConfig": {
         "access": "public"

packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts

@@ -3,7 +3,6 @@
 // tslint:disable:no-unused-variable
 import {
     BaseContract,
-    BlockRange,
     EventCallback,
     IndexedFilterValues,
     SubscriptionManager,
@@ -13,6 +12,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,

packages/abi-gen-wrappers/src/generated-wrappers/coordinator.ts

@@ -6,6 +6,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,

packages/abi-gen-wrappers/src/generated-wrappers/coordinator_registry.ts

@@ -3,7 +3,6 @@
 // tslint:disable:no-unused-variable
 import {
     BaseContract,
-    BlockRange,
     EventCallback,
     IndexedFilterValues,
     SubscriptionManager,
@@ -13,6 +12,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,

packages/abi-gen-wrappers/src/generated-wrappers/dev_utils.ts

@@ -6,6 +6,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,

packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc20_token.ts

@@ -3,7 +3,6 @@
 // tslint:disable:no-unused-variable
 import {
     BaseContract,
-    BlockRange,
     EventCallback,
     IndexedFilterValues,
     SubscriptionManager,
@@ -13,6 +12,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,

packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc721_token.ts

@@ -3,7 +3,6 @@
 // tslint:disable:no-unused-variable
 import {
     BaseContract,
-    BlockRange,
     EventCallback,
     IndexedFilterValues,
     SubscriptionManager,
@@ -13,6 +12,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,

packages/abi-gen-wrappers/src/generated-wrappers/dutch_auction.ts

@@ -6,6 +6,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,

packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts

@@ -3,7 +3,6 @@
 // tslint:disable:no-unused-variable
 import {
     BaseContract,
-    BlockRange,
     EventCallback,
     IndexedFilterValues,
     SubscriptionManager,
@@ -13,6 +12,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,

packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts

@@ -3,7 +3,6 @@
 // tslint:disable:no-unused-variable
 import {
     BaseContract,
-    BlockRange,
     EventCallback,
     IndexedFilterValues,
     SubscriptionManager,
@@ -13,6 +12,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,

packages/abi-gen-wrappers/src/generated-wrappers/erc721_proxy.ts

@@ -3,7 +3,6 @@
 // tslint:disable:no-unused-variable
 import {
     BaseContract,
-    BlockRange,
     EventCallback,
     IndexedFilterValues,
     SubscriptionManager,
@@ -13,6 +12,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,

packages/abi-gen-wrappers/src/generated-wrappers/erc721_token.ts

@@ -3,7 +3,6 @@
 // tslint:disable:no-unused-variable
 import {
     BaseContract,
-    BlockRange,
     EventCallback,
     IndexedFilterValues,
     SubscriptionManager,
@@ -13,6 +12,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,

packages/abi-gen-wrappers/src/generated-wrappers/eth_balance_checker.ts

@@ -6,6 +6,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,

packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts

@@ -3,7 +3,6 @@
 // tslint:disable:no-unused-variable
 import {
     BaseContract,
-    BlockRange,
     EventCallback,
     IndexedFilterValues,
     SubscriptionManager,
@@ -13,6 +12,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,

packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts

@@ -6,6 +6,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,

packages/abi-gen-wrappers/src/generated-wrappers/i_asset_proxy.ts

@@ -6,6 +6,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,

packages/abi-gen-wrappers/src/generated-wrappers/i_validator.ts

@@ -6,6 +6,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,
@@ -38,7 +39,7 @@ export class IValidatorContract extends BaseContract {
          * @param hash Message hash that is signed.
          * @param signerAddress Address that should have signed the given hash.
          * @param signature Proof of signing.
-         * @returns Validity of order signature.
+         * @returns Magic bytes4 value if the signature is valid.         Magic value is bytes4(keccak256("isValidValidatorSignature(address,bytes32,address,bytes)"))
          */
         async callAsync(
             hash: string,
@@ -46,7 +47,7 @@ export class IValidatorContract extends BaseContract {
             signature: string,
             callData: Partial<CallData> = {},
             defaultBlock?: BlockParam,
-        ): Promise<boolean> {
+        ): Promise<string> {
             assert.isString('hash', hash);
             assert.isString('signerAddress', signerAddress);
             assert.isString('signature', signature);
@@ -80,7 +81,7 @@ export class IValidatorContract extends BaseContract {
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
             const abiEncoder = self._lookupAbiEncoder('isValidSignature(bytes32,address,bytes)');
             // tslint:disable boolean-naming
-            const result = abiEncoder.strictDecodeReturnValue<boolean>(rawCallResult);
+            const result = abiEncoder.strictDecodeReturnValue<string>(rawCallResult);
             // tslint:enable boolean-naming
             return result;
         },
@@ -104,18 +105,18 @@ export class IValidatorContract extends BaseContract {
             ]);
             return abiEncodedTransactionData;
         },
-        getABIDecodedTransactionData(callData: string): boolean {
+        getABIDecodedTransactionData(callData: string): string {
             const self = (this as any) as IValidatorContract;
             const abiEncoder = self._lookupAbiEncoder('isValidSignature(bytes32,address,bytes)');
             // tslint:disable boolean-naming
-            const abiDecodedCallData = abiEncoder.strictDecode<boolean>(callData);
+            const abiDecodedCallData = abiEncoder.strictDecode<string>(callData);
             return abiDecodedCallData;
         },
-        getABIDecodedReturnData(returnData: string): boolean {
+        getABIDecodedReturnData(returnData: string): string {
             const self = (this as any) as IValidatorContract;
             const abiEncoder = self._lookupAbiEncoder('isValidSignature(bytes32,address,bytes)');
             // tslint:disable boolean-naming
-            const abiDecodedReturnData = abiEncoder.strictDecodeReturnValue<boolean>(returnData);
+            const abiDecodedReturnData = abiEncoder.strictDecodeReturnValue<string>(returnData);
             return abiDecodedReturnData;
         },
     };
@@ -207,8 +208,8 @@ export class IValidatorContract extends BaseContract {
                 name: 'isValidSignature',
                 outputs: [
                     {
-                        name: 'isValid',
-                        type: 'bool',
+                        name: '',
+                        type: 'bytes4',
                     },
                 ],
                 payable: false,

packages/abi-gen-wrappers/src/generated-wrappers/i_wallet.ts

@@ -6,6 +6,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,
@@ -37,14 +38,14 @@ export class IWalletContract extends BaseContract {
          * since they don't modify state.
          * @param hash Message hash that is signed.
          * @param signature Proof of signing.
-         * @returns Validity of order signature.
+         * @returns Magic bytes4 value if the signature is valid.         Magic value is bytes4(keccak256("isValidWalletSignature(bytes32,address,bytes)"))
          */
         async callAsync(
             hash: string,
             signature: string,
             callData: Partial<CallData> = {},
             defaultBlock?: BlockParam,
-        ): Promise<boolean> {
+        ): Promise<string> {
             assert.isString('hash', hash);
             assert.isString('signature', signature);
             assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [
@@ -73,7 +74,7 @@ export class IWalletContract extends BaseContract {
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
             const abiEncoder = self._lookupAbiEncoder('isValidSignature(bytes32,bytes)');
             // tslint:disable boolean-naming
-            const result = abiEncoder.strictDecodeReturnValue<boolean>(rawCallResult);
+            const result = abiEncoder.strictDecodeReturnValue<string>(rawCallResult);
             // tslint:enable boolean-naming
             return result;
         },
@@ -94,18 +95,18 @@ export class IWalletContract extends BaseContract {
             ]);
             return abiEncodedTransactionData;
         },
-        getABIDecodedTransactionData(callData: string): boolean {
+        getABIDecodedTransactionData(callData: string): string {
             const self = (this as any) as IWalletContract;
             const abiEncoder = self._lookupAbiEncoder('isValidSignature(bytes32,bytes)');
             // tslint:disable boolean-naming
-            const abiDecodedCallData = abiEncoder.strictDecode<boolean>(callData);
+            const abiDecodedCallData = abiEncoder.strictDecode<string>(callData);
             return abiDecodedCallData;
         },
-        getABIDecodedReturnData(returnData: string): boolean {
+        getABIDecodedReturnData(returnData: string): string {
             const self = (this as any) as IWalletContract;
             const abiEncoder = self._lookupAbiEncoder('isValidSignature(bytes32,bytes)');
             // tslint:disable boolean-naming
-            const abiDecodedReturnData = abiEncoder.strictDecodeReturnValue<boolean>(returnData);
+            const abiDecodedReturnData = abiEncoder.strictDecodeReturnValue<string>(returnData);
             return abiDecodedReturnData;
         },
     };
@@ -193,8 +194,8 @@ export class IWalletContract extends BaseContract {
                 name: 'isValidSignature',
                 outputs: [
                     {
-                        name: 'isValid',
-                        type: 'bool',
+                        name: '',
+                        type: 'bytes4',
                     },
                 ],
                 payable: false,

packages/abi-gen-wrappers/src/generated-wrappers/multi_asset_proxy.ts

@@ -3,7 +3,6 @@
 // tslint:disable:no-unused-variable
 import {
     BaseContract,
-    BlockRange,
     EventCallback,
     IndexedFilterValues,
     SubscriptionManager,
@@ -13,6 +12,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,

packages/abi-gen-wrappers/src/generated-wrappers/order_validator.ts

@@ -6,6 +6,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,

packages/abi-gen-wrappers/src/generated-wrappers/static_call_proxy.ts

@@ -6,6 +6,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,
@@ -26,24 +27,33 @@ import * as ethers from 'ethers';
 /* istanbul ignore next */
 // tslint:disable:no-parameter-reassignment
 // tslint:disable-next-line:class-name
-export class EthBalanceCheckerContract extends BaseContract {
+export class StaticCallProxyContract extends BaseContract {
     /**
-     * Batch fetches ETH balances
+     * Makes a staticcall to a target address and verifies that the data returned matches the expected return data.
      */
-    public getEthBalances = {
+    public transferFrom = {
         /**
          * Sends a read-only call to the contract method. Returns the result that would happen if one were to send an
          * Ethereum transaction to this method, given the current state of the blockchain. Calls do not cost gas
          * since they don't modify state.
-         * @param addresses Array of addresses.
-         * @returns Array of ETH balances.
+         * @param assetData Byte array encoded with staticCallTarget, staticCallData,
+         *     and expectedCallResultHash
+         * @param from This value is ignored.
+         * @param to This value is ignored.
+         * @param amount This value is ignored.
          */
         async callAsync(
-            addresses: string[],
+            assetData: string,
+            from: string,
+            to: string,
+            amount: BigNumber,
             callData: Partial<CallData> = {},
             defaultBlock?: BlockParam,
-        ): Promise<BigNumber[]> {
-            assert.isArray('addresses', addresses);
+        ): Promise<void> {
+            assert.isString('assetData', assetData);
+            assert.isString('from', from);
+            assert.isString('to', to);
+            assert.isBigNumber('amount', amount);
             assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [
                 schemas.addressSchema,
                 schemas.numberSchema,
@@ -52,8 +62,13 @@ export class EthBalanceCheckerContract extends BaseContract {
             if (defaultBlock !== undefined) {
                 assert.isBlockParam('defaultBlock', defaultBlock);
             }
-            const self = (this as any) as EthBalanceCheckerContract;
-            const encodedData = self._strictEncodeArguments('getEthBalances(address[])', [addresses]);
+            const self = (this as any) as StaticCallProxyContract;
+            const encodedData = self._strictEncodeArguments('transferFrom(bytes,address,address,uint256)', [
+                assetData,
+                from.toLowerCase(),
+                to.toLowerCase(),
+                amount,
+            ]);
             const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
                 {
                     to: self.address,
@@ -68,9 +83,9 @@ export class EthBalanceCheckerContract extends BaseContract {
 
             const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
             BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
-            const abiEncoder = self._lookupAbiEncoder('getEthBalances(address[])');
+            const abiEncoder = self._lookupAbiEncoder('transferFrom(bytes,address,address,uint256)');
             // tslint:disable boolean-naming
-            const result = abiEncoder.strictDecodeReturnValue<BigNumber[]>(rawCallResult);
+            const result = abiEncoder.strictDecodeReturnValue<void>(rawCallResult);
             // tslint:enable boolean-naming
             return result;
         },
@@ -78,26 +93,102 @@ export class EthBalanceCheckerContract extends BaseContract {
          * Returns the ABI encoded transaction data needed to send an Ethereum transaction calling this method. Before
          * sending the Ethereum tx, this encoded tx data can first be sent to a separate signing service or can be used
          * to create a 0x transaction (see protocol spec for more details).
-         * @param addresses Array of addresses.
+         * @param assetData Byte array encoded with staticCallTarget, staticCallData,
+         *     and expectedCallResultHash
+         * @param from This value is ignored.
+         * @param to This value is ignored.
+         * @param amount This value is ignored.
          */
-        getABIEncodedTransactionData(addresses: string[]): string {
-            assert.isArray('addresses', addresses);
-            const self = (this as any) as EthBalanceCheckerContract;
-            const abiEncodedTransactionData = self._strictEncodeArguments('getEthBalances(address[])', [addresses]);
+        getABIEncodedTransactionData(assetData: string, from: string, to: string, amount: BigNumber): string {
+            assert.isString('assetData', assetData);
+            assert.isString('from', from);
+            assert.isString('to', to);
+            assert.isBigNumber('amount', amount);
+            const self = (this as any) as StaticCallProxyContract;
+            const abiEncodedTransactionData = self._strictEncodeArguments(
+                'transferFrom(bytes,address,address,uint256)',
+                [assetData, from.toLowerCase(), to.toLowerCase(), amount],
+            );
             return abiEncodedTransactionData;
         },
-        getABIDecodedTransactionData(callData: string): BigNumber[] {
-            const self = (this as any) as EthBalanceCheckerContract;
-            const abiEncoder = self._lookupAbiEncoder('getEthBalances(address[])');
+        getABIDecodedTransactionData(callData: string): void {
+            const self = (this as any) as StaticCallProxyContract;
+            const abiEncoder = self._lookupAbiEncoder('transferFrom(bytes,address,address,uint256)');
             // tslint:disable boolean-naming
-            const abiDecodedCallData = abiEncoder.strictDecode<BigNumber[]>(callData);
+            const abiDecodedCallData = abiEncoder.strictDecode<void>(callData);
             return abiDecodedCallData;
         },
-        getABIDecodedReturnData(returnData: string): BigNumber[] {
-            const self = (this as any) as EthBalanceCheckerContract;
-            const abiEncoder = self._lookupAbiEncoder('getEthBalances(address[])');
+        getABIDecodedReturnData(returnData: string): void {
+            const self = (this as any) as StaticCallProxyContract;
+            const abiEncoder = self._lookupAbiEncoder('transferFrom(bytes,address,address,uint256)');
             // tslint:disable boolean-naming
-            const abiDecodedReturnData = abiEncoder.strictDecodeReturnValue<BigNumber[]>(returnData);
+            const abiDecodedReturnData = abiEncoder.strictDecodeReturnValue<void>(returnData);
+            return abiDecodedReturnData;
+        },
+    };
+    /**
+     * Gets the proxy id associated with the proxy address.
+     */
+    public getProxyId = {
+        /**
+         * Sends a read-only call to the contract method. Returns the result that would happen if one were to send an
+         * Ethereum transaction to this method, given the current state of the blockchain. Calls do not cost gas
+         * since they don't modify state.
+         * @returns Proxy id.
+         */
+        async callAsync(callData: Partial<CallData> = {}, defaultBlock?: BlockParam): Promise<string> {
+            assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [
+                schemas.addressSchema,
+                schemas.numberSchema,
+                schemas.jsNumber,
+            ]);
+            if (defaultBlock !== undefined) {
+                assert.isBlockParam('defaultBlock', defaultBlock);
+            }
+            const self = (this as any) as StaticCallProxyContract;
+            const encodedData = self._strictEncodeArguments('getProxyId()', []);
+            const callDataWithDefaults = await BaseContract._applyDefaultsToTxDataAsync(
+                {
+                    to: self.address,
+                    ...callData,
+                    data: encodedData,
+                },
+                self._web3Wrapper.getContractDefaults(),
+            );
+            callDataWithDefaults.from = callDataWithDefaults.from
+                ? callDataWithDefaults.from.toLowerCase()
+                : callDataWithDefaults.from;
+
+            const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
+            BaseContract._throwIfRevertWithReasonCallResult(rawCallResult);
+            const abiEncoder = self._lookupAbiEncoder('getProxyId()');
+            // tslint:disable boolean-naming
+            const result = abiEncoder.strictDecodeReturnValue<string>(rawCallResult);
+            // tslint:enable boolean-naming
+            return result;
+        },
+        /**
+         * Returns the ABI encoded transaction data needed to send an Ethereum transaction calling this method. Before
+         * sending the Ethereum tx, this encoded tx data can first be sent to a separate signing service or can be used
+         * to create a 0x transaction (see protocol spec for more details).
+         */
+        getABIEncodedTransactionData(): string {
+            const self = (this as any) as StaticCallProxyContract;
+            const abiEncodedTransactionData = self._strictEncodeArguments('getProxyId()', []);
+            return abiEncodedTransactionData;
+        },
+        getABIDecodedTransactionData(callData: string): string {
+            const self = (this as any) as StaticCallProxyContract;
+            const abiEncoder = self._lookupAbiEncoder('getProxyId()');
+            // tslint:disable boolean-naming
+            const abiDecodedCallData = abiEncoder.strictDecode<string>(callData);
+            return abiDecodedCallData;
+        },
+        getABIDecodedReturnData(returnData: string): string {
+            const self = (this as any) as StaticCallProxyContract;
+            const abiEncoder = self._lookupAbiEncoder('getProxyId()');
+            // tslint:disable boolean-naming
+            const abiDecodedReturnData = abiEncoder.strictDecodeReturnValue<string>(returnData);
             return abiDecodedReturnData;
         },
     };
@@ -106,7 +197,7 @@ export class EthBalanceCheckerContract extends BaseContract {
         supportedProvider: SupportedProvider,
         txDefaults: Partial<TxData>,
         logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact },
-    ): Promise<EthBalanceCheckerContract> {
+    ): Promise<StaticCallProxyContract> {
         assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [
             schemas.addressSchema,
             schemas.numberSchema,
@@ -124,7 +215,7 @@ export class EthBalanceCheckerContract extends BaseContract {
                 logDecodeDependenciesAbiOnly[key] = logDecodeDependencies[key].compilerOutput.abi;
             }
         }
-        return EthBalanceCheckerContract.deployAsync(bytecode, abi, provider, txDefaults, logDecodeDependenciesAbiOnly);
+        return StaticCallProxyContract.deployAsync(bytecode, abi, provider, txDefaults, logDecodeDependenciesAbiOnly);
     }
     public static async deployAsync(
         bytecode: string,
@@ -132,7 +223,7 @@ export class EthBalanceCheckerContract extends BaseContract {
         supportedProvider: SupportedProvider,
         txDefaults: Partial<TxData>,
         logDecodeDependencies: { [contractName: string]: ContractAbi },
-    ): Promise<EthBalanceCheckerContract> {
+    ): Promise<StaticCallProxyContract> {
         assert.isHexString('bytecode', bytecode);
         assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [
             schemas.addressSchema,
@@ -154,8 +245,8 @@ export class EthBalanceCheckerContract extends BaseContract {
         const txHash = await web3Wrapper.sendTransactionAsync(txDataWithDefaults);
         logUtils.log(`transactionHash: ${txHash}`);
         const txReceipt = await web3Wrapper.awaitTransactionSuccessAsync(txHash);
-        logUtils.log(`EthBalanceChecker successfully deployed at ${txReceipt.contractAddress}`);
-        const contractInstance = new EthBalanceCheckerContract(
+        logUtils.log(`StaticCallProxy successfully deployed at ${txReceipt.contractAddress}`);
+        const contractInstance = new StaticCallProxyContract(
             txReceipt.contractAddress as string,
             provider,
             txDefaults,
@@ -174,19 +265,40 @@ export class EthBalanceCheckerContract extends BaseContract {
                 constant: true,
                 inputs: [
                     {
-                        name: 'addresses',
-                        type: 'address[]',
+                        name: 'assetData',
+                        type: 'bytes',
+                    },
+                    {
+                        name: 'from',
+                        type: 'address',
+                    },
+                    {
+                        name: 'to',
+                        type: 'address',
+                    },
+                    {
+                        name: 'amount',
+                        type: 'uint256',
                     },
                 ],
-                name: 'getEthBalances',
+                name: 'transferFrom',
+                outputs: [],
+                payable: false,
+                stateMutability: 'view',
+                type: 'function',
+            },
+            {
+                constant: true,
+                inputs: [],
+                name: 'getProxyId',
                 outputs: [
                     {
                         name: '',
-                        type: 'uint256[]',
+                        type: 'bytes4',
                     },
                 ],
                 payable: false,
-                stateMutability: 'view',
+                stateMutability: 'pure',
                 type: 'function',
             },
         ] as ContractAbi;
@@ -199,8 +311,8 @@ export class EthBalanceCheckerContract extends BaseContract {
         logDecodeDependencies?: { [contractName: string]: ContractAbi },
     ) {
         super(
-            'EthBalanceChecker',
-            EthBalanceCheckerContract.ABI(),
+            'StaticCallProxy',
+            StaticCallProxyContract.ABI(),
             address,
             supportedProvider,
             txDefaults,

packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts

@@ -3,7 +3,6 @@
 // tslint:disable:no-unused-variable
 import {
     BaseContract,
-    BlockRange,
     EventCallback,
     IndexedFilterValues,
     SubscriptionManager,
@@ -13,6 +12,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,

packages/abi-gen-wrappers/src/generated-wrappers/zrx_token.ts

@@ -3,7 +3,6 @@
 // tslint:disable:no-unused-variable
 import {
     BaseContract,
-    BlockRange,
     EventCallback,
     IndexedFilterValues,
     SubscriptionManager,
@@ -13,6 +12,7 @@ import { schemas } from '@0x/json-schemas';
 import {
     BlockParam,
     BlockParamLiteral,
+    BlockRange,
     CallData,
     ContractAbi,
     ContractArtifact,

packages/abi-gen-wrappers/src/index.ts

@@ -1,25 +1,120 @@
-export * from './generated-wrappers/asset_proxy_owner';
-export * from './generated-wrappers/dev_utils';
-export * from './generated-wrappers/dummy_erc20_token';
-export * from './generated-wrappers/dummy_erc721_token';
-export * from './generated-wrappers/dutch_auction';
-export * from './generated-wrappers/erc1155_proxy';
-export * from './generated-wrappers/erc20_proxy';
-export * from './generated-wrappers/erc20_token';
-export * from './generated-wrappers/erc721_proxy';
-export * from './generated-wrappers/erc721_token';
-export * from './generated-wrappers/exchange';
-export * from './generated-wrappers/forwarder';
-export * from './generated-wrappers/i_asset_proxy';
-export * from './generated-wrappers/i_validator';
-export * from './generated-wrappers/i_wallet';
-export * from './generated-wrappers/multi_asset_proxy';
-export * from './generated-wrappers/order_validator';
-export * from './generated-wrappers/static_call_proxy';
-export * from './generated-wrappers/weth9';
-export * from './generated-wrappers/zrx_token';
-export * from './generated-wrappers/coordinator';
-export * from './generated-wrappers/coordinator_registry';
-export * from './generated-wrappers/eth_balance_checker';
+export {
+    AssetProxyOwnerEventArgs,
+    AssetProxyOwnerEvents,
+    AssetProxyOwnerAssetProxyRegistrationEventArgs,
+    AssetProxyOwnerConfirmationTimeSetEventArgs,
+    AssetProxyOwnerTimeLockChangeEventArgs,
+    AssetProxyOwnerConfirmationEventArgs,
+    AssetProxyOwnerRevocationEventArgs,
+    AssetProxyOwnerSubmissionEventArgs,
+    AssetProxyOwnerExecutionEventArgs,
+    AssetProxyOwnerExecutionFailureEventArgs,
+    AssetProxyOwnerDepositEventArgs,
+    AssetProxyOwnerOwnerAdditionEventArgs,
+    AssetProxyOwnerOwnerRemovalEventArgs,
+    AssetProxyOwnerRequirementChangeEventArgs,
+    AssetProxyOwnerContract,
+} from './generated-wrappers/asset_proxy_owner';
+export { DevUtilsContract } from './generated-wrappers/dev_utils';
+export {
+    DummyERC20TokenEventArgs,
+    DummyERC20TokenEvents,
+    DummyERC20TokenTransferEventArgs,
+    DummyERC20TokenApprovalEventArgs,
+    DummyERC20TokenContract,
+} from './generated-wrappers/dummy_erc20_token';
+export {
+    DummyERC721TokenEventArgs,
+    DummyERC721TokenEvents,
+    DummyERC721TokenTransferEventArgs,
+    DummyERC721TokenApprovalEventArgs,
+    DummyERC721TokenApprovalForAllEventArgs,
+    DummyERC721TokenContract,
+} from './generated-wrappers/dummy_erc721_token';
+export { DutchAuctionContract } from './generated-wrappers/dutch_auction';
+export {
+    ERC1155ProxyEventArgs,
+    ERC1155ProxyEvents,
+    ERC1155ProxyAuthorizedAddressAddedEventArgs,
+    ERC1155ProxyAuthorizedAddressRemovedEventArgs,
+    ERC1155ProxyContract,
+} from './generated-wrappers/erc1155_proxy';
+export {
+    ERC20ProxyEventArgs,
+    ERC20ProxyEvents,
+    ERC20ProxyAuthorizedAddressAddedEventArgs,
+    ERC20ProxyAuthorizedAddressRemovedEventArgs,
+    ERC20ProxyContract,
+} from './generated-wrappers/erc20_proxy';
+export {
+    ERC20TokenEventArgs,
+    ERC20TokenEvents,
+    ERC20TokenTransferEventArgs,
+    ERC20TokenApprovalEventArgs,
+    ERC20TokenContract,
+} from './generated-wrappers/erc20_token';
+export {
+    ERC721ProxyEventArgs,
+    ERC721ProxyEvents,
+    ERC721ProxyAuthorizedAddressAddedEventArgs,
+    ERC721ProxyAuthorizedAddressRemovedEventArgs,
+    ERC721ProxyContract,
+} from './generated-wrappers/erc721_proxy';
+export {
+    ERC721TokenEventArgs,
+    ERC721TokenEvents,
+    ERC721TokenTransferEventArgs,
+    ERC721TokenApprovalEventArgs,
+    ERC721TokenApprovalForAllEventArgs,
+    ERC721TokenContract,
+} from './generated-wrappers/erc721_token';
+export {
+    ExchangeEventArgs,
+    ExchangeEvents,
+    ExchangeSignatureValidatorApprovalEventArgs,
+    ExchangeFillEventArgs,
+    ExchangeCancelEventArgs,
+    ExchangeCancelUpToEventArgs,
+    ExchangeAssetProxyRegisteredEventArgs,
+    ExchangeContract,
+} from './generated-wrappers/exchange';
+export { ForwarderContract } from './generated-wrappers/forwarder';
+export { IAssetProxyContract } from './generated-wrappers/i_asset_proxy';
+export { IValidatorContract } from './generated-wrappers/i_validator';
+export { IWalletContract } from './generated-wrappers/i_wallet';
+export {
+    MultiAssetProxyEventArgs,
+    MultiAssetProxyEvents,
+    MultiAssetProxyAuthorizedAddressAddedEventArgs,
+    MultiAssetProxyAuthorizedAddressRemovedEventArgs,
+    MultiAssetProxyAssetProxyRegisteredEventArgs,
+    MultiAssetProxyContract,
+} from './generated-wrappers/multi_asset_proxy';
+export { OrderValidatorContract } from './generated-wrappers/order_validator';
+export { StaticCallProxyContract } from './generated-wrappers/static_call_proxy';
+export {
+    WETH9EventArgs,
+    WETH9Events,
+    WETH9ApprovalEventArgs,
+    WETH9TransferEventArgs,
+    WETH9DepositEventArgs,
+    WETH9WithdrawalEventArgs,
+    WETH9Contract,
+} from './generated-wrappers/weth9';
+export {
+    ZRXTokenEventArgs,
+    ZRXTokenEvents,
+    ZRXTokenTransferEventArgs,
+    ZRXTokenApprovalEventArgs,
+    ZRXTokenContract,
+} from './generated-wrappers/zrx_token';
+export { CoordinatorContract } from './generated-wrappers/coordinator';
+export {
+    CoordinatorRegistryEventArgs,
+    CoordinatorRegistryEvents,
+    CoordinatorRegistryCoordinatorEndpointSetEventArgs,
+    CoordinatorRegistryContract,
+} from './generated-wrappers/coordinator_registry';
+export { EthBalanceCheckerContract } from './generated-wrappers/eth_balance_checker';
 
 export * from '@0x/contract-addresses';