Publish

- 0x.js@6.0.0 - @0x/abi-gen@2.0.4 - @0x/abi-gen-templates@2.0.1 - @0x/abi-gen-wrappers@4.0.0 - @0x/assert@2.0.4 - @0x/asset-buyer@6.0.0 - @0x/base-contract@5.0.0 - @0x/connect@5.0.0 - @0x/contract-addresses@2.2.2 - @0x/contract-wrappers@8.0.0 - @0x/contracts-gen@1.0.3 - @0x/dev-tools-pages@0.0.20 - @0x/dev-utils@2.1.1 - ethereum-types@2.1.0 - @0x/fill-scenarios@3.0.0 - @0x/instant@1.0.14 - @0x/json-schemas@3.0.4 - @0x/metacoin@0.0.41 - @0x/migrations@4.0.0 - @0x/monorepo-scripts@1.0.25 - @0x/order-utils@7.0.0 - @0x/order-watcher@4.0.0 - @0x/pipeline@1.0.11 - @0x/react-docs@2.0.5 - @0x/react-shared@2.0.5 - @0x/sol-compiler@3.1.0 - @0x/sol-coverage@2.0.4 - @0x/sol-doc@2.0.4 - @0x/sol-profiler@3.0.0 - @0x/sol-resolver@2.0.3 - @0x/sol-trace@2.0.5 - @0x/sol-tracing-utils@6.0.4 - @0x/sra-spec@2.0.4 - @0x/subproviders@4.0.0 - @0x/testnet-faucets@1.0.70 - @0x/types@2.1.0 - @0x/typescript-typings@4.1.0 - @0x/utils@4.2.0 - @0x/web3-wrapper@6.0.0 - @0x/website@0.0.73 - @0x/contracts-asset-proxy@1.0.6 - @0x/contracts-erc20@1.0.6 - @0x/contracts-erc721@1.0.6 - @0x/contracts-exchange@1.0.6 - @0x/contracts-exchange-forwarder@1.0.6 - @0x/contracts-exchange-libs@1.1.0 - @0x/contracts-extensions@2.0.5 - @0x/contracts-multisig@2.0.5 - @0x/contracts-test-utils@3.0.5 - @0x/contracts-utils@2.0.5
Updated CHANGELOGS
2019-02-25 13:35:29 -08:00 · 2019-02-25 13:35:17 -08:00 · 2019-02-25 13:19:51 -08:00 · 2019-02-25 15:57:21 -05:00 · 2019-02-25 12:53:42 -08:00 · 2019-02-25 12:52:21 -08:00
850 changed files with 21935 additions and 10358 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,7 +16,8 @@ jobs:
                  command: sudo npm install --global yarn@1.9.4
            - run:
                  name: yarn
-                  command: yarn --frozen-lockfile --ignore-engines install
+                  command: yarn --frozen-lockfile --ignore-engines install || yarn --frozen-lockfile --ignore-engines install
+            - setup_remote_docker
            - run: yarn build:ci:no_website
            - run: yarn build:ts
            - save_cache:
@@ -43,10 +44,13 @@ jobs:
                      - repo-{{ .Environment.CIRCLE_SHA1 }}
            - run: yarn wsrun test:circleci @0x/contracts-multisig
            - run: yarn wsrun test:circleci @0x/contracts-utils
-            - run: yarn wsrun test:circleci @0x/contracts-libs
-            - run: yarn wsrun test:circleci @0x/contracts-tokens
+            - run: yarn wsrun test:circleci @0x/contracts-exchange-libs
+            - run: yarn wsrun test:circleci @0x/contracts-erc20
+            - run: yarn wsrun test:circleci @0x/contracts-erc721
            - run: yarn wsrun test:circleci @0x/contracts-extensions
-            - run: yarn wsrun test:circleci @0x/contracts-protocol
+            - run: yarn wsrun test:circleci @0x/contracts-asset-proxy
+            - run: yarn wsrun test:circleci @0x/contracts-exchange
+            - run: yarn wsrun test:circleci @0x/contracts-exchange-forwarder
    test-contracts-geth:
        docker:
            - image: circleci/node:9-browsers
@@ -59,11 +63,14 @@ jobs:
            # HACK(albrow): we need to sleep 10 seconds to ensure the devnet is
            # initialized
            - run: sleep 10 && TEST_PROVIDER=geth yarn wsrun test @0x/contracts-multisig
-            - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-utils
-            - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-libs
-            - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-tokens
-            - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-extensions
-            - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-protocol
+            - run: TEST_PROVIDER=geth yarn wsrun test:circleci @0x/contracts-utils
+            - run: TEST_PROVIDER=geth yarn wsrun test:circleci @0x/contracts-exchange-libs
+            - run: TEST_PROVIDER=geth yarn wsrun test:circleci @0x/contracts-erc20
+            - run: TEST_PROVIDER=geth yarn wsrun test:circleci @0x/contracts-erc721
+            - run: TEST_PROVIDER=geth yarn wsrun test:circleci @0x/contracts-extensions
+            - run: TEST_PROVIDER=geth yarn wsrun test:circleci @0x/contracts-asset-proxy
+            - run: TEST_PROVIDER=geth yarn wsrun test:circleci @0x/contracts-exchange
+            - run: TEST_PROVIDER=geth yarn wsrun test:circleci @0x/contracts-exchange-forwarder
    test-publish:
        resource_class: medium+
        docker:
@@ -195,7 +202,7 @@ jobs:
        steps:
            - checkout
            - run: sudo chown -R circleci:circleci /usr/local/bin
-            - run: sudo chown -R circleci:circleci /usr/local/lib/python3.7/site-packages
+            - run: sudo chown -R circleci:circleci /usr/local/lib/python3.7
            - restore_cache:
                  key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
            - run:
@@ -243,7 +250,7 @@ jobs:
        steps:
            - checkout
            - run: sudo chown -R circleci:circleci /usr/local/bin
-            - run: sudo chown -R circleci:circleci /usr/local/lib/python3.7/site-packages
+            - run: sudo chown -R circleci:circleci /usr/local/lib/python3.7
            - restore_cache:
                  key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
            - run:
@@ -271,7 +278,7 @@ jobs:
        steps:
            - checkout
            - run: sudo chown -R circleci:circleci /usr/local/bin
-            - run: sudo chown -R circleci:circleci /usr/local/lib/python3.7/site-packages
+            - run: sudo chown -R circleci:circleci /usr/local/lib/python3.7
            - restore_cache:
                  key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
            - run:
@@ -290,6 +297,7 @@ jobs:
                      - repo-{{ .Environment.CIRCLE_SHA1 }}
            - run: yarn lerna run lint
            - run: yarn prettier:ci
+            - run: yarn deps_versions:ci
            - run: cd packages/0x.js && yarn build:umd:prod
            - run: yarn bundlewatch
    submit-coverage:
--- a/.github/autolabeler.yml
+++ b/.github/autolabeler.yml
@@ -2,6 +2,7 @@ python: ['python-packages']
 contracts: ['contracts']
 sol-doc: ['packages/sol-doc']
 sol-resolver: ['packages/sol-resolver']
+contracts-gen: ['packages/contracts-gen']
 sra-spec: ['packages/sra-spec']
 subproviders: ['packages/subproviders']
 contract-addresses: ['packages/contract-addresses']
--- a/.gitignore
+++ b/.gitignore
@@ -83,27 +83,29 @@ packages/react-docs/example/public/bundle*
 packages/testnet-faucets/server/

 # generated contract artifacts/
-contracts/protocol/generated-artifacts/
+contracts/exchange/generated-artifacts/
+contracts/asset-proxy/generated-artifacts/
 contracts/multisig/generated-artifacts/
 contracts/utils/generated-artifacts/
-contracts/libs/generated-artifacts/
-contracts/interfaces/generated-artifacts/
-contracts/tokens/generated-artifacts/
-contracts/examples/generated-artifacts/
+contracts/exchange-libs/generated-artifacts/
+contracts/erc20/generated-artifacts/
+contracts/erc721/generated-artifacts/
 contracts/extensions/generated-artifacts/
+contracts/exchange-forwarder/generated-artifacts/
 packages/sol-tracing-utils/test/fixtures/artifacts/
 packages/metacoin/artifacts/

 # generated contract wrappers
 packages/abi-gen-wrappers/wrappers
-contracts/protocol/generated-wrappers/
+contracts/exchange/generated-wrappers/
+contracts/asset-proxy/generated-wrappers/
 contracts/multisig/generated-wrappers/
 contracts/utils/generated-wrappers/
-contracts/libs/generated-wrappers/
-contracts/interfaces/generated-wrappers/
-contracts/tokens/generated-wrappers/
-contracts/examples/generated-wrappers/
+contracts/exchange-libs/generated-wrappers/
+contracts/erc20/generated-wrappers/
+contracts/erc721/generated-wrappers/
 contracts/extensions/generated-wrappers/
+contracts/exchange-forwarder/generated-wrappers/
 packages/metacoin/src/contract_wrappers

 # solc-bin in sol-compiler
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,21 +1,23 @@
 lib
 .nyc_output
-/contracts/protocol/generated-wrappers
-/contracts/protocol/generated-artifacts
+/contracts/exchange/generated-wrappers
+/contracts/exchange/generated-artifacts
+/contracts/asset-proxy/generated-wrappers
+/contracts/asset-proxy/generated-artifacts
 /contracts/multisig/generated-wrappers
 /contracts/multisig/generated-artifacts
 /contracts/utils/generated-wrappers
 /contracts/utils/generated-artifacts
-/contracts/libs/generated-wrappers
-/contracts/libs/generated-artifacts
-/contracts/interfaces/generated-wrappers
-/contracts/interfaces/generated-artifacts
-/contracts/tokens/generated-wrappers
-/contracts/tokens/generated-artifacts
-/contracts/examples/generated-wrappers
-/contracts/examples/generated-artifacts
+/contracts/exchange-libs/generated-wrappers
+/contracts/exchange-libs/generated-artifacts
+/contracts/erc20/generated-wrappers
+/contracts/erc20/generated-artifacts
+/contracts/erc721/generated-wrappers
+/contracts/erc721/generated-artifacts
 /contracts/extensions/generated-wrappers
 /contracts/extensions/generated-artifacts
+/contracts/exchange-forwarder/generated-wrappers
+/contracts/exchange-forwarder/generated-artifacts
 /packages/abi-gen-wrappers/src/generated-wrappers
 /packages/contract-artifacts/artifacts
 /python-packages/contract_artifacts/src/zero_ex/contract_artifacts/artifacts
--- a/README.md
+++ b/README.md
@@ -32,6 +32,21 @@ Visit our [developer portal](https://0xproject.com/docs/order-utils) for a compr
 | [`0x-order-utils`](/python-packages/order_utils)               | [![PyPI](https://img.shields.io/pypi/v/0x-order-utils.svg)](https://pypi.org/project/0x-order-utils/)               | A set of utilities for generating, parsing, signing and validating 0x orders                      |
 | [`0x-sra-client`](/python-packages/sra_client)                 | [![PyPI](https://img.shields.io/pypi/v/0x-sra-client.svg)](https://pypi.org/project/0x-sra-client/)                 | A Python client for interacting with servers conforming to the Standard Relayer API specification |

+### Solidity Packages
+
+| Package                                                             | Version                                                                                                                                     | Description                                                                                                                                                                                                                                           |
+| ------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [`@0x/contracts-asset-proxy`](/contracts/asset-proxy)               | [![npm](https://img.shields.io/npm/v/@0x/contracts-asset-proxy.svg)](https://www.npmjs.com/package/@0x/contracts-asset-proxy)               | [`AssetProxy`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#assetproxy) contracts used within the protocol                                                                                               |
+| [`@0x/contracts-erc20`](/contracts/erc20)                           | [![npm](https://img.shields.io/npm/v/@0x/contracts-erc20.svg)](https://www.npmjs.com/package/@0x/contracts-erc20)                           | Implementations of various ERC20 tokens                                                                                                                                                                                                               |
+| [`@0x/contracts-erc721`](/contracts/erc721)                         | [![npm](https://img.shields.io/npm/v/@0x/contracts-erc721.svg)](https://www.npmjs.com/package/@0x/contracts-erc721)                         | Implementations of various ERC721 tokens                                                                                                                                                                                                              |
+| [`@0x/contracts-exchange`](/contracts/exchange)                     | [![npm](https://img.shields.io/npm/v/@0x/contracts-exchange.svg)](https://www.npmjs.com/package/@0x/contracts-exchange)                     | The [`Exchange`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#exchange) contract used for settling trades within the protocol                                                                            |
+| [`@0x/contracts-exchange-forwarder`](/contracts/exchange-forwarder) | [![npm](https://img.shields.io/npm/v/@0x/contracts-exchange-forwarder.svg)](https://www.npmjs.com/package/@0x/contracts-exchange-forwarder) | A [`Forwarder`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/forwarder-specification.md) contract used to simplify UX for interacting with the protocol                                                                      |
+| [`@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 Llbraries 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-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                                                                                                                                                                                  |
+
 ### Typescript/Javascript Packages

 #### 0x-specific packages
@@ -84,7 +99,6 @@ Visit our [developer portal](https://0xproject.com/docs/order-utils) for a compr

 | Package                                            | Description                                                                      |
 | -------------------------------------------------- | -------------------------------------------------------------------------------- |
-| [`@0x/contracts`](/contracts/core)                 | 0x protocol solidity smart contracts & tests                                     |
 | [`@0x/instant`](/packages/instant)                 | A free and flexible way to offer simple crypto purchasing in any app or website. |
 | [`@0x/testnet-faucets`](/packages/testnet-faucets) | A faucet micro-service that dispenses test ERC20 tokens or Ether                 |
 | [`@0x/website`](/packages/website)                 | 0x website                                                                       |
@@ -134,6 +148,12 @@ To build a specific package:
 PKG=@0x/web3-wrapper yarn build
 ```

+To build all contracts packages:
+
+```bash
+yarn build:contracts
+```
+
 ### Watch

 To re-build all packages on change:
@@ -206,3 +226,9 @@ Run a specific package's test:
 ```bash
 PKG=@0x/web3-wrapper yarn test
 ```
+
+Run all contracts packages tests:
+
+```bash
+yarn test:contracts
+```
--- a/contracts/asset-proxy/CHANGELOG.json
+++ b/contracts/asset-proxy/CHANGELOG.json
@@ -0,0 +1,65 @@
+[
+    {
+        "timestamp": 1551130135,
+        "version": "1.0.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1549733923,
+        "version": "1.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1549547375
+    },
+    {
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Fake publish to enable pinning"
+            }
+        ],
+        "timestamp": 1549504360
+    },
+    {
+        "timestamp": 1549452781,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1549373905,
+        "version": "1.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.0.0",
+        "changes": [
+            {
+                "note": "Move all AssetProxy contracts out of contracts-protocol to new package",
+                "pr": 1539
+            }
+        ]
+    }
+]
--- a/contracts/asset-proxy/CHANGELOG.md
+++ b/contracts/asset-proxy/CHANGELOG.md
@@ -0,0 +1,34 @@
+<!--
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
+Edit the package's CHANGELOG.json file only.
+-->
+
+CHANGELOG
+
+## v1.0.6 - _February 25, 2019_
+
+    * Dependencies updated
+
+## v1.0.5 - _February 9, 2019_
+
+    * Dependencies updated
+
+## v1.0.4 - _February 7, 2019_
+
+    * Dependencies updated
+
+## v1.0.3 - _February 7, 2019_
+
+    * Fake publish to enable pinning
+
+## v1.0.2 - _February 6, 2019_
+
+    * Dependencies updated
+
+## v1.0.1 - _February 5, 2019_
+
+    * Dependencies updated
+
+## v1.0.0 - _Invalid date_
+
+    * Move all AssetProxy contracts out of contracts-protocol to new package (#1539)
--- a/contracts/asset-proxy/DEPLOYS.json
+++ b/contracts/asset-proxy/DEPLOYS.json
@@ -0,0 +1,47 @@
+[
+    {
+        "name": "MultiAssetProxy",
+        "version": "1.0.0",
+        "changes": [
+            {
+                "note": "Add MultiAssetProxy implementation",
+                "pr": 1224,
+                "networks": {
+                    "3": "0xab8fbd189c569ccdee3a4d929bb7f557be4028f6",
+                    "4": "0xb34cde0ad3a83d04abebc0b66e75196f22216621",
+                    "42": "0xf6313a772c222f51c28f2304c0703b8cf5428fd8"
+                }
+            }
+        ]
+    },
+    {
+        "name": "ERC20Proxy",
+        "version": "1.0.0",
+        "changes": [
+            {
+                "note": "protocol v2 deploy",
+                "networks": {
+                    "1": "0x2240dab907db71e64d3e0dba4800c83b5c502d4e",
+                    "3": "0xb1408f4c245a23c31b98d2c626777d4c0d766caa",
+                    "4": "0x3e809c563c15a295e832e37053798ddc8d6c8dab",
+                    "42": "0xf1ec01d6236d3cd881a0bf0130ea25fe4234003e"
+                }
+            }
+        ]
+    },
+    {
+        "name": "ERC721Proxy",
+        "version": "1.0.0",
+        "changes": [
+            {
+                "note": "protocol v2 deploy",
+                "networks": {
+                    "1": "0x208e41fb445f1bb1b6780d58356e81405f3e6127",
+                    "3": "0xe654aac058bfbf9f83fcaee7793311dd82f6ddb4",
+                    "4": "0x8e1ff02637cb5e39f2fa36c14706aa348b065b09",
+                    "42": "0x2a9127c745688a165106c11cd4d647d2220af821"
+                }
+            }
+        ]
+    }
+]
--- a/contracts/asset-proxy/README.md
+++ b/contracts/asset-proxy/README.md
@@ -1,15 +1,14 @@
-## Contracts
+## AssetProxy

-Smart contracts that implement the 0x protocol. Addresses of the deployed contracts can be found in the 0x [wiki](https://0xproject.com/wiki#Deployed-Addresses) or the [CHANGELOG](./CHANGELOG.json) of 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 the 0x [wiki](https://0xproject.com/wiki#Deployed-Addresses) or the [DEPLOYS](./DEPLOYS.json) file within this package.

-## Usage
+## Installation

-Contracts that make up and interact with version 2.0.0 of the protocol can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
+**Install**

-   [protocol](./contracts/protocol)
-    -   This directory contains the contracts that make up version 2.0.0. A full specification can be found [here](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md).
-   [test](./contracts/test)
-    -   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
+```bash
+npm install @0x/contracts-asset-proxy --save
+```

 ## Bug bounty

@@ -42,13 +41,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:

 ```bash
-PKG=@0x/contracts-protocol yarn build
+PKG=@0x/contracts-asset-proxy yarn build
 ```

 Or continuously rebuild on change:

 ```bash
-PKG=@0x/contracts-protocol yarn watch
+PKG=@0x/contracts-asset-proxy yarn watch
 ```

 ### Clean
--- a/contracts/asset-proxy/compiler.json
+++ b/contracts/asset-proxy/compiler.json
@@ -0,0 +1,34 @@
+{
+    "artifactsDir": "./generated-artifacts",
+    "contractsDir": "./contracts",
+    "useDockerisedSolc": true,
+    "isOfflineMode": false,
+    "compilerSettings": {
+        "optimizer": { "enabled": true, "runs": 1000000 },
+        "outputSelection": {
+            "*": {
+                "*": [
+                    "abi",
+                    "evm.bytecode.object",
+                    "evm.bytecode.sourceMap",
+                    "evm.deployedBytecode.object",
+                    "evm.deployedBytecode.sourceMap"
+                ]
+            }
+        }
+    },
+    "contracts": [
+        "@0x/contracts-erc20/contracts/test/DummyERC20Token.sol",
+        "@0x/contracts-erc20/contracts/test/DummyMultipleReturnERC20Token.sol",
+        "@0x/contracts-erc20/contracts/test/DummyNoReturnERC20Token.sol",
+        "@0x/contracts-erc721/contracts/test/DummyERC721Receiver.sol",
+        "@0x/contracts-erc721/contracts/test/DummyERC721Token.sol",
+        "src/ERC20Proxy.sol",
+        "src/ERC721Proxy.sol",
+        "src/MixinAuthorizable.sol",
+        "src/MultiAssetProxy.sol",
+        "src/interfaces/IAssetData.sol",
+        "src/interfaces/IAssetProxy.sol",
+        "src/interfaces/IAuthorizable.sol"
+    ]
+}
--- a/contracts/protocol/contracts/protocol/AssetProxy/ERC20Proxy.sol
+++ b/contracts/protocol/contracts/protocol/AssetProxy/ERC20Proxy.sol
--- a/contracts/protocol/contracts/protocol/AssetProxy/ERC721Proxy.sol
+++ b/contracts/protocol/contracts/protocol/AssetProxy/ERC721Proxy.sol
--- a/contracts/protocol/contracts/protocol/Exchange/MixinAssetProxyDispatcher.sol
+++ b/contracts/protocol/contracts/protocol/Exchange/MixinAssetProxyDispatcher.sol
@@ -18,9 +18,9 @@

 pragma solidity ^0.4.24;

-import "@0x/contracts-utils/contracts/utils/Ownable/Ownable.sol";
+import "@0x/contracts-utils/contracts/src/Ownable.sol";
 import "./mixins/MAssetProxyDispatcher.sol";
-import "@0x/contracts-interfaces/contracts/protocol/AssetProxy/IAssetProxy.sol";
+import "./interfaces/IAssetProxy.sol";


 contract MixinAssetProxyDispatcher is
--- a/contracts/protocol/contracts/protocol/AssetProxy/MixinAuthorizable.sol
+++ b/contracts/protocol/contracts/protocol/AssetProxy/MixinAuthorizable.sol
@@ -18,7 +18,7 @@

 pragma solidity ^0.4.24;

-import "@0x/contracts-utils/contracts/utils/Ownable/Ownable.sol";
+import "@0x/contracts-utils/contracts/src/Ownable.sol";
 import "./mixins/MAuthorizable.sol";


--- a/contracts/protocol/contracts/protocol/AssetProxy/MultiAssetProxy.sol
+++ b/contracts/protocol/contracts/protocol/AssetProxy/MultiAssetProxy.sol
@@ -18,7 +18,7 @@

 pragma solidity 0.4.24;

-import "../Exchange/MixinAssetProxyDispatcher.sol";
+import "./MixinAssetProxyDispatcher.sol";
 import "./MixinAuthorizable.sol";


--- a/contracts/interfaces/contracts/protocol/AssetProxy/IAssetData.sol
+++ b/contracts/interfaces/contracts/protocol/AssetProxy/IAssetData.sol
--- a/contracts/interfaces/contracts/protocol/AssetProxy/IAssetProxy.sol
+++ b/contracts/interfaces/contracts/protocol/AssetProxy/IAssetProxy.sol
--- a/contracts/interfaces/contracts/protocol/Exchange/IAssetProxyDispatcher.sol
+++ b/contracts/interfaces/contracts/protocol/Exchange/IAssetProxyDispatcher.sol
--- a/contracts/interfaces/contracts/protocol/AssetProxy/IAuthorizable.sol
+++ b/contracts/interfaces/contracts/protocol/AssetProxy/IAuthorizable.sol
@@ -18,7 +18,7 @@

 pragma solidity ^0.4.24;

-import "@0x/contracts-utils/contracts/utils/Ownable/IOwnable.sol";
+import "@0x/contracts-utils/contracts/src/interfaces/IOwnable.sol";


 contract IAuthorizable is
--- a/contracts/protocol/contracts/protocol/Exchange/mixins/MAssetProxyDispatcher.sol
+++ b/contracts/protocol/contracts/protocol/Exchange/mixins/MAssetProxyDispatcher.sol
@@ -18,7 +18,7 @@

 pragma solidity ^0.4.24;

-import "@0x/contracts-interfaces/contracts/protocol/Exchange/IAssetProxyDispatcher.sol";
+import "../interfaces/IAssetProxyDispatcher.sol";


 contract MAssetProxyDispatcher is
--- a/contracts/protocol/contracts/protocol/AssetProxy/mixins/MAuthorizable.sol
+++ b/contracts/protocol/contracts/protocol/AssetProxy/mixins/MAuthorizable.sol
@@ -18,7 +18,7 @@

 pragma solidity ^0.4.24;

-import "@0x/contracts-interfaces/contracts/protocol/AssetProxy/IAuthorizable.sol";
+import "../interfaces/IAuthorizable.sol";


 contract MAuthorizable is
--- a/contracts/asset-proxy/package.json
+++ b/contracts/asset-proxy/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0x/contracts-protocol",
-    "version": "2.2.1",
+    "name": "@0x/contracts-asset-proxy",
+    "version": "1.0.6",
    "engines": {
        "node": ">=6.12"
    },
@@ -29,10 +29,12 @@
        "profiler:report:html": "istanbul report html && open coverage/index.html",
        "coverage:report:lcov": "istanbul report lcov",
        "test:circleci": "yarn test",
+        "contracts:gen": "contracts-gen",
        "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
    },
    "config": {
-        "abis": "generated-artifacts/@(AssetProxyOwner|ERC20Proxy|ERC721Proxy|Exchange|MixinAuthorizable|MultiAssetProxy|TestSignatureValidator|TestAssetProxyOwner|TestAssetProxyDispatcher|TestExchangeInternals|TestStaticCallReceiver).json"
+        "abis": "./generated-artifacts/@(DummyERC20Token|DummyERC721Receiver|DummyERC721Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAuthorizable|MixinAuthorizable|MultiAssetProxy).json",
+        "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
    },
    "repository": {
        "type": "git",
@@ -44,48 +46,38 @@
    },
    "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
    "devDependencies": {
-        "@0x/abi-gen": "^1.0.21",
-        "@0x/dev-utils": "^1.0.23",
-        "@0x/sol-compiler": "^2.0.1",
-        "@0x/subproviders": "^2.1.10",
-        "@0x/tslint-config": "^2.0.1",
-        "@types/bn.js": "^4.11.0",
+        "@0x/abi-gen": "^2.0.4",
+        "@0x/contracts-gen": "^1.0.3",
+        "@0x/dev-utils": "^2.1.1",
+        "@0x/sol-compiler": "^3.1.0",
+        "@0x/tslint-config": "^3.0.0",
        "@types/lodash": "4.14.104",
        "@types/node": "*",
-        "@types/yargs": "^10.0.0",
        "chai": "^4.0.1",
        "chai-as-promised": "^7.1.0",
-        "chai-bignumber": "^2.0.1",
+        "chai-bignumber": "^3.0.0",
        "dirty-chai": "^2.0.1",
-        "ethereumjs-abi": "0.6.5",
        "make-promises-safe": "^1.1.0",
        "mocha": "^4.1.0",
        "npm-run-all": "^4.1.2",
        "shx": "^0.2.2",
        "solhint": "^1.4.1",
        "tslint": "5.11.0",
-        "typescript": "3.0.1",
-        "yargs": "^10.0.3"
+        "typescript": "3.0.1"
    },
    "dependencies": {
-        "@0x/base-contract": "^3.0.12",
-        "@0x/contracts-examples": "^1.0.4",
-        "@0x/contracts-interfaces": "^1.0.4",
-        "@0x/contracts-libs": "^1.0.4",
-        "@0x/contracts-multisig": "^1.0.4",
-        "@0x/contracts-test-utils": "^1.0.4",
-        "@0x/contracts-tokens": "^1.0.4",
-        "@0x/contracts-utils": "^1.0.4",
-        "@0x/order-utils": "^3.1.1",
-        "@0x/types": "^1.5.1",
-        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^3.0.0",
-        "@0x/web3-wrapper": "^3.2.3",
-        "@types/js-combinatorics": "^0.5.29",
-        "bn.js": "^4.11.8",
-        "ethereum-types": "^1.1.5",
-        "ethereumjs-util": "^5.1.1",
-        "lodash": "^4.17.5"
+        "@0x/base-contract": "^5.0.0",
+        "@0x/contracts-erc20": "1.0.2",
+        "@0x/contracts-erc721": "1.0.2",
+        "@0x/contracts-test-utils": "^3.0.5",
+        "@0x/contracts-utils": "2.0.1",
+        "@0x/order-utils": "^7.0.0",
+        "@0x/types": "^2.1.0",
+        "@0x/typescript-typings": "^4.1.0",
+        "@0x/utils": "^4.2.0",
+        "@0x/web3-wrapper": "^6.0.0",
+        "ethereum-types": "^2.1.0",
+        "lodash": "^4.17.11"
    },
    "publishConfig": {
        "access": "public"
--- a/contracts/asset-proxy/src/artifacts.ts
+++ b/contracts/asset-proxy/src/artifacts.ts
@@ -0,0 +1,33 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+import { ContractArtifact } from 'ethereum-types';
+
+import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json';
+import * as DummyERC721Receiver from '../generated-artifacts/DummyERC721Receiver.json';
+import * as DummyERC721Token from '../generated-artifacts/DummyERC721Token.json';
+import * as DummyMultipleReturnERC20Token from '../generated-artifacts/DummyMultipleReturnERC20Token.json';
+import * as DummyNoReturnERC20Token from '../generated-artifacts/DummyNoReturnERC20Token.json';
+import * as ERC20Proxy from '../generated-artifacts/ERC20Proxy.json';
+import * as ERC721Proxy from '../generated-artifacts/ERC721Proxy.json';
+import * as IAssetData from '../generated-artifacts/IAssetData.json';
+import * as IAssetProxy from '../generated-artifacts/IAssetProxy.json';
+import * as IAuthorizable from '../generated-artifacts/IAuthorizable.json';
+import * as MixinAuthorizable from '../generated-artifacts/MixinAuthorizable.json';
+import * as MultiAssetProxy from '../generated-artifacts/MultiAssetProxy.json';
+export const artifacts = {
+    DummyERC20Token: DummyERC20Token as ContractArtifact,
+    DummyMultipleReturnERC20Token: DummyMultipleReturnERC20Token as ContractArtifact,
+    DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact,
+    DummyERC721Receiver: DummyERC721Receiver as ContractArtifact,
+    DummyERC721Token: DummyERC721Token as ContractArtifact,
+    ERC20Proxy: ERC20Proxy as ContractArtifact,
+    ERC721Proxy: ERC721Proxy as ContractArtifact,
+    MixinAuthorizable: MixinAuthorizable as ContractArtifact,
+    MultiAssetProxy: MultiAssetProxy as ContractArtifact,
+    IAssetData: IAssetData as ContractArtifact,
+    IAssetProxy: IAssetProxy as ContractArtifact,
+    IAuthorizable: IAuthorizable as ContractArtifact,
+};
--- a/contracts/asset-proxy/src/index.ts
+++ b/contracts/asset-proxy/src/index.ts
--- a/contracts/asset-proxy/src/wrappers.ts
+++ b/contracts/asset-proxy/src/wrappers.ts
@@ -0,0 +1,17 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+export * from '../generated-wrappers/dummy_erc20_token';
+export * from '../generated-wrappers/dummy_erc721_receiver';
+export * from '../generated-wrappers/dummy_erc721_token';
+export * from '../generated-wrappers/dummy_multiple_return_erc20_token';
+export * from '../generated-wrappers/dummy_no_return_erc20_token';
+export * from '../generated-wrappers/erc20_proxy';
+export * from '../generated-wrappers/erc721_proxy';
+export * from '../generated-wrappers/i_asset_data';
+export * from '../generated-wrappers/i_asset_proxy';
+export * from '../generated-wrappers/i_authorizable';
+export * from '../generated-wrappers/mixin_authorizable';
+export * from '../generated-wrappers/multi_asset_proxy';
--- a/contracts/protocol/test/asset_proxy/authorizable.ts
+++ b/contracts/protocol/test/asset_proxy/authorizable.ts
@@ -12,8 +12,7 @@ import { BigNumber } from '@0x/utils';
 import * as chai from 'chai';
 import * as _ from 'lodash';

-import { MixinAuthorizableContract } from '../../generated-wrappers/mixin_authorizable';
-import { artifacts } from '../../src/artifacts';
+import { artifacts, MixinAuthorizableContract } from '../src';

 chaiSetup.configure();
 const expect = chai.expect;
--- a/contracts/asset-proxy/test/global_hooks.ts
+++ b/contracts/asset-proxy/test/global_hooks.ts
--- a/contracts/protocol/test/asset_proxy/proxies.ts
+++ b/contracts/protocol/test/asset_proxy/proxies.ts
@@ -1,4 +1,3 @@
-import { artifacts as interfacesArtifacts, IAssetDataContract, IAssetProxyContract } from '@0x/contracts-interfaces';
 import {
    chaiSetup,
    constants,
@@ -9,15 +8,6 @@ import {
    txDefaults,
    web3Wrapper,
 } from '@0x/contracts-test-utils';
-import {
-    artifacts as tokensArtifacts,
-    DummyERC20TokenContract,
-    DummyERC20TokenTransferEventArgs,
-    DummyERC721ReceiverContract,
-    DummyERC721TokenContract,
-    DummyMultipleReturnERC20TokenContract,
-    DummyNoReturnERC20TokenContract,
-} from '@0x/contracts-tokens';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils } from '@0x/order-utils';
 import { RevertReason } from '@0x/types';
@@ -26,23 +16,33 @@ import * as chai from 'chai';
 import { LogWithDecodedArgs } from 'ethereum-types';
 import * as _ from 'lodash';

-import { ERC20ProxyContract } from '../../generated-wrappers/erc20_proxy';
-import { ERC721ProxyContract } from '../../generated-wrappers/erc721_proxy';
-import { MultiAssetProxyContract } from '../../generated-wrappers/multi_asset_proxy';
-import { artifacts } from '../../src/artifacts';
-import { ERC20Wrapper } from '../utils/erc20_wrapper';
-import { ERC721Wrapper } from '../utils/erc721_wrapper';
+import {
+    artifacts,
+    DummyERC20TokenContract,
+    DummyERC20TokenTransferEventArgs,
+    DummyERC721ReceiverContract,
+    DummyERC721TokenContract,
+    DummyMultipleReturnERC20TokenContract,
+    DummyNoReturnERC20TokenContract,
+    ERC20ProxyContract,
+    ERC20Wrapper,
+    ERC721ProxyContract,
+    ERC721Wrapper,
+    IAssetDataContract,
+    IAssetProxyContract,
+    MultiAssetProxyContract,
+} from '../src';

 chaiSetup.configure();
 const expect = chai.expect;
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
 const assetProxyInterface = new IAssetProxyContract(
-    interfacesArtifacts.IAssetProxy.compilerOutput.abi,
+    artifacts.IAssetProxy.compilerOutput.abi,
    constants.NULL_ADDRESS,
    provider,
 );
 const assetDataInterface = new IAssetDataContract(
-    interfacesArtifacts.IAssetData.compilerOutput.abi,
+    artifacts.IAssetData.compilerOutput.abi,
    constants.NULL_ADDRESS,
    provider,
 );
@@ -148,7 +148,7 @@ describe('Asset Transfer Proxies', () => {
            constants.DUMMY_TOKEN_DECIMALS,
        );
        noReturnErc20Token = await DummyNoReturnERC20TokenContract.deployFrom0xArtifactAsync(
-            tokensArtifacts.DummyNoReturnERC20Token,
+            artifacts.DummyNoReturnERC20Token,
            provider,
            txDefaults,
            constants.DUMMY_TOKEN_NAME,
@@ -157,7 +157,7 @@ describe('Asset Transfer Proxies', () => {
            constants.DUMMY_TOKEN_TOTAL_SUPPLY,
        );
        multipleReturnErc20Token = await DummyMultipleReturnERC20TokenContract.deployFrom0xArtifactAsync(
-            tokensArtifacts.DummyMultipleReturnERC20Token,
+            artifacts.DummyMultipleReturnERC20Token,
            provider,
            txDefaults,
            constants.DUMMY_TOKEN_NAME,
@@ -198,7 +198,7 @@ describe('Asset Transfer Proxies', () => {
        // Deploy and configure ERC721 tokens and receiver
        [erc721TokenA, erc721TokenB] = await erc721Wrapper.deployDummyTokensAsync();
        erc721Receiver = await DummyERC721ReceiverContract.deployFrom0xArtifactAsync(
-            tokensArtifacts.DummyERC721Receiver,
+            artifacts.DummyERC721Receiver,
            provider,
            txDefaults,
        );
@@ -259,7 +259,7 @@ describe('Asset Transfer Proxies', () => {
                    erc20Balances[fromAddress][erc20TokenA.address].minus(amount),
                );
                expect(newBalances[toAddress][erc20TokenA.address]).to.be.bignumber.equal(
-                    erc20Balances[toAddress][erc20TokenA.address].add(amount),
+                    erc20Balances[toAddress][erc20TokenA.address].plus(amount),
                );
            });

@@ -318,7 +318,7 @@ describe('Asset Transfer Proxies', () => {
                    erc20Balances[fromAddress][erc20TokenA.address].minus(amount),
                );
                expect(newBalances[toAddress][erc20TokenA.address]).to.be.bignumber.equal(
-                    erc20Balances[toAddress][erc20TokenA.address].add(amount),
+                    erc20Balances[toAddress][erc20TokenA.address].plus(amount),
                );
            });

@@ -562,7 +562,7 @@ describe('Asset Transfer Proxies', () => {
                    erc721Receiver.address,
                    amount,
                );
-                const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...tokensArtifacts });
+                const logDecoder = new LogDecoder(web3Wrapper, artifacts);
                const tx = await logDecoder.getTxWithDecodedLogsAsync(
                    await web3Wrapper.sendTransactionAsync({
                        to: erc721Proxy.address,
@@ -737,7 +737,7 @@ describe('Asset Transfer Proxies', () => {
                    erc20Balances[fromAddress][erc20TokenA.address].minus(totalAmount),
                );
                expect(newBalances[toAddress][erc20TokenA.address]).to.be.bignumber.equal(
-                    erc20Balances[toAddress][erc20TokenA.address].add(totalAmount),
+                    erc20Balances[toAddress][erc20TokenA.address].plus(totalAmount),
                );
            });
            it('should dispatch an ERC20 transfer when input amount is 0', async () => {
@@ -754,7 +754,7 @@ describe('Asset Transfer Proxies', () => {
                    inputAmount,
                );
                const erc20Balances = await erc20Wrapper.getBalancesAsync();
-                const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...tokensArtifacts });
+                const logDecoder = new LogDecoder(web3Wrapper, artifacts);
                const tx = await logDecoder.getTxWithDecodedLogsAsync(
                    await web3Wrapper.sendTransactionAsync({
                        to: multiAssetProxy.address,
@@ -800,7 +800,7 @@ describe('Asset Transfer Proxies', () => {
                    erc20Balances[fromAddress][erc20TokenA.address].minus(totalAmount),
                );
                expect(newBalances[toAddress][erc20TokenA.address]).to.be.bignumber.equal(
-                    erc20Balances[toAddress][erc20TokenA.address].add(totalAmount),
+                    erc20Balances[toAddress][erc20TokenA.address].plus(totalAmount),
                );
            });
            it('should successfully transfer multiple different ERC20 tokens', async () => {
@@ -834,13 +834,13 @@ describe('Asset Transfer Proxies', () => {
                    erc20Balances[fromAddress][erc20TokenA.address].minus(totalErc20AAmount),
                );
                expect(newBalances[toAddress][erc20TokenA.address]).to.be.bignumber.equal(
-                    erc20Balances[toAddress][erc20TokenA.address].add(totalErc20AAmount),
+                    erc20Balances[toAddress][erc20TokenA.address].plus(totalErc20AAmount),
                );
                expect(newBalances[fromAddress][erc20TokenB.address]).to.be.bignumber.equal(
                    erc20Balances[fromAddress][erc20TokenB.address].minus(totalErc20BAmount),
                );
                expect(newBalances[toAddress][erc20TokenB.address]).to.be.bignumber.equal(
-                    erc20Balances[toAddress][erc20TokenB.address].add(totalErc20BAmount),
+                    erc20Balances[toAddress][erc20TokenB.address].plus(totalErc20BAmount),
                );
            });
            it('should transfer a single ERC721 token', async () => {
@@ -970,7 +970,7 @@ describe('Asset Transfer Proxies', () => {
                    erc20Balances[fromAddress][erc20TokenA.address].minus(totalAmount),
                );
                expect(newBalances[toAddress][erc20TokenA.address]).to.be.bignumber.equal(
-                    erc20Balances[toAddress][erc20TokenA.address].add(totalAmount),
+                    erc20Balances[toAddress][erc20TokenA.address].plus(totalAmount),
                );
                const newOwnerFromAsset = await erc721TokenA.ownerOf.callAsync(erc721AFromTokenId);
                expect(newOwnerFromAsset).to.be.equal(toAddress);
@@ -1008,7 +1008,7 @@ describe('Asset Transfer Proxies', () => {
                    erc20Balances[fromAddress][erc20TokenA.address].minus(totalAmount),
                );
                expect(newBalances[toAddress][erc20TokenA.address]).to.be.bignumber.equal(
-                    erc20Balances[toAddress][erc20TokenA.address].add(totalAmount),
+                    erc20Balances[toAddress][erc20TokenA.address].plus(totalAmount),
                );
                const newOwnerFromAsset = await erc721TokenA.ownerOf.callAsync(erc721AFromTokenId);
                expect(newOwnerFromAsset).to.be.equal(toAddress);
@@ -1044,13 +1044,13 @@ describe('Asset Transfer Proxies', () => {
                    erc20Balances[fromAddress][erc20TokenA.address].minus(totalErc20AAmount),
                );
                expect(newBalances[toAddress][erc20TokenA.address]).to.be.bignumber.equal(
-                    erc20Balances[toAddress][erc20TokenA.address].add(totalErc20AAmount),
+                    erc20Balances[toAddress][erc20TokenA.address].plus(totalErc20AAmount),
                );
                expect(newBalances[fromAddress][erc20TokenB.address]).to.be.bignumber.equal(
                    erc20Balances[fromAddress][erc20TokenB.address].minus(totalErc20BAmount),
                );
                expect(newBalances[toAddress][erc20TokenB.address]).to.be.bignumber.equal(
-                    erc20Balances[toAddress][erc20TokenB.address].add(totalErc20BAmount),
+                    erc20Balances[toAddress][erc20TokenB.address].plus(totalErc20BAmount),
                );
            });
            it('should successfully transfer a large amount of tokens', async () => {
@@ -1122,13 +1122,13 @@ describe('Asset Transfer Proxies', () => {
                    erc20Balances[fromAddress][erc20TokenA.address].minus(totalErc20AAmount),
                );
                expect(newBalances[toAddress][erc20TokenA.address]).to.be.bignumber.equal(
-                    erc20Balances[toAddress][erc20TokenA.address].add(totalErc20AAmount),
+                    erc20Balances[toAddress][erc20TokenA.address].plus(totalErc20AAmount),
                );
                expect(newBalances[fromAddress][erc20TokenB.address]).to.be.bignumber.equal(
                    erc20Balances[fromAddress][erc20TokenB.address].minus(totalErc20BAmount),
                );
                expect(newBalances[toAddress][erc20TokenB.address]).to.be.bignumber.equal(
-                    erc20Balances[toAddress][erc20TokenB.address].add(totalErc20BAmount),
+                    erc20Balances[toAddress][erc20TokenB.address].plus(totalErc20BAmount),
                );
            });
            it('should revert if a single transfer fails', async () => {
--- a/contracts/asset-proxy/test/utils/erc20_wrapper.ts
+++ b/contracts/asset-proxy/test/utils/erc20_wrapper.ts
@@ -1,19 +1,16 @@
-import { constants, ERC20BalancesByOwner, txDefaults } from '@0x/contracts-test-utils';
-import { artifacts as tokensArtifacts, DummyERC20TokenContract } from '@0x/contracts-tokens';
+import { constants, ERC20BalancesByOwner, txDefaults, Web3ProviderEngine } from '@0x/contracts-test-utils';
 import { assetDataUtils } from '@0x/order-utils';
 import { BigNumber } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
-import { Provider } from 'ethereum-types';
 import * as _ from 'lodash';

-import { ERC20ProxyContract } from '../../generated-wrappers/erc20_proxy';
-import { artifacts } from '../../src/artifacts';
+import { artifacts, DummyERC20TokenContract, ERC20ProxyContract } from '../../src';

 export class ERC20Wrapper {
    private readonly _tokenOwnerAddresses: string[];
    private readonly _contractOwnerAddress: string;
    private readonly _web3Wrapper: Web3Wrapper;
-    private readonly _provider: Provider;
+    private readonly _provider: Web3ProviderEngine;
    private readonly _dummyTokenContracts: DummyERC20TokenContract[];
    private _proxyContract?: ERC20ProxyContract;
    private _proxyIdIfExists?: string;
@@ -24,7 +21,7 @@ export class ERC20Wrapper {
     * @param contractOwnerAddress Desired owner of the contract
     * Instance of ERC20Wrapper
     */
-    constructor(provider: Provider, tokenOwnerAddresses: string[], contractOwnerAddress: string) {
+    constructor(provider: Web3ProviderEngine, tokenOwnerAddresses: string[], contractOwnerAddress: string) {
        this._dummyTokenContracts = [];
        this._web3Wrapper = new Web3Wrapper(provider);
        this._provider = provider;
@@ -38,7 +35,7 @@ export class ERC20Wrapper {
        for (let i = 0; i < numberToDeploy; i++) {
            this._dummyTokenContracts.push(
                await DummyERC20TokenContract.deployFrom0xArtifactAsync(
-                    tokensArtifacts.DummyERC20Token,
+                    artifacts.DummyERC20Token,
                    this._provider,
                    txDefaults,
                    constants.DUMMY_TOKEN_NAME,
--- a/contracts/asset-proxy/test/utils/erc721_wrapper.ts
+++ b/contracts/asset-proxy/test/utils/erc721_wrapper.ts
@@ -1,24 +1,21 @@
-import { constants, ERC721TokenIdsByOwner, txDefaults } from '@0x/contracts-test-utils';
-import { artifacts as tokensArtifacts, DummyERC721TokenContract } from '@0x/contracts-tokens';
+import { constants, ERC721TokenIdsByOwner, txDefaults, Web3ProviderEngine } from '@0x/contracts-test-utils';
 import { generatePseudoRandomSalt } from '@0x/order-utils';
 import { BigNumber } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
-import { Provider } from 'ethereum-types';
 import * as _ from 'lodash';

-import { ERC721ProxyContract } from '../../generated-wrappers/erc721_proxy';
-import { artifacts } from '../../src/artifacts';
+import { artifacts, DummyERC721TokenContract, ERC721ProxyContract } from '../../src';

 export class ERC721Wrapper {
    private readonly _tokenOwnerAddresses: string[];
    private readonly _contractOwnerAddress: string;
    private readonly _web3Wrapper: Web3Wrapper;
-    private readonly _provider: Provider;
+    private readonly _provider: Web3ProviderEngine;
    private readonly _dummyTokenContracts: DummyERC721TokenContract[];
    private _proxyContract?: ERC721ProxyContract;
    private _proxyIdIfExists?: string;
    private _initialTokenIdsByOwner: ERC721TokenIdsByOwner = {};
-    constructor(provider: Provider, tokenOwnerAddresses: string[], contractOwnerAddress: string) {
+    constructor(provider: Web3ProviderEngine, tokenOwnerAddresses: string[], contractOwnerAddress: string) {
        this._web3Wrapper = new Web3Wrapper(provider);
        this._provider = provider;
        this._dummyTokenContracts = [];
@@ -30,7 +27,7 @@ export class ERC721Wrapper {
        for (const i of _.times(constants.NUM_DUMMY_ERC721_TO_DEPLOY)) {
            this._dummyTokenContracts.push(
                await DummyERC721TokenContract.deployFrom0xArtifactAsync(
-                    tokensArtifacts.DummyERC721Token,
+                    artifacts.DummyERC721Token,
                    this._provider,
                    txDefaults,
                    constants.DUMMY_TOKEN_NAME,
--- a/contracts/asset-proxy/test/utils/index.ts
+++ b/contracts/asset-proxy/test/utils/index.ts
@@ -1,3 +1,2 @@
-export * from './exchange_wrapper';
 export * from './erc20_wrapper';
 export * from './erc721_wrapper';
--- a/contracts/asset-proxy/tsconfig.json
+++ b/contracts/asset-proxy/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "extends": "../../tsconfig",
+    "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
+    "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
+    "files": [
+        "generated-artifacts/DummyERC20Token.json",
+        "generated-artifacts/DummyERC721Receiver.json",
+        "generated-artifacts/DummyERC721Token.json",
+        "generated-artifacts/DummyMultipleReturnERC20Token.json",
+        "generated-artifacts/DummyNoReturnERC20Token.json",
+        "generated-artifacts/ERC20Proxy.json",
+        "generated-artifacts/ERC721Proxy.json",
+        "generated-artifacts/IAssetData.json",
+        "generated-artifacts/IAssetProxy.json",
+        "generated-artifacts/IAuthorizable.json",
+        "generated-artifacts/MixinAuthorizable.json",
+        "generated-artifacts/MultiAssetProxy.json"
+    ],
+    "exclude": ["./deploy/solc/solc_bin"]
+}
--- a/contracts/asset-proxy/tslint.json
+++ b/contracts/asset-proxy/tslint.json
--- a/contracts/erc20/.solhintignore
+++ b/contracts/erc20/.solhintignore
@@ -0,0 +1 @@
+contracts/src/ZRXToken.sol
--- a/contracts/erc20/CHANGELOG.json
+++ b/contracts/erc20/CHANGELOG.json
@@ -0,0 +1,65 @@
+[
+    {
+        "timestamp": 1551130135,
+        "version": "1.0.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1549733923,
+        "version": "1.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1549547375
+    },
+    {
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Fake publish to enable pinning"
+            }
+        ],
+        "timestamp": 1549504360
+    },
+    {
+        "timestamp": 1549452781,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1549373905,
+        "version": "1.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.0.0",
+        "changes": [
+            {
+                "note": "Move all ERC20 contracts out of contracts-tokens to new package",
+                "pr": 1539
+            }
+        ]
+    }
+]
--- a/contracts/erc20/CHANGELOG.md
+++ b/contracts/erc20/CHANGELOG.md
@@ -0,0 +1,34 @@
+<!--
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
+Edit the package's CHANGELOG.json file only.
+-->
+
+CHANGELOG
+
+## v1.0.6 - _February 25, 2019_
+
+    * Dependencies updated
+
+## v1.0.5 - _February 9, 2019_
+
+    * Dependencies updated
+
+## v1.0.4 - _February 7, 2019_
+
+    * Dependencies updated
+
+## v1.0.3 - _February 7, 2019_
+
+    * Fake publish to enable pinning
+
+## v1.0.2 - _February 6, 2019_
+
+    * Dependencies updated
+
+## v1.0.1 - _February 5, 2019_
+
+    * Dependencies updated
+
+## v1.0.0 - _Invalid date_
+
+    * Move all ERC20 contracts out of contracts-tokens to new package (#1539)
--- a/contracts/tokens/DEPLOYS.json
+++ b/contracts/tokens/DEPLOYS.json
@@ -8,6 +8,7 @@
                "networks": {
                    "1": "0xe41d2489571d322189246dafa5ebde1f4699f498",
                    "3": "0xff67881f8d12f372d91baae9752eb3631ff0ed00",
+                    "4": "0x2727e688b8fd40b198cd5fe6e408e00494a06f07",
                    "42": "0x2002d3812f58e35f0ea1ffbf80a75a38c32175fa"
                }
            }
--- a/contracts/interfaces/README.md
+++ b/contracts/interfaces/README.md
@@ -1,13 +1,14 @@
-## Contract interfaces
+## ERC20 Tokens

-Smart contract interfaces of the 0x protocol.
+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.

-## Usage
+## Installation

-Contracts that make up and interact with version 2.0.0 of the protocol can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
+**Install**

-   [protocol](./contracts/protocol)
-    -   This directory contains the contract interfaces that make up version 2.0.0. A full specification can be found [here](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md).
+```bash
+npm install @0x/contracts-erc20 --save
+```

 ## Bug bounty

@@ -40,13 +41,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:

 ```bash
-PKG=@0x/contracts-interfaces yarn build
+PKG=@0x/contracts-erc20 yarn build
 ```

 Or continuously rebuild on change:

 ```bash
-PKG=@0x/contracts-interfaces yarn watch
+PKG=@0x/contracts-erc20 yarn watch
 ```

 ### Clean
--- a/contracts/erc20/compiler.json
+++ b/contracts/erc20/compiler.json
@@ -0,0 +1,33 @@
+{
+    "artifactsDir": "./generated-artifacts",
+    "contractsDir": "./contracts",
+    "useDockerisedSolc": true,
+    "isOfflineMode": false,
+    "compilerSettings": {
+        "optimizer": { "enabled": true, "runs": 1000000 },
+        "outputSelection": {
+            "*": {
+                "*": [
+                    "abi",
+                    "evm.bytecode.object",
+                    "evm.bytecode.sourceMap",
+                    "evm.deployedBytecode.object",
+                    "evm.deployedBytecode.sourceMap"
+                ]
+            }
+        }
+    },
+    "contracts": [
+        "src/ERC20Token.sol",
+        "src/MintableERC20Token.sol",
+        "src/UnlimitedAllowanceERC20Token.sol",
+        "src/WETH9.sol",
+        "src/ZRXToken.sol",
+        "src/interfaces/IERC20Token.sol",
+        "src/interfaces/IEtherToken.sol",
+        "test/DummyERC20Token.sol",
+        "test/DummyMultipleReturnERC20Token.sol",
+        "test/DummyNoReturnERC20Token.sol",
+        "test/ReentrantERC20Token.sol"
+    ]
+}
--- a/contracts/tokens/contracts/tokens/ERC20Token/ERC20Token.sol
+++ b/contracts/tokens/contracts/tokens/ERC20Token/ERC20Token.sol
@@ -18,7 +18,7 @@

 pragma solidity ^0.4.24;

-import "./IERC20Token.sol";
+import "./interfaces/IERC20Token.sol";


 contract ERC20Token is
--- a/contracts/tokens/contracts/tokens/ERC20Token/MintableERC20Token.sol
+++ b/contracts/tokens/contracts/tokens/ERC20Token/MintableERC20Token.sol
@@ -18,7 +18,7 @@

 pragma solidity ^0.4.24;

-import "@0x/contracts-utils/contracts/utils/SafeMath/SafeMath.sol";
+import "@0x/contracts-utils/contracts/src/SafeMath.sol";
 import "./UnlimitedAllowanceERC20Token.sol";


--- a/contracts/tokens/contracts/tokens/ERC20Token/UnlimitedAllowanceERC20Token.sol
+++ b/contracts/tokens/contracts/tokens/ERC20Token/UnlimitedAllowanceERC20Token.sol
@@ -18,7 +18,7 @@

 pragma solidity ^0.4.24;

-import "../ERC20Token/ERC20Token.sol";
+import "./ERC20Token.sol";


 contract UnlimitedAllowanceERC20Token is
--- a/contracts/tokens/contracts/tokens/EtherToken/WETH9.sol
+++ b/contracts/tokens/contracts/tokens/EtherToken/WETH9.sol
--- a/contracts/erc20/contracts/src/ZRXToken.sol
+++ b/contracts/erc20/contracts/src/ZRXToken.sol
@@ -0,0 +1,150 @@
+/*
+
+  Copyright 2018 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity 0.4.11;
+
+
+contract Token {
+
+    /// @return total amount of tokens
+    function totalSupply() constant returns (uint supply) {}
+
+    /// @param _owner The address from which the balance will be retrieved
+    /// @return The balance
+    function balanceOf(address _owner) constant returns (uint balance) {}
+
+    /// @notice send `_value` token to `_to` from `msg.sender`
+    /// @param _to The address of the recipient
+    /// @param _value The amount of token to be transferred
+    /// @return Whether the transfer was successful or not
+    function transfer(address _to, uint _value) returns (bool success) {}
+
+    /// @notice send `_value` token to `_to` from `_from` on the condition it is approved by `_from`
+    /// @param _from The address of the sender
+    /// @param _to The address of the recipient
+    /// @param _value The amount of token to be transferred
+    /// @return Whether the transfer was successful or not
+    function transferFrom(address _from, address _to, uint _value) returns (bool success) {}
+
+    /// @notice `msg.sender` approves `_addr` to spend `_value` tokens
+    /// @param _spender The address of the account able to transfer the tokens
+    /// @param _value The amount of wei to be approved for transfer
+    /// @return Whether the approval was successful or not
+    function approve(address _spender, uint _value) returns (bool success) {}
+
+    /// @param _owner The address of the account owning tokens
+    /// @param _spender The address of the account able to transfer the tokens
+    /// @return Amount of remaining tokens allowed to spent
+    function allowance(address _owner, address _spender) constant returns (uint remaining) {}
+
+    event Transfer(address indexed _from, address indexed _to, uint _value);
+    event Approval(address indexed _owner, address indexed _spender, uint _value);
+}
+
+
+contract ERC20Token is Token {
+
+    function transfer(address _to, uint _value) returns (bool) {
+        //Default assumes totalSupply can't be over max (2^256 - 1).
+        if (balances[msg.sender] >= _value && balances[_to] + _value >= balances[_to]) {
+            balances[msg.sender] -= _value;
+            balances[_to] += _value;
+            Transfer(msg.sender, _to, _value);
+            return true;
+        } else { return false; }
+    }
+
+    function transferFrom(address _from, address _to, uint _value) returns (bool) {
+        if (balances[_from] >= _value && allowed[_from][msg.sender] >= _value && balances[_to] + _value >= balances[_to]) {
+            balances[_to] += _value;
+            balances[_from] -= _value;
+            allowed[_from][msg.sender] -= _value;
+            Transfer(_from, _to, _value);
+            return true;
+        } else { return false; }
+    }
+
+    function balanceOf(address _owner) constant returns (uint) {
+        return balances[_owner];
+    }
+
+    function approve(address _spender, uint _value) returns (bool) {
+        allowed[msg.sender][_spender] = _value;
+        Approval(msg.sender, _spender, _value);
+        return true;
+    }
+
+    function allowance(address _owner, address _spender) constant returns (uint) {
+        return allowed[_owner][_spender];
+    }
+
+    mapping (address => uint) balances;
+    mapping (address => mapping (address => uint)) allowed;
+    uint public totalSupply;
+}
+
+
+contract UnlimitedAllowanceToken is ERC20Token {
+
+    uint constant MAX_UINT = 2**256 - 1;
+
+    /// @dev ERC20 transferFrom, modified such that an allowance of MAX_UINT represents an unlimited allowance.
+    /// @param _from Address to transfer from.
+    /// @param _to Address to transfer to.
+    /// @param _value Amount to transfer.
+    /// @return Success of transfer.
+    function transferFrom(address _from, address _to, uint _value)
+        public
+        returns (bool)
+    {
+        uint allowance = allowed[_from][msg.sender];
+        if (balances[_from] >= _value
+            && allowance >= _value
+            && balances[_to] + _value >= balances[_to]
+        ) {
+            balances[_to] += _value;
+            balances[_from] -= _value;
+            if (allowance < MAX_UINT) {
+                allowed[_from][msg.sender] -= _value;
+            }
+            Transfer(_from, _to, _value);
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
+
+
+contract ZRXToken is 
+    UnlimitedAllowanceToken
+{
+
+    // solhint-disable const-name-snakecase
+    uint8 constant public decimals = 18;
+    uint256 public totalSupply = 10**27; // 1 billion tokens, 18 decimal places
+    string constant public name = "0x Protocol Token";
+    string constant public symbol = "ZRX";
+    // solhint-enableconst-name-snakecase
+
+    function ZRXToken()
+        public
+    {
+        balances[msg.sender] = totalSupply;
+    }
+}
--- a/contracts/tokens/contracts/tokens/ERC20Token/IERC20Token.sol
+++ b/contracts/tokens/contracts/tokens/ERC20Token/IERC20Token.sol
--- a/contracts/tokens/contracts/tokens/EtherToken/IEtherToken.sol
+++ b/contracts/tokens/contracts/tokens/EtherToken/IEtherToken.sol
@@ -18,7 +18,7 @@

 pragma solidity ^0.4.24;

-import "../ERC20Token/IERC20Token.sol";
+import "./IERC20Token.sol";


 contract IEtherToken is
--- a/contracts/tokens/contracts/test/DummyERC20Token/DummyERC20Token.sol
+++ b/contracts/tokens/contracts/test/DummyERC20Token/DummyERC20Token.sol
@@ -18,8 +18,8 @@

 pragma solidity 0.4.24;

-import "@0x/contracts-utils/contracts/utils/Ownable/Ownable.sol";
-import "../../tokens/ERC20Token/MintableERC20Token.sol";
+import "@0x/contracts-utils/contracts/src/Ownable.sol";
+import "../src/MintableERC20Token.sol";


 contract DummyERC20Token is 
--- a/contracts/tokens/contracts/test/DummyERC20Token/DummyMultipleReturnERC20Token.sol
+++ b/contracts/tokens/contracts/test/DummyERC20Token/DummyMultipleReturnERC20Token.sol
--- a/contracts/tokens/contracts/test/DummyERC20Token/DummyNoReturnERC20Token.sol
+++ b/contracts/tokens/contracts/test/DummyERC20Token/DummyNoReturnERC20Token.sol
--- a/contracts/tokens/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol
+++ b/contracts/tokens/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol
@@ -19,10 +19,10 @@
 pragma solidity 0.4.24;
 pragma experimental ABIEncoderV2;

-import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol";
-import "../../tokens/ERC20Token/ERC20Token.sol";
-import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol";
-import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
+import "@0x/contracts-utils/contracts/src/LibBytes.sol";
+import "../src/ERC20Token.sol";
+import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";


 // solhint-disable no-unused-vars
--- a/contracts/tokens/package.json
+++ b/contracts/tokens/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0x/contracts-tokens",
-    "version": "1.0.4",
+    "name": "@0x/contracts-erc20",
+    "version": "1.0.6",
    "engines": {
        "node": ">=6.12"
    },
@@ -29,10 +29,12 @@
        "profiler:report:html": "istanbul report html && open coverage/index.html",
        "coverage:report:lcov": "istanbul report lcov",
        "test:circleci": "yarn test",
+        "contracts:gen": "contracts-gen",
        "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
    },
    "config": {
-        "abis": "generated-artifacts/@(DummyERC20Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|DummyERC721Receiver|InvalidERC721Receiver|DummyERC721Token|ReentrantERC20Token|ERC20Token|IERC20Token|MintableERC20Token|UnlimitedAllowanceERC20Token|ERC721Token|IERC721Receiver|IERC721Token|MintableERC721Token|IEtherToken|WETH9|ERC20Token_v1|Token_v1|UnlimitedAllowanceToken_v1|ZRXToken).json"
+        "abis": "./generated-artifacts/@(DummyERC20Token|DummyMultipleReturnERC20Token|DummyNoReturnERC20Token|ERC20Token|IERC20Token|IEtherToken|MintableERC20Token|ReentrantERC20Token|UnlimitedAllowanceERC20Token|WETH9|ZRXToken).json",
+        "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
    },
    "repository": {
        "type": "git",
@@ -44,46 +46,36 @@
    },
    "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
    "devDependencies": {
-        "@0x/abi-gen": "^1.0.21",
-        "@0x/contracts-test-utils": "^1.0.4",
-        "@0x/dev-utils": "^1.0.23",
-        "@0x/sol-compiler": "^2.0.1",
-        "@0x/subproviders": "^2.1.10",
-        "@0x/tslint-config": "^2.0.1",
-        "@types/bn.js": "^4.11.0",
+        "@0x/abi-gen": "^2.0.4",
+        "@0x/contracts-gen": "^1.0.3",
+        "@0x/contracts-test-utils": "^3.0.5",
+        "@0x/dev-utils": "^2.1.1",
+        "@0x/sol-compiler": "^3.1.0",
+        "@0x/tslint-config": "^3.0.0",
        "@types/lodash": "4.14.104",
        "@types/node": "*",
-        "@types/yargs": "^10.0.0",
        "chai": "^4.0.1",
        "chai-as-promised": "^7.1.0",
-        "chai-bignumber": "^2.0.1",
+        "chai-bignumber": "^3.0.0",
        "dirty-chai": "^2.0.1",
-        "ethereumjs-abi": "0.6.5",
        "make-promises-safe": "^1.1.0",
        "mocha": "^4.1.0",
        "npm-run-all": "^4.1.2",
        "shx": "^0.2.2",
        "solhint": "^1.4.1",
        "tslint": "5.11.0",
-        "typescript": "3.0.1",
-        "yargs": "^10.0.3"
+        "typescript": "3.0.1"
    },
    "dependencies": {
-        "@0x/base-contract": "^3.0.12",
-        "@0x/contracts-interfaces": "^1.0.4",
-        "@0x/contracts-libs": "^1.0.4",
-        "@0x/contracts-multisig": "^1.0.4",
-        "@0x/contracts-utils": "^1.0.4",
-        "@0x/order-utils": "^3.1.1",
-        "@0x/types": "^1.5.1",
-        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^3.0.0",
-        "@0x/web3-wrapper": "^3.2.3",
-        "@types/js-combinatorics": "^0.5.29",
-        "bn.js": "^4.11.8",
-        "ethereum-types": "^1.1.5",
-        "ethereumjs-util": "^5.1.1",
-        "lodash": "^4.17.5"
+        "@0x/base-contract": "^5.0.0",
+        "@0x/contracts-exchange-libs": "1.0.2",
+        "@0x/contracts-utils": "2.0.1",
+        "@0x/types": "^2.1.0",
+        "@0x/typescript-typings": "^4.1.0",
+        "@0x/utils": "^4.2.0",
+        "@0x/web3-wrapper": "^6.0.0",
+        "ethereum-types": "^2.1.0",
+        "lodash": "^4.17.11"
    },
    "publishConfig": {
        "access": "public"
--- a/contracts/erc20/src/artifacts.ts
+++ b/contracts/erc20/src/artifacts.ts
@@ -0,0 +1,31 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+import { ContractArtifact } from 'ethereum-types';
+
+import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json';
+import * as DummyMultipleReturnERC20Token from '../generated-artifacts/DummyMultipleReturnERC20Token.json';
+import * as DummyNoReturnERC20Token from '../generated-artifacts/DummyNoReturnERC20Token.json';
+import * as ERC20Token from '../generated-artifacts/ERC20Token.json';
+import * as IERC20Token from '../generated-artifacts/IERC20Token.json';
+import * as IEtherToken from '../generated-artifacts/IEtherToken.json';
+import * as MintableERC20Token from '../generated-artifacts/MintableERC20Token.json';
+import * as ReentrantERC20Token from '../generated-artifacts/ReentrantERC20Token.json';
+import * as UnlimitedAllowanceERC20Token from '../generated-artifacts/UnlimitedAllowanceERC20Token.json';
+import * as WETH9 from '../generated-artifacts/WETH9.json';
+import * as ZRXToken from '../generated-artifacts/ZRXToken.json';
+export const artifacts = {
+    ERC20Token: ERC20Token as ContractArtifact,
+    MintableERC20Token: MintableERC20Token as ContractArtifact,
+    UnlimitedAllowanceERC20Token: UnlimitedAllowanceERC20Token as ContractArtifact,
+    WETH9: WETH9 as ContractArtifact,
+    ZRXToken: (ZRXToken as any) as ContractArtifact,
+    IERC20Token: IERC20Token as ContractArtifact,
+    IEtherToken: IEtherToken as ContractArtifact,
+    DummyERC20Token: DummyERC20Token as ContractArtifact,
+    DummyMultipleReturnERC20Token: DummyMultipleReturnERC20Token as ContractArtifact,
+    DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact,
+    ReentrantERC20Token: ReentrantERC20Token as ContractArtifact,
+};
--- a/contracts/tokens/src/index.ts
+++ b/contracts/tokens/src/index.ts
--- a/contracts/erc20/src/wrappers.ts
+++ b/contracts/erc20/src/wrappers.ts
@@ -0,0 +1,16 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+export * from '../generated-wrappers/dummy_erc20_token';
+export * from '../generated-wrappers/dummy_multiple_return_erc20_token';
+export * from '../generated-wrappers/dummy_no_return_erc20_token';
+export * from '../generated-wrappers/erc20_token';
+export * from '../generated-wrappers/i_erc20_token';
+export * from '../generated-wrappers/i_ether_token';
+export * from '../generated-wrappers/mintable_erc20_token';
+export * from '../generated-wrappers/reentrant_erc20_token';
+export * from '../generated-wrappers/unlimited_allowance_erc20_token';
+export * from '../generated-wrappers/weth9';
+export * from '../generated-wrappers/zrx_token';
--- a/contracts/protocol/test/global_hooks.ts
+++ b/contracts/protocol/test/global_hooks.ts
--- a/contracts/tokens/test/unlimited_allowance_token.ts
+++ b/contracts/tokens/test/unlimited_allowance_token.ts
@@ -109,7 +109,7 @@ describe('UnlimitedAllowanceToken', () => {
            const amountToTransfer = ownerBalance;

            const spenderAllowance = await token.allowance.callAsync(owner, spender);
-            const isSpenderAllowanceInsufficient = spenderAllowance.cmp(amountToTransfer) < 0;
+            const isSpenderAllowanceInsufficient = spenderAllowance.comparedTo(amountToTransfer) < 0;
            expect(isSpenderAllowanceInsufficient).to.be.true();

            return expectContractCallFailedAsync(
--- a/contracts/tokens/test/weth9.ts
+++ b/contracts/tokens/test/weth9.ts
--- a/contracts/tokens/test/zrx_token.ts
+++ b/contracts/tokens/test/zrx_token.ts
@@ -117,7 +117,7 @@ describe('ZRXToken', () => {
            const amountToTransfer = ownerBalance;

            const spenderAllowance = await zrxToken.allowance.callAsync(owner, spender);
-            const isSpenderAllowanceInsufficient = spenderAllowance.cmp(amountToTransfer) < 0;
+            const isSpenderAllowanceInsufficient = spenderAllowance.comparedTo(amountToTransfer) < 0;
            expect(isSpenderAllowanceInsufficient).to.be.true();

            const didReturnTrue = await zrxToken.transferFrom.callAsync(owner, spender, amountToTransfer, {
--- a/contracts/erc20/tsconfig.json
+++ b/contracts/erc20/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "extends": "../../tsconfig",
+    "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
+    "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
+    "files": [
+        "generated-artifacts/DummyERC20Token.json",
+        "generated-artifacts/DummyMultipleReturnERC20Token.json",
+        "generated-artifacts/DummyNoReturnERC20Token.json",
+        "generated-artifacts/ERC20Token.json",
+        "generated-artifacts/IERC20Token.json",
+        "generated-artifacts/IEtherToken.json",
+        "generated-artifacts/MintableERC20Token.json",
+        "generated-artifacts/ReentrantERC20Token.json",
+        "generated-artifacts/UnlimitedAllowanceERC20Token.json",
+        "generated-artifacts/WETH9.json",
+        "generated-artifacts/ZRXToken.json"
+    ],
+    "exclude": ["./deploy/solc/solc_bin"]
+}
--- a/contracts/interfaces/tslint.json
+++ b/contracts/interfaces/tslint.json
--- a/contracts/erc721/.solhintignore
+++ b/contracts/erc721/.solhintignore
--- a/contracts/erc721/CHANGELOG.json
+++ b/contracts/erc721/CHANGELOG.json
@@ -0,0 +1,65 @@
+[
+    {
+        "timestamp": 1551130135,
+        "version": "1.0.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1549733923,
+        "version": "1.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1549547375
+    },
+    {
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Fake publish to enable pinning"
+            }
+        ],
+        "timestamp": 1549504360
+    },
+    {
+        "timestamp": 1549452781,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1549373905,
+        "version": "1.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.0.0",
+        "changes": [
+            {
+                "note": "Move all ERC721 contracts out of contracts-tokens to new package",
+                "pr": 1539
+            }
+        ]
+    }
+]
--- a/contracts/erc721/CHANGELOG.md
+++ b/contracts/erc721/CHANGELOG.md
@@ -0,0 +1,34 @@
+<!--
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
+Edit the package's CHANGELOG.json file only.
+-->
+
+CHANGELOG
+
+## v1.0.6 - _February 25, 2019_
+
+    * Dependencies updated
+
+## v1.0.5 - _February 9, 2019_
+
+    * Dependencies updated
+
+## v1.0.4 - _February 7, 2019_
+
+    * Dependencies updated
+
+## v1.0.3 - _February 7, 2019_
+
+    * Fake publish to enable pinning
+
+## v1.0.2 - _February 6, 2019_
+
+    * Dependencies updated
+
+## v1.0.1 - _February 5, 2019_
+
+    * Dependencies updated
+
+## v1.0.0 - _Invalid date_
+
+    * Move all ERC721 contracts out of contracts-tokens to new package (#1539)
--- a/contracts/erc721/DEPLOYS.json
+++ b/contracts/erc721/DEPLOYS.json
@@ -0,0 +1 @@
+[]
--- a/contracts/erc721/README.md
+++ b/contracts/erc721/README.md
@@ -1,15 +1,18 @@
-## Contracts libs
+## ERC721 Tokens

-Smart contracts libs used in the 0x protocol.
+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.

-## Usage
+## Installation

-Contracts can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
+**Install**

-   [libs](./contracts/protocol)
-    -   This directory contains the libs.
-   [test](./contracts/test)
-    -   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
+```bash
+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).

 ## Contributing

@@ -38,13 +41,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:

 ```bash
-PKG=@0x/contracts-libs yarn build
+PKG=@0x/contracts-erc721 yarn build
 ```

 Or continuously rebuild on change:

 ```bash
-PKG=@0x/contracts-libs yarn watch
+PKG=@0x/contracts-erc721 yarn watch
 ```

 ### Clean
--- a/contracts/interfaces/compiler.json
+++ b/contracts/interfaces/compiler.json
@@ -1,11 +1,10 @@
 {
    "artifactsDir": "./generated-artifacts",
    "contractsDir": "./contracts",
+    "useDockerisedSolc": true,
+    "isOfflineMode": false,
    "compilerSettings": {
-        "optimizer": {
-            "enabled": true,
-            "runs": 1000000
-        },
+        "optimizer": { "enabled": true, "runs": 1000000 },
        "outputSelection": {
            "*": {
                "*": [
@@ -19,17 +18,12 @@
        }
    },
    "contracts": [
-        "IAssetData",
-        "IAssetProxy",
-        "IAuthorizable",
-        "IAssetProxyDispatcher",
-        "IExchange",
-        "IExchangeCore",
-        "IMatchOrders",
-        "ISignatureValidator",
-        "ITransactions",
-        "IValidator",
-        "IWallet",
-        "IWrapperFunctions"
+        "src/ERC721Token.sol",
+        "src/MintableERC721Token.sol",
+        "src/interfaces/IERC721Receiver.sol",
+        "src/interfaces/IERC721Token.sol",
+        "test/DummyERC721Receiver.sol",
+        "test/DummyERC721Token.sol",
+        "test/InvalidERC721Receiver.sol"
    ]
 }
--- a/contracts/tokens/contracts/tokens/ERC721Token/ERC721Token.sol
+++ b/contracts/tokens/contracts/tokens/ERC721Token/ERC721Token.sol
@@ -18,9 +18,9 @@

 pragma solidity ^0.4.24;

-import "./IERC721Token.sol";
-import "./IERC721Receiver.sol";
-import "@0x/contracts-utils/contracts/utils/SafeMath/SafeMath.sol";
+import "./interfaces/IERC721Token.sol";
+import "./interfaces/IERC721Receiver.sol";
+import "@0x/contracts-utils/contracts/src/SafeMath.sol";


 contract ERC721Token is
--- a/contracts/tokens/contracts/tokens/ERC721Token/MintableERC721Token.sol
+++ b/contracts/tokens/contracts/tokens/ERC721Token/MintableERC721Token.sol
--- a/contracts/tokens/contracts/tokens/ERC721Token/IERC721Receiver.sol
+++ b/contracts/tokens/contracts/tokens/ERC721Token/IERC721Receiver.sol
--- a/contracts/tokens/contracts/tokens/ERC721Token/IERC721Token.sol
+++ b/contracts/tokens/contracts/tokens/ERC721Token/IERC721Token.sol
--- a/contracts/tokens/contracts/test/DummyERC721Receiver/DummyERC721Receiver.sol
+++ b/contracts/tokens/contracts/test/DummyERC721Receiver/DummyERC721Receiver.sol
@@ -18,7 +18,7 @@

 pragma solidity 0.4.24;

-import "../../tokens/ERC721Token/IERC721Receiver.sol";
+import "../src/interfaces/IERC721Receiver.sol";


 contract DummyERC721Receiver is
--- a/contracts/tokens/contracts/test/DummyERC721Token/DummyERC721Token.sol
+++ b/contracts/tokens/contracts/test/DummyERC721Token/DummyERC721Token.sol
@@ -18,8 +18,8 @@

 pragma solidity 0.4.24;

-import "../../tokens/ERC721Token/MintableERC721Token.sol";
-import "@0x/contracts-utils/contracts/utils/Ownable/Ownable.sol";
+import "../src/MintableERC721Token.sol";
+import "@0x/contracts-utils/contracts/src/Ownable.sol";


 // solhint-disable no-empty-blocks
--- a/contracts/tokens/contracts/test/DummyERC721Receiver/InvalidERC721Receiver.sol
+++ b/contracts/tokens/contracts/test/DummyERC721Receiver/InvalidERC721Receiver.sol
@@ -18,7 +18,7 @@

 pragma solidity 0.4.24;

-import "../../tokens/ERC721Token/IERC721Receiver.sol";
+import "../src/interfaces/IERC721Receiver.sol";


 contract InvalidERC721Receiver is
--- a/contracts/erc721/package.json
+++ b/contracts/erc721/package.json
@@ -0,0 +1,82 @@
+{
+    "name": "@0x/contracts-erc721",
+    "version": "1.0.6",
+    "engines": {
+        "node": ">=6.12"
+    },
+    "description": "Token contracts used by 0x protocol",
+    "main": "lib/src/index.js",
+    "directories": {
+        "test": "test"
+    },
+    "scripts": {
+        "build": "yarn pre_build && tsc -b",
+        "build:ci": "yarn build",
+        "pre_build": "run-s compile generate_contract_wrappers",
+        "test": "yarn run_mocha",
+        "rebuild_and_test": "run-s build test",
+        "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
+        "test:profiler": "SOLIDITY_PROFILER=true run-s build run_mocha profiler:report:html",
+        "test:trace": "SOLIDITY_REVERT_TRACE=true run-s build run_mocha",
+        "run_mocha": "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*.js' --timeout 100000 --bail --exit",
+        "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",
+        "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",
+        "profiler:report:html": "istanbul report html && open coverage/index.html",
+        "coverage:report:lcov": "istanbul report lcov",
+        "test:circleci": "yarn test",
+        "contracts:gen": "contracts-gen",
+        "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
+    },
+    "config": {
+        "abis": "./generated-artifacts/@(DummyERC721Receiver|DummyERC721Token|ERC721Token|IERC721Receiver|IERC721Token|InvalidERC721Receiver|MintableERC721Token).json",
+        "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
+    },
+    "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/contracts/tokens/README.md",
+    "devDependencies": {
+        "@0x/abi-gen": "^2.0.4",
+        "@0x/contracts-gen": "^1.0.3",
+        "@0x/contracts-test-utils": "^3.0.5",
+        "@0x/dev-utils": "^2.1.1",
+        "@0x/sol-compiler": "^3.1.0",
+        "@0x/tslint-config": "^3.0.0",
+        "@types/lodash": "4.14.104",
+        "@types/node": "*",
+        "chai": "^4.0.1",
+        "chai-as-promised": "^7.1.0",
+        "chai-bignumber": "^3.0.0",
+        "dirty-chai": "^2.0.1",
+        "make-promises-safe": "^1.1.0",
+        "mocha": "^4.1.0",
+        "npm-run-all": "^4.1.2",
+        "shx": "^0.2.2",
+        "solhint": "^1.4.1",
+        "tslint": "5.11.0",
+        "typescript": "3.0.1"
+    },
+    "dependencies": {
+        "@0x/base-contract": "^5.0.0",
+        "@0x/contracts-utils": "2.0.1",
+        "@0x/types": "^2.1.0",
+        "@0x/typescript-typings": "^4.1.0",
+        "@0x/utils": "^4.2.0",
+        "@0x/web3-wrapper": "^6.0.0",
+        "ethereum-types": "^2.1.0",
+        "lodash": "^4.17.11"
+    },
+    "publishConfig": {
+        "access": "public"
+    }
+}
--- a/contracts/erc721/src/artifacts.ts
+++ b/contracts/erc721/src/artifacts.ts
@@ -0,0 +1,23 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+import { ContractArtifact } from 'ethereum-types';
+
+import * as DummyERC721Receiver from '../generated-artifacts/DummyERC721Receiver.json';
+import * as DummyERC721Token from '../generated-artifacts/DummyERC721Token.json';
+import * as ERC721Token from '../generated-artifacts/ERC721Token.json';
+import * as IERC721Receiver from '../generated-artifacts/IERC721Receiver.json';
+import * as IERC721Token from '../generated-artifacts/IERC721Token.json';
+import * as InvalidERC721Receiver from '../generated-artifacts/InvalidERC721Receiver.json';
+import * as MintableERC721Token from '../generated-artifacts/MintableERC721Token.json';
+export const artifacts = {
+    ERC721Token: ERC721Token as ContractArtifact,
+    MintableERC721Token: MintableERC721Token as ContractArtifact,
+    IERC721Receiver: IERC721Receiver as ContractArtifact,
+    IERC721Token: IERC721Token as ContractArtifact,
+    DummyERC721Receiver: DummyERC721Receiver as ContractArtifact,
+    DummyERC721Token: DummyERC721Token as ContractArtifact,
+    InvalidERC721Receiver: InvalidERC721Receiver as ContractArtifact,
+};
--- a/contracts/interfaces/src/index.ts
+++ b/contracts/interfaces/src/index.ts
@@ -1,2 +1,2 @@
-export * from './artifacts';
 export * from './wrappers';
+export * from './artifacts';
--- a/contracts/erc721/src/wrappers.ts
+++ b/contracts/erc721/src/wrappers.ts
@@ -0,0 +1,12 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+export * from '../generated-wrappers/dummy_erc721_receiver';
+export * from '../generated-wrappers/dummy_erc721_token';
+export * from '../generated-wrappers/erc721_token';
+export * from '../generated-wrappers/i_erc721_receiver';
+export * from '../generated-wrappers/i_erc721_token';
+export * from '../generated-wrappers/invalid_erc721_receiver';
+export * from '../generated-wrappers/mintable_erc721_token';
--- a/contracts/erc721/test/erc721_token.ts
+++ b/contracts/erc721/test/erc721_token.ts
--- a/contracts/erc721/test/global_hooks.ts
+++ b/contracts/erc721/test/global_hooks.ts
--- a/contracts/erc721/tsconfig.json
+++ b/contracts/erc721/tsconfig.json
@@ -0,0 +1,15 @@
+{
+    "extends": "../../tsconfig",
+    "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
+    "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
+    "files": [
+        "generated-artifacts/DummyERC721Receiver.json",
+        "generated-artifacts/DummyERC721Token.json",
+        "generated-artifacts/ERC721Token.json",
+        "generated-artifacts/IERC721Receiver.json",
+        "generated-artifacts/IERC721Token.json",
+        "generated-artifacts/InvalidERC721Receiver.json",
+        "generated-artifacts/MintableERC721Token.json"
+    ],
+    "exclude": ["./deploy/solc/solc_bin"]
+}
--- a/contracts/erc721/tslint.json
+++ b/contracts/erc721/tslint.json
--- a/contracts/examples/CHANGELOG.md
+++ b/contracts/examples/CHANGELOG.md
@@ -1,18 +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
-
-## v1.0.4 - _January 11, 2019_
-
-    * Dependencies updated
-
-## v1.0.3 - _January 9, 2019_
-
-    * Dependencies updated
-
-## v1.0.2 - _December 13, 2018_
-
-    * Dependencies updated
--- a/contracts/examples/compiler.json
+++ b/contracts/examples/compiler.json
@@ -1,22 +0,0 @@
-{
-    "artifactsDir": "./generated-artifacts",
-    "contractsDir": "./contracts",
-    "compilerSettings": {
-        "optimizer": {
-            "enabled": true,
-            "runs": 1000000
-        },
-        "outputSelection": {
-            "*": {
-                "*": [
-                    "abi",
-                    "evm.bytecode.object",
-                    "evm.bytecode.sourceMap",
-                    "evm.deployedBytecode.object",
-                    "evm.deployedBytecode.sourceMap"
-                ]
-            }
-        }
-    },
-    "contracts": ["ExchangeWrapper", "Validator", "Wallet", "Whitelist"]
-}
--- a/contracts/examples/package.json
+++ b/contracts/examples/package.json
@@ -1,81 +0,0 @@
-{
-    "name": "@0x/contracts-examples",
-    "version": "1.0.4",
-    "engines": {
-        "node": ">=6.12"
-    },
-    "description": "Smart contract examples of 0x protocol",
-    "main": "lib/src/index.js",
-    "directories": {
-        "test": "test"
-    },
-    "scripts": {
-        "build": "yarn pre_build && tsc -b",
-        "build:ci": "yarn build",
-        "pre_build": "run-s compile generate_contract_wrappers",
-        "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",
-        "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
-        "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
-    },
-    "config": {
-        "abis": "generated-artifacts/@(ExchangeWrapper|Validator|Wallet|Whitelist).json"
-    },
-    "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/contracts/examples/README.md",
-    "devDependencies": {
-        "@0x/abi-gen": "^1.0.21",
-        "@0x/contracts-test-utils": "^1.0.4",
-        "@0x/dev-utils": "^1.0.23",
-        "@0x/sol-compiler": "^2.0.1",
-        "@0x/subproviders": "^2.1.10",
-        "@0x/tslint-config": "^2.0.1",
-        "@types/bn.js": "^4.11.0",
-        "@types/lodash": "4.14.104",
-        "@types/node": "*",
-        "@types/yargs": "^10.0.0",
-        "chai": "^4.0.1",
-        "chai-as-promised": "^7.1.0",
-        "chai-bignumber": "^2.0.1",
-        "dirty-chai": "^2.0.1",
-        "ethereumjs-abi": "0.6.5",
-        "make-promises-safe": "^1.1.0",
-        "mocha": "^4.1.0",
-        "npm-run-all": "^4.1.2",
-        "shx": "^0.2.2",
-        "solhint": "^1.4.1",
-        "tslint": "5.11.0",
-        "typescript": "3.0.1",
-        "yargs": "^10.0.3"
-    },
-    "dependencies": {
-        "@0x/base-contract": "^3.0.12",
-        "@0x/contracts-interfaces": "^1.0.4",
-        "@0x/contracts-libs": "^1.0.4",
-        "@0x/contracts-multisig": "^1.0.4",
-        "@0x/contracts-tokens": "^1.0.4",
-        "@0x/contracts-utils": "^1.0.4",
-        "@0x/order-utils": "^3.1.1",
-        "@0x/types": "^1.5.1",
-        "@0x/typescript-typings": "^3.0.7",
-        "@0x/utils": "^3.0.0",
-        "@0x/web3-wrapper": "^3.2.3",
-        "@types/js-combinatorics": "^0.5.29",
-        "bn.js": "^4.11.8",
-        "ethereum-types": "^1.1.5",
-        "ethereumjs-util": "^5.1.1",
-        "lodash": "^4.17.5"
-    },
-    "publishConfig": {
-        "access": "public"
-    }
-}
--- a/contracts/examples/src/artifacts/index.ts
+++ b/contracts/examples/src/artifacts/index.ts
@@ -1,13 +0,0 @@
-import { ContractArtifact } from 'ethereum-types';
-
-import * as ExchangeWrapper from '../../generated-artifacts/ExchangeWrapper.json';
-import * as Validator from '../../generated-artifacts/Validator.json';
-import * as Wallet from '../../generated-artifacts/Wallet.json';
-import * as Whitelist from '../../generated-artifacts/Whitelist.json';
-
-export const artifacts = {
-    ExchangeWrapper: ExchangeWrapper as ContractArtifact,
-    Validator: Validator as ContractArtifact,
-    Wallet: Wallet as ContractArtifact,
-    Whitelist: Whitelist as ContractArtifact,
-};
--- a/contracts/examples/src/wrappers/index.ts
+++ b/contracts/examples/src/wrappers/index.ts
@@ -1,4 +0,0 @@
-export * from '../../generated-wrappers/exchange_wrapper';
-export * from '../../generated-wrappers/validator';
-export * from '../../generated-wrappers/wallet';
-export * from '../../generated-wrappers/whitelist';
--- a/contracts/examples/tsconfig.json
+++ b/contracts/examples/tsconfig.json
@@ -1,16 +0,0 @@
-{
-    "extends": "../../tsconfig",
-    "compilerOptions": {
-        "outDir": "lib",
-        "rootDir": ".",
-        "resolveJsonModule": true
-    },
-    "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
-    "files": [
-        "./generated-artifacts/ExchangeWrapper.json",
-        "./generated-artifacts/Validator.json",
-        "./generated-artifacts/Wallet.json",
-        "./generated-artifacts/Whitelist.json"
-    ],
-    "exclude": ["./deploy/solc/solc_bin"]
-}
--- a/contracts/exchange-forwarder/CHANGELOG.json
+++ b/contracts/exchange-forwarder/CHANGELOG.json
@@ -0,0 +1,65 @@
+[
+    {
+        "timestamp": 1551130135,
+        "version": "1.0.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1549733923,
+        "version": "1.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1549547375
+    },
+    {
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Fake publish to enable pinning"
+            }
+        ],
+        "timestamp": 1549504360
+    },
+    {
+        "timestamp": 1549452781,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1549373905,
+        "version": "1.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.0.0",
+        "changes": [
+            {
+                "note": "Move Forwarder contract out of contracts-extensions into new package",
+                "pr": 1539
+            }
+        ]
+    }
+]
--- a/contracts/exchange-forwarder/CHANGELOG.md
+++ b/contracts/exchange-forwarder/CHANGELOG.md
@@ -0,0 +1,34 @@
+<!--
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
+Edit the package's CHANGELOG.json file only.
+-->
+
+CHANGELOG
+
+## v1.0.6 - _February 25, 2019_
+
+    * Dependencies updated
+
+## v1.0.5 - _February 9, 2019_
+
+    * Dependencies updated
+
+## v1.0.4 - _February 7, 2019_
+
+    * Dependencies updated
+
+## v1.0.3 - _February 7, 2019_
+
+    * Fake publish to enable pinning
+
+## v1.0.2 - _February 6, 2019_
+
+    * Dependencies updated
+
+## v1.0.1 - _February 5, 2019_
+
+    * Dependencies updated
+
+## v1.0.0 - _Invalid date_
+
+    * Move Forwarder contract out of contracts-extensions into new package (#1539)
--- a/contracts/exchange-forwarder/DEPLOYS.json
+++ b/contracts/exchange-forwarder/DEPLOYS.json
@@ -0,0 +1,32 @@
+[
+    {
+        "name": "Forwarder",
+        "version": "1.1.0",
+        "changes": [
+            {
+                "note": "Round up when calculating remaining amounts in marketBuy functions",
+                "pr": 1162,
+                "networks": {
+                    "1": "0x5468a1dc173652ee28d249c271fa9933144746b1",
+                    "3": "0x2240dab907db71e64d3e0dba4800c83b5c502d4e",
+                    "4": "0xd2dbf3250a764eaaa94fa0c84ed87c0edc8ed04e",
+                    "42": "0x17992e4ffb22730138e4b62aaa6367fa9d3699a6"
+                }
+            }
+        ]
+    },
+    {
+        "name": "Forwarder",
+        "version": "1.0.0",
+        "changes": [
+            {
+                "note": "protocol v2 deploy",
+                "networks": {
+                    "1": "0x7afc2d5107af94c462a194d2c21b5bdd238709d6",
+                    "3": "0x3983e204b12b3c02fb0638caf2cd406a62e0ead3",
+                    "42": "0xd85e2fa7e7e252b27b01bf0d65c946959d2f45b8"
+                }
+            }
+        ]
+    }
+]
--- a/contracts/exchange-forwarder/README.md
+++ b/contracts/exchange-forwarder/README.md
@@ -1,15 +1,14 @@
-## Token contracts
+## Exchange Forwarder

-Token smart contracts that are used in the 0x protocol. Addresses of the deployed contracts can be found in the 0x [wiki](https://0xproject.com/wiki#Deployed-Addresses) or the [CHANGELOG](./CHANGELOG.json) of 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 the 0x [wiki](https://0xproject.com/wiki#Deployed-Addresses) or the [DEPLOYS](./DEPLOYS.json) file within this package.

-## Usage
+## Installation

-Token contracts that make up and interact with version 2.0.0 of the protocol can be found in the [contracts](./contracts) directory. The contents of this directory are broken down into the following subdirectories:
+**Install**

-   [tokens](./contracts/tokens)
-    -   This directory contains implementations of different tokens and token standards, including [wETH](https://weth.io/), ZRX, [ERC20](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md), and [ERC721](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md).
-   [test](./contracts/test)
-    -   This directory contains mocks and other contracts that are used solely for testing contracts within the other directories.
+```bash
+npm install @0x/contracts-exchange-forwarder --save
+```

 ## Bug bounty

@@ -42,13 +41,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:

 ```bash
-PKG=@0x/contracts-tokens yarn build
+PKG=@0x/contracts-exchange-forwarder yarn build
 ```

 Or continuously rebuild on change:

 ```bash
-PKG=@0x/contracts-tokens yarn watch
+PKG=@0x/contracts-exchange-forwarder yarn watch
 ```

 ### Clean
--- a/contracts/exchange-forwarder/compiler.json
+++ b/contracts/exchange-forwarder/compiler.json
@@ -1,11 +1,10 @@
 {
    "artifactsDir": "./generated-artifacts",
    "contractsDir": "./contracts",
+    "useDockerisedSolc": true,
+    "isOfflineMode": false,
    "compilerSettings": {
-        "optimizer": {
-            "enabled": true,
-            "runs": 1000000
-        },
+        "optimizer": { "enabled": true, "runs": 1000000 },
        "outputSelection": {
            "*": {
                "*": [
@@ -19,16 +18,10 @@
        }
    },
    "contracts": [
-        "AssetProxyOwner",
-        "ERC20Proxy",
-        "ERC721Proxy",
-        "Exchange",
-        "MixinAuthorizable",
-        "MultiAssetProxy",
-        "TestAssetProxyOwner",
-        "TestAssetProxyDispatcher",
-        "TestExchangeInternals",
-        "TestSignatureValidator",
-        "TestStaticCallReceiver"
+        "@0x/contracts-erc20/contracts/src/WETH9.sol",
+        "@0x/contracts-erc20/contracts/test/DummyERC20Token.sol",
+        "@0x/contracts-erc721/contracts/test/DummyERC721Token.sol",
+        "@0x/contracts-exchange/contracts/src/Exchange.sol",
+        "src/Forwarder.sol"
    ]
 }
--- a/contracts/exchange-forwarder/contracts/src/Forwarder.sol
+++ b/contracts/exchange-forwarder/contracts/src/Forwarder.sol
--- a/contracts/exchange-forwarder/contracts/src/MixinAssets.sol
+++ b/contracts/exchange-forwarder/contracts/src/MixinAssets.sol
@@ -18,10 +18,10 @@

 pragma solidity ^0.4.24;

-import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol";
-import "@0x/contracts-utils/contracts/utils/Ownable/Ownable.sol";
-import "@0x/contracts-tokens/contracts/tokens/ERC20Token/IERC20Token.sol";
-import "@0x/contracts-tokens/contracts/tokens/ERC721Token/IERC721Token.sol";
+import "@0x/contracts-utils/contracts/src/LibBytes.sol";
+import "@0x/contracts-utils/contracts/src/Ownable.sol";
+import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
+import "@0x/contracts-erc721/contracts/src/interfaces/IERC721Token.sol";
 import "./libs/LibConstants.sol";
 import "./mixins/MAssets.sol";

--- a/contracts/exchange-forwarder/contracts/src/MixinExchangeWrapper.sol
+++ b/contracts/exchange-forwarder/contracts/src/MixinExchangeWrapper.sol
@@ -21,10 +21,10 @@ pragma experimental ABIEncoderV2;

 import "./libs/LibConstants.sol";
 import "./mixins/MExchangeWrapper.sol";
-import "@0x/contracts-libs/contracts/libs/LibAbiEncoder.sol";
-import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
-import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
-import "@0x/contracts-libs/contracts/libs/LibMath.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibAbiEncoder.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibMath.sol";


 contract MixinExchangeWrapper is
--- a/contracts/exchange-forwarder/contracts/src/MixinForwarderCore.sol
+++ b/contracts/exchange-forwarder/contracts/src/MixinForwarderCore.sol
@@ -24,10 +24,10 @@ import "./mixins/MWeth.sol";
 import "./mixins/MAssets.sol";
 import "./mixins/MExchangeWrapper.sol";
 import "./interfaces/IForwarderCore.sol";
-import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol";
-import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
-import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
-import "@0x/contracts-libs/contracts/libs/LibMath.sol";
+import "@0x/contracts-utils/contracts/src/LibBytes.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibMath.sol";


 contract MixinForwarderCore is
--- a/contracts/exchange-forwarder/contracts/src/MixinWeth.sol
+++ b/contracts/exchange-forwarder/contracts/src/MixinWeth.sol
@@ -18,7 +18,7 @@

 pragma solidity ^0.4.24;

-import "@0x/contracts-libs/contracts/libs/LibMath.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibMath.sol";
 import "./libs/LibConstants.sol";
 import "./mixins/MWeth.sol";

--- a/contracts/exchange-forwarder/contracts/src/interfaces/IAssets.sol
+++ b/contracts/exchange-forwarder/contracts/src/interfaces/IAssets.sol
--- a/contracts/exchange-forwarder/contracts/src/interfaces/IForwarder.sol
+++ b/contracts/exchange-forwarder/contracts/src/interfaces/IForwarder.sol
--- a/contracts/exchange-forwarder/contracts/src/interfaces/IForwarderCore.sol
+++ b/contracts/exchange-forwarder/contracts/src/interfaces/IForwarderCore.sol
@@ -19,8 +19,8 @@
 pragma solidity ^0.4.24;
 pragma experimental ABIEncoderV2;

-import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
-import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";


 contract IForwarderCore {
--- a/Show More
+++ b/Show More