Publish

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

.circleci/config.yml

@@ -0,0 +1,419 @@
+version: 2
+
+jobs:
+    build:
+        resource_class: medium+
+        docker:
+            - image: nikolaik/python-nodejs:python3.7-nodejs8
+        environment:
+            CONTRACTS_COMMIT_HASH: '9ed05f5'
+        working_directory: ~/repo
+        steps:
+            - checkout
+            - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV
+            # HACK(feuGeneA): commented out this hack as we're changing
+            # from a circleci-maintained container to a different
+            # container, and this hack may not apply anymore, as
+            # suggested by the non-existance of `/home/circleci/.bashrc`
+            # when running the command below.
+            # - run:
+            #       # HACK(albrow): Without this, yarn commands will sometimes
+            #       # fail with a "permission denied" error.
+            #       name: Set npm path
+            #       command: npm set prefix=/home/circleci/npm && echo 'export PATH=$HOME/circleci/npm/bin:$PATH' >> /home/circleci/.bashrc
+            - run:
+                  name: install-yarn
+                  command: npm install --global yarn@1.17.0
+            - run:
+                  name: yarn
+                  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:
+                  key: repo-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo
+            - store_artifacts:
+                  path: ~/repo/packages/abi-gen/test-cli/output
+            - store_artifacts:
+                  path: ~/repo/packages/abi-gen-wrappers/generated_docs
+    build-website:
+        resource_class: medium+
+        docker:
+            - image: nikolaik/python-nodejs:python3.7-nodejs8
+        working_directory: ~/repo
+        steps:
+            - restore_cache:
+                  keys:
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+            - run: cd packages/website && yarn build:prod
+    test-contracts-ganache:
+        resource_class: medium+
+        docker:
+            - image: nikolaik/python-nodejs:python3.7-nodejs8
+        working_directory: ~/repo
+        steps:
+            - restore_cache:
+                  keys:
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+            - run: yarn wsrun test:circleci @0x/contracts-multisig @0x/contracts-utils @0x/contracts-exchange-libs @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-extensions @0x/contracts-asset-proxy @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-coordinator @0x/contracts-dev-utils
+    test-contracts-geth:
+        docker:
+            - image: nikolaik/python-nodejs:python3.7-nodejs8
+            - image: 0xorg/devnet
+        working_directory: ~/repo
+        steps:
+            - restore_cache:
+                  keys:
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+            # HACK(albrow): we need to sleep 10 seconds to ensure the devnet is
+            # initialized
+            - run: sleep 10 && TEST_PROVIDER=geth yarn wsrun test:circleci @0x/contracts-multisig @0x/contracts-utils @0x/contracts-exchange-libs @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-extensions @0x/contracts-asset-proxy @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-coordinator @0x/contracts-dev-utils
+    test-publish:
+        resource_class: medium+
+        docker:
+            - image: nikolaik/python-nodejs:python3.7-nodejs8
+            - image: 0xorg/verdaccio
+        working_directory: ~/repo
+        steps:
+            - restore_cache:
+                  keys:
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+            - run: yarn test:publish:circleci
+    test-doc-generation:
+        docker:
+            - image: nikolaik/python-nodejs:python3.7-nodejs8
+        working_directory: ~/repo
+        steps:
+            - restore_cache:
+                  keys:
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+            - run: yarn test:generate_docs:circleci
+    test-rest:
+        docker:
+            - image: nikolaik/python-nodejs:python3.7-nodejs8
+        working_directory: ~/repo
+        steps:
+            - restore_cache:
+                  keys:
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+            - run: yarn wsrun test:circleci @0x/contracts-test-utils
+            - run: yarn wsrun test:circleci @0x/abi-gen
+            - run: yarn wsrun test:circleci @0x/asset-buyer
+            - run: yarn wsrun test:circleci @0x/contract-artifacts
+            - run: yarn wsrun test:circleci @0x/assert
+            - run: yarn wsrun test:circleci @0x/base-contract
+            - run: yarn wsrun test:circleci @0x/connect
+            - run: yarn wsrun test:circleci @0x/contract-wrappers
+            - run: yarn wsrun test:circleci @0x/dev-utils
+            - run: yarn wsrun test:circleci @0x/json-schemas
+            - run: yarn wsrun test:circleci @0x/order-utils
+            - run: yarn wsrun test:circleci @0x/sol-compiler
+            - run: yarn wsrun test:circleci @0x/sol-tracing-utils
+            - run: yarn wsrun test:circleci @0x/sol-doc
+            - run: yarn wsrun test:circleci @0x/subproviders
+            - run: yarn wsrun test:circleci @0x/web3-wrapper
+            - run: yarn wsrun test:circleci @0x/utils
+            - run: yarn wsrun test:circleci @0x/instant
+            - save_cache:
+                  key: coverage-abi-gen-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/packages/abi-gen/coverage/lcov.info
+            - save_cache:
+                  key: coverage-assert-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/packages/assert/coverage/lcov.info
+            - save_cache:
+                  key: coverage-asset-buyer-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/packages/asset-buyer/coverage/lcov.info
+            - save_cache:
+                  key: coverage-base-contract-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/packages/base-contract/coverage/lcov.info
+            - save_cache:
+                  key: coverage-connect-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/packages/connect/coverage/lcov.info
+            - save_cache:
+                  key: coverage-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/packages/contract-wrappers/coverage/lcov.info
+            - save_cache:
+                  key: coverage-dev-utils-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/packages/dev-utils/coverage/lcov.info
+            - save_cache:
+                  key: coverage-json-schemas-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/packages/json-schemas/coverage/lcov.info
+            - save_cache:
+                  key: coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/packages/order-utils/coverage/lcov.info
+            - save_cache:
+                  key: coverage-sol-compiler-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/packages/sol-compiler/coverage/lcov.info
+            - save_cache:
+                  key: coverage-sol-tracing-utils-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/packages/sol-tracing-utils/coverage/lcov.info
+            - save_cache:
+                  key: coverage-sol-doc-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/packages/sol-doc/coverage/lcov.info
+            - save_cache:
+                  key: coverage-subproviders-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/packages/subproviders/coverage/lcov.info
+            - save_cache:
+                  key: coverage-web3-wrapper-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/packages/web3-wrapper/coverage/lcov.info
+    test-python:
+        working_directory: ~/repo
+        docker:
+            - image: nikolaik/python-nodejs:python3.7-nodejs8
+            - image: 0xorg/ganache-cli:2.2.2
+            - image: 0xorg/launch-kit-backend:74bcc39
+              environment:
+                  RPC_URL: http://localhost:8545
+                  NETWORK_ID: 50
+                  WHITELIST_ALL_TOKENS: True
+              command: |
+                  sh -c "until printf 'POST /\r\nContent-Length: 26\r\n\r\n{\"method\":\"net_listening\"}' | nc localhost 8545 | grep true; do continue; done; node_modules/.bin/forever ts/lib/index.js"
+        steps:
+            - checkout
+            - restore_cache:
+                  key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+            - run:
+                  command: |
+                      cd python-packages
+                      python -m ensurepip
+                      ./pre_install
+                      ./install
+            - save_cache:
+                  key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - '/usr/local/bin'
+                      - '/usr/local/lib/python3.7/site-packages'
+            - run:
+                  command: |
+                      cd python-packages
+                      ./parallel_without_sra_client coverage run setup.py test
+                      ./build_docs
+            - save_cache:
+                  key: coverage-python-contract-addresses-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/python-packages/contract_addresses/.coverage
+            - save_cache:
+                  key: coverage-python-contract-artifacts-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/python-packages/contract_artifacts/.coverage
+            - save_cache:
+                  key: coverage-python-contract-demo-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/python-packages/contract_demo/.coverage
+            - save_cache:
+                  key: coverage-python-json-schemas-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/python-packages/json_schemas/.coverage
+            - save_cache:
+                  key: coverage-python-order-utils-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/python-packages/order_utils/.coverage
+            - save_cache:
+                  key: coverage-python-sra-client-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - ~/repo/python-packages/sra_client/.coverage
+            - store_artifacts:
+                  path: ~/repo/python-packages/contract_wrappers/src/zero_ex/contract_wrappers/*/__init__.py
+            - store_artifacts:
+                  path: ~/repo/python-packages/contract_addresses/build
+            - store_artifacts:
+                  path: ~/repo/python-packages/contract_artifacts/build
+            - store_artifacts:
+                  path: ~/repo/python-packages/contract_wrappers/build
+            - store_artifacts:
+                  path: ~/repo/python-packages/json_schemas/build
+            - store_artifacts:
+                  path: ~/repo/python-packages/middlewares/build
+            - store_artifacts:
+                  path: ~/repo/python-packages/order_utils/build
+            - store_artifacts:
+                  path: ~/repo/python-packages/sra_client/build
+    test-rest-python:
+        working_directory: ~/repo
+        docker:
+            - image: nikolaik/python-nodejs:python3.7-nodejs8
+        steps:
+            - checkout
+            - restore_cache:
+                  key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
+            - run:
+                  command: |
+                      cd python-packages/order_utils
+                      python -m ensurepip
+                      python -m pip install .
+            - save_cache:
+                  key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
+                  paths:
+                      - '/usr/local/bin'
+                      - '/usr/local/lib/python3.7/site-packages'
+                      - '.eggs'
+                      - '.mypy_cache'
+                      - '.pytest_cache'
+                      - '.tox'
+            - run:
+                  command: |
+                      cd python-packages/order_utils
+                      tox
+    static-tests-python:
+        working_directory: ~/repo
+        docker:
+            - image: nikolaik/python-nodejs:python3.7-nodejs8
+        steps:
+            - checkout
+            - restore_cache:
+                  key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+            - run:
+                  command: |
+                      python -m ensurepip
+                      cd python-packages
+                      ./pre_install
+                      ./install
+                      ./lint
+    static-tests:
+        working_directory: ~/repo
+        docker:
+            - image: nikolaik/python-nodejs:python3.7-nodejs8
+        steps:
+            - restore_cache:
+                  keys:
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+            - run: yarn lerna run lint
+            - run: yarn prettier:ci
+            - run: yarn deps_versions:ci
+            - run: yarn diff_md_docs:ci
+            - run: cd packages/0x.js && yarn build:umd:prod
+            - run: yarn bundlewatch
+    submit-coverage:
+        docker:
+            - image: nikolaik/python-nodejs:python3.7-nodejs8
+        working_directory: ~/repo
+        steps:
+            - restore_cache:
+                  keys:
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-abi-gen-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-assert-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-asset-buyer-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-base-contract-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-connect-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-dev-utils-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-json-schemas-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-sol-compiler-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-sol-tracing-utils-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-sol-doc-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-subproviders-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-web3-wrapper-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-contracts-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-python-json-schemas-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-python-contract-addresses-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-python-contract-artifacts-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-python-contract-demo-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-python-sra-client-{{ .Environment.CIRCLE_SHA1 }}
+            - restore_cache:
+                  keys:
+                      - coverage-python-order-utils-{{ .Environment.CIRCLE_SHA1 }}
+            - run: yarn report_coverage
+workflows:
+    version: 2
+    main:
+        jobs:
+            - build
+            - build-website:
+                  requires:
+                      - build
+            - test-contracts-ganache:
+                  requires:
+                      - build
+            # TODO(albrow): Tests always fail on Geth right now because our fork
+            # is outdated. Uncomment once we have updated our Geth fork.
+            # - test-contracts-geth:
+            #       requires:
+            #           - build
+            - test-rest:
+                  requires:
+                      - build
+            - static-tests:
+                  requires:
+                      - build
+            - test-publish:
+                  requires:
+                      - build
+            - test-doc-generation:
+                  requires:
+                      - build
+            - submit-coverage:
+                  requires:
+                      - test-rest
+                      - test-python
+            - static-tests-python:
+                  requires:
+                      - test-python
+            - test-python:
+                  requires:
+                      - build
+            # skip python tox run for now, as we don't yet have multiple test environments to support.
+            #- test-rest-python

.gitattributes

@@ -2,3 +2,7 @@
 
 # Automatically collapse generated files in GitHub.
 *.svg linguist-generated=true
+packages/contract-artifacts/artifacts/*json linguist-generated=true
+packages/abi-gen-wrappers/src/generated-wrappers/*.ts linguist-generated=true
+packages/contract-wrappers/src/generated-wrappers/*.ts linguist-generated=true
+

.github/CODEOWNERS

@@ -1,18 +0,0 @@
-# See https://help.github.com/articles/about-codeowners/
-
-# for more info about CODEOWNERS file
-
-# It uses the same pattern rule for gitignore file
-
-# https://git-scm.com/docs/gitignore#_pattern_format
-
-# Dev tools & setup
-
-.github/ @dekz
-packages/contract-addresses/ @dekz @dextracker @kyu-c
-packages/contract-artifacts/ @dekz
-packages/protocol-utils/ @dekz
-
-# Protocol/smart contracts
-
-contracts/ @dekz @dextracker

.github/CONTRIBUTING.md

@@ -1,91 +0,0 @@
-## 0x Contribution Guide
-
-We welcome contributions from anyone on the internet and are grateful for even the smallest contributions. This document will help get you setup to start contributing back to 0x.
-
-### Getting started
-
-1.  Fork `0xproject/0x-tools`
-2.  Clone your fork
-3.  Follow the [installation & build steps](https://github.com/0xProject/0x-tools#install-dependencies) in the repo's top-level README.
-4.  Setup the recommended [Development Tooling](#development-tooling).
-5.  Open a [draft PR](https://github.blog/2019-02-14-introducing-draft-pull-requests/) against the `development` branch and describe the change you are intending to undertake in the PR description. (see [our branch naming conventions](#branch-structure))
-
-Before making the PR "Ready for review", make sure:
-
--   It passes our linter checks (`yarn lint`)
--   It is properly formatted with Prettier (`yarn prettier`)
--   It passes our continuous integration tests (See: [Enabling code coverage checks on your fork](#fix-submit-coverage-ci-failure) for instructions on getting the `submit-coverage` test to pass on forks)
--   You've created/updated the corresponding [CHANGELOG](#CHANGELOGs) entries.
--   Your changes have sufficient test coverage (e.g regression tests have been added for bug fixes)
-
-### Branch structure
-
-We have two main branches:
-
--   `master` represents the most recently released (published on npm) version of the codebase.
--   `development` represents the current development state of the codebase.
-
-ALL PRs should be opened against `development`.
-
-Branch names should be prefixed with `fix`, `feature` or `refactor`.
-
--   e.g `fix/missing-import`
--   If the PR only edits a single package, add it's name too
-    -   e.g `fix/subproviders/missing-import`
-
-### CHANGELOGs
-
-At 0x we use [Semantic Versioning](http://semver.org/) for all our published packages. If a change you make corresponds to a semver bump, you must modify the package's `CHANGELOG.json` file accordingly.
-
-Each CHANGELOG entry that corresponds to a published package will have a `timestamp`. If no entry exists without a `timestamp`, you must first create a new one:
-
-```
-{
-        "version": "1.0.1", <- The updated package version
-        "changes": [
-            {
-                "note": "", <- Describe your change
-                "PR": 100 <- Your PR number
-            }
-        ]
-    },
-```
-
-If an entry without a `timestamp` already exists, this means other changes have been introduced by other collaborators since the last publish. Add your changes to the list of notes and adjust the version if your PR introduces a greater semver change (i.e current changes required a patch bump, but your changes require a major version bump).
-
-### Development Tooling
-
-We strongly recommend you use the [VSCode](https://code.visualstudio.com/) text editor since most of our code is written in TypeScript and it offers amazing support for the language.
-
-#### Linter
-
-We use [ESLint](https://eslint.org/docs/latest/) to keep our code-style consistent.
-
-Use `yarn lint` to lint the entire monorepo, and `PKG={PACKAGE_NAME} yarn lint` to lint a specific package.
-
-Integrate it into your text editor:
-
--   VSCode: [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
--   Atom: [ESLint](https://atom.io/packages/eslint)
-
-#### Auto-formatter
-
-We use [Prettier](https://prettier.io/) to auto-format our code. Be sure to either add a [text editor integration](https://prettier.io/docs/en/editors.html) or a [pre-commit hook](https://prettier.io/docs/en/precommit.html) to properly format your code changes.
-
-If using the Atom text editor, we recommend you install the following packages:
-
--   VSCode: [prettier-vscode](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
--   Atom: [prettier-atom](https://atom.io/packages/prettier-atom)
-
-## Unenforced coding conventions
-
-A few of our coding conventions are not yet enforced by the linter/auto-formatter. Be careful to follow these conventions in your PR's.
-
-1.  Unused anonymous function parameters should be named with an underscore + number (e.g \_1, \_2, etc...)
-1.  There should be a new-line between methods in a class and between test cases.
-1.  If a string literal has the same value in two or more places, it should be a single constant referenced in both places.
-1.  Do not import from a project's `index.ts` (e.g import { Token } from '../src';). Always import from the source file itself.
-1.  Generic error variables should be named `err` instead of `e` or `error`.
-1.  If you _must_ cast a variable to any - try to type it back as fast as possible. (e.g., `const cw = ((zeroEx as any)._contractWrappers as ContractWrappers);`). This ensures subsequent code is type-safe.
-1.  Our enum conventions coincide with the recommended TypeScript conventions, using capitalized keys, and all-caps snake-case values. Eg `GetStats = 'GET_STATS'`
-1.  All public, exported methods/functions/classes must have associated Javadoc-style comments.

.github/autolabeler.yml

@@ -1,2 +1,39 @@
-documentation: ['docs']
-liquidity integrations: ['contracts/zero-ex/contracts/src/transformers']
+python: ['python-packages']
+contracts: ['contracts']
+@0x/sol-doc: ['packages/sol-doc']
+@0x/sol-resolver: ['packages/sol-resolver']
+@0x/contracts-gen: ['packages/contracts-gen']
+@0x/sra-spec: ['packages/sra-spec']
+@0x/subproviders: ['packages/subproviders']
+@0x/contract-addresses: ['packages/contract-addresses']
+@0x/migrations: ['packages/migrations']
+@0x/web3-wrapper: ['packages/web3-wrapper']
+@0x/sol-compiler: ['packages/sol-compiler']
+@0x/types: ['packages/types']
+@0x/instant: ['packages/instant']
+@0x/abi-gen-templates: ['packages/abi-gen-templates']
+@0x/abi-gen: ['packages/abi-gen']
+@0x/website: ['packages/website']
+@0x/sol-coverage: ['packages/sol-coverage']
+@0x/sol-profiler: ['packages/sol-profiler']
+@0x/sol-trace: ['packages/sol-trace']
+@0x/sol-tracing-utils: ['packages/sol-tracing-utils']
+@0x/utils: ['packages/utils']
+@0x/tslint-config: ['packages/tslint-config']
+@0x/asset-buyer: ['packages/asset-buyer']
+@0x/order-utils: ['packages/order-utils']
+@0x/assert: ['packages/assert']
+@0x/base-contract: ['packages/base-contract']
+@0x/typescript-typings: ['packages/typescript-typings']
+0x.js: ['packages/0x.js']
+@0x/abi-gen-wrappers: ['packages/abi-gen-wrappers']
+@0x/contract-artifacts: ['packages/contract-artifacts']
+@0x/dev-utils: ['packages/dev-utils']
+@0x/contract-wrappers: ['packages/contract-wrappers']
+@0x/json-schemas: ['packages/json-schemas']
+@0x/ethereum-types: ['ethereum-types']
+@0x/connect: ['packages/connect']
+@0x/fill-scenarios: ['packages/fill-scenarios']
+@0x/dev-tools-pages: ['packages/dev-tools-pages']
+@0x/testnet-faucets: ['packages/testnet-faucets']
+@0x/monorepo-scripts: ['packages/monorepo-scripts']

.github/dependabot.yml

@@ -1,7 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: monthly
-    target-branch: "development"

.github/stale.yml

@@ -0,0 +1,19 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 30
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 30
+# Issues with these labels will never be considered stale
+exemptLabels:
+    - pinned
+    - security
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+    This issue has been automatically marked as stale because it has not had
+    recent activity. It will be closed if no further activity occurs. Thank you
+    for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: >
+    This issue has been automatically closed because no activity occured in 7 days after being marked as stale. If it's still relevant - feel free to reopen. Thank you
+    for your contributions.

.github/workflows/ci.yml

@@ -1,137 +0,0 @@
-name: Continuous Integration
-on:
-    push:
-        branches:
-            - main
-            - development
-    pull_request:
-
-jobs:
-    build:
-        name: Build and test
-        runs-on: ubuntu-latest
-        env:
-            ARBITRUM_RPC_URL: ${{ secrets.ARBITRUM_RPC_URL }}
-            AVALANCHE_RPC_URL: ${{ secrets.AVALANCHE_RPC_URL }}
-            BSC_RPC_URL: ${{ secrets.BSC_RPC_URL }}
-            FANTOM_RPC_URL: ${{ secrets.FANTOM_RPC_URL }}
-            MAINNET_RPC_URL: ${{ secrets.MAINNET_RPC_URL }}
-            OPTIMISM_RPC_URL: ${{ secrets.OPTIMISM_RPC_URL }}
-            POLYGON_RPC_URL: ${{ secrets.POLYGON_RPC_URL }}
-        steps:
-            - uses: actions/checkout@v3
-              with:
-                  submodules: recursive
-
-            - name: Setup Node
-              uses: actions/setup-node@v3
-              with:
-                  node-version: '16'
-
-            - name: Install dependencies
-              run: yarn install --frozen-lockfile
-
-            - name: Build solution
-              run: yarn build
-
-            - name: Lint typescript
-              run: yarn lint:ts
-
-            - name: Lint solidity
-              run: yarn lint:contracts
-
-            - name: Run prettier
-              run: yarn prettier:ci
-
-            - name: Check dependent packages have consistent versions
-              run: yarn deps_versions:ci
-
-            - name: Check diff in docs
-              run: yarn diff_md_docs:ci
-
-            - name: Check for broken links in markdown files
-              run: yarn test:links
-
-            - name: Test doc generation
-              run: yarn test:generate_docs:ci
-
-            - name: Test @0x/contracts-*
-              run: |
-                  yarn wsrun \
-                    -p @0x/contracts-multisig \
-                    -p @0x/contracts-utils \
-                    -p @0x/contracts-exchange-libs \
-                    -p @0x/contracts-erc721 \
-                    -p @0x/contracts-erc1155 \
-                    -p @0x/contracts-asset-proxy \
-                    -p @0x/contracts-broker \
-                    -p @0x/contracts-zero-ex \
-                    -m --serial -c test:ci
-
-            - name: Test local @0x/contracts-*
-              run: |
-                  yarn wsrun \
-                    -p @0x/contracts-test-utils \
-                    -p @0x/contract-addresses \
-                    -p @0x/contract-artifacts \
-                    -p @0x/contract-wrappers-test \
-                    -p @0x/order-utils \
-                    -m --serial -c test:ci
-
-            - name: Add foundry
-              uses: foundry-rs/foundry-toolchain@v1
-              with:
-                  version: nightly
-
-            - name: Run Forge build for erc20
-              working-directory: contracts/erc20
-              run: |
-                  forge --version
-                  forge build --sizes
-
-            - name: Run Forge tests for erc20
-              working-directory: contracts/erc20
-              run: |
-                  forge test -vvv --gas-report
-
-            - name: Run Forge coverage for erc20
-              working-directory: contracts/erc20
-              run: |
-                  forge coverage --report summary --report lcov
-
-            - name: Upload the coverage report to Coveralls
-              uses: coverallsapp/github-action@master
-              with:
-                  github-token: ${{ secrets.GITHUB_TOKEN }}
-                  base-path: ./contracts/erc20/
-                  path-to-lcov: ./contracts/erc20/lcov.info
-
-            - name: Run Forge build for zero-ex
-              working-directory: contracts/zero-ex
-              run: |
-                  forge --version
-                  forge build --sizes
-
-            - name: Run Forge tests for zero-ex
-              working-directory: contracts/zero-ex
-              run: |
-                  forge test -vvv --gas-report
-
-            - name: Run Forge coverage for zero-ex
-              working-directory: contracts/zero-ex
-              run: |
-                  forge coverage --report summary --report lcov
-
-            - name: Upload the coverage report to Coveralls
-              uses: coverallsapp/github-action@master
-              with:
-                  github-token: ${{ secrets.GITHUB_TOKEN }}
-                  base-path: ./contracts/zero-ex/
-                  path-to-lcov: ./contracts/zero-ex/lcov.info
-
-            - name: Check coverage threshold
-              uses: VeryGoodOpenSource/very_good_coverage@v2
-              with:
-                  path: ./contracts/zero-ex/lcov.info
-                  min_coverage: 6.98
-                  exclude: '**/tests'

.github/workflows/publish.yml

@@ -1,53 +0,0 @@
-name: publish
-
-on:
-  workflow_dispatch:
-      inputs:
-          ci_status:
-              description: 'required CI status'
-              default: 'success'
-              required: true
-          prerelease:
-              description: 'prerelease name'
-              required: false
-
-jobs:
-    publish:
-        runs-on: ubuntu-latest
-        steps:
-            - name: 'check successful status'
-              run: |
-                  REF_STATUS=$(curl -s \
-                  'https://api.github.com/repos/${{ github.repository }}/commits/${{ github.ref }}/status' \
-                  | jq .state)
-                  [[ "${REF_STATUS}" == '"${{ github.event.inputs.ci_status }}"' ]] || \
-                  (echo "::error ::${{ github.ref }} does not have a successful CI status" && false)
-            - uses: actions/checkout@v2
-              with:
-                ref: ${{ github.ref }}
-                fetch-depth: 0
-            - uses: actions/setup-node@v1
-              with:
-                node-version: 16
-            - uses: actions/setup-python@v2
-            - name: 'configure git'
-              run: |
-                  git config --global user.email "github-actions@github.com"
-                  git config --global user.name "Github Actions"
-            - name: 'install dependencies'
-              run: |
-                  yarn -D
-            - name: 'build and publish'
-              run: |
-                  echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}' > .npmrc
-                  npm run run:publish:gha
-              env:
-                  NPM_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
-                  GITHUB_TOKEN: ${{ github.token }}
-                  PUBLISH_PRERELEASE: ${{ github.event.inputs.prerelease }}
-            - name: 'merge into main branch'
-              if: github.event.inputs.prerelease == '' # unless it's a prerelease
-              run: |
-                  git checkout main && \
-                  git merge ${{ github.ref }} && \
-                  git push

.github/workflows/stale.yml

@@ -1,40 +0,0 @@
-name: "Close stale issues and PRs"
-on:
-  schedule:
-    - cron: "0 8 * * 1-5" # This is in UTC.
-  # Do a dry-run (debug-only: true) whenever this workflow itself is changed.
-  pull_request:
-    paths:
-      - .github/workflows/stale.yml
-    types:
-      - opened
-      - synchronize
-
-permissions:
-  issues: write
-  pull-requests: write
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v7
-        with:
-          ascending: true # Spend API operations budget on older, more-likely-to-get-closed issues first
-          close-issue-message: "" # Leave no comment when closing
-          close-pr-message: "" # Leave no comment when closing
-          days-before-issue-stale: 30
-          days-before-pr-stale: 30
-          days-before-close: 14
-          debug-only: ${{ github.event_name == 'pull_request' }} # Dry-run when true.
-          exempt-issue-labels: bug,enhancement,feature,question
-          # No actual changes get made in debug-only mode, so we can raise the operations ceiling.
-          operations-per-run: ${{ github.event_name == 'pull_request' && 100 || 30}}
-          stale-issue-label: stale
-          stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
-          stale-pr-label: stale
-          stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
-          # Time immemorial when in debug-only mode (ie. on pull requests).
-          # `STALEBOT_START_DATE` otherwise.
-          # You can use this as a killswitch by setting `STALEBOT_START_DATE` in the far future.
-          start-date: ${{ github.event_name == 'pull_request' && '1970-01-01T00:00:00Z' || secrets.STALEBOT_START_DATE }} # ISO 8601 or RFC 2822

.gitignore

@@ -15,6 +15,9 @@ pids
 *.db
 *.sqlite
 
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
 # Coverage directory used by tools like istanbul
 coverage
 
@@ -72,35 +75,84 @@ generated_docs/
 
 TODO.md
 
-# IDE file
+# VSCode file
 .vscode
-.idea
+
+packages/website/public/bundle*
+packages/dev-tools-pages/public/bundle*
+
+# server cli
+packages/testnet-faucets/server/
 
 # generated contract artifacts/
-generated-artifacts/
+contracts/coordinator/generated-artifacts/
+contracts/exchange/generated-artifacts/
+contracts/asset-proxy/generated-artifacts/
+contracts/multisig/generated-artifacts/
+contracts/utils/generated-artifacts/
+contracts/exchange-libs/generated-artifacts/
+contracts/erc20/generated-artifacts/
+contracts/erc721/generated-artifacts/
+contracts/erc1155/generated-artifacts/
+contracts/extensions/generated-artifacts/
+contracts/exchange-forwarder/generated-artifacts/
+contracts/dev-utils/generated-artifacts/
+packages/sol-tracing-utils/test/fixtures/artifacts/
+python-packages/contract_artifacts/src/zero_ex/contract_artifacts/artifacts/
 
 # generated contract wrappers
-generated-wrappers/
+packages/python-contract-wrappers/generated/
+contracts/coordinator/generated-wrappers/
+contracts/exchange/generated-wrappers/
+contracts/asset-proxy/generated-wrappers/
+contracts/multisig/generated-wrappers/
+contracts/utils/generated-wrappers/
+contracts/exchange-libs/generated-wrappers/
+contracts/erc20/generated-wrappers/
+contracts/erc721/generated-wrappers/
+contracts/erc1155/generated-wrappers/
+contracts/extensions/generated-wrappers/
+contracts/exchange-forwarder/generated-wrappers/
+contracts/dev-utils/generated-wrappers/
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/erc20_token/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/exchange/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/asset_proxy_owner/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/coordinator/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/coordinator_registry/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/dummy_erc20_token/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/dummy_erc721_token/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/dutch_auction/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/erc20_proxy/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/erc721_proxy/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/erc721_token/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/eth_balance_checker/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/forwarder/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/i_asset_proxy/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/i_validator/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/i_wallet/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/multi_asset_proxy/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/order_validator/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/weth9/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/zrx_token/__init__.py
 
-# forge std-lib
-contracts/zero-ex/contracts/deps/forge-std
+# solc-bin in sol-compiler
+packages/sol-compiler/solc_bin/
 
-# foundry artifacts
-foundry-artifacts/
+# python stuff
+.eggs
+.mypy_cache
+.tox
+python-packages/*/build
+python-packages/*/dist
+__pycache__
+python-packages/*/src/*.egg-info
+python-packages/*/.coverage
 
-# foundry cache
-cache/
-
-#foundry output artifacts
-out/
-
-# typechain wrappers
-contracts/zero-ex/typechain-wrappers/
+# python keeps package-local copies of json schemas
+python-packages/json_schemas/src/zero_ex/json_schemas/schemas
 
 # Doc README copy
 packages/*/docs/README.md
 
-.DS_Store
-
-# the snapshot that gets built for migrations sure does have a ton of files
-packages/migrations/0x_ganache_snapshot*
+# Tool MDX files authoritatively live on S3
+packages/website/mdx/tools/*

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "contracts/zero-ex/contracts/deps/forge-std"]
-	path = contracts/zero-ex/contracts/deps/forge-std
-	url = https://github.com/foundry-rs/forge-std
-[submodule "contracts/erc20/lib/forge-std"]
-	path = contracts/erc20/lib/forge-std
-	url = https://github.com/foundry-rs/forge-std

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npx lint-staged --no-stash

.prettierignore

@@ -1,10 +1,42 @@
 lib
-deps
 .nyc_output
-generated-artifacts/
-generated-wrappers/
-foundry-artifacts/
-out/
-cache/
+/contracts/coordinator/generated-wrappers
+/contracts/coordinator/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/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/erc1155/generated-wrappers
+/contracts/erc1155/generated-artifacts
+/contracts/extensions/generated-wrappers
+/contracts/extensions/generated-artifacts
+/contracts/exchange-forwarder/generated-wrappers
+/contracts/exchange-forwarder/generated-artifacts
+/contracts/dev-utils/generated-wrappers
+/contracts/dev-utils/generated-artifacts
+/packages/abi-gen/test-cli/output
+/packages/json-schemas/schemas
+/python-packages/json_schemas/src/zero_ex/json_schemas/schemas
+/packages/sra-spec/public/
+/packages/dev-tools-pages/ts/**/data.json
 package.json
-packages
+scripts/postpublish_utils.js
+packages/sol-coverage/test/fixtures/artifacts
+.pytest_cache
+.mypy_cache
+.tox
+packages/abi-gen/test-cli/fixtures/artifacts/AbiGenDummy.json
+packages/abi-gen/test-cli/fixtures/artifacts/LibDummy.json
+packages/abi-gen/test-cli/fixtures/artifacts/TestLibDummy.json
+packages/*/docs
+packages/website/mdx/tools

.prettierrc

@@ -1,20 +1,6 @@
 {
-    "printWidth": 120,
     "tabWidth": 4,
-    "singleQuote": true,
-    "trailingComma": "all",
-    "bracketSpacing": true,
-    "arrowParens": "avoid",
-    "overrides": [
-        {
-          "files": "**/*.sol",
-          "options": {
-            "printWidth": 120,
-            "tabWidth": 4,
-            "useTabs": false,
-            "singleQuote": false,
-            "bracketSpacing": false
-          }
-        }
-      ]
+    "printWidth": 120,
+    "trailingComma": all,
+    "singleQuote": true
 }

.readthedocs.yaml

@@ -1,23 +0,0 @@
-# Read the Docs configuration file
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-# Required
-version: 2
-
-# Build documentation in the docs/ directory with Sphinx
-sphinx:
-  configuration: docs/conf.py
-
-# Build documentation with MkDocs
-#mkdocs:
-#  configuration: mkdocs.yml
-
-# Optionally build your docs in additional formats such as PDF
-#formats:
-#  - pdf
-
-# Optionally set the version of Python and requirements required to build your docs
-python:
-  version: 3.7
-  install:
-    - requirements: docs/requirements.txt

.solhint.json

@@ -1,17 +0,0 @@
-{
-    "extends": "solhint:recommended",
-    "plugins": ["prettier"],
-    "rules": {
-        "prettier/prettier": "error",
-        "avoid-low-level-calls": "off",
-        "avoid-tx-origin": "warn",
-        "code-complexity": "off",
-        "const-name-snakecase": "error",
-        "function-max-lines": ["error", 350],
-        "max-line-length": ["error", 120],
-        "no-inline-assembly": "off",
-        "quotes": ["error", "double"],
-        "no-empty-blocks": "off",
-        "compiler-version": "off"
-    }
-}

.solhintignore

@@ -1,9 +0,0 @@
-contracts/erc20/src/ZRXToken.sol
-node_modules/
-lib
-deps
-generated-artifacts/
-generated-wrappers/
-foundry-artifacts/
-out/
-cache/

CODEOWNERS

@@ -0,0 +1,39 @@
+# See https://help.github.com/articles/about-codeowners/
+# for more info about CODEOWNERS file
+
+# It uses the same pattern rule for gitignore file
+# https://git-scm.com/docs/gitignore#_pattern_format
+
+# Website
+packages/asset-buyer/  @BMillman19 @fragosti @steveklebanoff
+packages/instant/  @BMillman19 @fragosti @steveklebanoff
+packages/website/  @BMillman19 @fragosti @fabioberger @steveklebanoff
+
+# Dev tools & setup
+.circleci/ @LogvinovLeon
+packages/abi-gen/ @feuGeneA
+packages/base-contract/ @xianny
+packages/connect/ @fragosti 
+packages/abi-gen-templates/ @feuGeneA @xianny
+packages/contract-addresses/ @albrow
+packages/contract-artifacts/ @albrow
+packages/dev-utils/ @LogvinovLeon @fabioberger
+packages/devnet/ @albrow
+packages/ethereum-types/ @LogvinovLeon
+packages/monorepo-scripts/ @fabioberger
+packages/order-utils/ @fabioberger @LogvinovLeon 
+packages/python-contract-wrappers/ @feuGeneA
+packages/sol-compiler/ @LogvinovLeon
+packages/sol-coverage/ @LogvinovLeon
+packages/sol-profiler/ @LogvinovLeon
+packages/sol-trace/ @LogvinovLeon
+packages/sol-tracing-utils/ @LogvinovLeon
+packages/sol-resolver/ @LogvinovLeon
+packages/subproviders/ @fabioberger @dekz
+packages/verdaccio/ @albrow
+packages/web3-wrapper/ @LogvinovLeon @fabioberger
+python-packages/ @feuGeneA
+packages/utils/ @hysz
+
+# Protocol/smart contracts
+contracts/ @abandeali1 @hysz

CONTRIBUTING.md

@@ -0,0 +1,105 @@
+## 0x Contribution Guide
+
+We welcome contributions from anyone on the internet and are grateful for even the smallest contributions. This document will help get you setup to start contributing back to 0x.
+
+### Getting started
+
+1.  Fork `0xproject/0x-monorepo`
+2.  Clone your fork
+3.  Follow the [installation & build steps](https://github.com/0xProject/0x-monorepo#install-dependencies) in the repo's top-level README.
+4.  Setup the recommended [Development Tooling](#development-tooling).
+5.  Open a PR with the `[WIP]` flag against the `development` branch and describe the change you are intending to undertake in the PR description. (see [our branch naming conventions](#branch-structure))
+
+Before removing the `[WIP]` tag and submitting the PR for review, make sure:
+
+-   It passes our linter checks (`yarn lint`)
+-   It is properly formatted with Prettier (`yarn prettier`)
+-   It passes our continuous integration tests (See: [Enabling code coverage checks on your fork](#enabling-code-coverage-checks-on-your-fork) for instructions on getting the `submit-coverage` test to pass on forks)
+-   You've created/updated the corresponding [CHANGELOG](#CHANGELOGs) entries.
+-   Your changes have sufficient test coverage (e.g regression tests have been added for bug fixes)
+
+### Branch structure
+
+We have two main branches:
+
+-   `master` represents the most recently released (published on npm) version of the codebase.
+-   `development` represents the current development state of the codebase.
+
+ALL PRs should be opened against `development`.
+
+Branch names should be prefixed with `fix`, `feature` or `refactor`.
+
+-   e.g `fix/broken-wiki-link`
+-   If the PR only edits a single package, add it's name too
+    -   e.g `fix/website/broken-wiki-link`
+
+### CHANGELOGs
+
+At 0x we use [Semantic Versioning](http://semver.org/) for all our published packages. If a change you make corresponds to a semver bump, you must modify the package's `CHANGELOG.json` file accordingly.
+
+Each CHANGELOG entry that corresponds to a published package will have a `timestamp`. If no entry exists without a `timestamp`, you must first create a new one:
+
+```
+{
+        "version": "1.0.1", <- The updated package version
+        "changes": [
+            {
+                "note": "", <- Describe your change
+                "PR": 100 <- Your PR number
+            }
+        ]
+    },
+```
+
+If an entry without a `timestamp` already exists, this means other changes have been introduced by other collaborators since the last publish. Add your changes to the list of notes and adjust the version if your PR introduces a greater semver change (i.e current changes required a patch bump, but your changes require a major version bump).
+
+### Development Tooling
+
+We strongly recommend you use the [VSCode](https://code.visualstudio.com/) text editor since most of our code is written in TypeScript and it offers amazing support for the language.
+
+#### Linter
+
+We use [TSLint](https://palantir.github.io/tslint/) with [custom configs](https://github.com/0xProject/0x-monorepo/tree/development/packages/tslint-config) to keep our code-style consistent.
+
+Use `yarn:lint` to lint the entire monorepo, and `PKG={PACKAGE_NAME} yarn lint` to lint a specific package.
+
+If you want to change a rule, or add a custom rule, please make these changes to our [tslint-config](https://github.com/0xProject/0x-monorepo/tree/development/packages/tslint-config) package. All other packages have it as a dependency.
+
+Integrate it into your text editor:
+
+-   VSCode: [vscode-tslint](https://marketplace.visualstudio.com/items?itemName=eg2.tslint)
+-   Atom: [linter-tslint](https://atom.io/packages/linter-tslint)
+
+#### Auto-formatter
+
+We use [Prettier](https://prettier.io/) to auto-format our code. Be sure to either add a [text editor integration](https://prettier.io/docs/en/editors.html) or a [pre-commit hook](https://prettier.io/docs/en/precommit.html) to properly format your code changes.
+
+If using the Atom text editor, we recommend you install the following packages:
+
+-   VSCode: [prettier-vscode](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
+-   Atom: [prettier-atom](https://atom.io/packages/prettier-atom)
+
+## Unenforced coding conventions
+
+A few of our coding conventions are not yet enforced by the linter/auto-formatter. Be careful to follow these conventions in your PR's.
+
+1.  Unused anonymous function parameters should be named with an underscore + number (e.g \_1, \_2, etc...)
+1.  There should be a new-line between methods in a class and between test cases.
+1.  If a string literal has the same value in two or more places, it should be a single constant referenced in both places.
+1.  Do not import from a project's `index.ts` (e.g import { Token } from '../src';). Always import from the source file itself.
+1.  Generic error variables should be named `err` instead of `e` or `error`.
+1.  If you _must_ cast a variable to any - try to type it back as fast as possible. (e.g., `const cw = ((zeroEx as any)._contractWrappers as ContractWrappers);`). This ensures subsequent code is type-safe.
+1.  Our enum conventions coincide with the recommended TypeScript conventions, using capitalized keys, and all-caps snake-case values. Eg `GetStats = 'GET_STATS'`
+1.  All public, exported methods/functions/classes must have associated Javadoc-style comments.
+
+### Fix `submit-coverage` CI failure
+
+If you simply fork the repo and then create a PR from it, your PR will fail the `submit-coverage` check on CI. This is because the 0x CircleCI configuration sets the `COVERALLS_REPO_TOKEN` environment variable to the token for `0xProject/0x-monorepo`, but when running the check against your fork the token needs to match your repo's name `your-username/0x-monorepo`.
+
+To facilitate this check, after creating your fork, but before creating the branch for your PR, do the following:
+
+1.  Log in to [coveralls.io](https://coveralls.io/), go to `Add Repos`, and enable your fork. Then go to the settings for that repo, and copy the `Repo Token` identifier.
+2.  Log in to [CircleCI](https://circleci.com/login), go to `Add Projects`, click the `Set Up Project` button corresponding to your fork, and then click `Start Building`. (Aside from step 3 below, no actual set up is needed, since it will use the `.circleci/config.yml` file in 0x-monorepo, so you can ignore all of the instruction/explanation given on the page with the `Start Building` button.)
+3.  In CircleCI, configure your project to add an environment variable, with name `COVERALLS_REPO_TOKEN`, and for the value paste in the `Repo Token` you copied in step 1.
+
+Now, when you push to your branch, CircleCI will automatically run all of the checks in your own instance, and the coverage check will work since it has the proper `Repo Token`, and the PR will magically refer to your own checks rather than running them in the 0x CircleCI instance.

ISSUE_TEMPLATE.md

@@ -2,13 +2,15 @@
 
 <!--- Before submitting please check to see if this issue was already reported -->
 
+<!--- Prefix your issue title with the package name it relates to (e.g., `0x.js: ` or `general:`) -->
+
 ## Expected Behavior
 
 <!--- If you're describing a bug, tell us what should happen -->
 
 <!--- If you're suggesting a package change/improvement, tell us how it should work -->
 
-<!--- If you're suggesting a contract or protocol change/improvement, visit our ZEIPs repo https://github.com/0xProject/ZEIPs -->
+<!--- If you're suggesting a contract or protocol change/improvement, visit our ZEIPs repo -->
 
 ## Current Behavior
 
@@ -47,9 +49,10 @@
 | Package | Version |
 | ------: | :------ |
 
+
 <!-- For example:
-|    `protocol-utils` | 2.0.4   |
-| `Exchange Contract` | v3      |
+|             `0x.js` | 2.0.4   |
+| `Exchange Contract` | v2      |
 -->
 
 | Network |
@@ -58,6 +61,6 @@
 
 <!-- For example:
 | mainnet |
-| goerli |
-| development |
+| kovan |
+| testrpc |
 -->

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2020 ZeroEx Labs
+Copyright 2017 ZeroEx Intl.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

PULL_REQUEST_TEMPLATE.md

@@ -20,6 +20,7 @@
 
 <!--- The following points should be used to indicate the progress of your PR.  Put an `x` in all the boxes that apply right now, and come back over time and check them off as you make progress.  If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
 
+-   [ ] Prefix PR title with `[WIP]` if necessary.
 -   [ ] Add tests to cover changes as needed.
 -   [ ] Update documentation as needed.
 -   [ ] Add new entries to the relevant CHANGELOG.jsons.

README.md

@@ -2,41 +2,105 @@
 
 ---
 
-[0x][website-url] is an open protocol that facilitates trustless, low friction exchange of Ethereum-based assets. For more information on how it works, check out the [0x protocol specification](https://protocol.0x.org/).
+[0x][website-url] is an open protocol that facilitates trustless, low friction exchange of Ethereum-based assets. For more information on how it works, check out the [0x protocol specification](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md).
 
 This repository is a monorepo including the 0x protocol smart contracts and numerous developer tools. Each public sub-package is independently published to NPM.
 
 [website-url]: https://0x.org
 
-[![Coverage Status](https://coveralls.io/repos/github/0xProject/protocol/badge.svg?branch=development)](https://coveralls.io/github/0xProject/protocol?branch=development)
+[![CircleCI](https://circleci.com/gh/0xProject/0x-monorepo.svg?style=svg&circle-token=61bf7cd8c9b4e11b132089dfcffdd1be277d1e0c)](https://circleci.com/gh/0xProject/0x-monorepo)
+[![Coverage Status](https://coveralls.io/repos/github/0xProject/0x-monorepo/badge.svg?branch=development)](https://coveralls.io/github/0xProject/0x-monorepo?branch=development)
 [![Discord](https://img.shields.io/badge/chat-discord.chat-yellow.svg?style=flat)](https://discordapp.com/invite/d3FTX3M)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
 ## Packages
 
-Visit our [developer portal](https://0x.org/docs/) for a comprehensive list of core & community maintained packages. All packages maintained with this monorepo are listed below.
+Visit our [developer portal](https://0x.org/docs/tools/order-utils) for a comprehensive list of core & community maintained packages. All packages maintained with this monorepo are listed below.
+
+### Python Packages
+
+| Package                                                        | Version                                                                                                             | Description                                                                                       |
+| -------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
+| [`0x-contract-addresses`](/python-packages/contract_addresses) | [![PyPI](https://img.shields.io/pypi/v/0x-contract-addresses.svg)](https://pypi.org/project/0x-contract-addresses/) | A tiny utility library for getting known deployed contract addresses for a particular network     |
+| [`0x-contract-artifacts`](/python-packages/contract_artifacts) | [![PyPI](https://img.shields.io/pypi/v/0x-contract-artifacts.svg)](https://pypi.org/project/0x-contract-artifacts/) | 0x smart contract compilation artifacts                                                           |
+| [`0x-contract-wrappers`](/python-packages/contract_wrappers)   | [![PyPI](https://img.shields.io/pypi/v/0x-contract-wrappers.svg)](https://pypi.org/project/0x-contract-wrappers/)   | 0x smart contract wrappers                                                                        |
+| [`0x-json-schemas`](/python-packages/json_schemas)             | [![PyPI](https://img.shields.io/pypi/v/0x-json-schemas.svg)](https://pypi.org/project/0x-json-schemas/)             | 0x-related JSON schemas                                                                           |
+| [`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
 
 These packages are all under development. See [/contracts/README.md](/contracts/README.md) for a list of deployed packages.
 
-| Package                                             | Version                                                                                                                     | Description                                                          |
-| --------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------- |
-| [`@0x/contracts-zero-ex`](/contracts/zero-ex)       | [![npm](https://img.shields.io/npm/v/@0x/contracts-zero-ex.svg)](https://www.npmjs.com/package/@0x/contracts-zero-ex)       | The contracts used for settling trades 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-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 |
+| 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-erc1155`](/contracts/erc1155)                       | [![npm](https://img.shields.io/npm/v/@0x/contracts-erc1155.svg)](https://www.npmjs.com/package/@0x/contracts-erc1155)                       | Implementations of various ERC1155 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 libraries used within the [`Exchange`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#exchange) contract                                                                                 |
+| [`@0x/contracts-extensions`](/contracts/extensions)                 | [![npm](https://img.shields.io/npm/v/@0x/contracts-extensions.svg)](https://www.npmjs.com/package/@0x/contracts-extensions)                 | Contracts that interact with and extend the functionality of the core protocol                                                                                                                                                                        |
+| [`@0x/contracts-multisig`](/contracts/multisig)                     | [![npm](https://img.shields.io/npm/v/@0x/contracts-multisig.svg)](https://www.npmjs.com/package/@0x/contracts-multisig)                     | Various implementations of multisignature wallets, including the [`AssetProxyOwner`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#assetproxyowner) contract that has permissions to upgrade the protocol |
+| [`@0x/contracts-test-utils`](/contracts/test-utils)                 | [![npm](https://img.shields.io/npm/v/@0x/contracts-test-utils.svg)](https://www.npmjs.com/package/@0x/contracts-test-utils)                 | TypeScript/Javascript shared utilities used for testing contracts                                                                                                                                                                                     |
+| [`@0x/contracts-utils`](/contracts/utils)                           | [![npm](https://img.shields.io/npm/v/@0x/contracts-utils.svg)](https://www.npmjs.com/package/@0x/contracts-utils)                           | Generic libraries and utilities used throughout all of the contracts                                                                                                                                                                                  |
+| [`@0x/contracts-coordinator`](/contracts/coordinator)               | [![npm](https://img.shields.io/npm/v/@0x/contracts-coordinator.svg)](https://www.npmjs.com/package/@0x/contracts-coordinator)               | A contract that allows users to execute 0x transactions with permission from a Coordinator                                                                                                                                                            |
+| [`@0x/contracts-dev-utils`](/contracts/dev-utils)                   | [![npm](https://img.shields.io/npm/v/@0x/contracts-dev-utils.svg)](https://www.npmjs.com/package/@0x/contracts-dev-utils)                   | A contract contains utility functions for developers (such as validating many orders using a single eth_call)                                                                                                                                         |
 
 ### TypeScript/Javascript Packages
 
 #### 0x-specific packages
 
-| Package                                                  | Version                                                                                                                 | Description                                                                                    |
-| -------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------- |
-| [`@0x/protocol-utils`](/packages/protocol-utils)         | [![npm](https://img.shields.io/npm/v/@0x/protocol-utils.svg)](https://www.npmjs.com/package/@0x/protocol-utils)         | A set of utilities for generating, parsing, signing and validating 0x orders                   |
-| [`@0x/contract-addresses`](/packages/contract-addresses) | [![npm](https://img.shields.io/npm/v/@0x/contract-addresses.svg)](https://www.npmjs.com/package/@0x/contract-addresses) | A tiny utility library for getting known deployed contract addresses for a particular network. |
-| [`@0x/contract-wrappers`](/packages/contract-wrappers)   | [![npm](https://img.shields.io/npm/v/@0x/contract-wrappers.svg)](https://www.npmjs.com/package/@0x/contract-wrappers)   | JS/TS wrappers for interacting with the 0x smart contracts                                     |
-| [`@0x/contract-artifacts`](/packages/contract-artifacts) | [![npm](https://img.shields.io/npm/v/@0x/contract-artifacts.svg)](https://www.npmjs.com/package/@0x/contract-artifacts) | 0x smart contract compilation artifacts                                                        |  |
+| Package                                                  | Version                                                                                                                 | Description                                                                                       |
+| -------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
+| [`0x.js`](/packages/0x.js)                               | [![npm](https://img.shields.io/npm/v/0x.js.svg)](https://www.npmjs.com/package/0x.js)                                   | An aggregate package combining many smaller utility packages for interacting with the 0x protocol |
+| [`@0x/contract-addresses`](/packages/contract-addresses) | [![npm](https://img.shields.io/npm/v/@0x/contract-addresses.svg)](https://www.npmjs.com/package/@0x/contract-addresses) | A tiny utility library for getting known deployed contract addresses for a particular network.    |
+| [`@0x/contract-wrappers`](/packages/contract-wrappers)   | [![npm](https://img.shields.io/npm/v/@0x/contract-wrappers.svg)](https://www.npmjs.com/package/@0x/contract-wrappers)   | JS/TS wrappers for interacting with the 0x smart contracts                                        |
+| [`@0x/order-utils`](/packages/order-utils)               | [![npm](https://img.shields.io/npm/v/@0x/order-utils.svg)](https://www.npmjs.com/package/@0x/order-utils)               | A set of utilities for generating, parsing, signing and validating 0x orders                      |
+| [`@0x/json-schemas`](/packages/json-schemas)             | [![npm](https://img.shields.io/npm/v/@0x/json-schemas.svg)](https://www.npmjs.com/package/@0x/json-schemas)             | 0x-related JSON schemas                                                                           |  |
+| [`@0x/migrations`](/packages/migrations)                 | [![npm](https://img.shields.io/npm/v/@0x/migrations.svg)](https://www.npmjs.com/package/@0x/migrations)                 | Migration tool for deploying 0x smart contracts on private testnets                               |
+| [`@0x/contract-artifacts`](/packages/contract-artifacts) | [![npm](https://img.shields.io/npm/v/@0x/contract-artifacts.svg)](https://www.npmjs.com/package/@0x/contract-artifacts) | 0x smart contract compilation artifacts                                                           |
+| [`@0x/abi-gen-wrappers`](/packages/abi-gen-wrappers)     | [![npm](https://img.shields.io/npm/v/@0x/abi-gen-wrappers.svg)](https://www.npmjs.com/package/@0x/abi-gen-wrappers)     | Low-level 0x smart contract wrappers generated using `@0x/abi-gen`                                |
+| [`@0x/sra-spec`](/packages/sra-spec)                     | [![npm](https://img.shields.io/npm/v/@0x/sra-spec.svg)](https://www.npmjs.com/package/@0x/sra-spec)                     | OpenAPI specification for the Standard Relayer API                                                |
+| [`@0x/connect`](/packages/connect)                       | [![npm](https://img.shields.io/npm/v/@0x/connect.svg)](https://www.npmjs.com/package/@0x/connect)                       | An HTTP/WS client for interacting with the Standard Relayer API                                   |
+| [`@0x/asset-buyer`](/packages/asset-buyer)               | [![npm](https://img.shields.io/npm/v/@0x/asset-buyer.svg)](https://www.npmjs.com/package/@0x/asset-buyer)               | Convenience package for discovering and buying assets with Ether                                  |
+| [`@0x/asset-swapper`](/packages/asset-swapper)           | [![npm](https://img.shields.io/npm/v/@0x/asset-swapper.svg)](https://www.npmjs.com/package/@0x/asset-swapper)           | Convenience package for discovering and performing swaps for any ERC20 Assets                     |
+
+#### Ethereum tooling
+
+| Package                                      | Version                                                                                                     | Description                                                                                                                                                                             |
+| -------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [`@0x/web3-wrapper`](/packages/web3-wrapper) | [![npm](https://img.shields.io/npm/v/@0x/web3-wrapper.svg)](https://www.npmjs.com/package/@0x/web3-wrapper) | An Ethereum JSON RPC client                                                                                                                                                             |
+| [`@0x/sol-compiler`](/packages/sol-compiler) | [![npm](https://img.shields.io/npm/v/@0x/sol-compiler.svg)](https://www.npmjs.com/package/@0x/sol-compiler) | A wrapper around solc-js that adds smart re-compilation, ability to compile an entire project, Solidity version specific compilation, standard input description support and much more. |
+| [`@0x/sol-coverage`](/packages/sol-coverage) | [![npm](https://img.shields.io/npm/v/@0x/sol-coverage.svg)](https://www.npmjs.com/package/@0x/sol-coverage) | A solidity test coverage tool                                                                                                                                                           |
+| [`@0x/sol-profiler`](/packages/sol-profiler) | [![npm](https://img.shields.io/npm/v/@0x/sol-profiler.svg)](https://www.npmjs.com/package/@0x/sol-profiler) | A solidity gas cost profiler                                                                                                                                                            |
+| [`@0x/sol-trace`](/packages/sol-trace)       | [![npm](https://img.shields.io/npm/v/@0x/sol-trace.svg)](https://www.npmjs.com/package/@0x/sol-trace)       | A solidity stack trace tool                                                                                                                                                             |
+| [`@0x/sol-resolver`](/packages/sol-resolver) | [![npm](https://img.shields.io/npm/v/@0x/sol-resolver.svg)](https://www.npmjs.com/package/@0x/sol-resolver) | Import resolver for smart contracts dependencies                                                                                                                                        |
+| [`@0x/subproviders`](/packages/subproviders) | [![npm](https://img.shields.io/npm/v/@0x/subproviders.svg)](https://www.npmjs.com/package/@0x/subproviders) | Web3 provider middlewares (e.g. LedgerSubprovider)                                                                                                                                      |
+| [`@0x/sol-doc`](/packages/sol-doc)           | [![npm](https://img.shields.io/npm/v/@0x/sol-doc.svg)](https://www.npmjs.com/package/@0x/sol-doc)           | Solidity documentation generator                                                                                                                                                        |
+
+#### Utilities
+
+| Package                                                  | Version                                                                                                                 | Description                                                     |
+| -------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------- |
+| [`@0x/abi-gen`](/packages/abi-gen)                       | [![npm](https://img.shields.io/npm/v/@0x/abi-gen.svg)](https://www.npmjs.com/package/@0x/abi-gen)                       | Tool to generate TS wrappers from smart contract ABIs           |
+| [`@0x/tslint-config`](/packages/tslint-config)           | [![npm](https://img.shields.io/npm/v/@0x/tslint-config.svg)](https://www.npmjs.com/package/@0x/tslint-config)           | Custom TSLint rules used by the 0x core team                    |
+| [`@0x/types`](/packages/types)                           | [![npm](https://img.shields.io/npm/v/@0x/types.svg)](https://www.npmjs.com/package/@0x/types)                           | Shared type declarations                                        |
+| [`@0x/typescript-typings`](/packages/typescript-typings) | [![npm](https://img.shields.io/npm/v/@0x/typescript-typings.svg)](https://www.npmjs.com/package/@0x/typescript-typings) | Repository of types for external packages                       |
+| [`@0x/utils`](/packages/utils)                           | [![npm](https://img.shields.io/npm/v/@0x/utils.svg)](https://www.npmjs.com/package/@0x/utils)                           | Shared utilities                                                |
+| [`@0x/assert`](/packages/assert)                         | [![npm](https://img.shields.io/npm/v/@0x/assert.svg)](https://www.npmjs.com/package/@0x/assert)                         | Type and schema assertions used by our packages                 |
+| [`@0x/base-contract`](/packages/base-contract)           | [![npm](https://img.shields.io/npm/v/@0x/base-contract.svg)](https://www.npmjs.com/package/@0x/base-contract)           | BaseContract used by auto-generated `abi-gen` wrapper contracts |
+| [`@0x/dev-utils`](/packages/dev-utils)                   | [![npm](https://img.shields.io/npm/v/@0x/dev-utils.svg)](https://www.npmjs.com/package/@0x/dev-utils)                   | Dev utils to be shared across 0x packages                       |
+| [`@0x/fill-scenarios`](/packages/fill-scenarios)         | [![npm](https://img.shields.io/npm/v/@0x/fill-scenarios.svg)](https://www.npmjs.com/package/@0x/fill-scenarios)         | 0x order fill scenario generator                                |
+
+#### Private Packages
+
+| Package                                            | Description                                                                      |
+| -------------------------------------------------- | -------------------------------------------------------------------------------- |
+| [`@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                                                                       |
 
 ## Usage
 
@@ -53,7 +117,7 @@ You can include those by prepending the `@0x/typescript-typings` package to your
 
 We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
 
-#### Read our [contribution guidelines](.github/CONTRIBUTING.md).
+#### Read our [contribution guidelines](./CONTRIBUTING.md).
 
 ### Install dependencies
 
@@ -69,6 +133,8 @@ Then install dependencies
 yarn install
 ```
 
+You will also need to have Python 3 installed, in order to build and run the tests of `abi-gen`'s command-line interface, which is integrated with the yarn build, yarn test, and yarn lint commands described below. More specifically, your local pip should resolve to the Python 3 version of pip, not a Python 2.x version.
+
 ### Build
 
 To build all packages:
@@ -80,7 +146,7 @@ yarn build
 To build a specific package:
 
 ```bash
-PKG=@0x/protocol-utils yarn build
+PKG=@0x/web3-wrapper yarn build
 ```
 
 To build all contracts packages:
@@ -103,7 +169,7 @@ To watch a specific package and all it's dependent packages:
 PKG=[NPM_PACKAGE_NAME] yarn watch
 
 e.g
-PKG=@0x/protocol-utils yarn watch
+PKG=@0x/web3-wrapper yarn watch
 ```
 
 ### Clean
@@ -117,7 +183,7 @@ yarn clean
 Clean a specific package
 
 ```bash
-PKG=@0x/protocol-utils yarn clean
+PKG=0x.js yarn clean
 ```
 
 ### Rebuild
@@ -131,7 +197,7 @@ yarn rebuild
 To re-build (clean & build) a specific package & it's deps:
 
 ```bash
-PKG=@0x/protocol-utils yarn rebuild
+PKG=0x.js yarn rebuild
 ```
 
 ### Lint
@@ -145,7 +211,7 @@ yarn lint
 Lint a specific package:
 
 ```bash
-PKG=@0x/protocol-utils yarn lint
+PKG=0x.js yarn lint
 ```
 
 ### Run Tests
@@ -159,7 +225,7 @@ yarn test
 Run a specific package's test:
 
 ```bash
-PKG=@0x/protocol-utils yarn test
+PKG=@0x/web3-wrapper yarn test
 ```
 
 Run all contracts packages tests:

contracts/.solhint.json

@@ -0,0 +1,21 @@
+{
+    "extends": "default",
+    "rules": {
+        "avoid-low-level-calls": false,
+        "avoid-tx-origin": "warn",
+        "bracket-align": false,
+        "code-complexity": false,
+        "compiler-fixed": false,
+        "const-name-snakecase": "error",
+        "expression-indent": "error",
+        "function-max-lines": false,
+        "func-order": "error",
+        "indent": ["error", 4],
+        "max-line-length": ["warn", 160],
+        "no-inline-assembly": false,
+        "quotes": ["error", "double"],
+        "separate-by-one-line-in-contract": "error",
+        "space-after-comma": "error",
+        "statement-indent": "error"
+    }
+}

contracts/README.md

@@ -1,3 +1,16 @@
+#### Deployed Contract Packages
+
+| Contract        | Package                                                             | Version                                                                          | Git Tag                                                                                                                                |
+| --------------- | ------------------------------------------------------------------- | -------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
+| AssetProxyOwner | [`@0x/contracts-multisig`](/contracts/multisig)                     | [v1.0.2](https://www.npmjs.com/package/@0x/contracts-multisig/v/1.0.2)           | [@0x/contracts-multisig@1.0.2](https://github.com/0xProject/0x-monorepo/releases/tag/@0x/contracts-multisig@1.0.2)                     |
+| ERC20Proxy      | [`@0x/contracts-asset-proxy`](/contracts/asset-proxy)               | [v1.0.1](https://www.npmjs.com/package/@0x/contracts-asset-proxy/v/1.0.1)        | [@0x/contracts-asset-proxy@1.0.1](https://github.com/0xProject/0x-monorepo/releases/tag/@0x/contracts-asset-proxy@1.0.1)               |
+| ERC721Proxy     | [`@0x/contracts-asset-proxy`](/contracts/asset-proxy)               | [v1.0.1](https://www.npmjs.com/package/@0x/contracts-asset-proxy/v/1.0.1)        | [@0x/contracts-asset-proxy@1.0.1](https://github.com/0xProject/0x-monorepo/releases/tag/@0x/contracts-asset-proxy@1.0.1)               |
+| Exchange        | [`@0x/contracts-exchange`](/contracts/exchange)                     | [v1.0.1](https://www.npmjs.com/package/@0x/contracts-exchange/v/1.0.1)           | [@0x/contracts-exchange@1.0.1](https://github.com/0xProject/0x-monorepo/releases/tag/@0x/contracts-exchange@1.0.1)                     |
+| DutchAuction    | [`@0x/contracts-extensions`](/contracts/extensions)                 | [v1.0.2](https://www.npmjs.com/package/@0x/contracts-extensions/v/1.0.2)         | [@0x/contracts-extensions@1.0.2](https://github.com/0xProject/0x-monorepo/releases/tag/@0x/contracts-extensions@1.0.2)                 |
+| Forwarder       | [`@0x/contracts-exchange-forwarder`](/contracts/exchange-forwarder) | [v1.0.1](https://www.npmjs.com/package/@0x/contracts-exchange-forwarder/v/1.0.1) | [@0x/contracts-exchange-forwarder@1.0.1](https://github.com/0xProject/0x-monorepo/releases/tag/@0x/contracts-exchange-forwarder@1.0.1) |
+| MultiAssetProxy | [`@0x/contracts-asset-proxy`](/contracts/asset-proxy)               | [v1.0.1](https://www.npmjs.com/package/@0x/contracts-asset-proxy/v/1.0.1)        | [@0x/contracts-asset-proxy@1.0.1](https://github.com/0xProject/0x-monorepo/releases/tag/@0x/contracts-asset-proxy@1.0.1)               |
+| ZRXToken        | [`@0x/contracts-erc20`](/contracts/erc20)                           | [v1.0.1](https://www.npmjs.com/package/@0x/contracts-erc20/v/1.0.1)              | [@0x/contracts-erc20@1.0.1](https://github.com/0xProject/0x-monorepo/releases/tag/@0x/contracts-erc20@1.0.1)                           |
+
 #### Development
 
-Building solidity files will update the contract artifact in `{package-name}/generated-artifacts/{contract}.json`, but does not automatically update the `contract-artifacts` or `contract-wrappers` packages, which are generated from the artifact JSON. See `contract-artifacts/README.md` for instructions on updating these packages.
+Building solidity files will update the contract artifact in `{package-name}/generated-artifacts/{contract}.json`, but does not automatically update the `abi-gen-wrappers` package, which are generated from the artifact JSON. To ensure consistency, clean and rebuild `abi-gen-wrappers` after any changes to the artifact JSON.

contracts/TESTING.md

@@ -0,0 +1,48 @@
+# Contracts testing options
+
+## Revert stack traces
+
+If you want to see helpful stack traces (incl. line number, code snippet) for smart contract reverts, run the tests with:
+
+```
+yarn test:trace
+```
+
+**Note:** This currently slows down the test runs and is therefore not enabled by default.
+
+## Backing Ethereum node
+
+By default, our tests run against an in-process [Ganache](https://github.com/trufflesuite/ganache-core) instance. In order to run the tests against [Geth](https://github.com/ethereum/go-ethereum), first follow the instructions in the README for the devnet package to start the devnet Geth node. Then run:
+
+```bash
+TEST_PROVIDER=geth yarn test
+```
+
+## Code coverage
+
+In order to see the Solidity code coverage output generated by `@0x/sol-coverage`, run:
+
+```
+yarn test:coverage
+```
+
+## Gas profiler
+
+In order to profile the gas costs for a specific smart contract call/transaction, you can run the tests in `profiler` mode.
+
+**Note:** Traces emitted by ganache have incorrect gas costs so we recommend using Geth for profiling.
+
+```
+TEST_PROVIDER=geth yarn test:profiler
+```
+
+You'll see a warning that you need to explicitly enable and disable the profiler before and after the block of code you want to profile.
+
+```typescript
+import { profiler } from './utils/profiler';
+profiler.start();
+// Some call to a smart contract
+profiler.stop();
+```
+
+Without explicitly starting and stopping the profiler, the profiler output will be too busy, and therefore unusable.

contracts/asset-proxy/CHANGELOG.json

@@ -0,0 +1,252 @@
+[
+    {
+        "timestamp": 1567521715,
+        "version": "2.2.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1566446343,
+        "version": "2.2.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1565296576,
+        "version": "2.2.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "2.2.4",
+        "changes": [
+            {
+                "note": "Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies.",
+                "pr": 1995
+            }
+        ],
+        "timestamp": 1564607468
+    },
+    {
+        "timestamp": 1563957393,
+        "version": "2.2.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1563193019,
+        "version": "2.2.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1563047529,
+        "version": "2.2.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "2.2.0",
+        "changes": [
+            {
+                "note": "Add `LibAssetProxyIds` contract",
+                "pr": 1835
+            },
+            {
+                "note": "Updated ERC1155 Asset Proxy. Less optimization. More explicit handling of edge cases.",
+                "pr": 1852
+            },
+            {
+                "note": "Implement StaticCallProxy",
+                "pr": 1863
+            }
+        ],
+        "timestamp": 1563006338
+    },
+    {
+        "timestamp": 1558712885,
+        "version": "2.1.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1557961111,
+        "version": "2.1.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1557799313,
+        "version": "2.1.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "2.1.2",
+        "changes": [
+            {
+                "note": "Update tests to use contract-built-in `awaitTransactionSuccessAsync`",
+                "pr": 1797
+            }
+        ],
+        "timestamp": 1557507213
+    },
+    {
+        "version": "2.1.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1554997931
+    },
+    {
+        "version": "2.1.0",
+        "changes": [
+            {
+                "note": "Run Web3ProviderEngine without excess block polling",
+                "pr": 1695
+            }
+        ],
+        "timestamp": 1553183790
+    },
+    {
+        "version": "2.0.0",
+        "changes": [
+            {
+                "note": "Do not reexport external dependencies",
+                "pr": 1682
+            },
+            {
+                "note": "Add ERC1155Proxy",
+                "pr": 1661
+            },
+            {
+                "note": "Bumped solidity version to ^0.5.5",
+                "pr": 1701
+            },
+            {
+                "note": "Integration testing for ERC1155Proxy",
+                "pr": 1673
+            }
+        ],
+        "timestamp": 1553091633
+    },
+    {
+        "timestamp": 1551479279,
+        "version": "1.0.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1551299797,
+        "version": "1.0.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1551220833,
+        "version": "1.0.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "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
+            }
+        ]
+    }
+]

contracts/asset-proxy/CHANGELOG.md

@@ -0,0 +1,111 @@
+<!--
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
+Edit the package's CHANGELOG.json file only.
+-->
+
+CHANGELOG
+
+## v2.2.7 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v2.2.6 - _August 22, 2019_
+
+    * Dependencies updated
+
+## v2.2.5 - _August 8, 2019_
+
+    * Dependencies updated
+
+## v2.2.4 - _July 31, 2019_
+
+    * Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies. (#1995)
+
+## v2.2.3 - _July 24, 2019_
+
+    * Dependencies updated
+
+## v2.2.2 - _July 15, 2019_
+
+    * Dependencies updated
+
+## v2.2.1 - _July 13, 2019_
+
+    * Dependencies updated
+
+## v2.2.0 - _July 13, 2019_
+
+    * Add `LibAssetProxyIds` contract (#1835)
+    * Updated ERC1155 Asset Proxy. Less optimization. More explicit handling of edge cases. (#1852)
+    * Implement StaticCallProxy (#1863)
+
+## v2.1.5 - _May 24, 2019_
+
+    * Dependencies updated
+
+## v2.1.4 - _May 15, 2019_
+
+    * Dependencies updated
+
+## v2.1.3 - _May 14, 2019_
+
+    * Dependencies updated
+
+## v2.1.2 - _May 10, 2019_
+
+    * Update tests to use contract-built-in `awaitTransactionSuccessAsync` (#1797)
+
+## v2.1.1 - _April 11, 2019_
+
+    * Dependencies updated
+
+## v2.1.0 - _March 21, 2019_
+
+    * Run Web3ProviderEngine without excess block polling (#1695)
+
+## v2.0.0 - _March 20, 2019_
+
+    * Do not reexport external dependencies (#1682)
+    * Add ERC1155Proxy (#1661)
+    * Bumped solidity version to ^0.5.5 (#1701)
+    * Integration testing for ERC1155Proxy (#1673)
+
+## v1.0.9 - _March 1, 2019_
+
+    * Dependencies updated
+
+## v1.0.8 - _February 27, 2019_
+
+    * Dependencies updated
+
+## v1.0.7 - _February 26, 2019_
+
+    * Dependencies updated
+
+## 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)

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"
+                }
+            }
+        ]
+    }
+]

contracts/asset-proxy/README.md

@@ -0,0 +1,73 @@
+## AssetProxy
+
+This package contains the implementations of all of the [`AssetProxy`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#assetproxy) contracts available within the 0x protocol. These contracts are responsible for decoding the `assetData` sent to them and performing the actual transfer of assets. Addresses of the deployed contracts can be found in this 0x [guide](https://0x.org/docs/guides/0x-cheat-sheet) or the [DEPLOYS](./DEPLOYS.json) file within this package.
+
+## Installation
+
+**Install**
+
+```bash
+npm install @0x/contracts-asset-proxy --save
+```
+
+## Bug bounty
+
+A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0x.org/docs/guides/bug-bounty-program).
+
+## Contributing
+
+We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+
+For proposals regarding the 0x protocol's smart contract architecture, message format, or additional functionality, go to the [0x Improvement Proposals (ZEIPs)](https://github.com/0xProject/ZEIPs) repository and follow the contribution guidelines provided therein.
+
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
+
+### Install Dependencies
+
+If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
+
+```bash
+yarn config set workspaces-experimental true
+```
+
+Then install dependencies
+
+```bash
+yarn install
+```
+
+### Build
+
+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-asset-proxy yarn build
+```
+
+Or continuously rebuild on change:
+
+```bash
+PKG=@0x/contracts-asset-proxy yarn watch
+```
+
+### Clean
+
+```bash
+yarn clean
+```
+
+### Lint
+
+```bash
+yarn lint
+```
+
+### Run Tests
+
+```bash
+yarn test
+```
+
+#### Testing options
+
+Contracts testing options like coverage, profiling, revert traces or backing node choosing - are described [here](../TESTING.md).

contracts/asset-proxy/compiler.json

@@ -0,0 +1,38 @@
+{
+    "artifactsDir": "./generated-artifacts",
+    "contractsDir": "./contracts",
+    "useDockerisedSolc": false,
+    "isOfflineMode": false,
+    "compilerSettings": {
+        "evmVersion": "constantinople",
+        "optimizer": {
+            "enabled": true,
+            "runs": 1000000,
+            "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
+        },
+        "outputSelection": {
+            "*": {
+                "*": [
+                    "abi",
+                    "devdoc",
+                    "evm.bytecode.object",
+                    "evm.bytecode.sourceMap",
+                    "evm.deployedBytecode.object",
+                    "evm.deployedBytecode.sourceMap"
+                ]
+            }
+        }
+    },
+    "contracts": [
+        "src/ERC1155Proxy.sol",
+        "src/ERC20Proxy.sol",
+        "src/ERC721Proxy.sol",
+        "src/MixinAuthorizable.sol",
+        "src/MultiAssetProxy.sol",
+        "src/StaticCallProxy.sol",
+        "src/interfaces/IAssetData.sol",
+        "src/interfaces/IAssetProxy.sol",
+        "src/interfaces/IAuthorizable.sol",
+        "test/TestStaticCallTarget.sol"
+    ]
+}

contracts/asset-proxy/contracts/src/ERC1155Proxy.sol

@@ -0,0 +1,97 @@
+/*
+
+  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.5.9;
+
+import "@0x/contracts-utils/contracts/src/LibBytes.sol";
+import "@0x/contracts-utils/contracts/src/SafeMath.sol";
+import "@0x/contracts-erc1155/contracts/src/interfaces/IERC1155.sol";
+import "./MixinAuthorizable.sol";
+import "./interfaces/IAssetProxy.sol";
+
+
+contract ERC1155Proxy is
+    MixinAuthorizable,
+    SafeMath,
+    IAssetProxy
+{
+    using LibBytes for bytes;
+
+    // Id of this proxy.
+    bytes4 constant internal PROXY_ID = bytes4(keccak256("ERC1155Assets(address,uint256[],uint256[],bytes)"));
+
+    /// @dev Transfers batch of ERC1155 assets. Either succeeds or throws.
+    /// @param assetData Byte array encoded with ERC1155 token address, array of ids, array of values, and callback data.
+    /// @param from Address to transfer assets from.
+    /// @param to Address to transfer assets to.
+    /// @param amount Amount that will be multiplied with each element of `assetData.values` to scale the
+    ///        values that will be transferred.
+    function transferFrom(
+        bytes calldata assetData,
+        address from,
+        address to,
+        uint256 amount
+    )
+        external
+        onlyAuthorized
+    {
+        // Decode params from `assetData`
+        // solhint-disable indent
+        (
+            address erc1155TokenAddress,
+            uint256[] memory ids,
+            uint256[] memory values,
+            bytes memory data
+        ) = abi.decode(
+            assetData.sliceDestructive(4, assetData.length),
+            (address, uint256[], uint256[], bytes)
+        );
+        // solhint-enable indent
+
+        // Scale values up by `amount`
+        uint256 length = values.length;
+        uint256[] memory scaledValues = new uint256[](length);
+        for (uint256 i = 0; i != length; i++) {
+            // We write the scaled values to an unused location in memory in order
+            // to avoid copying over `ids` or `data`. This is possible if they are
+            // identical to `values` and the offsets for each are pointing to the 
+            // same location in the ABI encoded calldata.
+            scaledValues[i] = safeMul(values[i], amount);
+        }
+
+        // Execute `safeBatchTransferFrom` call
+        // Either succeeds or throws
+        IERC1155(erc1155TokenAddress).safeBatchTransferFrom(
+            from,
+            to,
+            ids,
+            scaledValues,
+            data
+        );
+    }
+
+    /// @dev Gets the proxy id associated with the proxy address.
+    /// @return Proxy id.
+    function getProxyId()
+        external
+        pure
+        returns (bytes4)
+    {
+        return PROXY_ID;
+    }
+}

contracts/asset-proxy/contracts/src/ERC20Proxy.sol

@@ -0,0 +1,184 @@
+/*
+
+  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.5.5;
+
+import "./MixinAuthorizable.sol";
+
+
+contract ERC20Proxy is
+    MixinAuthorizable
+{
+    // Id of this proxy.
+    bytes4 constant internal PROXY_ID = bytes4(keccak256("ERC20Token(address)"));
+    
+    // solhint-disable-next-line payable-fallback
+    function () 
+        external
+    {
+        assembly {
+            // The first 4 bytes of calldata holds the function selector
+            let selector := and(calldataload(0), 0xffffffff00000000000000000000000000000000000000000000000000000000)
+
+            // `transferFrom` will be called with the following parameters:
+            // assetData Encoded byte array.
+            // from Address to transfer asset from.
+            // to Address to transfer asset to.
+            // amount Amount of asset to transfer.
+            // bytes4(keccak256("transferFrom(bytes,address,address,uint256)")) = 0xa85e59e4
+            if eq(selector, 0xa85e59e400000000000000000000000000000000000000000000000000000000) {
+
+                // To lookup a value in a mapping, we load from the storage location keccak256(k, p),
+                // where k is the key left padded to 32 bytes and p is the storage slot
+                let start := mload(64)
+                mstore(start, and(caller, 0xffffffffffffffffffffffffffffffffffffffff))
+                mstore(add(start, 32), authorized_slot)
+
+                // Revert if authorized[msg.sender] == false
+                if iszero(sload(keccak256(start, 64))) {
+                    // Revert with `Error("SENDER_NOT_AUTHORIZED")`
+                    mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
+                    mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
+                    mstore(64, 0x0000001553454e4445525f4e4f545f415554484f52495a454400000000000000)
+                    mstore(96, 0)
+                    revert(0, 100)
+                }
+
+                // `transferFrom`.
+                // The function is marked `external`, so no abi decodeding is done for
+                // us. Instead, we expect the `calldata` memory to contain the
+                // following:
+                //
+                // | Area     | Offset | Length  | Contents                            |
+                // |----------|--------|---------|-------------------------------------|
+                // | Header   | 0      | 4       | function selector                   |
+                // | Params   |        | 4 * 32  | function parameters:                |
+                // |          | 4      |         |   1. offset to assetData (*)        |
+                // |          | 36     |         |   2. from                           |
+                // |          | 68     |         |   3. to                             |
+                // |          | 100    |         |   4. amount                         |
+                // | Data     |        |         | assetData:                          |
+                // |          | 132    | 32      | assetData Length                    |
+                // |          | 164    | **      | assetData Contents                  |
+                //
+                // (*): offset is computed from start of function parameters, so offset
+                //      by an additional 4 bytes in the calldata.
+                //
+                // (**): see table below to compute length of assetData Contents
+                //
+                // WARNING: The ABIv2 specification allows additional padding between
+                //          the Params and Data section. This will result in a larger
+                //          offset to assetData.
+
+                // Asset data itself is encoded as follows:
+                //
+                // | Area     | Offset | Length  | Contents                            |
+                // |----------|--------|---------|-------------------------------------|
+                // | Header   | 0      | 4       | function selector                   |
+                // | Params   |        | 1 * 32  | function parameters:                |
+                // |          | 4      | 12 + 20 |   1. token address                  |
+
+                // We construct calldata for the `token.transferFrom` ABI.
+                // The layout of this calldata is in the table below.
+                //
+                // | Area     | Offset | Length  | Contents                            |
+                // |----------|--------|---------|-------------------------------------|
+                // | Header   | 0      | 4       | function selector                   |
+                // | Params   |        | 3 * 32  | function parameters:                |
+                // |          | 4      |         |   1. from                           |
+                // |          | 36     |         |   2. to                             |
+                // |          | 68     |         |   3. amount                         |
+
+                /////// Read token address from calldata ///////
+                // * The token address is stored in `assetData`.
+                //
+                // * The "offset to assetData" is stored at offset 4 in the calldata (table 1).
+                //   [assetDataOffsetFromParams = calldataload(4)]
+                //
+                // * Notes that the "offset to assetData" is relative to the "Params" area of calldata;
+                //   add 4 bytes to account for the length of the "Header" area (table 1).
+                //   [assetDataOffsetFromHeader = assetDataOffsetFromParams + 4]
+                //
+                // * The "token address" is offset 32+4=36 bytes into "assetData" (tables 1 & 2).
+                //   [tokenOffset = assetDataOffsetFromHeader + 36 = calldataload(4) + 4 + 36]
+                let token := calldataload(add(calldataload(4), 40))
+                
+                /////// Setup Header Area ///////
+                // This area holds the 4-byte `transferFrom` selector.
+                // Any trailing data in transferFromSelector will be
+                // overwritten in the next `mstore` call.
+                mstore(0, 0x23b872dd00000000000000000000000000000000000000000000000000000000)
+                
+                /////// Setup Params Area ///////
+                // We copy the fields `from`, `to` and `amount` in bulk
+                // from our own calldata to the new calldata.
+                calldatacopy(4, 36, 96)
+
+                /////// Call `token.transferFrom` using the calldata ///////
+                let success := call(
+                    gas,            // forward all gas
+                    token,          // call address of token contract
+                    0,              // don't send any ETH
+                    0,              // pointer to start of input
+                    100,            // length of input
+                    0,              // write output over input
+                    32              // output size should be 32 bytes
+                )
+
+                /////// Check return data. ///////
+                // If there is no return data, we assume the token incorrectly
+                // does not return a bool. In this case we expect it to revert
+                // on failure, which was handled above.
+                // If the token does return data, we require that it is a single
+                // nonzero 32 bytes value.
+                // So the transfer succeeded if the call succeeded and either
+                // returned nothing, or returned a non-zero 32 byte value. 
+                success := and(success, or(
+                    iszero(returndatasize),
+                    and(
+                        eq(returndatasize, 32),
+                        gt(mload(0), 0)
+                    )
+                ))
+                if success {
+                    return(0, 0)
+                }
+                
+                // Revert with `Error("TRANSFER_FAILED")`
+                mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
+                mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
+                mstore(64, 0x0000000f5452414e534645525f4641494c454400000000000000000000000000)
+                mstore(96, 0)
+                revert(0, 100)
+            }
+
+            // Revert if undefined function is called
+            revert(0, 0)
+        }
+    }
+
+    /// @dev Gets the proxy id associated with the proxy address.
+    /// @return Proxy id.
+    function getProxyId()
+        external
+        pure
+        returns (bytes4)
+    {
+        return PROXY_ID;
+    }
+}

contracts/asset-proxy/contracts/src/ERC721Proxy.sol

@@ -0,0 +1,171 @@
+/*
+
+  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.5.5;
+
+import "./MixinAuthorizable.sol";
+
+
+contract ERC721Proxy is
+    MixinAuthorizable
+{
+    // Id of this proxy.
+    bytes4 constant internal PROXY_ID = bytes4(keccak256("ERC721Token(address,uint256)"));
+
+    // solhint-disable-next-line payable-fallback
+    function () 
+        external
+    {
+        assembly {
+            // The first 4 bytes of calldata holds the function selector
+            let selector := and(calldataload(0), 0xffffffff00000000000000000000000000000000000000000000000000000000)
+
+            // `transferFrom` will be called with the following parameters:
+            // assetData Encoded byte array.
+            // from Address to transfer asset from.
+            // to Address to transfer asset to.
+            // amount Amount of asset to transfer.
+            // bytes4(keccak256("transferFrom(bytes,address,address,uint256)")) = 0xa85e59e4
+            if eq(selector, 0xa85e59e400000000000000000000000000000000000000000000000000000000) {
+
+                // To lookup a value in a mapping, we load from the storage location keccak256(k, p),
+                // where k is the key left padded to 32 bytes and p is the storage slot
+                let start := mload(64)
+                mstore(start, and(caller, 0xffffffffffffffffffffffffffffffffffffffff))
+                mstore(add(start, 32), authorized_slot)
+
+                // Revert if authorized[msg.sender] == false
+                if iszero(sload(keccak256(start, 64))) {
+                    // Revert with `Error("SENDER_NOT_AUTHORIZED")`
+                    mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
+                    mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
+                    mstore(64, 0x0000001553454e4445525f4e4f545f415554484f52495a454400000000000000)
+                    mstore(96, 0)
+                    revert(0, 100)
+                }
+
+                // `transferFrom`.
+                // The function is marked `external`, so no abi decodeding is done for
+                // us. Instead, we expect the `calldata` memory to contain the
+                // following:
+                //
+                // | Area     | Offset | Length  | Contents                            |
+                // |----------|--------|---------|-------------------------------------|
+                // | Header   | 0      | 4       | function selector                   |
+                // | Params   |        | 4 * 32  | function parameters:                |
+                // |          | 4      |         |   1. offset to assetData (*)        |
+                // |          | 36     |         |   2. from                           |
+                // |          | 68     |         |   3. to                             |
+                // |          | 100    |         |   4. amount                         |
+                // | Data     |        |         | assetData:                          |
+                // |          | 132    | 32      | assetData Length                    |
+                // |          | 164    | **      | assetData Contents                  |
+                //
+                // (*): offset is computed from start of function parameters, so offset
+                //      by an additional 4 bytes in the calldata.
+                //
+                // (**): see table below to compute length of assetData Contents
+                //
+                // WARNING: The ABIv2 specification allows additional padding between
+                //          the Params and Data section. This will result in a larger
+                //          offset to assetData.
+
+                // Asset data itself is encoded as follows:
+                //
+                // | Area     | Offset | Length  | Contents                            |
+                // |----------|--------|---------|-------------------------------------|
+                // | Header   | 0      | 4       | function selector                   |
+                // | Params   |        | 2 * 32  | function parameters:                |
+                // |          | 4      | 12 + 20 |   1. token address                  |
+                // |          | 36     |         |   2. tokenId                        |
+                
+                // We construct calldata for the `token.transferFrom` ABI.
+                // The layout of this calldata is in the table below.
+                // 
+                // | Area     | Offset | Length  | Contents                            |
+                // |----------|--------|---------|-------------------------------------|
+                // | Header   | 0      | 4       | function selector                   |
+                // | Params   |        | 3 * 32  | function parameters:                |
+                // |          | 4      |         |   1. from                           |
+                // |          | 36     |         |   2. to                             |
+                // |          | 68     |         |   3. tokenId                        |
+
+                // There exists only 1 of each token.
+                // require(amount == 1, "INVALID_AMOUNT")
+                if sub(calldataload(100), 1) {
+                    // Revert with `Error("INVALID_AMOUNT")`
+                    mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
+                    mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
+                    mstore(64, 0x0000000e494e56414c49445f414d4f554e540000000000000000000000000000)
+                    mstore(96, 0)
+                    revert(0, 100)
+                }
+
+                /////// Setup Header Area ///////
+                // This area holds the 4-byte `transferFrom` selector.
+                // Any trailing data in transferFromSelector will be
+                // overwritten in the next `mstore` call.
+                mstore(0, 0x23b872dd00000000000000000000000000000000000000000000000000000000)
+                
+                /////// Setup Params Area ///////
+                // We copy the fields `from` and `to` in bulk
+                // from our own calldata to the new calldata.
+                calldatacopy(4, 36, 64)
+
+                // Copy `tokenId` field from our own calldata to the new calldata.
+                let assetDataOffset := calldataload(4)
+                calldatacopy(68, add(assetDataOffset, 72), 32)
+
+                /////// Call `token.transferFrom` using the calldata ///////
+                let token := calldataload(add(assetDataOffset, 40))
+                let success := call(
+                    gas,            // forward all gas
+                    token,          // call address of token contract
+                    0,              // don't send any ETH
+                    0,              // pointer to start of input
+                    100,            // length of input
+                    0,              // write output to null
+                    0               // output size is 0 bytes
+                )
+                if success {
+                    return(0, 0)
+                }
+                
+                // Revert with `Error("TRANSFER_FAILED")`
+                mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
+                mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
+                mstore(64, 0x0000000f5452414e534645525f4641494c454400000000000000000000000000)
+                mstore(96, 0)
+                revert(0, 100)
+            }
+
+            // Revert if undefined function is called
+            revert(0, 0)
+        }
+    }
+
+    /// @dev Gets the proxy id associated with the proxy address.
+    /// @return Proxy id.
+    function getProxyId()
+        external
+        pure
+        returns (bytes4)
+    {
+        return PROXY_ID;
+    }
+}

contracts/asset-proxy/contracts/src/MixinAssetProxyDispatcher.sol

@@ -0,0 +1,172 @@
+/*
+
+  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.5.5;
+
+import "@0x/contracts-utils/contracts/src/Ownable.sol";
+import "./mixins/MAssetProxyDispatcher.sol";
+import "./interfaces/IAssetProxy.sol";
+
+
+contract MixinAssetProxyDispatcher is
+    Ownable,
+    MAssetProxyDispatcher
+{
+    // Mapping from Asset Proxy Id's to their respective Asset Proxy
+    mapping (bytes4 => address) public assetProxies;
+
+    /// @dev Registers an asset proxy to its asset proxy id.
+    ///      Once an asset proxy is registered, it cannot be unregistered.
+    /// @param assetProxy Address of new asset proxy to register.
+    function registerAssetProxy(address assetProxy)
+        external
+        onlyOwner
+    {
+        // Ensure that no asset proxy exists with current id.
+        bytes4 assetProxyId = IAssetProxy(assetProxy).getProxyId();
+        address currentAssetProxy = assetProxies[assetProxyId];
+        require(
+            currentAssetProxy == address(0),
+            "ASSET_PROXY_ALREADY_EXISTS"
+        );
+
+        // Add asset proxy and log registration.
+        assetProxies[assetProxyId] = assetProxy;
+        emit AssetProxyRegistered(
+            assetProxyId,
+            assetProxy
+        );
+    }
+
+    /// @dev Gets an asset proxy.
+    /// @param assetProxyId Id of the asset proxy.
+    /// @return The asset proxy registered to assetProxyId. Returns 0x0 if no proxy is registered.
+    function getAssetProxy(bytes4 assetProxyId)
+        external
+        view
+        returns (address)
+    {
+        return assetProxies[assetProxyId];
+    }
+
+    /// @dev Forwards arguments to assetProxy and calls `transferFrom`. Either succeeds or throws.
+    /// @param assetData Byte array encoded for the asset.
+    /// @param from Address to transfer token from.
+    /// @param to Address to transfer token to.
+    /// @param amount Amount of token to transfer.
+    function dispatchTransferFrom(
+        bytes memory assetData,
+        address from,
+        address to,
+        uint256 amount
+    )
+        internal
+    {
+        // Do nothing if no amount should be transferred.
+        if (amount > 0 && from != to) {
+            // Ensure assetData length is valid
+            require(
+                assetData.length > 3,
+                "LENGTH_GREATER_THAN_3_REQUIRED"
+            );
+            
+            // Lookup assetProxy. We do not use `LibBytes.readBytes4` for gas efficiency reasons.
+            bytes4 assetProxyId;
+            assembly {
+                assetProxyId := and(mload(
+                    add(assetData, 32)),
+                    0xFFFFFFFF00000000000000000000000000000000000000000000000000000000
+                )
+            }
+            address assetProxy = assetProxies[assetProxyId];
+
+            // Ensure that assetProxy exists
+            require(
+                assetProxy != address(0),
+                "ASSET_PROXY_DOES_NOT_EXIST"
+            );
+            
+            // We construct calldata for the `assetProxy.transferFrom` ABI.
+            // The layout of this calldata is in the table below.
+            // 
+            // | Area     | Offset | Length  | Contents                                    |
+            // | -------- |--------|---------|-------------------------------------------- |
+            // | Header   | 0      | 4       | function selector                           |
+            // | Params   |        | 4 * 32  | function parameters:                        |
+            // |          | 4      |         |   1. offset to assetData (*)                |
+            // |          | 36     |         |   2. from                                   |
+            // |          | 68     |         |   3. to                                     |
+            // |          | 100    |         |   4. amount                                 |
+            // | Data     |        |         | assetData:                                  |
+            // |          | 132    | 32      | assetData Length                            |
+            // |          | 164    | **      | assetData Contents                          |
+
+            assembly {
+                /////// Setup State ///////
+                // `cdStart` is the start of the calldata for `assetProxy.transferFrom` (equal to free memory ptr).
+                let cdStart := mload(64)
+                // `dataAreaLength` is the total number of words needed to store `assetData`
+                //  As-per the ABI spec, this value is padded up to the nearest multiple of 32,
+                //  and includes 32-bytes for length.
+                let dataAreaLength := and(add(mload(assetData), 63), 0xFFFFFFFFFFFE0)
+                // `cdEnd` is the end of the calldata for `assetProxy.transferFrom`.
+                let cdEnd := add(cdStart, add(132, dataAreaLength))
+
+                
+                /////// Setup Header Area ///////
+                // This area holds the 4-byte `transferFromSelector`.
+                // bytes4(keccak256("transferFrom(bytes,address,address,uint256)")) = 0xa85e59e4
+                mstore(cdStart, 0xa85e59e400000000000000000000000000000000000000000000000000000000)
+                
+                /////// Setup Params Area ///////
+                // Each parameter is padded to 32-bytes. The entire Params Area is 128 bytes.
+                // Notes:
+                //   1. The offset to `assetData` is the length of the Params Area (128 bytes).
+                //   2. A 20-byte mask is applied to addresses to zero-out the unused bytes.
+                mstore(add(cdStart, 4), 128)
+                mstore(add(cdStart, 36), and(from, 0xffffffffffffffffffffffffffffffffffffffff))
+                mstore(add(cdStart, 68), and(to, 0xffffffffffffffffffffffffffffffffffffffff))
+                mstore(add(cdStart, 100), amount)
+                
+                /////// Setup Data Area ///////
+                // This area holds `assetData`.
+                let dataArea := add(cdStart, 132)
+                // solhint-disable-next-line no-empty-blocks
+                for {} lt(dataArea, cdEnd) {} {
+                    mstore(dataArea, mload(assetData))
+                    dataArea := add(dataArea, 32)
+                    assetData := add(assetData, 32)
+                }
+
+                /////// Call `assetProxy.transferFrom` using the constructed calldata ///////
+                let success := call(
+                    gas,                    // forward all gas
+                    assetProxy,             // call address of asset proxy
+                    0,                      // don't send any ETH
+                    cdStart,                // pointer to start of input
+                    sub(cdEnd, cdStart),    // length of input  
+                    cdStart,                // write output over input
+                    512                     // reserve 512 bytes for output
+                )
+                if iszero(success) {
+                    revert(cdStart, returndatasize())
+                }
+            }
+        }
+    }
+}

contracts/asset-proxy/contracts/src/MixinAuthorizable.sol

@@ -0,0 +1,117 @@
+/*
+
+  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.5.5;
+
+import "@0x/contracts-utils/contracts/src/Ownable.sol";
+import "./mixins/MAuthorizable.sol";
+
+
+contract MixinAuthorizable is
+    Ownable,
+    MAuthorizable
+{
+    /// @dev Only authorized addresses can invoke functions with this modifier.
+    modifier onlyAuthorized {
+        require(
+            authorized[msg.sender],
+            "SENDER_NOT_AUTHORIZED"
+        );
+        _;
+    }
+
+    mapping (address => bool) public authorized;
+    address[] public authorities;
+
+    /// @dev Authorizes an address.
+    /// @param target Address to authorize.
+    function addAuthorizedAddress(address target)
+        external
+        onlyOwner
+    {
+        require(
+            !authorized[target],
+            "TARGET_ALREADY_AUTHORIZED"
+        );
+
+        authorized[target] = true;
+        authorities.push(target);
+        emit AuthorizedAddressAdded(target, msg.sender);
+    }
+
+    /// @dev Removes authorizion of an address.
+    /// @param target Address to remove authorization from.
+    function removeAuthorizedAddress(address target)
+        external
+        onlyOwner
+    {
+        require(
+            authorized[target],
+            "TARGET_NOT_AUTHORIZED"
+        );
+
+        delete authorized[target];
+        for (uint256 i = 0; i < authorities.length; i++) {
+            if (authorities[i] == target) {
+                authorities[i] = authorities[authorities.length - 1];
+                authorities.length -= 1;
+                break;
+            }
+        }
+        emit AuthorizedAddressRemoved(target, msg.sender);
+    }
+
+    /// @dev Removes authorizion of an address.
+    /// @param target Address to remove authorization from.
+    /// @param index Index of target in authorities array.
+    function removeAuthorizedAddressAtIndex(
+        address target,
+        uint256 index
+    )
+        external
+        onlyOwner
+    {
+        require(
+            authorized[target],
+            "TARGET_NOT_AUTHORIZED"
+        );
+        require(
+            index < authorities.length,
+            "INDEX_OUT_OF_BOUNDS"
+        );
+        require(
+            authorities[index] == target,
+            "AUTHORIZED_ADDRESS_MISMATCH"
+        );
+
+        delete authorized[target];
+        authorities[index] = authorities[authorities.length - 1];
+        authorities.length -= 1;
+        emit AuthorizedAddressRemoved(target, msg.sender);
+    }
+
+    /// @dev Gets all authorized addresses.
+    /// @return Array of authorized addresses.
+    function getAuthorizedAddresses()
+        external
+        view
+        returns (address[] memory)
+    {
+        return authorities;
+    }
+}

contracts/asset-proxy/contracts/src/MultiAssetProxy.sol

@@ -0,0 +1,335 @@
+/*
+
+  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.5.5;
+
+import "./MixinAssetProxyDispatcher.sol";
+import "./MixinAuthorizable.sol";
+
+
+contract MultiAssetProxy is
+    MixinAssetProxyDispatcher,
+    MixinAuthorizable
+{
+    // Id of this proxy.
+    bytes4 constant internal PROXY_ID = bytes4(keccak256("MultiAsset(uint256[],bytes[])"));
+
+    // solhint-disable-next-line payable-fallback
+    function ()
+        external
+    {
+        // NOTE: The below assembly assumes that clients do some input validation and that the input is properly encoded according to the AbiV2 specification.
+        // It is technically possible for inputs with very large lengths and offsets to cause overflows. However, this would make the calldata prohibitively
+        // expensive and we therefore do not check for overflows in these scenarios.
+        assembly {
+            // The first 4 bytes of calldata holds the function selector
+            let selector := and(calldataload(0), 0xffffffff00000000000000000000000000000000000000000000000000000000)
+
+            // `transferFrom` will be called with the following parameters:
+            // assetData Encoded byte array.
+            // from Address to transfer asset from.
+            // to Address to transfer asset to.
+            // amount Amount of asset to transfer.
+            // bytes4(keccak256("transferFrom(bytes,address,address,uint256)")) = 0xa85e59e4
+            if eq(selector, 0xa85e59e400000000000000000000000000000000000000000000000000000000) {
+
+                // To lookup a value in a mapping, we load from the storage location keccak256(k, p),
+                // where k is the key left padded to 32 bytes and p is the storage slot
+                mstore(0, caller)
+                mstore(32, authorized_slot)
+
+                // Revert if authorized[msg.sender] == false
+                if iszero(sload(keccak256(0, 64))) {
+                    // Revert with `Error("SENDER_NOT_AUTHORIZED")`
+                    mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
+                    mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
+                    mstore(64, 0x0000001553454e4445525f4e4f545f415554484f52495a454400000000000000)
+                    mstore(96, 0)
+                    revert(0, 100)
+                }
+
+                // `transferFrom`.
+                // The function is marked `external`, so no abi decoding is done for
+                // us. Instead, we expect the `calldata` memory to contain the
+                // following:
+                //
+                // | Area     | Offset | Length  | Contents                            |
+                // |----------|--------|---------|-------------------------------------|
+                // | Header   | 0      | 4       | function selector                   |
+                // | Params   |        | 4 * 32  | function parameters:                |
+                // |          | 4      |         |   1. offset to assetData (*)        |
+                // |          | 36     |         |   2. from                           |
+                // |          | 68     |         |   3. to                             |
+                // |          | 100    |         |   4. amount                         |
+                // | Data     |        |         | assetData:                          |
+                // |          | 132    | 32      | assetData Length                    |
+                // |          | 164    | **      | assetData Contents                  |
+                //
+                // (*): offset is computed from start of function parameters, so offset
+                //      by an additional 4 bytes in the calldata.
+                //
+                // (**): see table below to compute length of assetData Contents
+                //
+                // WARNING: The ABIv2 specification allows additional padding between
+                //          the Params and Data section. This will result in a larger
+                //          offset to assetData.
+
+                // Load offset to `assetData`
+                let assetDataOffset := add(calldataload(4), 4)
+
+                // Load length in bytes of `assetData`
+                let assetDataLength := calldataload(assetDataOffset)
+
+                // Asset data itself is encoded as follows:
+                //
+                // | Area     | Offset      | Length  | Contents                            |
+                // |----------|-------------|---------|-------------------------------------|
+                // | Header   | 0           | 4       | assetProxyId                        |
+                // | Params   |             | 2 * 32  | function parameters:                |
+                // |          | 4           |         |   1. offset to amounts (*)          |
+                // |          | 36          |         |   2. offset to nestedAssetData (*)  |
+                // | Data     |             |         | amounts:                            |
+                // |          | 68          | 32      | amounts Length                      |
+                // |          | 100         | a       | amounts Contents                    | 
+                // |          |             |         | nestedAssetData:                    |
+                // |          | 100 + a     | 32      | nestedAssetData Length              |
+                // |          | 132 + a     | b       | nestedAssetData Contents (offsets)  |
+                // |          | 132 + a + b |         | nestedAssetData[0, ..., len]        |
+
+                // Assert that the length of asset data:
+                // 1. Must be at least 68 bytes (see table above)
+                // 2. Must be a multiple of 32 (excluding the 4-byte selector)
+                if or(lt(assetDataLength, 68), mod(sub(assetDataLength, 4), 32)) {
+                    // Revert with `Error("INVALID_ASSET_DATA_LENGTH")`
+                    mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
+                    mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
+                    mstore(64, 0x00000019494e56414c49445f41535345545f444154415f4c454e475448000000)
+                    mstore(96, 0)
+                    revert(0, 100)
+                }
+
+                // End of asset data in calldata
+                // assetDataOffset
+                // + 32 (assetData len)
+                let assetDataEnd := add(assetDataOffset, add(assetDataLength, 32))
+                if gt(assetDataEnd, calldatasize()) {
+                    // Revert with `Error("INVALID_ASSET_DATA_END")`
+                    mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
+                    mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
+                    mstore(64, 0x00000016494e56414c49445f41535345545f444154415f454e44000000000000)
+                    mstore(96, 0)
+                    revert(0, 100)
+                }
+
+                // In order to find the offset to `amounts`, we must add:
+                // assetDataOffset
+                // + 32 (assetData len)
+                // + 4 (assetProxyId)
+                let amountsOffset := calldataload(add(assetDataOffset, 36))
+
+                // In order to find the offset to `nestedAssetData`, we must add:
+                // assetDataOffset
+                // + 32 (assetData len)
+                // + 4 (assetProxyId)
+                // + 32 (amounts offset)
+                let nestedAssetDataOffset := calldataload(add(assetDataOffset, 68))
+
+                // In order to find the start of the `amounts` contents, we must add: 
+                // assetDataOffset 
+                // + 32 (assetData len)
+                // + 4 (assetProxyId)
+                // + amountsOffset
+                // + 32 (amounts len)
+                let amountsContentsStart := add(assetDataOffset, add(amountsOffset, 68))
+
+                // Load number of elements in `amounts`
+                let amountsLen := calldataload(sub(amountsContentsStart, 32))
+
+                // In order to find the start of the `nestedAssetData` contents, we must add: 
+                // assetDataOffset 
+                // + 32 (assetData len)
+                // + 4 (assetProxyId)
+                // + nestedAssetDataOffset
+                // + 32 (nestedAssetData len)
+                let nestedAssetDataContentsStart := add(assetDataOffset, add(nestedAssetDataOffset, 68))
+
+                // Load number of elements in `nestedAssetData`
+                let nestedAssetDataLen := calldataload(sub(nestedAssetDataContentsStart, 32))
+
+                // Revert if number of elements in `amounts` differs from number of elements in `nestedAssetData`
+                if sub(amountsLen, nestedAssetDataLen) {
+                    // Revert with `Error("LENGTH_MISMATCH")`
+                    mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
+                    mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
+                    mstore(64, 0x0000000f4c454e4754485f4d49534d4154434800000000000000000000000000)
+                    mstore(96, 0)
+                    revert(0, 100)
+                }
+
+                // Copy `transferFrom` selector, offset to `assetData`, `from`, and `to` from calldata to memory
+                calldatacopy(
+                    0,   // memory can safely be overwritten from beginning
+                    0,   // start of calldata
+                    100  // length of selector (4) and 3 params (32 * 3)
+                )
+
+                // Overwrite existing offset to `assetData` with our own
+                mstore(4, 128)
+                
+                // Load `amount`
+                let amount := calldataload(100)
+        
+                // Calculate number of bytes in `amounts` contents
+                let amountsByteLen := mul(amountsLen, 32)
+
+                // Initialize `assetProxyId` and `assetProxy` to 0
+                let assetProxyId := 0
+                let assetProxy := 0
+
+                // Loop through `amounts` and `nestedAssetData`, calling `transferFrom` for each respective element
+                for {let i := 0} lt(i, amountsByteLen) {i := add(i, 32)} {
+
+                    // Calculate the total amount
+                    let amountsElement := calldataload(add(amountsContentsStart, i))
+                    let totalAmount := mul(amountsElement, amount)
+
+                    // Revert if `amount` != 0 and multiplication resulted in an overflow 
+                    if iszero(or(
+                        iszero(amount),
+                        eq(div(totalAmount, amount), amountsElement)
+                    )) {
+                        // Revert with `Error("UINT256_OVERFLOW")`
+                        mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
+                        mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
+                        mstore(64, 0x0000001055494e543235365f4f564552464c4f57000000000000000000000000)
+                        mstore(96, 0)
+                        revert(0, 100)
+                    }
+
+                    // Write `totalAmount` to memory
+                    mstore(100, totalAmount)
+
+                    // Load offset to `nestedAssetData[i]`
+                    let nestedAssetDataElementOffset := calldataload(add(nestedAssetDataContentsStart, i))
+
+                    // In order to find the start of the `nestedAssetData[i]` contents, we must add:
+                    // assetDataOffset 
+                    // + 32 (assetData len)
+                    // + 4 (assetProxyId)
+                    // + nestedAssetDataOffset
+                    // + 32 (nestedAssetData len)
+                    // + nestedAssetDataElementOffset
+                    // + 32 (nestedAssetDataElement len)
+                    let nestedAssetDataElementContentsStart := add(
+                        assetDataOffset,
+                        add(
+                            nestedAssetDataOffset,
+                            add(nestedAssetDataElementOffset, 100)
+                        )
+                    )
+
+                    // Load length of `nestedAssetData[i]`
+                    let nestedAssetDataElementLenStart := sub(nestedAssetDataElementContentsStart, 32)
+                    let nestedAssetDataElementLen := calldataload(nestedAssetDataElementLenStart)
+
+                    // Revert if the `nestedAssetData` does not contain a 4 byte `assetProxyId`
+                    if lt(nestedAssetDataElementLen, 4) {
+                        // Revert with `Error("LENGTH_GREATER_THAN_3_REQUIRED")`
+                        mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
+                        mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
+                        mstore(64, 0x0000001e4c454e4754485f475245415445525f5448414e5f335f524551554952)
+                        mstore(96, 0x4544000000000000000000000000000000000000000000000000000000000000)
+                        revert(0, 100)
+                    }
+
+                    // Load AssetProxy id
+                    let currentAssetProxyId := and(
+                        calldataload(nestedAssetDataElementContentsStart),
+                        0xffffffff00000000000000000000000000000000000000000000000000000000
+                    )
+
+                    // Only load `assetProxy` if `currentAssetProxyId` does not equal `assetProxyId`
+                    // We do not need to check if `currentAssetProxyId` is 0 since `assetProxy` is also initialized to 0
+                    if sub(currentAssetProxyId, assetProxyId) {
+                        // Update `assetProxyId`
+                        assetProxyId := currentAssetProxyId
+                        // To lookup a value in a mapping, we load from the storage location keccak256(k, p),
+                        // where k is the key left padded to 32 bytes and p is the storage slot
+                        mstore(132, assetProxyId)
+                        mstore(164, assetProxies_slot)
+                        assetProxy := sload(keccak256(132, 64))
+                    }
+                    
+                    // Revert if AssetProxy with given id does not exist
+                    if iszero(assetProxy) {
+                        // Revert with `Error("ASSET_PROXY_DOES_NOT_EXIST")`
+                        mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
+                        mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
+                        mstore(64, 0x0000001a41535345545f50524f58595f444f45535f4e4f545f45584953540000)
+                        mstore(96, 0)
+                        revert(0, 100)
+                    }
+    
+                    // Copy `nestedAssetData[i]` from calldata to memory
+                    calldatacopy(
+                        132,                                // memory slot after `amounts[i]`
+                        nestedAssetDataElementLenStart,     // location of `nestedAssetData[i]` in calldata
+                        add(nestedAssetDataElementLen, 32)  // `nestedAssetData[i].length` plus 32 byte length
+                    )
+
+                    // call `assetProxy.transferFrom`
+                    let success := call(
+                        gas,                                    // forward all gas
+                        assetProxy,                             // call address of asset proxy
+                        0,                                      // don't send any ETH
+                        0,                                      // pointer to start of input
+                        add(164, nestedAssetDataElementLen),    // length of input  
+                        0,                                      // write output over memory that won't be reused
+                        0                                       // don't copy output to memory
+                    )
+
+                    // Revert with reason given by AssetProxy if `transferFrom` call failed
+                    if iszero(success) {
+                        returndatacopy(
+                            0,                // copy to memory at 0
+                            0,                // copy from return data at 0
+                            returndatasize()  // copy all return data
+                        )
+                        revert(0, returndatasize())
+                    }
+                }
+
+                // Return if no `transferFrom` calls reverted
+                return(0, 0)
+            }
+
+            // Revert if undefined function is called
+            revert(0, 0)
+        }
+    }
+
+    /// @dev Gets the proxy id associated with the proxy address.
+    /// @return Proxy id.
+    function getProxyId()
+        external
+        pure
+        returns (bytes4)
+    {
+        return PROXY_ID;
+    }
+}

contracts/asset-proxy/contracts/src/StaticCallProxy.sol

@@ -0,0 +1,83 @@
+/*
+
+  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.5.9;
+
+import "@0x/contracts-utils/contracts/src/LibBytes.sol";
+
+
+// solhint-disable no-unused-vars
+contract StaticCallProxy {
+
+    using LibBytes for bytes;
+
+    // Id of this proxy.
+    bytes4 constant internal PROXY_ID = bytes4(keccak256("StaticCall(address,bytes,bytes32)"));
+
+    /// @dev Makes a staticcall to a target address and verifies that the data returned matches the expected return data.
+    /// @param assetData Byte array encoded with staticCallTarget, staticCallData, and expectedCallResultHash
+    /// @param from This value is ignored.
+    /// @param to This value is ignored.
+    /// @param amount This value is ignored.
+    function transferFrom(
+        bytes calldata assetData,
+        address from,
+        address to,
+        uint256 amount
+    )
+        external
+        view
+    {
+        // Decode params from `assetData`
+        (
+            address staticCallTarget,
+            bytes memory staticCallData,
+            bytes32 expectedReturnDataHash
+        ) = abi.decode(
+            assetData.sliceDestructive(4, assetData.length),
+            (address, bytes, bytes32)
+        );
+
+        // Execute staticcall
+        (bool success, bytes memory returnData) = staticCallTarget.staticcall(staticCallData);
+
+        // Revert with returned data if staticcall is unsuccessful
+        if (!success) {
+            assembly {
+                revert(add(returnData, 32), mload(returnData))
+            }
+        }
+
+        // Revert if hash of return data is not as expected
+        bytes32 returnDataHash = keccak256(returnData);
+        require(
+            expectedReturnDataHash == returnDataHash,
+            "UNEXPECTED_STATIC_CALL_RESULT"
+        );
+    }
+
+    /// @dev Gets the proxy id associated with the proxy address.
+    /// @return Proxy id.
+    function getProxyId()
+        external
+        pure
+        returns (bytes4)
+    {
+        return PROXY_ID;
+    }
+}

contracts/asset-proxy/contracts/src/interfaces/IAssetData.sol

@@ -0,0 +1,58 @@
+/*
+
+  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.
+
+*/
+
+// solhint-disable
+pragma solidity ^0.5.5;
+pragma experimental ABIEncoderV2;
+
+
+// @dev Interface of the asset proxy's assetData.
+// The asset proxies take an ABI encoded `bytes assetData` as argument.
+// This argument is ABI encoded as one of the methods of this interface.
+interface IAssetData {
+
+    function ERC20Token(address tokenAddress)
+        external;
+    
+    function ERC721Token(
+        address tokenAddress,
+        uint256 tokenId
+    )
+        external;
+
+    function ERC1155Assets(
+        address tokenAddress,
+        uint256[] calldata tokenIds,
+        uint256[] calldata tokenValues,
+        bytes calldata callbackData
+    )
+        external;
+
+    function MultiAsset(
+        uint256[] calldata amounts,
+        bytes[] calldata nestedAssetData
+    )
+        external;
+
+    function StaticCall(
+        address callTarget,
+        bytes calldata staticCallData,
+        bytes32 callResultHash
+    )
+        external;
+}

contracts/asset-proxy/contracts/src/interfaces/IAssetProxy.sol

@@ -0,0 +1,45 @@
+/*
+
+  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.5.5;
+
+import "./IAuthorizable.sol";
+
+
+contract IAssetProxy {
+
+    /// @dev Transfers assets. Either succeeds or throws.
+    /// @param assetData Byte array encoded for the respective asset proxy.
+    /// @param from Address to transfer asset from.
+    /// @param to Address to transfer asset to.
+    /// @param amount Amount of asset to transfer.
+    function transferFrom(
+        bytes calldata assetData,
+        address from,
+        address to,
+        uint256 amount
+    )
+        external;
+    
+    /// @dev Gets the proxy id associated with the proxy address.
+    /// @return Proxy id.
+    function getProxyId()
+        external
+        pure
+        returns (bytes4);
+}

contracts/asset-proxy/contracts/src/interfaces/IAssetProxyDispatcher.sol

@@ -0,0 +1,37 @@
+/*
+
+  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.5.5;
+
+
+contract IAssetProxyDispatcher {
+
+    /// @dev Registers an asset proxy to its asset proxy id.
+    ///      Once an asset proxy is registered, it cannot be unregistered.
+    /// @param assetProxy Address of new asset proxy to register.
+    function registerAssetProxy(address assetProxy)
+        external;
+
+    /// @dev Gets an asset proxy.
+    /// @param assetProxyId Id of the asset proxy.
+    /// @return The asset proxy registered to assetProxyId. Returns 0x0 if no proxy is registered.
+    function getAssetProxy(bytes4 assetProxyId)
+        external
+        view
+        returns (address);
+}

contracts/asset-proxy/contracts/src/interfaces/IAuthorizable.sol

@@ -0,0 +1,52 @@
+/*
+
+  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.5.5;
+
+import "@0x/contracts-utils/contracts/src/interfaces/IOwnable.sol";
+
+
+contract IAuthorizable is
+    IOwnable
+{
+    /// @dev Authorizes an address.
+    /// @param target Address to authorize.
+    function addAuthorizedAddress(address target)
+        external;
+
+    /// @dev Removes authorizion of an address.
+    /// @param target Address to remove authorization from.
+    function removeAuthorizedAddress(address target)
+        external;
+
+    /// @dev Removes authorizion of an address.
+    /// @param target Address to remove authorization from.
+    /// @param index Index of target in authorities array.
+    function removeAuthorizedAddressAtIndex(
+        address target,
+        uint256 index
+    )
+        external;
+    
+    /// @dev Gets all authorized addresses.
+    /// @return Array of authorized addresses.
+    function getAuthorizedAddresses()
+        external
+        view
+        returns (address[] memory);
+}

contracts/asset-proxy/contracts/src/libs/LibAssetProxyIds.sol

@@ -0,0 +1,40 @@
+/*
+
+  Copyright 2019 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.5.5;
+
+
+contract LibAssetProxyIds {
+
+    // AssetProxy Ids are equiavalent the first 4 bytes of the keccak256 hash of the function signature assigned to each AssetProxy.
+
+    // ERC20Token(address)
+    bytes4 constant public ERC20_PROXY_ID = 0xf47261b0;
+
+    // ERC721Token(address,uint256)
+    bytes4 constant public ERC721_PROXY_ID = 0x02571792;
+
+    // ERC1155Assets(address,uint256[],uint256[],bytes)
+    bytes4 constant public ERC1155_PROXY_ID = 0xa7cb5fb7;
+
+    // MultiAsset(uint256[],bytes[])
+    bytes4 constant public MULTI_ASSET_PROXY_ID = 0x94cfcdd7;
+
+    // StaticCall(address,bytes,bytes32)
+    bytes4 constant public STATIC_CALL_PROXY_ID = 0xc339d10a;
+}

contracts/asset-proxy/contracts/src/mixins/MAssetProxyDispatcher.sol

@@ -0,0 +1,45 @@
+/*
+
+  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.5.5;
+
+import "../interfaces/IAssetProxyDispatcher.sol";
+
+
+contract MAssetProxyDispatcher is
+    IAssetProxyDispatcher
+{
+    // Logs registration of new asset proxy
+    event AssetProxyRegistered(
+        bytes4 id,              // Id of new registered AssetProxy.
+        address assetProxy      // Address of new registered AssetProxy.
+    );
+
+    /// @dev Forwards arguments to assetProxy and calls `transferFrom`. Either succeeds or throws.
+    /// @param assetData Byte array encoded for the asset.
+    /// @param from Address to transfer token from.
+    /// @param to Address to transfer token to.
+    /// @param amount Amount of token to transfer.
+    function dispatchTransferFrom(
+        bytes memory assetData,
+        address from,
+        address to,
+        uint256 amount
+    )
+        internal;
+}

contracts/asset-proxy/contracts/src/mixins/MAuthorizable.sol

@@ -0,0 +1,41 @@
+/*
+
+  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.5.5;
+
+import "../interfaces/IAuthorizable.sol";
+
+
+contract MAuthorizable is
+    IAuthorizable
+{
+    // Event logged when a new address is authorized.
+    event AuthorizedAddressAdded(
+        address indexed target,
+        address indexed caller
+    );
+
+    // Event logged when a currently authorized address is unauthorized.
+    event AuthorizedAddressRemoved(
+        address indexed target,
+        address indexed caller
+    );
+
+    /// @dev Only authorized addresses can invoke functions with this modifier.
+    modifier onlyAuthorized { revert(); _; }
+}

contracts/asset-proxy/contracts/test/TestStaticCallTarget.sol

@@ -0,0 +1,82 @@
+/*
+
+  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.5.9;
+
+import "@0x/contracts-utils/contracts/src/LibBytes.sol";
+
+
+contract TestStaticCallTarget {
+
+    using LibBytes for bytes;
+
+    uint256 internal _state;
+ 
+    function updateState()
+        external
+    {
+        _state++;
+    }
+
+    function assertEvenNumber(uint256 target)
+        external
+        pure
+    {
+        require(
+            target % 2 == 0,
+            "TARGET_NOT_EVEN"
+        );
+    }
+
+    function isOddNumber(uint256 target)
+        external
+        pure
+        returns (bool isOdd)
+    {
+        isOdd = target % 2 == 1;
+        return isOdd;
+    }
+
+    function noInputFunction()
+        external
+        pure
+    {
+        assert(msg.data.length == 4 && msg.data.readBytes4(0) == bytes4(keccak256("noInputFunction()")));
+    }
+
+    function dynamicInputFunction(bytes calldata a)
+        external
+        pure
+    {
+        bytes memory abiEncodedData = abi.encodeWithSignature("dynamicInputFunction(bytes)", a);
+        assert(msg.data.equals(abiEncodedData));
+    }
+
+    function returnComplexType(uint256 a, uint256 b)
+        external
+        view
+        returns (bytes memory result)
+    {
+        result = abi.encodePacked(
+            address(this),
+            a,
+            b
+        );
+        return result;
+    }
+}

contracts/asset-proxy/package.json

@@ -0,0 +1,89 @@
+{
+    "name": "@0x/contracts-asset-proxy",
+    "version": "2.2.7",
+    "engines": {
+        "node": ">=6.12"
+    },
+    "description": "Smart contract components 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",
+        "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} --output generated-wrappers --backend ethers",
+        "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
+        "fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
+        "coverage:report:text": "istanbul report text",
+        "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/@(ERC1155Proxy|ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAuthorizable|MixinAuthorizable|MultiAssetProxy|StaticCallProxy|TestStaticCallTarget).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/protocol/README.md",
+    "devDependencies": {
+        "@0x/abi-gen": "^4.2.0",
+        "@0x/contracts-gen": "^1.0.14",
+        "@0x/contracts-test-utils": "^3.1.15",
+        "@0x/dev-utils": "^2.3.2",
+        "@0x/sol-compiler": "^3.1.14",
+        "@0x/tslint-config": "^3.0.1",
+        "@types/lodash": "4.14.104",
+        "@types/mocha": "^5.2.7",
+        "@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": "^6.2.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.3.3",
+        "@0x/contracts-erc1155": "^1.1.14",
+        "@0x/contracts-erc20": "^2.2.13",
+        "@0x/contracts-erc721": "^2.1.14",
+        "@0x/contracts-utils": "^3.2.3",
+        "@0x/order-utils": "^8.3.1",
+        "@0x/types": "^2.4.2",
+        "@0x/typescript-typings": "^4.2.5",
+        "@0x/utils": "^4.5.1",
+        "@0x/web3-wrapper": "^6.0.12",
+        "ethereum-types": "^2.1.5",
+        "ethereumjs-util": "^5.1.1",
+        "lodash": "^4.17.11"
+    },
+    "publishConfig": {
+        "access": "public"
+    }
+}

contracts/asset-proxy/src/artifacts.ts

@@ -0,0 +1,29 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+import { ContractArtifact } from 'ethereum-types';
+
+import * as ERC1155Proxy from '../generated-artifacts/ERC1155Proxy.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';
+import * as StaticCallProxy from '../generated-artifacts/StaticCallProxy.json';
+import * as TestStaticCallTarget from '../generated-artifacts/TestStaticCallTarget.json';
+export const artifacts = {
+    ERC1155Proxy: ERC1155Proxy as ContractArtifact,
+    ERC20Proxy: ERC20Proxy as ContractArtifact,
+    ERC721Proxy: ERC721Proxy as ContractArtifact,
+    MixinAuthorizable: MixinAuthorizable as ContractArtifact,
+    MultiAssetProxy: MultiAssetProxy as ContractArtifact,
+    StaticCallProxy: StaticCallProxy as ContractArtifact,
+    IAssetData: IAssetData as ContractArtifact,
+    IAssetProxy: IAssetProxy as ContractArtifact,
+    IAuthorizable: IAuthorizable as ContractArtifact,
+    TestStaticCallTarget: TestStaticCallTarget as ContractArtifact,
+};

contracts/asset-proxy/src/index.ts

@@ -0,0 +1,3 @@
+export * from './artifacts';
+export * from './wrappers';
+export * from '../test/utils';

contracts/asset-proxy/src/wrappers.ts

@@ -0,0 +1,15 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+export * from '../generated-wrappers/erc1155_proxy';
+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';
+export * from '../generated-wrappers/static_call_proxy';
+export * from '../generated-wrappers/test_static_call_target';

contracts/asset-proxy/test/authorizable.ts

@@ -0,0 +1,216 @@
+import {
+    chaiSetup,
+    constants,
+    expectTransactionFailedAsync,
+    provider,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
+import { BlockchainLifecycle } from '@0x/dev-utils';
+import { RevertReason } from '@0x/types';
+import { BigNumber } from '@0x/utils';
+import * as chai from 'chai';
+import * as _ from 'lodash';
+
+import { artifacts, MixinAuthorizableContract } from '../src';
+
+chaiSetup.configure();
+const expect = chai.expect;
+const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
+
+describe('Authorizable', () => {
+    let owner: string;
+    let notOwner: string;
+    let address: string;
+    let authorizable: MixinAuthorizableContract;
+
+    before(async () => {
+        await blockchainLifecycle.startAsync();
+    });
+    after(async () => {
+        await blockchainLifecycle.revertAsync();
+    });
+    before(async () => {
+        const accounts = await web3Wrapper.getAvailableAddressesAsync();
+        [owner, address, notOwner] = _.slice(accounts, 0, 3);
+        authorizable = await MixinAuthorizableContract.deployFrom0xArtifactAsync(
+            artifacts.MixinAuthorizable,
+            provider,
+            txDefaults,
+            artifacts,
+        );
+    });
+    beforeEach(async () => {
+        await blockchainLifecycle.startAsync();
+    });
+    afterEach(async () => {
+        await blockchainLifecycle.revertAsync();
+    });
+    describe('addAuthorizedAddress', () => {
+        it('should throw if not called by owner', async () => {
+            return expectTransactionFailedAsync(
+                authorizable.addAuthorizedAddress.sendTransactionAsync(notOwner, { from: notOwner }),
+                RevertReason.OnlyContractOwner,
+            );
+        });
+        it('should allow owner to add an authorized address', async () => {
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            const isAuthorized = await authorizable.authorized.callAsync(address);
+            expect(isAuthorized).to.be.true();
+        });
+        it('should throw if owner attempts to authorize a duplicate address', async () => {
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            return expectTransactionFailedAsync(
+                authorizable.addAuthorizedAddress.sendTransactionAsync(address, { from: owner }),
+                RevertReason.TargetAlreadyAuthorized,
+            );
+        });
+    });
+
+    describe('removeAuthorizedAddress', () => {
+        it('should throw if not called by owner', async () => {
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            return expectTransactionFailedAsync(
+                authorizable.removeAuthorizedAddress.sendTransactionAsync(address, {
+                    from: notOwner,
+                }),
+                RevertReason.OnlyContractOwner,
+            );
+        });
+
+        it('should allow owner to remove an authorized address', async () => {
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            await authorizable.removeAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            const isAuthorized = await authorizable.authorized.callAsync(address);
+            expect(isAuthorized).to.be.false();
+        });
+
+        it('should throw if owner attempts to remove an address that is not authorized', async () => {
+            return expectTransactionFailedAsync(
+                authorizable.removeAuthorizedAddress.sendTransactionAsync(address, {
+                    from: owner,
+                }),
+                RevertReason.TargetNotAuthorized,
+            );
+        });
+    });
+
+    describe('removeAuthorizedAddressAtIndex', () => {
+        it('should throw if not called by owner', async () => {
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            const index = new BigNumber(0);
+            return expectTransactionFailedAsync(
+                authorizable.removeAuthorizedAddressAtIndex.sendTransactionAsync(address, index, {
+                    from: notOwner,
+                }),
+                RevertReason.OnlyContractOwner,
+            );
+        });
+        it('should throw if index is >= authorities.length', async () => {
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            const index = new BigNumber(1);
+            return expectTransactionFailedAsync(
+                authorizable.removeAuthorizedAddressAtIndex.sendTransactionAsync(address, index, {
+                    from: owner,
+                }),
+                RevertReason.IndexOutOfBounds,
+            );
+        });
+        it('should throw if owner attempts to remove an address that is not authorized', async () => {
+            const index = new BigNumber(0);
+            return expectTransactionFailedAsync(
+                authorizable.removeAuthorizedAddressAtIndex.sendTransactionAsync(address, index, {
+                    from: owner,
+                }),
+                RevertReason.TargetNotAuthorized,
+            );
+        });
+        it('should throw if address at index does not match target', async () => {
+            const address1 = address;
+            const address2 = notOwner;
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address1,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address2,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            const address1Index = new BigNumber(0);
+            return expectTransactionFailedAsync(
+                authorizable.removeAuthorizedAddressAtIndex.sendTransactionAsync(address2, address1Index, {
+                    from: owner,
+                }),
+                RevertReason.AuthorizedAddressMismatch,
+            );
+        });
+        it('should allow owner to remove an authorized address', async () => {
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            const index = new BigNumber(0);
+            await authorizable.removeAuthorizedAddressAtIndex.awaitTransactionSuccessAsync(
+                address,
+                index,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            const isAuthorized = await authorizable.authorized.callAsync(address);
+            expect(isAuthorized).to.be.false();
+        });
+    });
+
+    describe('getAuthorizedAddresses', () => {
+        it('should return all authorized addresses', async () => {
+            const initial = await authorizable.getAuthorizedAddresses.callAsync();
+            expect(initial).to.have.length(0);
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            const afterAdd = await authorizable.getAuthorizedAddresses.callAsync();
+            expect(afterAdd).to.have.length(1);
+            expect(afterAdd).to.include(address);
+            await authorizable.removeAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            const afterRemove = await authorizable.getAuthorizedAddresses.callAsync();
+            expect(afterRemove).to.have.length(0);
+        });
+    });
+});

contracts/asset-proxy/test/global_hooks.ts

@@ -0,0 +1,19 @@
+import { env, EnvVars } from '@0x/dev-utils';
+
+import { coverage, profiler, provider } from '@0x/contracts-test-utils';
+import { providerUtils } from '@0x/utils';
+
+before('start web3 provider', () => {
+    providerUtils.startProviderEngine(provider);
+});
+after('generate coverage report', async () => {
+    if (env.parseBoolean(EnvVars.SolidityCoverage)) {
+        const coverageSubprovider = coverage.getCoverageSubproviderSingleton();
+        await coverageSubprovider.writeCoverageAsync();
+    }
+    if (env.parseBoolean(EnvVars.SolidityProfiler)) {
+        const profilerSubprovider = profiler.getProfilerSubproviderSingleton();
+        await profilerSubprovider.writeProfilerOutputAsync();
+    }
+    provider.stop();
+});

contracts/asset-proxy/test/static_call_proxy.ts

@@ -0,0 +1,242 @@
+import {
+    chaiSetup,
+    constants,
+    expectTransactionFailedAsync,
+    expectTransactionFailedWithoutReasonAsync,
+    provider,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
+import { BlockchainLifecycle } from '@0x/dev-utils';
+import { assetDataUtils } from '@0x/order-utils';
+import { AssetProxyId, RevertReason } from '@0x/types';
+import { AbiEncoder, BigNumber } from '@0x/utils';
+import * as chai from 'chai';
+import * as ethUtil from 'ethereumjs-util';
+
+import { artifacts, IAssetProxyContract, StaticCallProxyContract, TestStaticCallTargetContract } from '../src';
+
+chaiSetup.configure();
+const expect = chai.expect;
+const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
+
+describe('StaticCallProxy', () => {
+    const amount = constants.ZERO_AMOUNT;
+    let fromAddress: string;
+    let toAddress: string;
+
+    let staticCallProxy: IAssetProxyContract;
+    let staticCallTarget: TestStaticCallTargetContract;
+
+    before(async () => {
+        await blockchainLifecycle.startAsync();
+    });
+    after(async () => {
+        await blockchainLifecycle.revertAsync();
+    });
+    before(async () => {
+        const accounts = await web3Wrapper.getAvailableAddressesAsync();
+        [fromAddress, toAddress] = accounts.slice(0, 2);
+        const staticCallProxyWithoutTransferFrom = await StaticCallProxyContract.deployFrom0xArtifactAsync(
+            artifacts.StaticCallProxy,
+            provider,
+            txDefaults,
+            artifacts,
+        );
+        staticCallProxy = new IAssetProxyContract(staticCallProxyWithoutTransferFrom.address, provider, txDefaults);
+        staticCallTarget = await TestStaticCallTargetContract.deployFrom0xArtifactAsync(
+            artifacts.TestStaticCallTarget,
+            provider,
+            txDefaults,
+            artifacts,
+        );
+    });
+    beforeEach(async () => {
+        await blockchainLifecycle.startAsync();
+    });
+    afterEach(async () => {
+        await blockchainLifecycle.revertAsync();
+    });
+
+    describe('general', () => {
+        it('should revert if undefined function is called', async () => {
+            const undefinedSelector = '0x01020304';
+            await expectTransactionFailedWithoutReasonAsync(
+                web3Wrapper.sendTransactionAsync({
+                    from: fromAddress,
+                    to: staticCallProxy.address,
+                    value: constants.ZERO_AMOUNT,
+                    data: undefinedSelector,
+                }),
+            );
+        });
+        it('should have an id of 0xc339d10a', async () => {
+            const proxyId = await staticCallProxy.getProxyId.callAsync();
+            const expectedProxyId = AssetProxyId.StaticCall;
+            expect(proxyId).to.equal(expectedProxyId);
+        });
+    });
+    describe('transferFrom', () => {
+        it('should revert if assetData lies outside the bounds of calldata', async () => {
+            const staticCallData = staticCallTarget.noInputFunction.getABIEncodedTransactionData();
+            const expectedResultHash = constants.KECCAK256_NULL;
+            const assetData = assetDataUtils.encodeStaticCallAssetData(
+                staticCallTarget.address,
+                staticCallData,
+                expectedResultHash,
+            );
+            const txData = staticCallProxy.transferFrom.getABIEncodedTransactionData(
+                assetData,
+                fromAddress,
+                toAddress,
+                amount,
+            );
+            const offsetToAssetData = '0000000000000000000000000000000000000000000000000000000000000080';
+            const txDataEndBuffer = ethUtil.toBuffer((txData.length - 2) / 2 - 4);
+            const paddedTxDataEndBuffer = ethUtil.setLengthLeft(txDataEndBuffer, 32);
+            const invalidOffsetToAssetData = ethUtil.bufferToHex(paddedTxDataEndBuffer).slice(2);
+            const newAssetData = '0000000000000000000000000000000000000000000000000000000000000304';
+            const badTxData = `${txData.replace(offsetToAssetData, invalidOffsetToAssetData)}${newAssetData}`;
+            await expectTransactionFailedWithoutReasonAsync(
+                web3Wrapper.sendTransactionAsync({
+                    to: staticCallProxy.address,
+                    from: fromAddress,
+                    data: badTxData,
+                }),
+            );
+        });
+        it('should revert if the length of assetData is less than 100 bytes', async () => {
+            const staticCallData = constants.NULL_BYTES;
+            const expectedResultHash = constants.KECCAK256_NULL;
+            const assetData = assetDataUtils
+                .encodeStaticCallAssetData(staticCallTarget.address, staticCallData, expectedResultHash)
+                .slice(0, -128);
+            const assetDataByteLen = (assetData.length - 2) / 2;
+            expect((assetDataByteLen - 4) % 32).to.equal(0);
+            await expectTransactionFailedWithoutReasonAsync(
+                staticCallProxy.transferFrom.sendTransactionAsync(assetData, fromAddress, toAddress, amount),
+            );
+        });
+        it('should revert if the offset to `staticCallData` points to outside of assetData', async () => {
+            const staticCallData = staticCallTarget.noInputFunction.getABIEncodedTransactionData();
+            const expectedResultHash = constants.KECCAK256_NULL;
+            const assetData = assetDataUtils.encodeStaticCallAssetData(
+                staticCallTarget.address,
+                staticCallData,
+                expectedResultHash,
+            );
+            const offsetToStaticCallData = '0000000000000000000000000000000000000000000000000000000000000060';
+            const assetDataEndBuffer = ethUtil.toBuffer((assetData.length - 2) / 2 - 4);
+            const paddedAssetDataEndBuffer = ethUtil.setLengthLeft(assetDataEndBuffer, 32);
+            const invalidOffsetToStaticCallData = ethUtil.bufferToHex(paddedAssetDataEndBuffer).slice(2);
+            const newStaticCallData = '0000000000000000000000000000000000000000000000000000000000000304';
+            const badAssetData = `${assetData.replace(
+                offsetToStaticCallData,
+                invalidOffsetToStaticCallData,
+            )}${newStaticCallData}`;
+            await expectTransactionFailedWithoutReasonAsync(
+                staticCallProxy.transferFrom.sendTransactionAsync(badAssetData, fromAddress, toAddress, amount),
+            );
+        });
+        it('should revert if the callTarget attempts to write to state', async () => {
+            const staticCallData = staticCallTarget.updateState.getABIEncodedTransactionData();
+            const expectedResultHash = constants.KECCAK256_NULL;
+            const assetData = assetDataUtils.encodeStaticCallAssetData(
+                staticCallTarget.address,
+                staticCallData,
+                expectedResultHash,
+            );
+            await expectTransactionFailedWithoutReasonAsync(
+                staticCallProxy.transferFrom.sendTransactionAsync(assetData, fromAddress, toAddress, amount),
+            );
+        });
+        it('should revert with data provided by the callTarget if the staticcall reverts', async () => {
+            const staticCallData = staticCallTarget.assertEvenNumber.getABIEncodedTransactionData(new BigNumber(1));
+            const expectedResultHash = constants.KECCAK256_NULL;
+            const assetData = assetDataUtils.encodeStaticCallAssetData(
+                staticCallTarget.address,
+                staticCallData,
+                expectedResultHash,
+            );
+            await expectTransactionFailedAsync(
+                staticCallProxy.transferFrom.sendTransactionAsync(assetData, fromAddress, toAddress, amount),
+                RevertReason.TargetNotEven,
+            );
+        });
+        it('should revert if the hash of the output is different than expected expected', async () => {
+            const staticCallData = staticCallTarget.isOddNumber.getABIEncodedTransactionData(new BigNumber(0));
+            const trueAsBuffer = ethUtil.toBuffer('0x0000000000000000000000000000000000000000000000000000000000000001');
+            const expectedResultHash = ethUtil.bufferToHex(ethUtil.sha3(trueAsBuffer));
+            const assetData = assetDataUtils.encodeStaticCallAssetData(
+                staticCallTarget.address,
+                staticCallData,
+                expectedResultHash,
+            );
+            await expectTransactionFailedAsync(
+                staticCallProxy.transferFrom.sendTransactionAsync(assetData, fromAddress, toAddress, amount),
+                RevertReason.UnexpectedStaticCallResult,
+            );
+        });
+        it('should be successful if a function call with no inputs and no outputs is successful', async () => {
+            const staticCallData = staticCallTarget.noInputFunction.getABIEncodedTransactionData();
+            const expectedResultHash = constants.KECCAK256_NULL;
+            const assetData = assetDataUtils.encodeStaticCallAssetData(
+                staticCallTarget.address,
+                staticCallData,
+                expectedResultHash,
+            );
+            await staticCallProxy.transferFrom.awaitTransactionSuccessAsync(assetData, fromAddress, toAddress, amount);
+        });
+        it('should be successful if the staticCallTarget is not a contract and no return value is expected', async () => {
+            const staticCallData = '0x0102030405060708';
+            const expectedResultHash = constants.KECCAK256_NULL;
+            const assetData = assetDataUtils.encodeStaticCallAssetData(toAddress, staticCallData, expectedResultHash);
+            await staticCallProxy.transferFrom.awaitTransactionSuccessAsync(assetData, fromAddress, toAddress, amount);
+        });
+        it('should be successful if a function call with one static input returns the correct value', async () => {
+            const staticCallData = staticCallTarget.isOddNumber.getABIEncodedTransactionData(new BigNumber(1));
+            const trueAsBuffer = ethUtil.toBuffer('0x0000000000000000000000000000000000000000000000000000000000000001');
+            const expectedResultHash = ethUtil.bufferToHex(ethUtil.sha3(trueAsBuffer));
+            const assetData = assetDataUtils.encodeStaticCallAssetData(
+                staticCallTarget.address,
+                staticCallData,
+                expectedResultHash,
+            );
+            await staticCallProxy.transferFrom.awaitTransactionSuccessAsync(assetData, fromAddress, toAddress, amount);
+        });
+        it('should be successful if a function with one dynamic input is successful', async () => {
+            const dynamicInput = '0x0102030405060708';
+            const staticCallData = staticCallTarget.dynamicInputFunction.getABIEncodedTransactionData(dynamicInput);
+            const expectedResultHash = constants.KECCAK256_NULL;
+            const assetData = assetDataUtils.encodeStaticCallAssetData(
+                staticCallTarget.address,
+                staticCallData,
+                expectedResultHash,
+            );
+            await staticCallProxy.transferFrom.awaitTransactionSuccessAsync(assetData, fromAddress, toAddress, amount);
+        });
+        it('should be successful if a function call returns a complex type', async () => {
+            const a = new BigNumber(1);
+            const b = new BigNumber(2);
+            const staticCallData = staticCallTarget.returnComplexType.getABIEncodedTransactionData(a, b);
+            const abiEncoder = new AbiEncoder.DynamicBytes({
+                name: '',
+                type: 'bytes',
+            });
+            const aHex = '0000000000000000000000000000000000000000000000000000000000000001';
+            const bHex = '0000000000000000000000000000000000000000000000000000000000000002';
+            const expectedResults = `${staticCallTarget.address}${aHex}${bHex}`;
+            const offset = '0000000000000000000000000000000000000000000000000000000000000020';
+            const encodedExpectedResultWithOffset = `0x${offset}${abiEncoder.encode(expectedResults).slice(2)}`;
+            const expectedResultHash = ethUtil.bufferToHex(
+                ethUtil.sha3(ethUtil.toBuffer(encodedExpectedResultWithOffset)),
+            );
+            const assetData = assetDataUtils.encodeStaticCallAssetData(
+                staticCallTarget.address,
+                staticCallData,
+                expectedResultHash,
+            );
+            await staticCallProxy.transferFrom.awaitTransactionSuccessAsync(assetData, fromAddress, toAddress, amount);
+        });
+    });
+});

contracts/asset-proxy/test/utils/erc1155_proxy_wrapper.ts

@@ -0,0 +1,403 @@
+import { artifacts as erc1155Artifacts, ERC1155MintableContract, Erc1155Wrapper } from '@0x/contracts-erc1155';
+import {
+    constants,
+    ERC1155FungibleHoldingsByOwner,
+    ERC1155HoldingsByOwner,
+    ERC1155NonFungibleHoldingsByOwner,
+    LogDecoder,
+    txDefaults,
+} from '@0x/contracts-test-utils';
+import { assetDataUtils } from '@0x/order-utils';
+import { BigNumber } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
+import { Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
+import * as _ from 'lodash';
+
+import { artifacts, ERC1155ProxyContract, IAssetProxyContract } from '../../src';
+
+export class ERC1155ProxyWrapper {
+    private readonly _tokenOwnerAddresses: string[];
+    private readonly _fungibleTokenIds: string[];
+    private readonly _nonFungibleTokenIds: string[];
+    private readonly _nfts: Array<{ id: BigNumber; tokenId: BigNumber }>;
+    private readonly _contractOwnerAddress: string;
+    private readonly _web3Wrapper: Web3Wrapper;
+    private readonly _provider: Provider;
+    private readonly _logDecoder: LogDecoder;
+    private readonly _dummyTokenWrappers: Erc1155Wrapper[];
+    private readonly _assetProxyInterface: IAssetProxyContract;
+    private _proxyContract?: ERC1155ProxyContract;
+    private _proxyIdIfExists?: string;
+    private _initialTokenIdsByOwner: ERC1155HoldingsByOwner = { fungible: {}, nonFungible: {} };
+
+    constructor(provider: Provider, tokenOwnerAddresses: string[], contractOwnerAddress: string) {
+        this._web3Wrapper = new Web3Wrapper(provider);
+        this._provider = provider;
+        const allArtifacts = _.merge(artifacts, erc1155Artifacts);
+        this._logDecoder = new LogDecoder(this._web3Wrapper, allArtifacts);
+        this._dummyTokenWrappers = [];
+        this._assetProxyInterface = new IAssetProxyContract(constants.NULL_ADDRESS, provider);
+        this._tokenOwnerAddresses = tokenOwnerAddresses;
+        this._contractOwnerAddress = contractOwnerAddress;
+        this._fungibleTokenIds = [];
+        this._nonFungibleTokenIds = [];
+        this._nfts = [];
+    }
+    /**
+     * @dev Deploys dummy ERC1155 contracts
+     * @return An array of ERC1155 wrappers; one for each deployed contract.
+     */
+    public async deployDummyContractsAsync(): Promise<Erc1155Wrapper[]> {
+        // tslint:disable-next-line:no-unused-variable
+        for (const i of _.times(constants.NUM_DUMMY_ERC1155_CONTRACTS_TO_DEPLOY)) {
+            const erc1155Contract = await ERC1155MintableContract.deployFrom0xArtifactAsync(
+                erc1155Artifacts.ERC1155Mintable,
+                this._provider,
+                txDefaults,
+                artifacts,
+            );
+            const erc1155Wrapper = new Erc1155Wrapper(erc1155Contract, this._provider, this._contractOwnerAddress);
+            this._dummyTokenWrappers.push(erc1155Wrapper);
+        }
+        return this._dummyTokenWrappers;
+    }
+    /**
+     * @dev Deploys the ERC1155 proxy
+     * @return Deployed ERC1155 proxy contract instance
+     */
+    public async deployProxyAsync(): Promise<ERC1155ProxyContract> {
+        this._proxyContract = await ERC1155ProxyContract.deployFrom0xArtifactAsync(
+            artifacts.ERC1155Proxy,
+            this._provider,
+            txDefaults,
+            artifacts,
+        );
+        this._proxyIdIfExists = await this._proxyContract.getProxyId.callAsync();
+        return this._proxyContract;
+    }
+    /**
+     * @dev Gets the ERC1155 proxy id
+     */
+    public getProxyId(): string {
+        this._validateProxyContractExistsOrThrow();
+        return this._proxyIdIfExists as string;
+    }
+    /**
+     * @dev generates abi-encoded tx data for transferring erc1155 fungible/non-fungible tokens.
+     * @param from source address
+     * @param to destination address
+     * @param contractAddress address of erc155 contract
+     * @param tokensToTransfer array of erc1155 tokens to transfer
+     * @param valuesToTransfer array of corresponding values for each erc1155 token to transfer
+     * @param valueMultiplier each value in `valuesToTransfer` is multiplied by this
+     * @param receiverCallbackData callback data if `to` is a contract
+     * @param authorizedSender sender of `transferFrom` transaction
+     * @param extraData extra data to append to `transferFrom` transaction. Optional.
+     * @return abi encoded tx data.
+     */
+    public getTransferFromAbiEncodedTxData(
+        from: string,
+        to: string,
+        contractAddress: string,
+        tokensToTransfer: BigNumber[],
+        valuesToTransfer: BigNumber[],
+        valueMultiplier: BigNumber,
+        receiverCallbackData: string,
+        authorizedSender: string,
+        assetData_?: string,
+    ): string {
+        this._validateProxyContractExistsOrThrow();
+        const assetData =
+            assetData_ === undefined
+                ? assetDataUtils.encodeERC1155AssetData(
+                      contractAddress,
+                      tokensToTransfer,
+                      valuesToTransfer,
+                      receiverCallbackData,
+                  )
+                : assetData_;
+        const data = this._assetProxyInterface.transferFrom.getABIEncodedTransactionData(
+            assetData,
+            from,
+            to,
+            valueMultiplier,
+        );
+        return data;
+    }
+    /**
+     * @dev transfers erc1155 fungible/non-fungible tokens.
+     * @param txData: abi-encoded tx data
+     * @param authorizedSender sender of `transferFrom` transaction
+     */
+    public async transferFromRawAsync(
+        txData: string,
+        authorizedSender: string,
+    ): Promise<TransactionReceiptWithDecodedLogs> {
+        const txHash = await this._web3Wrapper.sendTransactionAsync({
+            to: (this._proxyContract as ERC1155ProxyContract).address,
+            data: txData,
+            from: authorizedSender,
+            gas: 300000,
+        });
+        const txReceipt = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
+        return txReceipt;
+    }
+    /**
+     * @dev transfers erc1155 fungible/non-fungible tokens.
+     * @param from source address
+     * @param to destination address
+     * @param contractAddress address of erc155 contract
+     * @param tokensToTransfer array of erc1155 tokens to transfer
+     * @param valuesToTransfer array of corresponding values for each erc1155 token to transfer
+     * @param valueMultiplier each value in `valuesToTransfer` is multiplied by this
+     * @param receiverCallbackData callback data if `to` is a contract
+     * @param authorizedSender sender of `transferFrom` transaction
+     * @param extraData extra data to append to `transferFrom` transaction. Optional.
+     * @return tranasction hash.
+     */
+    public async transferFromAsync(
+        from: string,
+        to: string,
+        contractAddress: string,
+        tokensToTransfer: BigNumber[],
+        valuesToTransfer: BigNumber[],
+        valueMultiplier: BigNumber,
+        receiverCallbackData: string,
+        authorizedSender: string,
+        assetData_?: string,
+    ): Promise<TransactionReceiptWithDecodedLogs> {
+        this._validateProxyContractExistsOrThrow();
+        const assetData =
+            assetData_ === undefined
+                ? assetDataUtils.encodeERC1155AssetData(
+                      contractAddress,
+                      tokensToTransfer,
+                      valuesToTransfer,
+                      receiverCallbackData,
+                  )
+                : assetData_;
+        const data = this._assetProxyInterface.transferFrom.getABIEncodedTransactionData(
+            assetData,
+            from,
+            to,
+            valueMultiplier,
+        );
+        const txHash = await this._web3Wrapper.sendTransactionAsync({
+            to: (this._proxyContract as ERC1155ProxyContract).address,
+            data,
+            from: authorizedSender,
+            gas: 300000,
+        });
+        const txReceipt = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
+        return txReceipt;
+    }
+    /**
+     * @dev For each deployed ERC1155 contract, this function mints a set of fungible/non-fungible
+     *      tokens for each token owner address (`_tokenOwnerAddresses`).
+     * @return Balances of each token owner, across all ERC1155 contracts and tokens.
+     */
+    public async setBalancesAndAllowancesAsync(): Promise<ERC1155HoldingsByOwner> {
+        this._validateDummyTokenContractsExistOrThrow();
+        this._validateProxyContractExistsOrThrow();
+        this._initialTokenIdsByOwner = {
+            fungible: {},
+            nonFungible: {},
+        };
+        const fungibleHoldingsByOwner: ERC1155FungibleHoldingsByOwner = {};
+        const nonFungibleHoldingsByOwner: ERC1155NonFungibleHoldingsByOwner = {};
+        // Set balances accordingly
+        for (const dummyWrapper of this._dummyTokenWrappers) {
+            const dummyAddress = dummyWrapper.getContract().address;
+            // tslint:disable-next-line:no-unused-variable
+            for (const i of _.times(constants.NUM_ERC1155_FUNGIBLE_TOKENS_MINT)) {
+                // Create a fungible token
+                const tokenId = await dummyWrapper.mintFungibleTokensAsync(
+                    this._tokenOwnerAddresses,
+                    constants.INITIAL_ERC1155_FUNGIBLE_BALANCE,
+                );
+                const tokenIdAsString = tokenId.toString();
+                this._fungibleTokenIds.push(tokenIdAsString);
+                // Mint tokens for each owner for this token
+                for (const tokenOwnerAddress of this._tokenOwnerAddresses) {
+                    // tslint:disable-next-line:no-unused-variable
+                    if (fungibleHoldingsByOwner[tokenOwnerAddress] === undefined) {
+                        fungibleHoldingsByOwner[tokenOwnerAddress] = {};
+                    }
+                    if (fungibleHoldingsByOwner[tokenOwnerAddress][dummyAddress] === undefined) {
+                        fungibleHoldingsByOwner[tokenOwnerAddress][dummyAddress] = {};
+                    }
+                    fungibleHoldingsByOwner[tokenOwnerAddress][dummyAddress][tokenIdAsString] =
+                        constants.INITIAL_ERC1155_FUNGIBLE_BALANCE;
+                    await dummyWrapper.setApprovalForAllAsync(
+                        tokenOwnerAddress,
+                        (this._proxyContract as ERC1155ProxyContract).address,
+                        true,
+                    );
+                }
+            }
+            // Non-fungible tokens
+            // tslint:disable-next-line:no-unused-variable
+            for (const j of _.times(constants.NUM_ERC1155_NONFUNGIBLE_TOKENS_MINT)) {
+                const [tokenId, nftIds] = await dummyWrapper.mintNonFungibleTokensAsync(this._tokenOwnerAddresses);
+                const tokenIdAsString = tokenId.toString();
+                this._nonFungibleTokenIds.push(tokenIdAsString);
+                _.each(this._tokenOwnerAddresses, async (tokenOwnerAddress: string, i: number) => {
+                    if (nonFungibleHoldingsByOwner[tokenOwnerAddress] === undefined) {
+                        nonFungibleHoldingsByOwner[tokenOwnerAddress] = {};
+                    }
+                    if (nonFungibleHoldingsByOwner[tokenOwnerAddress][dummyAddress] === undefined) {
+                        nonFungibleHoldingsByOwner[tokenOwnerAddress][dummyAddress] = {};
+                    }
+                    if (nonFungibleHoldingsByOwner[tokenOwnerAddress][dummyAddress][tokenIdAsString] === undefined) {
+                        nonFungibleHoldingsByOwner[tokenOwnerAddress][dummyAddress][tokenIdAsString] = [];
+                    }
+                    this._nfts.push({ id: nftIds[i], tokenId });
+                    nonFungibleHoldingsByOwner[tokenOwnerAddress][dummyAddress][tokenIdAsString].push(nftIds[i]);
+                    await dummyWrapper.setApprovalForAllAsync(
+                        tokenOwnerAddress,
+                        (this._proxyContract as ERC1155ProxyContract).address,
+                        true,
+                    );
+                });
+            }
+        }
+        this._initialTokenIdsByOwner = {
+            fungible: fungibleHoldingsByOwner,
+            nonFungible: nonFungibleHoldingsByOwner,
+        };
+        return this._initialTokenIdsByOwner;
+    }
+    /**
+     * @dev For each deployed ERC1155 contract, this function quieries the set of fungible/non-fungible
+     *      tokens for each token owner address (`_tokenOwnerAddresses`).
+     * @return Balances of each token owner, across all ERC1155 contracts and tokens.
+     */
+    public async getBalancesAsync(): Promise<ERC1155HoldingsByOwner> {
+        this._validateDummyTokenContractsExistOrThrow();
+        this._validateBalancesAndAllowancesSetOrThrow();
+        const tokenHoldingsByOwner: ERC1155FungibleHoldingsByOwner = {};
+        const nonFungibleHoldingsByOwner: ERC1155NonFungibleHoldingsByOwner = {};
+        for (const dummyTokenWrapper of this._dummyTokenWrappers) {
+            const tokenContract = dummyTokenWrapper.getContract();
+            const tokenAddress = tokenContract.address;
+            // Construct batch balance call
+            const tokenOwners: string[] = [];
+            const tokenIds: BigNumber[] = [];
+            for (const tokenOwnerAddress of this._tokenOwnerAddresses) {
+                for (const tokenId of this._fungibleTokenIds) {
+                    tokenOwners.push(tokenOwnerAddress);
+                    tokenIds.push(new BigNumber(tokenId));
+                }
+                for (const nft of this._nfts) {
+                    tokenOwners.push(tokenOwnerAddress);
+                    tokenIds.push(nft.id);
+                }
+            }
+            const balances = await dummyTokenWrapper.getBalancesAsync(tokenOwners, tokenIds);
+            // Parse out balances into fungible / non-fungible token holdings
+            let i = 0;
+            for (const tokenOwnerAddress of this._tokenOwnerAddresses) {
+                // Fungible tokens
+                for (const tokenId of this._fungibleTokenIds) {
+                    if (tokenHoldingsByOwner[tokenOwnerAddress] === undefined) {
+                        tokenHoldingsByOwner[tokenOwnerAddress] = {};
+                    }
+                    if (tokenHoldingsByOwner[tokenOwnerAddress][tokenAddress] === undefined) {
+                        tokenHoldingsByOwner[tokenOwnerAddress][tokenAddress] = {};
+                    }
+                    tokenHoldingsByOwner[tokenOwnerAddress][tokenAddress][tokenId] = balances[i++];
+                }
+                // Non-fungible tokens
+                for (const nft of this._nfts) {
+                    if (nonFungibleHoldingsByOwner[tokenOwnerAddress] === undefined) {
+                        nonFungibleHoldingsByOwner[tokenOwnerAddress] = {};
+                    }
+                    if (nonFungibleHoldingsByOwner[tokenOwnerAddress][tokenAddress] === undefined) {
+                        nonFungibleHoldingsByOwner[tokenOwnerAddress][tokenAddress] = {};
+                    }
+                    if (
+                        nonFungibleHoldingsByOwner[tokenOwnerAddress][tokenAddress][nft.tokenId.toString()] ===
+                        undefined
+                    ) {
+                        nonFungibleHoldingsByOwner[tokenOwnerAddress][tokenAddress][nft.tokenId.toString()] = [];
+                    }
+                    const isOwner = balances[i++];
+                    if (isOwner.isEqualTo(1)) {
+                        nonFungibleHoldingsByOwner[tokenOwnerAddress][tokenAddress][nft.tokenId.toString()].push(
+                            nft.id,
+                        );
+                    }
+                }
+            }
+        }
+        const holdingsByOwner = {
+            fungible: tokenHoldingsByOwner,
+            nonFungible: nonFungibleHoldingsByOwner,
+        };
+        return holdingsByOwner;
+    }
+    /**
+     * @dev Checks if proxy is approved to transfer tokens on behalf of `userAddress`.
+     * @param userAddress owner of ERC1155 tokens.
+     * @param contractAddress address of ERC1155 contract.
+     * @return True iff the proxy is approved for all. False otherwise.
+     */
+    public async isProxyApprovedForAllAsync(userAddress: string, contractAddress: string): Promise<boolean> {
+        this._validateProxyContractExistsOrThrow();
+        const tokenContract = this._getContractFromAddress(contractAddress);
+        const operator = (this._proxyContract as ERC1155ProxyContract).address;
+        const didApproveAll = await tokenContract.isApprovedForAll.callAsync(userAddress, operator);
+        return didApproveAll;
+    }
+    public getFungibleTokenIds(): BigNumber[] {
+        const fungibleTokenIds = _.map(this._fungibleTokenIds, (tokenIdAsString: string) => {
+            return new BigNumber(tokenIdAsString);
+        });
+        return fungibleTokenIds;
+    }
+    public getNonFungibleTokenIds(): BigNumber[] {
+        const nonFungibleTokenIds = _.map(this._nonFungibleTokenIds, (tokenIdAsString: string) => {
+            return new BigNumber(tokenIdAsString);
+        });
+        return nonFungibleTokenIds;
+    }
+    public getTokenOwnerAddresses(): string[] {
+        return this._tokenOwnerAddresses;
+    }
+    public getContractWrapper(contractAddress: string): Erc1155Wrapper {
+        const tokenWrapper = _.find(this._dummyTokenWrappers, (wrapper: Erc1155Wrapper) => {
+            return wrapper.getContract().address === contractAddress;
+        });
+        if (tokenWrapper === undefined) {
+            throw new Error(`Contract: ${contractAddress} was not deployed through ERC1155ProxyWrapper`);
+        }
+        return tokenWrapper;
+    }
+    private _getContractFromAddress(tokenAddress: string): ERC1155MintableContract {
+        const tokenContractIfExists = _.find(this._dummyTokenWrappers, c => c.getContract().address === tokenAddress);
+        if (tokenContractIfExists === undefined) {
+            throw new Error(`Token: ${tokenAddress} was not deployed through ERC1155ProxyWrapper`);
+        }
+        return tokenContractIfExists.getContract();
+    }
+    private _validateDummyTokenContractsExistOrThrow(): void {
+        if (this._dummyTokenWrappers === undefined) {
+            throw new Error('Dummy ERC1155 tokens not yet deployed, please call "deployDummyTokensAsync"');
+        }
+    }
+    private _validateProxyContractExistsOrThrow(): void {
+        if (this._proxyContract === undefined) {
+            throw new Error('ERC1155 proxy contract not yet deployed, please call "deployProxyAsync"');
+        }
+    }
+    private _validateBalancesAndAllowancesSetOrThrow(): void {
+        if (
+            _.keys(this._initialTokenIdsByOwner.fungible).length === 0 ||
+            _.keys(this._initialTokenIdsByOwner.nonFungible).length === 0
+        ) {
+            throw new Error(
+                'Dummy ERC1155 balances and allowances not yet set, please call "setBalancesAndAllowancesAsync"',
+            );
+        }
+    }
+}

contracts/asset-proxy/test/utils/erc20_wrapper.ts

@@ -0,0 +1,173 @@
+import { artifacts as erc20Artifacts, DummyERC20TokenContract } from '@0x/contracts-erc20';
+import { constants, ERC20BalancesByOwner, txDefaults } from '@0x/contracts-test-utils';
+import { assetDataUtils } from '@0x/order-utils';
+import { BigNumber } from '@0x/utils';
+import { ZeroExProvider } from 'ethereum-types';
+import * as _ from 'lodash';
+
+import { artifacts, ERC20ProxyContract } from '../../src';
+
+export class ERC20Wrapper {
+    private readonly _tokenOwnerAddresses: string[];
+    private readonly _contractOwnerAddress: string;
+    private readonly _provider: ZeroExProvider;
+    private readonly _dummyTokenContracts: DummyERC20TokenContract[];
+    private _proxyContract?: ERC20ProxyContract;
+    private _proxyIdIfExists?: string;
+    /**
+     * Instanitates an ERC20Wrapper
+     * @param provider Web3 provider to use for all JSON RPC requests
+     * @param tokenOwnerAddresses Addresses that we want to endow as owners for dummy ERC20 tokens
+     * @param contractOwnerAddress Desired owner of the contract
+     * Instance of ERC20Wrapper
+     */
+    constructor(provider: ZeroExProvider, tokenOwnerAddresses: string[], contractOwnerAddress: string) {
+        this._dummyTokenContracts = [];
+        this._provider = provider;
+        this._tokenOwnerAddresses = tokenOwnerAddresses;
+        this._contractOwnerAddress = contractOwnerAddress;
+    }
+    public async deployDummyTokensAsync(
+        numberToDeploy: number,
+        decimals: BigNumber,
+    ): Promise<DummyERC20TokenContract[]> {
+        for (let i = 0; i < numberToDeploy; i++) {
+            this._dummyTokenContracts.push(
+                await DummyERC20TokenContract.deployFrom0xArtifactAsync(
+                    erc20Artifacts.DummyERC20Token,
+                    this._provider,
+                    txDefaults,
+                    artifacts,
+                    constants.DUMMY_TOKEN_NAME,
+                    constants.DUMMY_TOKEN_SYMBOL,
+                    decimals,
+                    constants.DUMMY_TOKEN_TOTAL_SUPPLY,
+                ),
+            );
+        }
+        return this._dummyTokenContracts;
+    }
+    public async deployProxyAsync(): Promise<ERC20ProxyContract> {
+        this._proxyContract = await ERC20ProxyContract.deployFrom0xArtifactAsync(
+            artifacts.ERC20Proxy,
+            this._provider,
+            txDefaults,
+            artifacts,
+        );
+        this._proxyIdIfExists = await this._proxyContract.getProxyId.callAsync();
+        return this._proxyContract;
+    }
+    public getProxyId(): string {
+        this._validateProxyContractExistsOrThrow();
+        return this._proxyIdIfExists as string;
+    }
+    public async setBalancesAndAllowancesAsync(): Promise<void> {
+        this._validateDummyTokenContractsExistOrThrow();
+        this._validateProxyContractExistsOrThrow();
+        for (const dummyTokenContract of this._dummyTokenContracts) {
+            for (const tokenOwnerAddress of this._tokenOwnerAddresses) {
+                await dummyTokenContract.setBalance.awaitTransactionSuccessAsync(
+                    tokenOwnerAddress,
+                    constants.INITIAL_ERC20_BALANCE,
+                    { from: this._contractOwnerAddress },
+                    constants.AWAIT_TRANSACTION_MINED_MS,
+                );
+                await dummyTokenContract.approve.awaitTransactionSuccessAsync(
+                    (this._proxyContract as ERC20ProxyContract).address,
+                    constants.INITIAL_ERC20_ALLOWANCE,
+                    { from: tokenOwnerAddress },
+                    constants.AWAIT_TRANSACTION_MINED_MS,
+                );
+            }
+        }
+    }
+    public async getBalanceAsync(userAddress: string, assetData: string): Promise<BigNumber> {
+        const tokenContract = this._getTokenContractFromAssetData(assetData);
+        const balance = new BigNumber(await tokenContract.balanceOf.callAsync(userAddress));
+        return balance;
+    }
+    public async setBalanceAsync(userAddress: string, assetData: string, amount: BigNumber): Promise<void> {
+        const tokenContract = this._getTokenContractFromAssetData(assetData);
+        await tokenContract.setBalance.awaitTransactionSuccessAsync(
+            userAddress,
+            amount,
+            { from: this._contractOwnerAddress },
+            constants.AWAIT_TRANSACTION_MINED_MS,
+        );
+    }
+    public async getProxyAllowanceAsync(userAddress: string, assetData: string): Promise<BigNumber> {
+        const tokenContract = this._getTokenContractFromAssetData(assetData);
+        const proxyAddress = (this._proxyContract as ERC20ProxyContract).address;
+        const allowance = new BigNumber(await tokenContract.allowance.callAsync(userAddress, proxyAddress));
+        return allowance;
+    }
+    public async setAllowanceAsync(userAddress: string, assetData: string, amount: BigNumber): Promise<void> {
+        const tokenContract = this._getTokenContractFromAssetData(assetData);
+        const proxyAddress = (this._proxyContract as ERC20ProxyContract).address;
+        await tokenContract.approve.awaitTransactionSuccessAsync(
+            proxyAddress,
+            amount,
+            { from: userAddress },
+            constants.AWAIT_TRANSACTION_MINED_MS,
+        );
+    }
+    public async getBalancesAsync(): Promise<ERC20BalancesByOwner> {
+        this._validateDummyTokenContractsExistOrThrow();
+        const balancesByOwner: ERC20BalancesByOwner = {};
+        const balances: BigNumber[] = [];
+        const balanceInfo: Array<{ tokenOwnerAddress: string; tokenAddress: string }> = [];
+        for (const dummyTokenContract of this._dummyTokenContracts) {
+            for (const tokenOwnerAddress of this._tokenOwnerAddresses) {
+                balances.push(await dummyTokenContract.balanceOf.callAsync(tokenOwnerAddress));
+                balanceInfo.push({
+                    tokenOwnerAddress,
+                    tokenAddress: dummyTokenContract.address,
+                });
+            }
+        }
+        _.forEach(balances, (balance, balanceIndex) => {
+            const tokenAddress = balanceInfo[balanceIndex].tokenAddress;
+            const tokenOwnerAddress = balanceInfo[balanceIndex].tokenOwnerAddress;
+            if (balancesByOwner[tokenOwnerAddress] === undefined) {
+                balancesByOwner[tokenOwnerAddress] = {};
+            }
+            const wrappedBalance = new BigNumber(balance);
+            balancesByOwner[tokenOwnerAddress][tokenAddress] = wrappedBalance;
+        });
+        return balancesByOwner;
+    }
+    public addDummyTokenContract(dummy: DummyERC20TokenContract): void {
+        if (this._dummyTokenContracts !== undefined) {
+            this._dummyTokenContracts.push(dummy);
+        }
+    }
+    public addTokenOwnerAddress(address: string): void {
+        this._tokenOwnerAddresses.push(address);
+    }
+    public getTokenOwnerAddresses(): string[] {
+        return this._tokenOwnerAddresses;
+    }
+    public getTokenAddresses(): string[] {
+        const tokenAddresses = _.map(this._dummyTokenContracts, dummyTokenContract => dummyTokenContract.address);
+        return tokenAddresses;
+    }
+    private _getTokenContractFromAssetData(assetData: string): DummyERC20TokenContract {
+        const erc20ProxyData = assetDataUtils.decodeERC20AssetData(assetData);
+        const tokenAddress = erc20ProxyData.tokenAddress;
+        const tokenContractIfExists = _.find(this._dummyTokenContracts, c => c.address === tokenAddress);
+        if (tokenContractIfExists === undefined) {
+            throw new Error(`Token: ${tokenAddress} was not deployed through ERC20Wrapper`);
+        }
+        return tokenContractIfExists;
+    }
+    private _validateDummyTokenContractsExistOrThrow(): void {
+        if (this._dummyTokenContracts === undefined) {
+            throw new Error('Dummy ERC20 tokens not yet deployed, please call "deployDummyTokensAsync"');
+        }
+    }
+    private _validateProxyContractExistsOrThrow(): void {
+        if (this._proxyContract === undefined) {
+            throw new Error('ERC20 proxy contract not yet deployed, please call "deployProxyAsync"');
+        }
+    }
+}

contracts/asset-proxy/test/utils/erc721_wrapper.ts

@@ -0,0 +1,235 @@
+import { artifacts as erc721Artifacts, DummyERC721TokenContract } from '@0x/contracts-erc721';
+import { constants, ERC721TokenIdsByOwner, txDefaults } from '@0x/contracts-test-utils';
+import { generatePseudoRandomSalt } from '@0x/order-utils';
+import { BigNumber } from '@0x/utils';
+import { ZeroExProvider } from 'ethereum-types';
+import * as _ from 'lodash';
+
+import { artifacts, ERC721ProxyContract } from '../../src';
+
+export class ERC721Wrapper {
+    private readonly _tokenOwnerAddresses: string[];
+    private readonly _contractOwnerAddress: string;
+    private readonly _provider: ZeroExProvider;
+    private readonly _dummyTokenContracts: DummyERC721TokenContract[];
+    private _proxyContract?: ERC721ProxyContract;
+    private _proxyIdIfExists?: string;
+    private _initialTokenIdsByOwner: ERC721TokenIdsByOwner = {};
+    constructor(provider: ZeroExProvider, tokenOwnerAddresses: string[], contractOwnerAddress: string) {
+        this._provider = provider;
+        this._dummyTokenContracts = [];
+        this._tokenOwnerAddresses = tokenOwnerAddresses;
+        this._contractOwnerAddress = contractOwnerAddress;
+    }
+    public async deployDummyTokensAsync(): Promise<DummyERC721TokenContract[]> {
+        // tslint:disable-next-line:no-unused-variable
+        for (const i of _.times(constants.NUM_DUMMY_ERC721_TO_DEPLOY)) {
+            this._dummyTokenContracts.push(
+                await DummyERC721TokenContract.deployFrom0xArtifactAsync(
+                    erc721Artifacts.DummyERC721Token,
+                    this._provider,
+                    txDefaults,
+                    artifacts,
+                    constants.DUMMY_TOKEN_NAME,
+                    constants.DUMMY_TOKEN_SYMBOL,
+                ),
+            );
+        }
+        return this._dummyTokenContracts;
+    }
+    public async deployProxyAsync(): Promise<ERC721ProxyContract> {
+        this._proxyContract = await ERC721ProxyContract.deployFrom0xArtifactAsync(
+            artifacts.ERC721Proxy,
+            this._provider,
+            txDefaults,
+            artifacts,
+        );
+        this._proxyIdIfExists = await this._proxyContract.getProxyId.callAsync();
+        return this._proxyContract;
+    }
+    public getProxyId(): string {
+        this._validateProxyContractExistsOrThrow();
+        return this._proxyIdIfExists as string;
+    }
+    public async setBalancesAndAllowancesAsync(): Promise<void> {
+        this._validateDummyTokenContractsExistOrThrow();
+        this._validateProxyContractExistsOrThrow();
+        this._initialTokenIdsByOwner = {};
+        for (const dummyTokenContract of this._dummyTokenContracts) {
+            for (const tokenOwnerAddress of this._tokenOwnerAddresses) {
+                // tslint:disable-next-line:no-unused-variable
+                for (const i of _.times(constants.NUM_ERC721_TOKENS_TO_MINT)) {
+                    const tokenId = generatePseudoRandomSalt();
+                    await this.mintAsync(dummyTokenContract.address, tokenId, tokenOwnerAddress);
+                    if (this._initialTokenIdsByOwner[tokenOwnerAddress] === undefined) {
+                        this._initialTokenIdsByOwner[tokenOwnerAddress] = {
+                            [dummyTokenContract.address]: [],
+                        };
+                    }
+                    if (this._initialTokenIdsByOwner[tokenOwnerAddress][dummyTokenContract.address] === undefined) {
+                        this._initialTokenIdsByOwner[tokenOwnerAddress][dummyTokenContract.address] = [];
+                    }
+                    this._initialTokenIdsByOwner[tokenOwnerAddress][dummyTokenContract.address].push(tokenId);
+
+                    await this.approveProxyAsync(dummyTokenContract.address, tokenId);
+                }
+            }
+        }
+    }
+    public async doesTokenExistAsync(tokenAddress: string, tokenId: BigNumber): Promise<boolean> {
+        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
+        const owner = await tokenContract.ownerOf.callAsync(tokenId);
+        const doesExist = owner !== constants.NULL_ADDRESS;
+        return doesExist;
+    }
+    public async approveProxyAsync(tokenAddress: string, tokenId: BigNumber): Promise<void> {
+        const proxyAddress = (this._proxyContract as ERC721ProxyContract).address;
+        await this.approveAsync(proxyAddress, tokenAddress, tokenId);
+    }
+    public async approveProxyForAllAsync(tokenAddress: string, tokenId: BigNumber, isApproved: boolean): Promise<void> {
+        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
+        const tokenOwner = await this.ownerOfAsync(tokenAddress, tokenId);
+        const proxyAddress = (this._proxyContract as ERC721ProxyContract).address;
+        await tokenContract.setApprovalForAll.awaitTransactionSuccessAsync(
+            proxyAddress,
+            isApproved,
+            { from: tokenOwner },
+            constants.AWAIT_TRANSACTION_MINED_MS,
+        );
+    }
+    public async approveAsync(to: string, tokenAddress: string, tokenId: BigNumber): Promise<void> {
+        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
+        const tokenOwner = await this.ownerOfAsync(tokenAddress, tokenId);
+        await tokenContract.approve.awaitTransactionSuccessAsync(
+            to,
+            tokenId,
+            { from: tokenOwner },
+            constants.AWAIT_TRANSACTION_MINED_MS,
+        );
+    }
+    public async transferFromAsync(
+        tokenAddress: string,
+        tokenId: BigNumber,
+        currentOwner: string,
+        userAddress: string,
+    ): Promise<void> {
+        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
+        await tokenContract.transferFrom.awaitTransactionSuccessAsync(
+            currentOwner,
+            userAddress,
+            tokenId,
+            { from: currentOwner },
+            constants.AWAIT_TRANSACTION_MINED_MS,
+        );
+    }
+    public async mintAsync(tokenAddress: string, tokenId: BigNumber, userAddress: string): Promise<void> {
+        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
+        await tokenContract.mint.awaitTransactionSuccessAsync(
+            userAddress,
+            tokenId,
+            { from: this._contractOwnerAddress },
+            constants.AWAIT_TRANSACTION_MINED_MS,
+        );
+    }
+    public async burnAsync(tokenAddress: string, tokenId: BigNumber, owner: string): Promise<void> {
+        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
+        await tokenContract.burn.awaitTransactionSuccessAsync(
+            owner,
+            tokenId,
+            { from: this._contractOwnerAddress },
+            constants.AWAIT_TRANSACTION_MINED_MS,
+        );
+    }
+    public async ownerOfAsync(tokenAddress: string, tokenId: BigNumber): Promise<string> {
+        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
+        const owner = await tokenContract.ownerOf.callAsync(tokenId);
+        return owner;
+    }
+    public async isOwnerAsync(userAddress: string, tokenAddress: string, tokenId: BigNumber): Promise<boolean> {
+        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
+        const tokenOwner = await tokenContract.ownerOf.callAsync(tokenId);
+        const isOwner = tokenOwner === userAddress;
+        return isOwner;
+    }
+    public async isProxyApprovedForAllAsync(userAddress: string, tokenAddress: string): Promise<boolean> {
+        this._validateProxyContractExistsOrThrow();
+        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
+        const operator = (this._proxyContract as ERC721ProxyContract).address;
+        const didApproveAll = await tokenContract.isApprovedForAll.callAsync(userAddress, operator);
+        return didApproveAll;
+    }
+    public async isProxyApprovedAsync(tokenAddress: string, tokenId: BigNumber): Promise<boolean> {
+        this._validateProxyContractExistsOrThrow();
+        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
+        const approvedAddress = await tokenContract.getApproved.callAsync(tokenId);
+        const proxyAddress = (this._proxyContract as ERC721ProxyContract).address;
+        const isProxyAnApprovedOperator = approvedAddress === proxyAddress;
+        return isProxyAnApprovedOperator;
+    }
+    public async getBalancesAsync(): Promise<ERC721TokenIdsByOwner> {
+        this._validateDummyTokenContractsExistOrThrow();
+        this._validateBalancesAndAllowancesSetOrThrow();
+        const tokenIdsByOwner: ERC721TokenIdsByOwner = {};
+        const tokenOwnerAddresses: string[] = [];
+        const tokenInfo: Array<{ tokenId: BigNumber; tokenAddress: string }> = [];
+        for (const dummyTokenContract of this._dummyTokenContracts) {
+            for (const tokenOwnerAddress of this._tokenOwnerAddresses) {
+                const initialTokenOwnerIds = this._initialTokenIdsByOwner[tokenOwnerAddress][
+                    dummyTokenContract.address
+                ];
+                for (const tokenId of initialTokenOwnerIds) {
+                    tokenOwnerAddresses.push(await dummyTokenContract.ownerOf.callAsync(tokenId));
+                    tokenInfo.push({
+                        tokenId,
+                        tokenAddress: dummyTokenContract.address,
+                    });
+                }
+            }
+        }
+        _.forEach(tokenOwnerAddresses, (tokenOwnerAddress, ownerIndex) => {
+            const tokenAddress = tokenInfo[ownerIndex].tokenAddress;
+            const tokenId = tokenInfo[ownerIndex].tokenId;
+            if (tokenIdsByOwner[tokenOwnerAddress] === undefined) {
+                tokenIdsByOwner[tokenOwnerAddress] = {
+                    [tokenAddress]: [],
+                };
+            }
+            if (tokenIdsByOwner[tokenOwnerAddress][tokenAddress] === undefined) {
+                tokenIdsByOwner[tokenOwnerAddress][tokenAddress] = [];
+            }
+            tokenIdsByOwner[tokenOwnerAddress][tokenAddress].push(tokenId);
+        });
+        return tokenIdsByOwner;
+    }
+    public getTokenOwnerAddresses(): string[] {
+        return this._tokenOwnerAddresses;
+    }
+    public getTokenAddresses(): string[] {
+        const tokenAddresses = _.map(this._dummyTokenContracts, dummyTokenContract => dummyTokenContract.address);
+        return tokenAddresses;
+    }
+    private _getTokenContractFromAssetData(tokenAddress: string): DummyERC721TokenContract {
+        const tokenContractIfExists = _.find(this._dummyTokenContracts, c => c.address === tokenAddress);
+        if (tokenContractIfExists === undefined) {
+            throw new Error(`Token: ${tokenAddress} was not deployed through ERC20Wrapper`);
+        }
+        return tokenContractIfExists;
+    }
+    private _validateDummyTokenContractsExistOrThrow(): void {
+        if (this._dummyTokenContracts === undefined) {
+            throw new Error('Dummy ERC721 tokens not yet deployed, please call "deployDummyTokensAsync"');
+        }
+    }
+    private _validateProxyContractExistsOrThrow(): void {
+        if (this._proxyContract === undefined) {
+            throw new Error('ERC721 proxy contract not yet deployed, please call "deployProxyAsync"');
+        }
+    }
+    private _validateBalancesAndAllowancesSetOrThrow(): void {
+        if (_.keys(this._initialTokenIdsByOwner).length === 0) {
+            throw new Error(
+                'Dummy ERC721 balances and allowances not yet set, please call "setBalancesAndAllowancesAsync"',
+            );
+        }
+    }
+}

contracts/asset-proxy/test/utils/index.ts

@@ -0,0 +1,3 @@
+export * from './erc20_wrapper';
+export * from './erc721_wrapper';
+export * from './erc1155_proxy_wrapper';

contracts/asset-proxy/tsconfig.json

@@ -0,0 +1,18 @@
+{
+    "extends": "../../tsconfig",
+    "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
+    "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
+    "files": [
+        "generated-artifacts/ERC1155Proxy.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",
+        "generated-artifacts/StaticCallProxy.json",
+        "generated-artifacts/TestStaticCallTarget.json"
+    ],
+    "exclude": ["./deploy/solc/solc_bin"]
+}

contracts/asset-proxy/tslint.json

@@ -0,0 +1,6 @@
+{
+    "extends": ["@0x/tslint-config"],
+    "rules": {
+        "custom-no-magic-numbers": false
+    }
+}

contracts/coordinator/CHANGELOG.json

@@ -0,0 +1,156 @@
+[
+    {
+        "timestamp": 1567521715,
+        "version": "2.0.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1566446343,
+        "version": "2.0.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1565296576,
+        "version": "2.0.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "2.0.9",
+        "changes": [
+            {
+                "note": "Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies.",
+                "pr": 1995
+            }
+        ],
+        "timestamp": 1564607468
+    },
+    {
+        "timestamp": 1563957393,
+        "version": "2.0.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1563193019,
+        "version": "2.0.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1563047529,
+        "version": "2.0.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1563006338,
+        "version": "2.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1558712885,
+        "version": "2.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1557961111,
+        "version": "2.0.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1557799313,
+        "version": "2.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1557507213,
+        "version": "2.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "2.0.0",
+        "changes": [
+            {
+                "note": "Make `decodeOrdersFromFillData`, `getCoordinatorApprovalHash`, and `getTransactionHash` public",
+                "pr": 1729
+            },
+            {
+                "note": "Make `assertValidTransactionOrdersApproval` internal",
+                "pr": 1729
+            }
+        ],
+        "timestamp": 1554997931
+    },
+    {
+        "version": "1.1.0",
+        "changes": [
+            {
+                "note": "Run Web3ProviderEngine without excess block polling",
+                "pr": 1695
+            }
+        ],
+        "timestamp": 1553183790
+    },
+    {
+        "version": "1.0.0",
+        "changes": [
+            {
+                "note": "Created Coordinator package"
+            },
+            {
+                "note": "Use separate EIP712 domains for transactions and approvals",
+                "pr": 1705
+            },
+            {
+                "note": "Add `SignatureType.Invalid`",
+                "pr": 1705
+            },
+            {
+                "note": "Set `evmVersion` to `constantinople`",
+                "pr": 1707
+            }
+        ],
+        "timestamp": 1553091633
+    }
+]

contracts/coordinator/CHANGELOG.md

@@ -0,0 +1,70 @@
+<!--
+changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
+Edit the package's CHANGELOG.json file only.
+-->
+
+CHANGELOG
+
+## v2.0.12 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v2.0.11 - _August 22, 2019_
+
+    * Dependencies updated
+
+## v2.0.10 - _August 8, 2019_
+
+    * Dependencies updated
+
+## v2.0.9 - _July 31, 2019_
+
+    * Updated calls to <contract wrapper>.deployFrom0xArtifactAsync to include artifact dependencies. (#1995)
+
+## v2.0.8 - _July 24, 2019_
+
+    * Dependencies updated
+
+## v2.0.7 - _July 15, 2019_
+
+    * Dependencies updated
+
+## v2.0.6 - _July 13, 2019_
+
+    * Dependencies updated
+
+## v2.0.5 - _July 13, 2019_
+
+    * Dependencies updated
+
+## v2.0.4 - _May 24, 2019_
+
+    * Dependencies updated
+
+## v2.0.3 - _May 15, 2019_
+
+    * Dependencies updated
+
+## v2.0.2 - _May 14, 2019_
+
+    * Dependencies updated
+
+## v2.0.1 - _May 10, 2019_
+
+    * Dependencies updated
+
+## v2.0.0 - _April 11, 2019_
+
+    * Make `decodeOrdersFromFillData`, `getCoordinatorApprovalHash`, and `getTransactionHash` public (#1729)
+    * Make `assertValidTransactionOrdersApproval` internal (#1729)
+
+## v1.1.0 - _March 21, 2019_
+
+    * Run Web3ProviderEngine without excess block polling (#1695)
+
+## v1.0.0 - _March 20, 2019_
+
+    * Created Coordinator package
+    * Use separate EIP712 domains for transactions and approvals (#1705)
+    * Add `SignatureType.Invalid` (#1705)
+    * Set `evmVersion` to `constantinople` (#1707)

contracts/coordinator/README.md

@@ -0,0 +1,73 @@
+## Coordinator
+
+This package contains a contract that allows users to call arbitrary functions on the Exchange contract with permission from one or more Coordinators. Addresses of the deployed contracts can be found in this 0x [guide](https://0x.org/docs/guides/0x-cheat-sheet) or the [DEPLOYS](./DEPLOYS.json) file within this package.
+
+## Installation
+
+**Install**
+
+```bash
+npm install @0x/contracts-coordinator --save
+```
+
+## Bug bounty
+
+A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0x.org/docs/guides/bug-bounty-program).
+
+## Contributing
+
+We strongly recommend that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository.
+
+For proposals regarding the 0x protocol's smart contract architecture, message format, or additional functionality, go to the [0x Improvement Proposals (ZEIPs)](https://github.com/0xProject/ZEIPs) repository and follow the contribution guidelines provided therein.
+
+Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
+
+### Install Dependencies
+
+If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
+
+```bash
+yarn config set workspaces-experimental true
+```
+
+Then install dependencies
+
+```bash
+yarn install
+```
+
+### Build
+
+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-coordinator yarn build
+```
+
+Or continuously rebuild on change:
+
+```bash
+PKG=@0x/contracts-coordinator yarn watch
+```
+
+### Clean
+
+```bash
+yarn clean
+```
+
+### Lint
+
+```bash
+yarn lint
+```
+
+### Run Tests
+
+```bash
+yarn test
+```
+
+#### Testing options
+
+Contracts testing options like coverage, profiling, revert traces or backing node choosing - are described [here](../TESTING.md).

contracts/coordinator/compiler.json

@@ -0,0 +1,26 @@
+{
+    "artifactsDir": "./generated-artifacts",
+    "contractsDir": "./contracts",
+    "useDockerisedSolc": false,
+    "compilerSettings": {
+        "evmVersion": "constantinople",
+        "optimizer": {
+            "enabled": true,
+            "runs": 1000000,
+            "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
+        },
+        "outputSelection": {
+            "*": {
+                "*": [
+                    "abi",
+                    "devdoc",
+                    "evm.bytecode.object",
+                    "evm.bytecode.sourceMap",
+                    "evm.deployedBytecode.object",
+                    "evm.deployedBytecode.sourceMap"
+                ]
+            }
+        }
+    },
+    "contracts": ["src/Coordinator.sol", "src/registry/CoordinatorRegistry.sol"]
+}

contracts/coordinator/contracts/src/Coordinator.sol

@@ -0,0 +1,39 @@
+/*
+
+  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.5.5;
+pragma experimental "ABIEncoderV2";
+
+import "./libs/LibConstants.sol";
+import "./MixinSignatureValidator.sol";
+import "./MixinCoordinatorApprovalVerifier.sol";
+import "./MixinCoordinatorCore.sol";
+
+
+// solhint-disable no-empty-blocks
+contract Coordinator is
+    LibConstants,
+    MixinSignatureValidator,
+    MixinCoordinatorApprovalVerifier,
+    MixinCoordinatorCore
+{
+    constructor (address _exchange)
+        public
+        LibConstants(_exchange)
+    {}
+}

contracts/coordinator/contracts/src/MixinCoordinatorApprovalVerifier.sol

@@ -0,0 +1,203 @@
+/*
+
+  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.5.5;
+pragma experimental "ABIEncoderV2";
+
+import "@0x/contracts-exchange-libs/contracts/src/LibExchangeSelectors.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
+import "@0x/contracts-utils/contracts/src/LibBytes.sol";
+import "@0x/contracts-utils/contracts/src/LibAddressArray.sol";
+import "./libs/LibCoordinatorApproval.sol";
+import "./libs/LibZeroExTransaction.sol";
+import "./mixins/MSignatureValidator.sol";
+import "./mixins/MCoordinatorApprovalVerifier.sol";
+
+
+// solhint-disable avoid-tx-origin
+contract MixinCoordinatorApprovalVerifier is
+    LibExchangeSelectors,
+    LibCoordinatorApproval,
+    LibZeroExTransaction,
+    MSignatureValidator,
+    MCoordinatorApprovalVerifier
+{
+    using LibBytes for bytes;
+    using LibAddressArray for address[];
+
+    /// @dev Validates that the 0x transaction has been approved by all of the feeRecipients
+    ///      that correspond to each order in the transaction's Exchange calldata.
+    /// @param transaction 0x transaction containing salt, signerAddress, and data.
+    /// @param txOrigin Required signer of Ethereum transaction calling this function.
+    /// @param transactionSignature Proof that the transaction has been signed by the signer.
+    /// @param approvalExpirationTimeSeconds Array of expiration times in seconds for which each corresponding approval signature expires.
+    /// @param approvalSignatures Array of signatures that correspond to the feeRecipients of each order in the transaction's Exchange calldata.
+    function assertValidCoordinatorApprovals(
+        LibZeroExTransaction.ZeroExTransaction memory transaction,
+        address txOrigin,
+        bytes memory transactionSignature,
+        uint256[] memory approvalExpirationTimeSeconds,
+        bytes[] memory approvalSignatures
+    )
+        public
+        view
+    {
+        // Get the orders from the the Exchange calldata in the 0x transaction
+        LibOrder.Order[] memory orders = decodeOrdersFromFillData(transaction.data);
+
+        // No approval is required for non-fill methods
+        if (orders.length > 0) {
+            // Revert if approval is invalid for transaction orders
+            assertValidTransactionOrdersApproval(
+                transaction,
+                orders,
+                txOrigin,
+                transactionSignature,
+                approvalExpirationTimeSeconds,
+                approvalSignatures
+            );
+        }
+    }
+
+    /// @dev Decodes the orders from Exchange calldata representing any fill method.
+    /// @param data Exchange calldata representing a fill method.
+    /// @return The orders from the Exchange calldata.
+    function decodeOrdersFromFillData(bytes memory data)
+        public
+        pure
+        returns (LibOrder.Order[] memory orders)
+    {
+        bytes4 selector = data.readBytes4(0);
+        if (
+            selector == FILL_ORDER_SELECTOR ||
+            selector == FILL_ORDER_NO_THROW_SELECTOR ||
+            selector == FILL_OR_KILL_ORDER_SELECTOR
+        ) {
+            // Decode single order
+            (LibOrder.Order memory order) = abi.decode(
+                data.slice(4, data.length),
+                (LibOrder.Order)
+            );
+            orders = new LibOrder.Order[](1);
+            orders[0] = order;
+        } else if (
+            selector == BATCH_FILL_ORDERS_SELECTOR ||
+            selector == BATCH_FILL_ORDERS_NO_THROW_SELECTOR ||
+            selector == BATCH_FILL_OR_KILL_ORDERS_SELECTOR ||
+            selector == MARKET_BUY_ORDERS_SELECTOR ||
+            selector == MARKET_BUY_ORDERS_NO_THROW_SELECTOR ||
+            selector == MARKET_SELL_ORDERS_SELECTOR ||
+            selector == MARKET_SELL_ORDERS_NO_THROW_SELECTOR
+        ) {
+            // Decode all orders
+            // solhint-disable indent
+            (orders) = abi.decode(
+                data.slice(4, data.length),
+                (LibOrder.Order[])
+            );
+        } else if (selector == MATCH_ORDERS_SELECTOR) {
+            // Decode left and right orders
+            (LibOrder.Order memory leftOrder, LibOrder.Order memory rightOrder) = abi.decode(
+                data.slice(4, data.length),
+                (LibOrder.Order, LibOrder.Order)
+            );
+
+            // Create array of orders
+            orders = new LibOrder.Order[](2);
+            orders[0] = leftOrder;
+            orders[1] = rightOrder;
+        }
+        return orders;
+    }
+
+    /// @dev Validates that the feeRecipients of a batch of order have approved a 0x transaction.
+    /// @param transaction 0x transaction containing salt, signerAddress, and data.
+    /// @param orders Array of order structs containing order specifications.
+    /// @param txOrigin Required signer of Ethereum transaction calling this function.
+    /// @param transactionSignature Proof that the transaction has been signed by the signer.
+    /// @param approvalExpirationTimeSeconds Array of expiration times in seconds for which each corresponding approval signature expires.
+    /// @param approvalSignatures Array of signatures that correspond to the feeRecipients of each order.
+    function assertValidTransactionOrdersApproval(
+        LibZeroExTransaction.ZeroExTransaction memory transaction,
+        LibOrder.Order[] memory orders,
+        address txOrigin,
+        bytes memory transactionSignature,
+        uint256[] memory approvalExpirationTimeSeconds,
+        bytes[] memory approvalSignatures
+    )
+        internal
+        view
+    {
+        // Verify that Ethereum tx signer is the same as the approved txOrigin
+        require(
+            tx.origin == txOrigin,
+            "INVALID_ORIGIN"
+        );
+
+        // Hash 0x transaction
+        bytes32 transactionHash = getTransactionHash(transaction);
+
+        // Create empty list of approval signers
+        address[] memory approvalSignerAddresses = new address[](0);
+
+        uint256 signaturesLength = approvalSignatures.length;
+        for (uint256 i = 0; i != signaturesLength; i++) {
+            // Create approval message
+            uint256 currentApprovalExpirationTimeSeconds = approvalExpirationTimeSeconds[i];
+            CoordinatorApproval memory approval = CoordinatorApproval({
+                txOrigin: txOrigin,
+                transactionHash: transactionHash,
+                transactionSignature: transactionSignature,
+                approvalExpirationTimeSeconds: currentApprovalExpirationTimeSeconds
+            });
+
+            // Ensure approval has not expired
+            require(
+                // solhint-disable-next-line not-rely-on-time
+                currentApprovalExpirationTimeSeconds > block.timestamp,
+                "APPROVAL_EXPIRED"
+            );
+
+            // Hash approval message and recover signer address
+            bytes32 approvalHash = getCoordinatorApprovalHash(approval);
+            address approvalSignerAddress = getSignerAddress(approvalHash, approvalSignatures[i]);
+
+            // Add approval signer to list of signers
+            approvalSignerAddresses = approvalSignerAddresses.append(approvalSignerAddress);
+        }
+
+        // Ethereum transaction signer gives implicit signature of approval
+        approvalSignerAddresses = approvalSignerAddresses.append(tx.origin);
+
+        uint256 ordersLength = orders.length;
+        for (uint256 i = 0; i != ordersLength; i++) {
+            // Do not check approval if the order's senderAddress is null
+            if (orders[i].senderAddress == address(0)) {
+                continue;
+            }
+
+            // Ensure feeRecipient of order has approved this 0x transaction
+            address approverAddress = orders[i].feeRecipientAddress;
+            bool isOrderApproved = approvalSignerAddresses.contains(approverAddress);
+            require(
+                isOrderApproved,
+                "INVALID_APPROVAL_SIGNATURE"
+            );
+        }
+    }
+}

contracts/coordinator/contracts/src/MixinCoordinatorCore.sol

@@ -0,0 +1,65 @@
+/*
+
+  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.5.5;
+pragma experimental "ABIEncoderV2";
+
+import "./libs/LibZeroExTransaction.sol";
+import "./libs/LibConstants.sol";
+import "./mixins/MCoordinatorApprovalVerifier.sol";
+import "./interfaces/ICoordinatorCore.sol";
+
+
+contract MixinCoordinatorCore is
+    LibConstants,
+    MCoordinatorApprovalVerifier,
+    ICoordinatorCore
+{
+    /// @dev Executes a 0x transaction that has been signed by the feeRecipients that correspond to each order in the transaction's Exchange calldata.
+    /// @param transaction 0x transaction containing salt, signerAddress, and data.
+    /// @param txOrigin Required signer of Ethereum transaction calling this function.
+    /// @param transactionSignature Proof that the transaction has been signed by the signer.
+    /// @param approvalExpirationTimeSeconds Array of expiration times in seconds for which each corresponding approval signature expires.
+    /// @param approvalSignatures Array of signatures that correspond to the feeRecipients of each order in the transaction's Exchange calldata.
+    function executeTransaction(
+        LibZeroExTransaction.ZeroExTransaction memory transaction,
+        address txOrigin,
+        bytes memory transactionSignature,
+        uint256[] memory approvalExpirationTimeSeconds,
+        bytes[] memory approvalSignatures
+    )
+        public
+    {
+        // Validate that the 0x transaction has been approves by each feeRecipient
+        assertValidCoordinatorApprovals(
+            transaction,
+            txOrigin,
+            transactionSignature,
+            approvalExpirationTimeSeconds,
+            approvalSignatures
+        );
+
+        // Execute the transaction
+        EXCHANGE.executeTransaction(
+            transaction.salt,
+            transaction.signerAddress,
+            transaction.data,
+            transactionSignature
+        );
+    }
+}

contracts/coordinator/contracts/src/MixinSignatureValidator.sol

@@ -0,0 +1,118 @@
+/*
+
+  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.5.5;
+
+import "@0x/contracts-utils/contracts/src/LibBytes.sol";
+import "./mixins/MSignatureValidator.sol";
+
+
+contract MixinSignatureValidator is
+    MSignatureValidator
+{
+    using LibBytes for bytes;
+
+    /// @dev Recovers the address of a signer given a hash and signature.
+    /// @param hash Any 32 byte hash.
+    /// @param signature Proof that the hash has been signed by signer.
+    function getSignerAddress(bytes32 hash, bytes memory signature)
+        public
+        pure
+        returns (address signerAddress)
+    {
+        require(
+            signature.length > 0,
+            "LENGTH_GREATER_THAN_0_REQUIRED"
+        );
+
+        // Pop last byte off of signature byte array.
+        uint8 signatureTypeRaw = uint8(signature.popLastByte());
+
+        // Ensure signature is supported
+        require(
+            signatureTypeRaw < uint8(SignatureType.NSignatureTypes),
+            "SIGNATURE_UNSUPPORTED"
+        );
+
+        SignatureType signatureType = SignatureType(signatureTypeRaw);
+
+        // Always illegal signature.
+        // This is always an implicit option since a signer can create a
+        // signature array with invalid type or length. We may as well make
+        // it an explicit option. This aids testing and analysis. It is
+        // also the initialization value for the enum type.
+        if (signatureType == SignatureType.Illegal) {
+            revert("SIGNATURE_ILLEGAL");
+
+        // Always invalid signature.
+        // Like Illegal, this is always implicitly available and therefore
+        // offered explicitly. It can be implicitly created by providing
+        // a correctly formatted but incorrect signature.
+        } else if (signatureType == SignatureType.Invalid) {
+            require(
+                signature.length == 0,
+                "LENGTH_0_REQUIRED"
+            );
+            revert("SIGNATURE_INVALID");
+
+        // Signature using EIP712
+        } else if (signatureType == SignatureType.EIP712) {
+            require(
+                signature.length == 65,
+                "LENGTH_65_REQUIRED"
+            );
+            uint8 v = uint8(signature[0]);
+            bytes32 r = signature.readBytes32(1);
+            bytes32 s = signature.readBytes32(33);
+            signerAddress = ecrecover(
+                hash,
+                v,
+                r,
+                s
+            );
+            return signerAddress;
+
+        // Signed using web3.eth_sign
+        } else if (signatureType == SignatureType.EthSign) {
+            require(
+                signature.length == 65,
+                "LENGTH_65_REQUIRED"
+            );
+            uint8 v = uint8(signature[0]);
+            bytes32 r = signature.readBytes32(1);
+            bytes32 s = signature.readBytes32(33);
+            signerAddress = ecrecover(
+                keccak256(abi.encodePacked(
+                    "\x19Ethereum Signed Message:\n32",
+                    hash
+                )),
+                v,
+                r,
+                s
+            );
+            return signerAddress;
+        }
+
+        // Anything else is illegal (We do not return false because
+        // the signature may actually be valid, just not in a format
+        // that we currently support. In this case returning false
+        // may lead the caller to incorrectly believe that the
+        // signature was invalid.)
+        revert("SIGNATURE_UNSUPPORTED");
+    }
+}

contracts/coordinator/contracts/src/interfaces/ICoordinatorApprovalVerifier.sol

@@ -0,0 +1,52 @@
+/*
+
+  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.5.5;
+pragma experimental "ABIEncoderV2";
+
+import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
+import "../libs/LibZeroExTransaction.sol";
+
+
+contract ICoordinatorApprovalVerifier {
+
+    /// @dev Validates that the 0x transaction has been approved by all of the feeRecipients
+    ///      that correspond to each order in the transaction's Exchange calldata.
+    /// @param transaction 0x transaction containing salt, signerAddress, and data.
+    /// @param txOrigin Required signer of Ethereum transaction calling this function.
+    /// @param transactionSignature Proof that the transaction has been signed by the signer.
+    /// @param approvalExpirationTimeSeconds Array of expiration times in seconds for which each corresponding approval signature expires.
+    /// @param approvalSignatures Array of signatures that correspond to the feeRecipients of each order in the transaction's Exchange calldata.
+    function assertValidCoordinatorApprovals(
+        LibZeroExTransaction.ZeroExTransaction memory transaction,
+        address txOrigin,
+        bytes memory transactionSignature,
+        uint256[] memory approvalExpirationTimeSeconds,
+        bytes[] memory approvalSignatures
+    )
+        public
+        view;
+
+    /// @dev Decodes the orders from Exchange calldata representing any fill method.
+    /// @param data Exchange calldata representing a fill method.
+    /// @return The orders from the Exchange calldata.
+    function decodeOrdersFromFillData(bytes memory data)
+        public
+        pure
+        returns (LibOrder.Order[] memory orders);
+}

contracts/coordinator/contracts/src/interfaces/ICoordinatorCore.sol

@@ -0,0 +1,41 @@
+/*
+
+  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.5.5;
+pragma experimental "ABIEncoderV2";
+
+import "../libs/LibZeroExTransaction.sol";
+
+
+contract ICoordinatorCore {
+
+    /// @dev Executes a 0x transaction that has been signed by the feeRecipients that correspond to each order in the transaction's Exchange calldata.
+    /// @param transaction 0x transaction containing salt, signerAddress, and data.
+    /// @param txOrigin Required signer of Ethereum transaction calling this function.
+    /// @param transactionSignature Proof that the transaction has been signed by the signer.
+    /// @param approvalExpirationTimeSeconds Array of expiration times in seconds for which each corresponding approval signature expires.
+    /// @param approvalSignatures Array of signatures that correspond to the feeRecipients of each order in the transaction's Exchange calldata.
+    function executeTransaction(
+        LibZeroExTransaction.ZeroExTransaction memory transaction,
+        address txOrigin,
+        bytes memory transactionSignature,
+        uint256[] memory approvalExpirationTimeSeconds,
+        bytes[] memory approvalSignatures
+    )
+        public;
+}

contracts/coordinator/contracts/src/interfaces/ISignatureValidator.sol

@@ -0,0 +1,31 @@
+/*
+
+  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.5.5;
+
+
+contract ISignatureValidator {
+
+    /// @dev Recovers the address of a signer given a hash and signature.
+    /// @param hash Any 32 byte hash.
+    /// @param signature Proof that the hash has been signed by signer.
+    function getSignerAddress(bytes32 hash, bytes memory signature)
+        public
+        pure
+        returns (address signerAddress);
+}

contracts/coordinator/contracts/src/interfaces/ITransactions.sol

@@ -0,0 +1,35 @@
+/*
+
+  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.5.5;
+
+
+contract ITransactions {
+
+    /// @dev Executes an exchange method call in the context of signer.
+    /// @param salt Arbitrary number to ensure uniqueness of transaction hash.
+    /// @param signerAddress Address of transaction signer.
+    /// @param data AbiV2 encoded calldata.
+    /// @param signature Proof of signer transaction by signer.
+    function executeTransaction(
+        uint256 salt,
+        address signerAddress,
+        bytes calldata data,
+        bytes calldata signature
+    )
+        external;
+}

contracts/coordinator/contracts/src/libs/LibConstants.sol

@@ -0,0 +1,34 @@
+/*
+
+  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.5.5;
+
+import "../interfaces/ITransactions.sol";
+
+
+contract LibConstants {
+
+     // solhint-disable-next-line var-name-mixedcase
+    ITransactions internal EXCHANGE;
+
+    constructor (address _exchange)
+        public
+    {
+        EXCHANGE = ITransactions(_exchange);
+    }
+}

contracts/coordinator/contracts/src/libs/LibCoordinatorApproval.sol

@@ -0,0 +1,98 @@
+/*
+
+  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.5.5;
+pragma experimental "ABIEncoderV2";
+
+import "./LibEIP712Domain.sol";
+
+
+contract LibCoordinatorApproval is
+    LibEIP712Domain
+{
+    // Hash for the EIP712 Coordinator approval message
+    // keccak256(abi.encodePacked(
+    //     "CoordinatorApproval(",
+    //     "address txOrigin,",
+    //     "bytes32 transactionHash,",
+    //     "bytes transactionSignature,",
+    //     "uint256 approvalExpirationTimeSeconds",
+    //     ")"
+    // ));
+    bytes32 constant internal EIP712_COORDINATOR_APPROVAL_SCHEMA_HASH = 0x2fbcdbaa76bc7589916958ae919dfbef04d23f6bbf26de6ff317b32c6cc01e05;
+
+    struct CoordinatorApproval {
+        address txOrigin;                       // Required signer of Ethereum transaction that is submitting approval.
+        bytes32 transactionHash;                // EIP712 hash of the transaction.
+        bytes transactionSignature;             // Signature of the 0x transaction.
+        uint256 approvalExpirationTimeSeconds;  // Timestamp in seconds for which the approval expires.
+    }
+
+    /// @dev Calculated the EIP712 hash of the Coordinator approval mesasage using the domain separator of this contract.
+    /// @param approval Coordinator approval message containing the transaction hash, transaction signature, and expiration of the approval.
+    /// @return EIP712 hash of the Coordinator approval message with the domain separator of this contract.
+    function getCoordinatorApprovalHash(CoordinatorApproval memory approval)
+        public
+        view
+        returns (bytes32 approvalHash)
+    {
+        approvalHash = hashEIP712CoordinatorMessage(hashCoordinatorApproval(approval));
+        return approvalHash;
+    }
+
+    /// @dev Calculated the EIP712 hash of the Coordinator approval mesasage with no domain separator.
+    /// @param approval Coordinator approval message containing the transaction hash, transaction signature, and expiration of the approval.
+    /// @return EIP712 hash of the Coordinator approval message with no domain separator.
+    function hashCoordinatorApproval(CoordinatorApproval memory approval)
+        internal
+        pure
+        returns (bytes32 result)
+    {
+        bytes32 schemaHash = EIP712_COORDINATOR_APPROVAL_SCHEMA_HASH;
+        bytes memory transactionSignature = approval.transactionSignature;
+        address txOrigin = approval.txOrigin;
+        bytes32 transactionHash = approval.transactionHash;
+        uint256 approvalExpirationTimeSeconds = approval.approvalExpirationTimeSeconds;
+
+        // Assembly for more efficiently computing:
+        // keccak256(abi.encodePacked(
+        //     EIP712_COORDINATOR_APPROVAL_SCHEMA_HASH,
+        //     approval.txOrigin,
+        //     approval.transactionHash,
+        //     keccak256(approval.transactionSignature)
+        //     approval.approvalExpirationTimeSeconds,
+        // ));
+
+        assembly {
+            // Compute hash of transaction signature
+            let transactionSignatureHash := keccak256(add(transactionSignature, 32), mload(transactionSignature))
+
+            // Load free memory pointer
+            let memPtr := mload(64)
+
+            mstore(memPtr, schemaHash)                               // hash of schema
+            mstore(add(memPtr, 32), txOrigin)                        // txOrigin
+            mstore(add(memPtr, 64), transactionHash)                 // transactionHash
+            mstore(add(memPtr, 96), transactionSignatureHash)        // transactionSignatureHash
+            mstore(add(memPtr, 128), approvalExpirationTimeSeconds)  // approvalExpirationTimeSeconds
+            // Compute hash
+            result := keccak256(memPtr, 160)
+        }
+        return result;
+    }
+}

contracts/coordinator/contracts/src/libs/LibEIP712Domain.sol

@@ -0,0 +1,131 @@
+/*
+
+  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.5.5;
+
+import "./LibConstants.sol";
+
+
+contract LibEIP712Domain is
+    LibConstants
+{
+
+    // EIP191 header for EIP712 prefix
+    string constant internal EIP191_HEADER = "\x19\x01";
+
+    // EIP712 Domain Name value for the Coordinator
+    string constant internal EIP712_COORDINATOR_DOMAIN_NAME = "0x Protocol Coordinator";
+
+    // EIP712 Domain Version value for the Coordinator
+    string constant internal EIP712_COORDINATOR_DOMAIN_VERSION = "1.0.0";
+
+    // EIP712 Domain Name value for the Exchange
+    string constant internal EIP712_EXCHANGE_DOMAIN_NAME = "0x Protocol";
+
+    // EIP712 Domain Version value for the Exchange
+    string constant internal EIP712_EXCHANGE_DOMAIN_VERSION = "2";
+
+    // Hash of the EIP712 Domain Separator Schema
+    bytes32 constant internal EIP712_DOMAIN_SEPARATOR_SCHEMA_HASH = keccak256(abi.encodePacked(
+        "EIP712Domain(",
+        "string name,",
+        "string version,",
+        "address verifyingContract",
+        ")"
+    ));
+
+    // Hash of the EIP712 Domain Separator data for the Coordinator
+    // solhint-disable-next-line var-name-mixedcase
+    bytes32 public EIP712_COORDINATOR_DOMAIN_HASH;
+
+    // Hash of the EIP712 Domain Separator data for the Exchange
+    // solhint-disable-next-line var-name-mixedcase
+    bytes32 public EIP712_EXCHANGE_DOMAIN_HASH;
+
+    constructor ()
+        public
+    {
+        EIP712_COORDINATOR_DOMAIN_HASH = keccak256(abi.encodePacked(
+            EIP712_DOMAIN_SEPARATOR_SCHEMA_HASH,
+            keccak256(bytes(EIP712_COORDINATOR_DOMAIN_NAME)),
+            keccak256(bytes(EIP712_COORDINATOR_DOMAIN_VERSION)),
+            uint256(address(this))
+        ));
+
+        EIP712_EXCHANGE_DOMAIN_HASH = keccak256(abi.encodePacked(
+            EIP712_DOMAIN_SEPARATOR_SCHEMA_HASH,
+            keccak256(bytes(EIP712_EXCHANGE_DOMAIN_NAME)),
+            keccak256(bytes(EIP712_EXCHANGE_DOMAIN_VERSION)),
+            uint256(address(EXCHANGE))
+        ));
+    }
+
+    /// @dev Calculates EIP712 encoding for a hash struct in the EIP712 domain
+    ///      of this contract.
+    /// @param hashStruct The EIP712 hash struct.
+    /// @return EIP712 hash applied to this EIP712 Domain.
+    function hashEIP712CoordinatorMessage(bytes32 hashStruct)
+        internal
+        view
+        returns (bytes32 result)
+    {
+        return hashEIP712Message(EIP712_COORDINATOR_DOMAIN_HASH, hashStruct);
+    }
+
+    /// @dev Calculates EIP712 encoding for a hash struct in the EIP712 domain
+    ///      of the Exchange contract.
+    /// @param hashStruct The EIP712 hash struct.
+    /// @return EIP712 hash applied to the Exchange EIP712 Domain.
+    function hashEIP712ExchangeMessage(bytes32 hashStruct)
+        internal
+        view
+        returns (bytes32 result)
+    {
+        return hashEIP712Message(EIP712_EXCHANGE_DOMAIN_HASH, hashStruct);
+    }
+
+    /// @dev Calculates EIP712 encoding for a hash struct with a given domain hash.
+    /// @param eip712DomainHash Hash of the domain domain separator data.
+    /// @param hashStruct The EIP712 hash struct.
+    /// @return EIP712 hash applied to the Exchange EIP712 Domain.
+    function hashEIP712Message(bytes32 eip712DomainHash, bytes32 hashStruct)
+        internal
+        pure
+        returns (bytes32 result)
+    {
+        // Assembly for more efficient computing:
+        // keccak256(abi.encodePacked(
+        //     EIP191_HEADER,
+        //     EIP712_DOMAIN_HASH,
+        //     hashStruct
+        // ));
+
+        assembly {
+            // Load free memory pointer
+            let memPtr := mload(64)
+
+            mstore(memPtr, 0x1901000000000000000000000000000000000000000000000000000000000000)  // EIP191 header
+            mstore(add(memPtr, 2), eip712DomainHash)                                            // EIP712 domain hash
+            mstore(add(memPtr, 34), hashStruct)                                                 // Hash of struct
+
+            // Compute hash
+            result := keccak256(memPtr, 66)
+        }
+        return result;
+    }
+}

contracts/coordinator/contracts/src/libs/LibZeroExTransaction.sol

@@ -0,0 +1,95 @@
+/*
+
+  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.5.5;
+pragma experimental "ABIEncoderV2";
+
+import "./LibEIP712Domain.sol";
+
+
+contract LibZeroExTransaction is
+    LibEIP712Domain
+{
+    // Hash for the EIP712 0x transaction schema
+    // keccak256(abi.encodePacked(
+    //    "ZeroExTransaction(",
+    //    "uint256 salt,",
+    //    "address signerAddress,",
+    //    "bytes data",
+    //    ")"
+    // ));
+    bytes32 constant internal EIP712_ZEROEX_TRANSACTION_SCHEMA_HASH = 0x213c6f636f3ea94e701c0adf9b2624aa45a6c694f9a292c094f9a81c24b5df4c;
+
+    struct ZeroExTransaction {
+        uint256 salt;           // Arbitrary number to ensure uniqueness of transaction hash.
+        address signerAddress;  // Address of transaction signer.
+        bytes data;             // AbiV2 encoded calldata.
+    }
+
+    /// @dev Calculates the EIP712 hash of a 0x transaction using the domain separator of the Exchange contract.
+    /// @param transaction 0x transaction containing salt, signerAddress, and data.
+    /// @return EIP712 hash of the transaction with the domain separator of this contract.
+    function getTransactionHash(ZeroExTransaction memory transaction)
+        public
+        view
+        returns (bytes32 transactionHash)
+    {
+        // Hash the transaction with the domain separator of the Exchange contract.
+        transactionHash = hashEIP712ExchangeMessage(hashZeroExTransaction(transaction));
+        return transactionHash;
+    }
+
+    /// @dev Calculates EIP712 hash of the 0x transaction with no domain separator.
+    /// @param transaction 0x transaction containing salt, signerAddress, and data.
+    /// @return EIP712 hash of the transaction with no domain separator.
+    function hashZeroExTransaction(ZeroExTransaction memory transaction)
+        internal
+        pure
+        returns (bytes32 result)
+    {
+        bytes32 schemaHash = EIP712_ZEROEX_TRANSACTION_SCHEMA_HASH;
+        bytes memory data = transaction.data;
+        uint256 salt = transaction.salt;
+        address signerAddress = transaction.signerAddress;
+
+        // Assembly for more efficiently computing:
+        // keccak256(abi.encodePacked(
+        //     EIP712_ZEROEX_TRANSACTION_SCHEMA_HASH,
+        //     transaction.salt,
+        //     uint256(transaction.signerAddress),
+        //     keccak256(transaction.data)
+        // ));
+
+        assembly {
+            // Compute hash of data
+            let dataHash := keccak256(add(data, 32), mload(data))
+
+            // Load free memory pointer
+            let memPtr := mload(64)
+
+            mstore(memPtr, schemaHash)                                                               // hash of schema
+            mstore(add(memPtr, 32), salt)                                                            // salt
+            mstore(add(memPtr, 64), and(signerAddress, 0xffffffffffffffffffffffffffffffffffffffff))  // signerAddress
+            mstore(add(memPtr, 96), dataHash)                                                        // hash of data
+
+            // Compute hash
+            result := keccak256(memPtr, 128)
+        }
+        return result;
+    }
+}

contracts/coordinator/contracts/src/mixins/MCoordinatorApprovalVerifier.sol

@@ -0,0 +1,46 @@
+/*
+
+  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.5.5;
+pragma experimental "ABIEncoderV2";
+
+import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
+import "../interfaces/ICoordinatorApprovalVerifier.sol";
+
+
+contract MCoordinatorApprovalVerifier is
+    ICoordinatorApprovalVerifier
+{
+    /// @dev Validates that the feeRecipients of a batch of order have approved a 0x transaction.
+    /// @param transaction 0x transaction containing salt, signerAddress, and data.
+    /// @param orders Array of order structs containing order specifications.
+    /// @param txOrigin Required signer of Ethereum transaction calling this function.
+    /// @param transactionSignature Proof that the transaction has been signed by the signer.
+    /// @param approvalExpirationTimeSeconds Array of expiration times in seconds for which each corresponding approval signature expires.
+    /// @param approvalSignatures Array of signatures that correspond to the feeRecipients of each order.
+    function assertValidTransactionOrdersApproval(
+        LibZeroExTransaction.ZeroExTransaction memory transaction,
+        LibOrder.Order[] memory orders,
+        address txOrigin,
+        bytes memory transactionSignature,
+        uint256[] memory approvalExpirationTimeSeconds,
+        bytes[] memory approvalSignatures
+    )
+        internal
+        view;
+}

contracts/coordinator/contracts/src/mixins/MSignatureValidator.sol

@@ -0,0 +1,35 @@
+/*
+
+  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.5.5;
+
+import "../interfaces/ISignatureValidator.sol";
+
+
+contract MSignatureValidator is
+    ISignatureValidator
+{
+    // Allowed signature types.
+    enum SignatureType {
+        Illegal,         // 0x00, default value
+        Invalid,         // 0x01
+        EIP712,          // 0x02
+        EthSign,         // 0x03
+        NSignatureTypes  // 0x04, number of signature types. Always leave at end.
+    }
+}

contracts/coordinator/contracts/src/registry/CoordinatorRegistry.sol

@@ -0,0 +1,32 @@
+/*
+
+  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.5.5;
+
+import "./MixinCoordinatorRegistryCore.sol";
+
+
+// solhint-disable no-empty-blocks
+contract CoordinatorRegistry is
+    MixinCoordinatorRegistryCore
+{
+    constructor ()
+        public
+        MixinCoordinatorRegistryCore()
+    {}
+}

contracts/coordinator/contracts/src/registry/MixinCoordinatorRegistryCore.sol

@@ -0,0 +1,48 @@
+/*
+
+  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.5.5;
+
+import "./interfaces/ICoordinatorRegistryCore.sol";
+
+
+// solhint-disable no-empty-blocks
+contract MixinCoordinatorRegistryCore is
+    ICoordinatorRegistryCore
+{
+    // mapping from `coordinatorOperator` -> `coordinatorEndpoint`
+    mapping (address => string) internal coordinatorEndpoints;
+
+    /// @dev Called by a Coordinator operator to set the endpoint of their Coordinator.
+    /// @param coordinatorEndpoint endpoint of the Coordinator.
+    function setCoordinatorEndpoint(string calldata coordinatorEndpoint) external {
+        address coordinatorOperator = msg.sender;
+        coordinatorEndpoints[coordinatorOperator] = coordinatorEndpoint;
+        emit CoordinatorEndpointSet(coordinatorOperator, coordinatorEndpoint);
+    }
+
+    /// @dev Gets the endpoint for a Coordinator.
+    /// @param coordinatorOperator operator of the Coordinator endpoint.
+    function getCoordinatorEndpoint(address coordinatorOperator)
+        external
+        view
+        returns (string memory coordinatorEndpoint)
+    {
+        return coordinatorEndpoints[coordinatorOperator];
+    }
+}

contracts/coordinator/contracts/src/registry/interfaces/ICoordinatorRegistryCore.sol

@@ -0,0 +1,41 @@
+/*
+
+  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.5.5;
+
+
+// solhint-disable no-empty-blocks
+contract ICoordinatorRegistryCore
+{
+    /// @dev Emitted when a Coordinator endpoint is set.
+    event CoordinatorEndpointSet(
+        address coordinatorOperator,
+        string coordinatorEndpoint
+    );
+
+    /// @dev Called by a Coordinator operator to set the endpoint of their Coordinator.
+    /// @param coordinatorEndpoint endpoint of the Coordinator.
+    function setCoordinatorEndpoint(string calldata coordinatorEndpoint) external;
+
+    /// @dev Gets the endpoint for a Coordinator.
+    /// @param coordinatorOperator operator of the Coordinator endpoint.
+    function getCoordinatorEndpoint(address coordinatorOperator)
+        external
+        view
+        returns (string memory coordinatorEndpoint);
+}

contracts/coordinator/package.json

@@ -0,0 +1,90 @@
+{
+    "name": "@0x/contracts-coordinator",
+    "version": "2.0.12",
+    "engines": {
+        "node": ">=6.12"
+    },
+    "description": "Smart contract extensions 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",
+        "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} --output generated-wrappers --backend ethers",
+        "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
+        "fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
+        "coverage:report:text": "istanbul report text",
+        "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/@(Coordinator|CoordinatorRegistry).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/extensions/README.md",
+    "devDependencies": {
+        "@0x/abi-gen": "^4.2.0",
+        "@0x/contracts-gen": "^1.0.14",
+        "@0x/contracts-test-utils": "^3.1.15",
+        "@0x/dev-utils": "^2.3.2",
+        "@0x/sol-compiler": "^3.1.14",
+        "@0x/tslint-config": "^3.0.1",
+        "@types/lodash": "4.14.104",
+        "@types/mocha": "^5.2.7",
+        "@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": "^6.2.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.3.3",
+        "@0x/contracts-asset-proxy": "^2.2.7",
+        "@0x/contracts-erc20": "^2.2.13",
+        "@0x/contracts-exchange": "^2.1.13",
+        "@0x/contracts-exchange-libs": "^3.0.7",
+        "@0x/contracts-utils": "^3.2.3",
+        "@0x/order-utils": "^8.3.1",
+        "@0x/types": "^2.4.2",
+        "@0x/typescript-typings": "^4.2.5",
+        "@0x/utils": "^4.5.1",
+        "@0x/web3-wrapper": "^6.0.12",
+        "ethereum-types": "^2.1.5",
+        "ethereumjs-util": "^5.1.1",
+        "lodash": "^4.17.11"
+    },
+    "publishConfig": {
+        "access": "public"
+    }
+}

contracts/coordinator/src/artifacts.ts

@@ -0,0 +1,13 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+import { ContractArtifact } from 'ethereum-types';
+
+import * as Coordinator from '../generated-artifacts/Coordinator.json';
+import * as CoordinatorRegistry from '../generated-artifacts/CoordinatorRegistry.json';
+export const artifacts = {
+    Coordinator: Coordinator as ContractArtifact,
+    CoordinatorRegistry: CoordinatorRegistry as ContractArtifact,
+};

contracts/coordinator/src/index.ts

@@ -0,0 +1,3 @@
+export * from './artifacts';
+export * from './wrappers';
+export * from '../test/utils';

contracts/coordinator/src/wrappers.ts

@@ -0,0 +1,7 @@
+/*
+ * -----------------------------------------------------------------------------
+ * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
+ * -----------------------------------------------------------------------------
+ */
+export * from '../generated-wrappers/coordinator';
+export * from '../generated-wrappers/coordinator_registry';

contracts/coordinator/test/coordinator.ts

@@ -0,0 +1,523 @@
+import { ERC20ProxyContract, ERC20Wrapper } from '@0x/contracts-asset-proxy';
+import { DummyERC20TokenContract } from '@0x/contracts-erc20';
+import {
+    artifacts as exchangeArtifacts,
+    ExchangeCancelEventArgs,
+    ExchangeCancelUpToEventArgs,
+    ExchangeContract,
+    ExchangeFillEventArgs,
+} from '@0x/contracts-exchange';
+import {
+    chaiSetup,
+    constants as devConstants,
+    expectTransactionFailedAsync,
+    getLatestBlockTimestampAsync,
+    OrderFactory,
+    provider,
+    TransactionFactory,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
+import { BlockchainLifecycle } from '@0x/dev-utils';
+import { assetDataUtils, orderHashUtils } from '@0x/order-utils';
+import { RevertReason, SignedOrder } from '@0x/types';
+import { BigNumber } from '@0x/utils';
+import * as chai from 'chai';
+import { LogWithDecodedArgs } from 'ethereum-types';
+
+import { ApprovalFactory, artifacts, constants, CoordinatorContract, exchangeDataEncoder } from '../src';
+
+chaiSetup.configure();
+const expect = chai.expect;
+const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
+web3Wrapper.abiDecoder.addABI(exchangeArtifacts.Exchange.compilerOutput.abi);
+// tslint:disable:no-unnecessary-type-assertion
+describe('Coordinator tests', () => {
+    let makerAddress: string;
+    let owner: string;
+    let takerAddress: string;
+    let feeRecipientAddress: string;
+
+    let erc20Proxy: ERC20ProxyContract;
+    let erc20TokenA: DummyERC20TokenContract;
+    let erc20TokenB: DummyERC20TokenContract;
+    let zrxToken: DummyERC20TokenContract;
+    let coordinatorContract: CoordinatorContract;
+    let exchange: ExchangeContract;
+
+    let erc20Wrapper: ERC20Wrapper;
+    let orderFactory: OrderFactory;
+    let takerTransactionFactory: TransactionFactory;
+    let makerTransactionFactory: TransactionFactory;
+    let approvalFactory: ApprovalFactory;
+
+    before(async () => {
+        await blockchainLifecycle.startAsync();
+    });
+    after(async () => {
+        await blockchainLifecycle.revertAsync();
+    });
+    before(async () => {
+        const accounts = await web3Wrapper.getAvailableAddressesAsync();
+        const usedAddresses = ([owner, makerAddress, takerAddress, feeRecipientAddress] = accounts.slice(0, 4));
+
+        erc20Wrapper = new ERC20Wrapper(provider, usedAddresses, owner);
+        erc20Proxy = await erc20Wrapper.deployProxyAsync();
+        const numDummyErc20ToDeploy = 3;
+        [erc20TokenA, erc20TokenB, zrxToken] = await erc20Wrapper.deployDummyTokensAsync(
+            numDummyErc20ToDeploy,
+            devConstants.DUMMY_TOKEN_DECIMALS,
+        );
+        await erc20Wrapper.setBalancesAndAllowancesAsync();
+
+        exchange = await ExchangeContract.deployFrom0xArtifactAsync(
+            exchangeArtifacts.Exchange,
+            provider,
+            txDefaults,
+            artifacts,
+            assetDataUtils.encodeERC20AssetData(zrxToken.address),
+        );
+
+        await web3Wrapper.awaitTransactionSuccessAsync(
+            await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { from: owner }),
+            devConstants.AWAIT_TRANSACTION_MINED_MS,
+        );
+
+        await web3Wrapper.awaitTransactionSuccessAsync(
+            await exchange.registerAssetProxy.sendTransactionAsync(erc20Proxy.address, { from: owner }),
+            devConstants.AWAIT_TRANSACTION_MINED_MS,
+        );
+
+        coordinatorContract = await CoordinatorContract.deployFrom0xArtifactAsync(
+            artifacts.Coordinator,
+            provider,
+            txDefaults,
+            artifacts,
+            exchange.address,
+        );
+
+        // Configure order defaults
+        const defaultOrderParams = {
+            ...devConstants.STATIC_ORDER_PARAMS,
+            exchangeAddress: exchange.address,
+            senderAddress: coordinatorContract.address,
+            makerAddress,
+            feeRecipientAddress,
+            makerAssetData: assetDataUtils.encodeERC20AssetData(erc20TokenA.address),
+            takerAssetData: assetDataUtils.encodeERC20AssetData(erc20TokenB.address),
+        };
+        const makerPrivateKey = devConstants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(makerAddress)];
+        const takerPrivateKey = devConstants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(takerAddress)];
+        const feeRecipientPrivateKey = devConstants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(feeRecipientAddress)];
+        orderFactory = new OrderFactory(makerPrivateKey, defaultOrderParams);
+        makerTransactionFactory = new TransactionFactory(makerPrivateKey, exchange.address);
+        takerTransactionFactory = new TransactionFactory(takerPrivateKey, exchange.address);
+        approvalFactory = new ApprovalFactory(feeRecipientPrivateKey, coordinatorContract.address);
+    });
+    beforeEach(async () => {
+        await blockchainLifecycle.startAsync();
+    });
+    afterEach(async () => {
+        await blockchainLifecycle.revertAsync();
+    });
+
+    describe('single order fills', () => {
+        for (const fnName of constants.SINGLE_FILL_FN_NAMES) {
+            it(`${fnName} should fill the order with a signed approval`, async () => {
+                const orders = [await orderFactory.newSignedOrderAsync()];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval = approvalFactory.newSignedApproval(
+                    transaction,
+                    takerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                const transactionReceipt = await web3Wrapper.awaitTransactionSuccessAsync(
+                    await coordinatorContract.executeTransaction.sendTransactionAsync(
+                        transaction,
+                        takerAddress,
+                        transaction.signature,
+                        [approvalExpirationTimeSeconds],
+                        [approval.signature],
+                        { from: takerAddress },
+                    ),
+                    devConstants.AWAIT_TRANSACTION_MINED_MS,
+                );
+                const fillLogs = transactionReceipt.logs.filter(
+                    log => (log as LogWithDecodedArgs<ExchangeFillEventArgs>).event === 'Fill',
+                );
+                expect(fillLogs.length).to.eq(1);
+                const fillLogArgs = (fillLogs[0] as LogWithDecodedArgs<ExchangeFillEventArgs>).args;
+                expect(fillLogArgs.makerAddress).to.eq(makerAddress);
+                expect(fillLogArgs.takerAddress).to.eq(takerAddress);
+                expect(fillLogArgs.senderAddress).to.eq(coordinatorContract.address);
+                expect(fillLogArgs.feeRecipientAddress).to.eq(feeRecipientAddress);
+                expect(fillLogArgs.makerAssetData).to.eq(orders[0].makerAssetData);
+                expect(fillLogArgs.takerAssetData).to.eq(orders[0].takerAssetData);
+                expect(fillLogArgs.makerAssetFilledAmount).to.bignumber.eq(orders[0].makerAssetAmount);
+                expect(fillLogArgs.takerAssetFilledAmount).to.bignumber.eq(orders[0].takerAssetAmount);
+                expect(fillLogArgs.makerFeePaid).to.bignumber.eq(orders[0].makerFee);
+                expect(fillLogArgs.takerFeePaid).to.bignumber.eq(orders[0].takerFee);
+                expect(fillLogArgs.orderHash).to.eq(orderHashUtils.getOrderHashHex(orders[0]));
+            });
+            it(`${fnName} should fill the order if called by approver`, async () => {
+                const orders = [await orderFactory.newSignedOrderAsync()];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const transactionReceipt = await web3Wrapper.awaitTransactionSuccessAsync(
+                    await coordinatorContract.executeTransaction.sendTransactionAsync(
+                        transaction,
+                        feeRecipientAddress,
+                        transaction.signature,
+                        [],
+                        [],
+                        { from: feeRecipientAddress },
+                    ),
+                    devConstants.AWAIT_TRANSACTION_MINED_MS,
+                );
+                const fillLogs = transactionReceipt.logs.filter(
+                    log => (log as LogWithDecodedArgs<ExchangeFillEventArgs>).event === 'Fill',
+                );
+                expect(fillLogs.length).to.eq(1);
+                const fillLogArgs = (fillLogs[0] as LogWithDecodedArgs<ExchangeFillEventArgs>).args;
+                expect(fillLogArgs.makerAddress).to.eq(makerAddress);
+                expect(fillLogArgs.takerAddress).to.eq(takerAddress);
+                expect(fillLogArgs.senderAddress).to.eq(coordinatorContract.address);
+                expect(fillLogArgs.feeRecipientAddress).to.eq(feeRecipientAddress);
+                expect(fillLogArgs.makerAssetData).to.eq(orders[0].makerAssetData);
+                expect(fillLogArgs.takerAssetData).to.eq(orders[0].takerAssetData);
+                expect(fillLogArgs.makerAssetFilledAmount).to.bignumber.eq(orders[0].makerAssetAmount);
+                expect(fillLogArgs.takerAssetFilledAmount).to.bignumber.eq(orders[0].takerAssetAmount);
+                expect(fillLogArgs.makerFeePaid).to.bignumber.eq(orders[0].makerFee);
+                expect(fillLogArgs.takerFeePaid).to.bignumber.eq(orders[0].takerFee);
+                expect(fillLogArgs.orderHash).to.eq(orderHashUtils.getOrderHashHex(orders[0]));
+            });
+            it(`${fnName} should revert with no approval signature`, async () => {
+                const orders = [await orderFactory.newSignedOrderAsync()];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                await expectTransactionFailedAsync(
+                    coordinatorContract.executeTransaction.sendTransactionAsync(
+                        transaction,
+                        takerAddress,
+                        transaction.signature,
+                        [],
+                        [],
+                        {
+                            from: takerAddress,
+                            gas: devConstants.MAX_EXECUTE_TRANSACTION_GAS,
+                        },
+                    ),
+                    RevertReason.InvalidApprovalSignature,
+                );
+            });
+            it(`${fnName} should revert with an invalid approval signature`, async () => {
+                const orders = [await orderFactory.newSignedOrderAsync()];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval = approvalFactory.newSignedApproval(
+                    transaction,
+                    takerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                const signature = `${approval.signature.slice(0, 4)}FFFFFFFF${approval.signature.slice(12)}`;
+                await expectTransactionFailedAsync(
+                    coordinatorContract.executeTransaction.sendTransactionAsync(
+                        transaction,
+                        takerAddress,
+                        transaction.signature,
+                        [approvalExpirationTimeSeconds],
+                        [signature],
+                        { from: takerAddress },
+                    ),
+                    RevertReason.InvalidApprovalSignature,
+                );
+            });
+            it(`${fnName} should revert with an expired approval`, async () => {
+                const orders = [await orderFactory.newSignedOrderAsync()];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).minus(constants.TIME_BUFFER);
+                const approval = approvalFactory.newSignedApproval(
+                    transaction,
+                    takerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                await expectTransactionFailedAsync(
+                    coordinatorContract.executeTransaction.sendTransactionAsync(
+                        transaction,
+                        takerAddress,
+                        transaction.signature,
+                        [approvalExpirationTimeSeconds],
+                        [approval.signature],
+                        { from: takerAddress },
+                    ),
+                    RevertReason.ApprovalExpired,
+                );
+            });
+            it(`${fnName} should revert if not called by tx signer or approver`, async () => {
+                const orders = [await orderFactory.newSignedOrderAsync()];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval = approvalFactory.newSignedApproval(
+                    transaction,
+                    takerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                await expectTransactionFailedAsync(
+                    coordinatorContract.executeTransaction.sendTransactionAsync(
+                        transaction,
+                        takerAddress,
+                        transaction.signature,
+                        [approvalExpirationTimeSeconds],
+                        [approval.signature],
+                        { from: owner },
+                    ),
+                    RevertReason.InvalidOrigin,
+                );
+            });
+        }
+    });
+    describe('batch order fills', () => {
+        for (const fnName of [...constants.MARKET_FILL_FN_NAMES, ...constants.BATCH_FILL_FN_NAMES]) {
+            it(`${fnName} should fill the orders with a signed approval`, async () => {
+                const orders = [await orderFactory.newSignedOrderAsync(), await orderFactory.newSignedOrderAsync()];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval = approvalFactory.newSignedApproval(
+                    transaction,
+                    takerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                const transactionReceipt = await web3Wrapper.awaitTransactionSuccessAsync(
+                    await coordinatorContract.executeTransaction.sendTransactionAsync(
+                        transaction,
+                        takerAddress,
+                        transaction.signature,
+                        [approvalExpirationTimeSeconds],
+                        [approval.signature],
+                        { from: takerAddress, gas: devConstants.MAX_EXECUTE_TRANSACTION_GAS },
+                    ),
+                    devConstants.AWAIT_TRANSACTION_MINED_MS,
+                );
+                const fillLogs = transactionReceipt.logs.filter(
+                    log => (log as LogWithDecodedArgs<ExchangeFillEventArgs>).event === 'Fill',
+                );
+                expect(fillLogs.length).to.eq(orders.length);
+                orders.forEach((order, index) => {
+                    const fillLogArgs = (fillLogs[index] as LogWithDecodedArgs<ExchangeFillEventArgs>).args;
+                    expect(fillLogArgs.makerAddress).to.eq(makerAddress);
+                    expect(fillLogArgs.takerAddress).to.eq(takerAddress);
+                    expect(fillLogArgs.senderAddress).to.eq(coordinatorContract.address);
+                    expect(fillLogArgs.feeRecipientAddress).to.eq(feeRecipientAddress);
+                    expect(fillLogArgs.makerAssetData).to.eq(order.makerAssetData);
+                    expect(fillLogArgs.takerAssetData).to.eq(order.takerAssetData);
+                    expect(fillLogArgs.makerAssetFilledAmount).to.bignumber.eq(order.makerAssetAmount);
+                    expect(fillLogArgs.takerAssetFilledAmount).to.bignumber.eq(order.takerAssetAmount);
+                    expect(fillLogArgs.makerFeePaid).to.bignumber.eq(order.makerFee);
+                    expect(fillLogArgs.takerFeePaid).to.bignumber.eq(order.takerFee);
+                    expect(fillLogArgs.orderHash).to.eq(orderHashUtils.getOrderHashHex(order));
+                });
+            });
+            it(`${fnName} should fill the orders if called by approver`, async () => {
+                const orders = [await orderFactory.newSignedOrderAsync(), await orderFactory.newSignedOrderAsync()];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const transactionReceipt = await web3Wrapper.awaitTransactionSuccessAsync(
+                    await coordinatorContract.executeTransaction.sendTransactionAsync(
+                        transaction,
+                        feeRecipientAddress,
+                        transaction.signature,
+                        [],
+                        [],
+                        { from: feeRecipientAddress, gas: devConstants.MAX_EXECUTE_TRANSACTION_GAS },
+                    ),
+                    devConstants.AWAIT_TRANSACTION_MINED_MS,
+                );
+                const fillLogs = transactionReceipt.logs.filter(
+                    log => (log as LogWithDecodedArgs<ExchangeFillEventArgs>).event === 'Fill',
+                );
+                expect(fillLogs.length).to.eq(orders.length);
+                orders.forEach((order, index) => {
+                    const fillLogArgs = (fillLogs[index] as LogWithDecodedArgs<ExchangeFillEventArgs>).args;
+                    expect(fillLogArgs.makerAddress).to.eq(makerAddress);
+                    expect(fillLogArgs.takerAddress).to.eq(takerAddress);
+                    expect(fillLogArgs.senderAddress).to.eq(coordinatorContract.address);
+                    expect(fillLogArgs.feeRecipientAddress).to.eq(feeRecipientAddress);
+                    expect(fillLogArgs.makerAssetData).to.eq(order.makerAssetData);
+                    expect(fillLogArgs.takerAssetData).to.eq(order.takerAssetData);
+                    expect(fillLogArgs.makerAssetFilledAmount).to.bignumber.eq(order.makerAssetAmount);
+                    expect(fillLogArgs.takerAssetFilledAmount).to.bignumber.eq(order.takerAssetAmount);
+                    expect(fillLogArgs.makerFeePaid).to.bignumber.eq(order.makerFee);
+                    expect(fillLogArgs.takerFeePaid).to.bignumber.eq(order.takerFee);
+                    expect(fillLogArgs.orderHash).to.eq(orderHashUtils.getOrderHashHex(order));
+                });
+            });
+            it(`${fnName} should revert with an invalid approval signature`, async () => {
+                const orders = [await orderFactory.newSignedOrderAsync(), await orderFactory.newSignedOrderAsync()];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval = approvalFactory.newSignedApproval(
+                    transaction,
+                    takerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                const signature = `${approval.signature.slice(0, 4)}FFFFFFFF${approval.signature.slice(12)}`;
+                await expectTransactionFailedAsync(
+                    coordinatorContract.executeTransaction.sendTransactionAsync(
+                        transaction,
+                        takerAddress,
+                        transaction.signature,
+                        [approvalExpirationTimeSeconds],
+                        [signature],
+                        { from: takerAddress },
+                    ),
+                    RevertReason.InvalidApprovalSignature,
+                );
+            });
+            it(`${fnName} should revert with an expired approval`, async () => {
+                const orders = [await orderFactory.newSignedOrderAsync(), await orderFactory.newSignedOrderAsync()];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).minus(constants.TIME_BUFFER);
+                const approval = approvalFactory.newSignedApproval(
+                    transaction,
+                    takerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                await expectTransactionFailedAsync(
+                    coordinatorContract.executeTransaction.sendTransactionAsync(
+                        transaction,
+                        takerAddress,
+                        transaction.signature,
+                        [approvalExpirationTimeSeconds],
+                        [approval.signature],
+                        { from: takerAddress },
+                    ),
+                    RevertReason.ApprovalExpired,
+                );
+            });
+            it(`${fnName} should revert if not called by tx signer or approver`, async () => {
+                const orders = [await orderFactory.newSignedOrderAsync(), await orderFactory.newSignedOrderAsync()];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = takerTransactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval = approvalFactory.newSignedApproval(
+                    transaction,
+                    takerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                await expectTransactionFailedAsync(
+                    coordinatorContract.executeTransaction.sendTransactionAsync(
+                        transaction,
+                        takerAddress,
+                        transaction.signature,
+                        [approvalExpirationTimeSeconds],
+                        [approval.signature],
+                        { from: owner },
+                    ),
+                    RevertReason.InvalidOrigin,
+                );
+            });
+        }
+    });
+    describe('cancels', () => {
+        it('cancelOrder call should be successful without an approval', async () => {
+            const orders = [await orderFactory.newSignedOrderAsync()];
+            const data = exchangeDataEncoder.encodeOrdersToExchangeData(constants.CANCEL_ORDER, orders);
+            const transaction = makerTransactionFactory.newSignedTransaction(data);
+            const transactionReceipt = await web3Wrapper.awaitTransactionSuccessAsync(
+                await coordinatorContract.executeTransaction.sendTransactionAsync(
+                    transaction,
+                    makerAddress,
+                    transaction.signature,
+                    [],
+                    [],
+                    {
+                        from: makerAddress,
+                    },
+                ),
+            );
+            const cancelLogs = transactionReceipt.logs.filter(
+                log => (log as LogWithDecodedArgs<ExchangeCancelEventArgs>).event === 'Cancel',
+            );
+            expect(cancelLogs.length).to.eq(1);
+            const cancelLogArgs = (cancelLogs[0] as LogWithDecodedArgs<ExchangeCancelEventArgs>).args;
+            expect(cancelLogArgs.makerAddress).to.eq(makerAddress);
+            expect(cancelLogArgs.senderAddress).to.eq(coordinatorContract.address);
+            expect(cancelLogArgs.feeRecipientAddress).to.eq(feeRecipientAddress);
+            expect(cancelLogArgs.makerAssetData).to.eq(orders[0].makerAssetData);
+            expect(cancelLogArgs.takerAssetData).to.eq(orders[0].takerAssetData);
+            expect(cancelLogArgs.orderHash).to.eq(orderHashUtils.getOrderHashHex(orders[0]));
+        });
+        it('batchCancelOrders call should be successful without an approval', async () => {
+            const orders = [await orderFactory.newSignedOrderAsync(), await orderFactory.newSignedOrderAsync()];
+            const data = exchangeDataEncoder.encodeOrdersToExchangeData(constants.BATCH_CANCEL_ORDERS, orders);
+            const transaction = makerTransactionFactory.newSignedTransaction(data);
+            const transactionReceipt = await web3Wrapper.awaitTransactionSuccessAsync(
+                await coordinatorContract.executeTransaction.sendTransactionAsync(
+                    transaction,
+                    makerAddress,
+                    transaction.signature,
+                    [],
+                    [],
+                    {
+                        from: makerAddress,
+                    },
+                ),
+            );
+            const cancelLogs = transactionReceipt.logs.filter(
+                log => (log as LogWithDecodedArgs<ExchangeCancelEventArgs>).event === 'Cancel',
+            );
+            expect(cancelLogs.length).to.eq(orders.length);
+            orders.forEach((order, index) => {
+                const cancelLogArgs = (cancelLogs[index] as LogWithDecodedArgs<ExchangeCancelEventArgs>).args;
+                expect(cancelLogArgs.makerAddress).to.eq(makerAddress);
+                expect(cancelLogArgs.senderAddress).to.eq(coordinatorContract.address);
+                expect(cancelLogArgs.feeRecipientAddress).to.eq(feeRecipientAddress);
+                expect(cancelLogArgs.makerAssetData).to.eq(order.makerAssetData);
+                expect(cancelLogArgs.takerAssetData).to.eq(order.takerAssetData);
+                expect(cancelLogArgs.orderHash).to.eq(orderHashUtils.getOrderHashHex(order));
+            });
+        });
+        it('cancelOrdersUpTo call should be successful without an approval', async () => {
+            const orders: SignedOrder[] = [];
+            const data = exchangeDataEncoder.encodeOrdersToExchangeData(constants.CANCEL_ORDERS_UP_TO, orders);
+            const transaction = makerTransactionFactory.newSignedTransaction(data);
+            const transactionReceipt = await web3Wrapper.awaitTransactionSuccessAsync(
+                await coordinatorContract.executeTransaction.sendTransactionAsync(
+                    transaction,
+                    makerAddress,
+                    transaction.signature,
+                    [],
+                    [],
+                    {
+                        from: makerAddress,
+                    },
+                ),
+            );
+            const cancelLogs = transactionReceipt.logs.filter(
+                log => (log as LogWithDecodedArgs<ExchangeCancelUpToEventArgs>).event === 'CancelUpTo',
+            );
+            expect(cancelLogs.length).to.eq(1);
+            const cancelLogArgs = (cancelLogs[0] as LogWithDecodedArgs<ExchangeCancelUpToEventArgs>).args;
+            expect(cancelLogArgs.makerAddress).to.eq(makerAddress);
+            expect(cancelLogArgs.senderAddress).to.eq(coordinatorContract.address);
+            expect(cancelLogArgs.orderEpoch).to.bignumber.eq(new BigNumber(1));
+        });
+    });
+});
+// tslint:disable:max-file-line-count

contracts/coordinator/test/coordinator_registry.ts

@@ -0,0 +1,81 @@
+import { artifacts as exchangeArtifacts } from '@0x/contracts-exchange';
+import { chaiSetup, provider, web3Wrapper } from '@0x/contracts-test-utils';
+import { BlockchainLifecycle } from '@0x/dev-utils';
+import * as chai from 'chai';
+import { LogWithDecodedArgs } from 'ethereum-types';
+
+import { CoordinatorRegistryCoordinatorEndpointSetEventArgs } from '../src';
+
+import { CoordinatorRegistryWrapper } from './utils/coordinator_registry_wrapper';
+
+chaiSetup.configure();
+const expect = chai.expect;
+const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
+web3Wrapper.abiDecoder.addABI(exchangeArtifacts.Exchange.compilerOutput.abi);
+// tslint:disable:no-unnecessary-type-assertion
+describe('Coordinator Registry tests', () => {
+    let coordinatorOperator: string;
+    const coordinatorEndpoint = 'http://sometec.0x.org';
+    const nilCoordinatorEndpoint = '';
+    let coordinatorRegistryWrapper: CoordinatorRegistryWrapper;
+    // tests
+    before(async () => {
+        await blockchainLifecycle.startAsync();
+    });
+    after(async () => {
+        await blockchainLifecycle.revertAsync();
+    });
+    before(async () => {
+        // setup accounts (skip owner)
+        const accounts = await web3Wrapper.getAvailableAddressesAsync();
+        [, coordinatorOperator] = accounts;
+        // deploy coordinator registry
+        coordinatorRegistryWrapper = new CoordinatorRegistryWrapper(provider);
+        await coordinatorRegistryWrapper.deployCoordinatorRegistryAsync();
+    });
+    beforeEach(async () => {
+        await blockchainLifecycle.startAsync();
+    });
+    afterEach(async () => {
+        await blockchainLifecycle.revertAsync();
+    });
+    describe('core', () => {
+        it('Should successfully set a Coordinator endpoint', async () => {
+            await coordinatorRegistryWrapper.setCoordinatorEndpointAsync(coordinatorOperator, coordinatorEndpoint);
+            const recordedCoordinatorEndpoint = await coordinatorRegistryWrapper.getCoordinatorEndpointAsync(
+                coordinatorOperator,
+            );
+            expect(recordedCoordinatorEndpoint).to.be.equal(coordinatorEndpoint);
+        });
+        it('Should successfully unset a Coordinator endpoint', async () => {
+            // set Coordinator endpoint
+            await coordinatorRegistryWrapper.setCoordinatorEndpointAsync(coordinatorOperator, coordinatorEndpoint);
+            let recordedCoordinatorEndpoint = await coordinatorRegistryWrapper.getCoordinatorEndpointAsync(
+                coordinatorOperator,
+            );
+            expect(recordedCoordinatorEndpoint).to.be.equal(coordinatorEndpoint);
+            // unset Coordinator endpoint
+            await coordinatorRegistryWrapper.setCoordinatorEndpointAsync(coordinatorOperator, nilCoordinatorEndpoint);
+            recordedCoordinatorEndpoint = await coordinatorRegistryWrapper.getCoordinatorEndpointAsync(
+                coordinatorOperator,
+            );
+            expect(recordedCoordinatorEndpoint).to.be.equal(nilCoordinatorEndpoint);
+        });
+        it('Should emit an event when setting Coordinator endpoint', async () => {
+            // set Coordinator endpoint
+            const txReceipt = await coordinatorRegistryWrapper.setCoordinatorEndpointAsync(
+                coordinatorOperator,
+                coordinatorEndpoint,
+            );
+            const recordedCoordinatorEndpoint = await coordinatorRegistryWrapper.getCoordinatorEndpointAsync(
+                coordinatorOperator,
+            );
+            expect(recordedCoordinatorEndpoint).to.be.equal(coordinatorEndpoint);
+            // validate event
+            expect(txReceipt.logs.length).to.be.equal(1);
+            const log = txReceipt.logs[0] as LogWithDecodedArgs<CoordinatorRegistryCoordinatorEndpointSetEventArgs>;
+            expect(log.args.coordinatorOperator).to.be.equal(coordinatorOperator);
+            expect(log.args.coordinatorEndpoint).to.be.equal(coordinatorEndpoint);
+        });
+    });
+});

contracts/coordinator/test/global_hooks.ts

@@ -0,0 +1,19 @@
+import { env, EnvVars } from '@0x/dev-utils';
+
+import { coverage, profiler, provider } from '@0x/contracts-test-utils';
+import { providerUtils } from '@0x/utils';
+
+before('start web3 provider', () => {
+    providerUtils.startProviderEngine(provider);
+});
+after('generate coverage report', async () => {
+    if (env.parseBoolean(EnvVars.SolidityCoverage)) {
+        const coverageSubprovider = coverage.getCoverageSubproviderSingleton();
+        await coverageSubprovider.writeCoverageAsync();
+    }
+    if (env.parseBoolean(EnvVars.SolidityProfiler)) {
+        const profilerSubprovider = profiler.getProfilerSubproviderSingleton();
+        await profilerSubprovider.writeProfilerOutputAsync();
+    }
+    provider.stop();
+});

contracts/coordinator/test/libs.ts

@@ -0,0 +1,80 @@
+import { addressUtils, chaiSetup, constants, provider, txDefaults, web3Wrapper } from '@0x/contracts-test-utils';
+import { BlockchainLifecycle } from '@0x/dev-utils';
+import { transactionHashUtils } from '@0x/order-utils';
+import { BigNumber } from '@0x/utils';
+import * as chai from 'chai';
+
+import { artifacts, CoordinatorContract, hashUtils } from '../src';
+
+chaiSetup.configure();
+const expect = chai.expect;
+const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
+
+describe('Libs tests', () => {
+    let coordinatorContract: CoordinatorContract;
+    const exchangeAddress = addressUtils.generatePseudoRandomAddress();
+
+    before(async () => {
+        await blockchainLifecycle.startAsync();
+    });
+    after(async () => {
+        await blockchainLifecycle.revertAsync();
+    });
+    before(async () => {
+        coordinatorContract = await CoordinatorContract.deployFrom0xArtifactAsync(
+            artifacts.Coordinator,
+            provider,
+            txDefaults,
+            artifacts,
+            exchangeAddress,
+        );
+    });
+    beforeEach(async () => {
+        await blockchainLifecycle.startAsync();
+    });
+    afterEach(async () => {
+        await blockchainLifecycle.revertAsync();
+    });
+
+    describe('getTransactionHash', () => {
+        it('should return the correct transaction hash', async () => {
+            const tx = {
+                verifyingContractAddress: exchangeAddress,
+                salt: new BigNumber(0),
+                signerAddress: constants.NULL_ADDRESS,
+                data: '0x1234',
+            };
+            const expectedTxHash = transactionHashUtils.getTransactionHashHex(tx);
+            const txHash = await coordinatorContract.getTransactionHash.callAsync(tx);
+            expect(expectedTxHash).to.eq(txHash);
+        });
+    });
+
+    describe('getApprovalHash', () => {
+        it('should return the correct approval hash', async () => {
+            const signedTx = {
+                verifyingContractAddress: exchangeAddress,
+                salt: new BigNumber(0),
+                signerAddress: constants.NULL_ADDRESS,
+                data: '0x1234',
+                signature: '0x5678',
+            };
+            const approvalExpirationTimeSeconds = new BigNumber(0);
+            const txOrigin = constants.NULL_ADDRESS;
+            const approval = {
+                txOrigin,
+                transactionHash: transactionHashUtils.getTransactionHashHex(signedTx),
+                transactionSignature: signedTx.signature,
+                approvalExpirationTimeSeconds,
+            };
+            const expectedApprovalHash = hashUtils.getApprovalHashHex(
+                signedTx,
+                coordinatorContract.address,
+                txOrigin,
+                approvalExpirationTimeSeconds,
+            );
+            const approvalHash = await coordinatorContract.getCoordinatorApprovalHash.callAsync(approval);
+            expect(expectedApprovalHash).to.eq(approvalHash);
+        });
+    });
+});

contracts/coordinator/test/mixins.ts

@@ -0,0 +1,729 @@
+import {
+    addressUtils,
+    chaiSetup,
+    constants as devConstants,
+    expectContractCallFailedAsync,
+    getLatestBlockTimestampAsync,
+    provider,
+    TransactionFactory,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
+import { BlockchainLifecycle } from '@0x/dev-utils';
+import { transactionHashUtils } from '@0x/order-utils';
+import { RevertReason, SignatureType, SignedOrder } from '@0x/types';
+import { BigNumber } from '@0x/utils';
+import * as chai from 'chai';
+import * as ethUtil from 'ethereumjs-util';
+
+import { ApprovalFactory, artifacts, constants, CoordinatorContract, exchangeDataEncoder } from '../src';
+
+chaiSetup.configure();
+const expect = chai.expect;
+const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
+
+describe('Mixins tests', () => {
+    let transactionSignerAddress: string;
+    let approvalSignerAddress1: string;
+    let approvalSignerAddress2: string;
+    let mixins: CoordinatorContract;
+    let transactionFactory: TransactionFactory;
+    let approvalFactory1: ApprovalFactory;
+    let approvalFactory2: ApprovalFactory;
+    let defaultOrder: SignedOrder;
+    const exchangeAddress = addressUtils.generatePseudoRandomAddress();
+
+    before(async () => {
+        await blockchainLifecycle.startAsync();
+    });
+    after(async () => {
+        await blockchainLifecycle.revertAsync();
+    });
+    before(async () => {
+        mixins = await CoordinatorContract.deployFrom0xArtifactAsync(
+            artifacts.Coordinator,
+            provider,
+            txDefaults,
+            artifacts,
+            exchangeAddress,
+        );
+        const accounts = await web3Wrapper.getAvailableAddressesAsync();
+        [transactionSignerAddress, approvalSignerAddress1, approvalSignerAddress2] = accounts.slice(0, 3);
+        defaultOrder = {
+            exchangeAddress: devConstants.NULL_ADDRESS,
+            makerAddress: devConstants.NULL_ADDRESS,
+            takerAddress: devConstants.NULL_ADDRESS,
+            senderAddress: mixins.address,
+            feeRecipientAddress: approvalSignerAddress1,
+            makerAssetData: devConstants.NULL_BYTES,
+            takerAssetData: devConstants.NULL_BYTES,
+            makerAssetAmount: devConstants.ZERO_AMOUNT,
+            takerAssetAmount: devConstants.ZERO_AMOUNT,
+            makerFee: devConstants.ZERO_AMOUNT,
+            takerFee: devConstants.ZERO_AMOUNT,
+            expirationTimeSeconds: devConstants.ZERO_AMOUNT,
+            salt: devConstants.ZERO_AMOUNT,
+            signature: devConstants.NULL_BYTES,
+        };
+        const transactionSignerPrivateKey =
+            devConstants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(transactionSignerAddress)];
+        const approvalSignerPrivateKey1 = devConstants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(approvalSignerAddress1)];
+        const approvalSignerPrivateKey2 = devConstants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(approvalSignerAddress2)];
+        transactionFactory = new TransactionFactory(transactionSignerPrivateKey, exchangeAddress);
+        approvalFactory1 = new ApprovalFactory(approvalSignerPrivateKey1, mixins.address);
+        approvalFactory2 = new ApprovalFactory(approvalSignerPrivateKey2, mixins.address);
+    });
+    beforeEach(async () => {
+        await blockchainLifecycle.startAsync();
+    });
+    afterEach(async () => {
+        await blockchainLifecycle.revertAsync();
+    });
+
+    describe('getSignerAddress', () => {
+        it('should return the correct address using the EthSign signature type', async () => {
+            const data = devConstants.NULL_BYTES;
+            const transaction = transactionFactory.newSignedTransaction(data, SignatureType.EthSign);
+            const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
+            const signerAddress = await mixins.getSignerAddress.callAsync(transactionHash, transaction.signature);
+            expect(transaction.signerAddress).to.eq(signerAddress);
+        });
+        it('should return the correct address using the EIP712 signature type', async () => {
+            const data = devConstants.NULL_BYTES;
+            const transaction = transactionFactory.newSignedTransaction(data, SignatureType.EIP712);
+            const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
+            const signerAddress = await mixins.getSignerAddress.callAsync(transactionHash, transaction.signature);
+            expect(transaction.signerAddress).to.eq(signerAddress);
+        });
+        it('should revert with with the Illegal signature type', async () => {
+            const data = devConstants.NULL_BYTES;
+            const transaction = transactionFactory.newSignedTransaction(data);
+            const illegalSignatureByte = ethUtil.toBuffer(SignatureType.Illegal).toString('hex');
+            transaction.signature = `${transaction.signature.slice(
+                0,
+                transaction.signature.length - 2,
+            )}${illegalSignatureByte}`;
+            const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
+            expectContractCallFailedAsync(
+                mixins.getSignerAddress.callAsync(transactionHash, transaction.signature),
+                RevertReason.SignatureIllegal,
+            );
+        });
+        it('should revert with with the Invalid signature type', async () => {
+            const data = devConstants.NULL_BYTES;
+            const transaction = transactionFactory.newSignedTransaction(data);
+            const invalidSignatureByte = ethUtil.toBuffer(SignatureType.Invalid).toString('hex');
+            transaction.signature = `0x${invalidSignatureByte}`;
+            const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
+            expectContractCallFailedAsync(
+                mixins.getSignerAddress.callAsync(transactionHash, transaction.signature),
+                RevertReason.SignatureInvalid,
+            );
+        });
+        it("should revert with with a signature type that doesn't exist", async () => {
+            const data = devConstants.NULL_BYTES;
+            const transaction = transactionFactory.newSignedTransaction(data);
+            const invalidSignatureByte = '04';
+            transaction.signature = `${transaction.signature.slice(
+                0,
+                transaction.signature.length - 2,
+            )}${invalidSignatureByte}`;
+            const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
+            expectContractCallFailedAsync(
+                mixins.getSignerAddress.callAsync(transactionHash, transaction.signature),
+                RevertReason.SignatureUnsupported,
+            );
+        });
+    });
+
+    describe('decodeOrdersFromFillData', () => {
+        for (const fnName of constants.SINGLE_FILL_FN_NAMES) {
+            it(`should correctly decode the orders for ${fnName} data`, async () => {
+                const orders = [defaultOrder];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const decodedOrders = await mixins.decodeOrdersFromFillData.callAsync(data);
+                const decodedSignedOrders = decodedOrders.map(order => ({
+                    ...order,
+                    exchangeAddress: devConstants.NULL_ADDRESS,
+                    signature: devConstants.NULL_BYTES,
+                }));
+                expect(orders).to.deep.eq(decodedSignedOrders);
+            });
+        }
+        for (const fnName of constants.BATCH_FILL_FN_NAMES) {
+            it(`should correctly decode the orders for ${fnName} data`, async () => {
+                const orders = [defaultOrder, defaultOrder];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const decodedOrders = await mixins.decodeOrdersFromFillData.callAsync(data);
+                const decodedSignedOrders = decodedOrders.map(order => ({
+                    ...order,
+                    exchangeAddress: devConstants.NULL_ADDRESS,
+                    signature: devConstants.NULL_BYTES,
+                }));
+                expect(orders).to.deep.eq(decodedSignedOrders);
+            });
+        }
+        for (const fnName of constants.MARKET_FILL_FN_NAMES) {
+            it(`should correctly decode the orders for ${fnName} data`, async () => {
+                const orders = [defaultOrder, defaultOrder];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const decodedOrders = await mixins.decodeOrdersFromFillData.callAsync(data);
+                const decodedSignedOrders = decodedOrders.map(order => ({
+                    ...order,
+                    exchangeAddress: devConstants.NULL_ADDRESS,
+                    signature: devConstants.NULL_BYTES,
+                }));
+                expect(orders).to.deep.eq(decodedSignedOrders);
+            });
+        }
+        for (const fnName of [constants.CANCEL_ORDER, constants.BATCH_CANCEL_ORDERS, constants.CANCEL_ORDERS_UP_TO]) {
+            it(`should correctly decode the orders for ${fnName} data`, async () => {
+                const orders = [defaultOrder, defaultOrder];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const decodedOrders = await mixins.decodeOrdersFromFillData.callAsync(data);
+                const emptyArray: any[] = [];
+                expect(emptyArray).to.deep.eq(decodedOrders);
+            });
+        }
+        it('should decode an empty array for invalid data', async () => {
+            const data = '0x0123456789';
+            const decodedOrders = await mixins.decodeOrdersFromFillData.callAsync(data);
+            const emptyArray: any[] = [];
+            expect(emptyArray).to.deep.eq(decodedOrders);
+        });
+        it('should revert if data is less than 4 bytes long', async () => {
+            const data = '0x010203';
+            await expectContractCallFailedAsync(
+                mixins.decodeOrdersFromFillData.callAsync(data),
+                RevertReason.LibBytesGreaterOrEqualTo4LengthRequired,
+            );
+        });
+    });
+
+    describe('Single order approvals', () => {
+        for (const fnName of constants.SINGLE_FILL_FN_NAMES) {
+            it(`Should be successful: function=${fnName}, caller=tx_signer, senderAddress=[verifier], approval_sig=[approver1], expiration=[valid]`, async () => {
+                const orders = [defaultOrder];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval = approvalFactory1.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                await mixins.assertValidCoordinatorApprovals.callAsync(
+                    transaction,
+                    transactionSignerAddress,
+                    transaction.signature,
+                    [approvalExpirationTimeSeconds],
+                    [approval.signature],
+                    { from: transactionSignerAddress },
+                );
+            });
+            it(`Should be successful: function=${fnName}, caller=tx_signer, senderAddress=[null], approval_sig=[approver1], expiration=[valid]`, async () => {
+                const order = {
+                    ...defaultOrder,
+                    senderAddress: devConstants.NULL_ADDRESS,
+                };
+                const orders = [order];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval = approvalFactory1.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                await mixins.assertValidCoordinatorApprovals.callAsync(
+                    transaction,
+                    transactionSignerAddress,
+                    transaction.signature,
+                    [approvalExpirationTimeSeconds],
+                    [approval.signature],
+                    { from: transactionSignerAddress },
+                );
+            });
+            it(`Should be successful: function=${fnName}, caller=approver1, senderAddress=[verifier], approval_sig=[], expiration=[]`, async () => {
+                const orders = [defaultOrder];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                await mixins.assertValidCoordinatorApprovals.callAsync(
+                    transaction,
+                    approvalSignerAddress1,
+                    transaction.signature,
+                    [],
+                    [],
+                    {
+                        from: approvalSignerAddress1,
+                    },
+                );
+            });
+            it(`Should be successful: function=${fnName}, caller=approver1, senderAddress=[verifier], approval_sig=[approver1], expiration=[invalid]`, async () => {
+                const orders = [defaultOrder];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval = approvalFactory1.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                await mixins.assertValidCoordinatorApprovals.callAsync(
+                    transaction,
+                    approvalSignerAddress1,
+                    transaction.signature,
+                    [approvalExpirationTimeSeconds],
+                    [approval.signature],
+                    { from: approvalSignerAddress1 },
+                );
+            });
+            it(`Should be successful: function=${fnName}, caller=approver1, senderAddress=[verifier], approval_sig=[], expiration=[]`, async () => {
+                const orders = [defaultOrder];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                await mixins.assertValidCoordinatorApprovals.callAsync(
+                    transaction,
+                    approvalSignerAddress1,
+                    transaction.signature,
+                    [],
+                    [],
+                    {
+                        from: approvalSignerAddress1,
+                    },
+                );
+            });
+            it(`Should revert: function=${fnName}, caller=tx_signer, senderAddress=[verifier], approval_sig=[invalid], expiration=[valid]`, async () => {
+                const orders = [defaultOrder];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval = approvalFactory1.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                const signature = `${approval.signature.slice(0, 4)}FFFFFFFF${approval.signature.slice(12)}`;
+                expectContractCallFailedAsync(
+                    mixins.assertValidCoordinatorApprovals.callAsync(
+                        transaction,
+                        transactionSignerAddress,
+                        transaction.signature,
+                        [approvalExpirationTimeSeconds],
+                        [signature],
+                        { from: transactionSignerAddress },
+                    ),
+                    RevertReason.InvalidApprovalSignature,
+                );
+            });
+            it(`Should revert: function=${fnName}, caller=tx_signer, senderAddress=[verifier], approval_sig=[approver1], expiration=[invalid]`, async () => {
+                const orders = [defaultOrder];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).minus(constants.TIME_BUFFER);
+                const approval = approvalFactory1.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                expectContractCallFailedAsync(
+                    mixins.assertValidCoordinatorApprovals.callAsync(
+                        transaction,
+                        transactionSignerAddress,
+                        transaction.signature,
+                        [approvalExpirationTimeSeconds],
+                        [approval.signature],
+                        { from: transactionSignerAddress },
+                    ),
+                    RevertReason.ApprovalExpired,
+                );
+            });
+            it(`Should revert: function=${fnName}, caller=approver2, senderAddress=[verifier], approval_sig=[approver1], expiration=[valid]`, async () => {
+                const orders = [defaultOrder];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval = approvalFactory1.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                expectContractCallFailedAsync(
+                    mixins.assertValidCoordinatorApprovals.callAsync(
+                        transaction,
+                        transactionSignerAddress,
+                        transaction.signature,
+                        [approvalExpirationTimeSeconds],
+                        [approval.signature],
+                        { from: approvalSignerAddress2 },
+                    ),
+                    RevertReason.InvalidOrigin,
+                );
+            });
+        }
+    });
+    describe('Batch order approvals', () => {
+        for (const fnName of [
+            ...constants.BATCH_FILL_FN_NAMES,
+            ...constants.MARKET_FILL_FN_NAMES,
+            constants.MATCH_ORDERS,
+        ]) {
+            it(`Should be successful: function=${fnName} caller=tx_signer, senderAddress=[verifier,verifier], feeRecipient=[approver1,approver1], approval_sig=[approver1], expiration=[valid]`, async () => {
+                const orders = [defaultOrder, defaultOrder];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval = approvalFactory1.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                await mixins.assertValidCoordinatorApprovals.callAsync(
+                    transaction,
+                    transactionSignerAddress,
+                    transaction.signature,
+                    [approvalExpirationTimeSeconds],
+                    [approval.signature],
+                    { from: transactionSignerAddress },
+                );
+            });
+            it(`Should be successful: function=${fnName} caller=tx_signer, senderAddress=[null,null], feeRecipient=[approver1,approver1], approval_sig=[approver1], expiration=[valid]`, async () => {
+                const orders = [defaultOrder, defaultOrder].map(order => ({
+                    ...order,
+                    senderAddress: devConstants.NULL_ADDRESS,
+                }));
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval = approvalFactory1.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                await mixins.assertValidCoordinatorApprovals.callAsync(
+                    transaction,
+                    transactionSignerAddress,
+                    transaction.signature,
+                    [approvalExpirationTimeSeconds],
+                    [approval.signature],
+                    { from: transactionSignerAddress },
+                );
+            });
+            it(`Should be successful: function=${fnName} caller=tx_signer, senderAddress=[null,null], feeRecipient=[approver1,approver1], approval_sig=[], expiration=[]`, async () => {
+                const orders = [defaultOrder, defaultOrder].map(order => ({
+                    ...order,
+                    senderAddress: devConstants.NULL_ADDRESS,
+                }));
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                await mixins.assertValidCoordinatorApprovals.callAsync(
+                    transaction,
+                    transactionSignerAddress,
+                    transaction.signature,
+                    [],
+                    [],
+                    { from: transactionSignerAddress },
+                );
+            });
+            it(`Should be successful: function=${fnName} caller=tx_signer, senderAddress=[verifier,null], feeRecipient=[approver1,approver1], approval_sig=[approver1], expiration=[valid]`, async () => {
+                const orders = [defaultOrder, { ...defaultOrder, senderAddress: devConstants.NULL_ADDRESS }];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval = approvalFactory1.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                await mixins.assertValidCoordinatorApprovals.callAsync(
+                    transaction,
+                    transactionSignerAddress,
+                    transaction.signature,
+                    [approvalExpirationTimeSeconds],
+                    [approval.signature],
+                    { from: transactionSignerAddress },
+                );
+            });
+            it(`Should be successful: function=${fnName} caller=tx_signer, senderAddress=[verifier,verifier], feeRecipient=[approver1,approver2], approval_sig=[approver1,approver2], expiration=[valid,valid]`, async () => {
+                const orders = [defaultOrder, { ...defaultOrder, feeRecipientAddress: approvalSignerAddress2 }];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval1 = approvalFactory1.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                const approval2 = approvalFactory2.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                await mixins.assertValidCoordinatorApprovals.callAsync(
+                    transaction,
+                    transactionSignerAddress,
+                    transaction.signature,
+                    [approvalExpirationTimeSeconds, approvalExpirationTimeSeconds],
+                    [approval1.signature, approval2.signature],
+                    { from: transactionSignerAddress },
+                );
+            });
+            it(`Should be successful: function=${fnName} caller=approver1, senderAddress=[verifier,verifier], feeRecipient=[approver1,approver1], approval_sig=[], expiration=[]`, async () => {
+                const orders = [defaultOrder, defaultOrder];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                await mixins.assertValidCoordinatorApprovals.callAsync(
+                    transaction,
+                    approvalSignerAddress1,
+                    transaction.signature,
+                    [],
+                    [],
+                    { from: approvalSignerAddress1 },
+                );
+            });
+            it(`Should revert: function=${fnName} caller=approver1, senderAddress=[verifier,verifier], feeRecipient=[approver1,approver2], approval_sig=[approver2], expiration=[valid]`, async () => {
+                const orders = [defaultOrder, { ...defaultOrder, feeRecipientAddress: approvalSignerAddress2 }];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval2 = approvalFactory2.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                expectContractCallFailedAsync(
+                    mixins.assertValidCoordinatorApprovals.callAsync(
+                        transaction,
+                        transactionSignerAddress,
+                        transaction.signature,
+                        [approvalExpirationTimeSeconds],
+                        [approval2.signature],
+                        { from: approvalSignerAddress1 },
+                    ),
+                    RevertReason.InvalidOrigin,
+                );
+            });
+            it(`Should revert: function=${fnName} caller=tx_signer, senderAddress=[verifier,verifier], feeRecipient=[approver1, approver1], approval_sig=[], expiration=[]`, async () => {
+                const orders = [defaultOrder, defaultOrder];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                expectContractCallFailedAsync(
+                    mixins.assertValidCoordinatorApprovals.callAsync(
+                        transaction,
+                        transactionSignerAddress,
+                        transaction.signature,
+                        [],
+                        [],
+                        { from: transactionSignerAddress },
+                    ),
+                    RevertReason.InvalidApprovalSignature,
+                );
+            });
+            it(`Should revert: function=${fnName} caller=tx_signer, senderAddress=[verifier,verifier], feeRecipient=[approver1, approver1], approval_sig=[invalid], expiration=[valid]`, async () => {
+                const orders = [defaultOrder, defaultOrder];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval = approvalFactory1.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                const signature = `${approval.signature.slice(0, 4)}FFFFFFFF${approval.signature.slice(12)}`;
+                expectContractCallFailedAsync(
+                    mixins.assertValidCoordinatorApprovals.callAsync(
+                        transaction,
+                        transactionSignerAddress,
+                        transaction.signature,
+                        [approvalExpirationTimeSeconds],
+                        [signature],
+                        { from: transactionSignerAddress },
+                    ),
+                    RevertReason.InvalidApprovalSignature,
+                );
+            });
+            it(`Should revert: function=${fnName} caller=tx_signer, senderAddress=[verifier,verifier], feeRecipient=[approver1, approver2], approval_sig=[valid,invalid], expiration=[valid,valid]`, async () => {
+                const orders = [defaultOrder, { ...defaultOrder, feeRecipientAddress: approvalSignerAddress2 }];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval1 = approvalFactory1.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                const approval2 = approvalFactory2.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                const approvalSignature2 = `${approval2.signature.slice(0, 4)}FFFFFFFF${approval2.signature.slice(12)}`;
+                expectContractCallFailedAsync(
+                    mixins.assertValidCoordinatorApprovals.callAsync(
+                        transaction,
+                        transactionSignerAddress,
+                        transaction.signature,
+                        [approvalExpirationTimeSeconds, approvalExpirationTimeSeconds],
+                        [approval1.signature, approvalSignature2],
+                        { from: transactionSignerAddress },
+                    ),
+                    RevertReason.InvalidApprovalSignature,
+                );
+            });
+            it(`Should revert: function=${fnName} caller=approver1, senderAddress=[verifier,verifier], feeRecipient=[approver1, approver2], approval_sig=[invalid], expiration=[valid]`, async () => {
+                const orders = [defaultOrder, { ...defaultOrder, feeRecipientAddress: approvalSignerAddress2 }];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval2 = approvalFactory2.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                const approvalSignature2 = `${approval2.signature.slice(0, 4)}FFFFFFFF${approval2.signature.slice(12)}`;
+                expectContractCallFailedAsync(
+                    mixins.assertValidCoordinatorApprovals.callAsync(
+                        transaction,
+                        approvalSignerAddress1,
+                        transaction.signature,
+                        [approvalExpirationTimeSeconds],
+                        [approvalSignature2],
+                        { from: approvalSignerAddress1 },
+                    ),
+                    RevertReason.InvalidApprovalSignature,
+                );
+            });
+            it(`Should revert: function=${fnName} caller=tx_signer, senderAddress=[verifier,verifier], feeRecipient=[approver1, approver2], approval_sig=[valid,valid], expiration=[valid,invalid]`, async () => {
+                const orders = [defaultOrder, { ...defaultOrder, feeRecipientAddress: approvalSignerAddress2 }];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds1 = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approvalExpirationTimeSeconds2 = new BigNumber(currentTimestamp).minus(constants.TIME_BUFFER);
+                const approval1 = approvalFactory1.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds1,
+                );
+                const approval2 = approvalFactory2.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds2,
+                );
+                expectContractCallFailedAsync(
+                    mixins.assertValidCoordinatorApprovals.callAsync(
+                        transaction,
+                        transactionSignerAddress,
+                        transaction.signature,
+                        [approvalExpirationTimeSeconds1, approvalExpirationTimeSeconds2],
+                        [approval1.signature, approval2.signature],
+                        { from: transactionSignerAddress },
+                    ),
+                    RevertReason.ApprovalExpired,
+                );
+            });
+            it(`Should revert: function=${fnName} caller=approver1, senderAddress=[verifier,verifier], feeRecipient=[approver1, approver2], approval_sig=[valid], expiration=[invalid]`, async () => {
+                const orders = [defaultOrder, { ...defaultOrder, feeRecipientAddress: approvalSignerAddress2 }];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).minus(constants.TIME_BUFFER);
+                const approval2 = approvalFactory2.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                expectContractCallFailedAsync(
+                    mixins.assertValidCoordinatorApprovals.callAsync(
+                        transaction,
+                        approvalSignerAddress1,
+                        transaction.signature,
+                        [approvalExpirationTimeSeconds],
+                        [approval2.signature],
+                        { from: approvalSignerAddress1 },
+                    ),
+                    RevertReason.ApprovalExpired,
+                );
+            });
+            it(`Should revert: function=${fnName} caller=approver2, senderAddress=[verifier,verifier], feeRecipient=[approver1, approver1], approval_sig=[valid], expiration=[valid]`, async () => {
+                const orders = [defaultOrder, defaultOrder];
+                const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
+                const transaction = transactionFactory.newSignedTransaction(data);
+                const currentTimestamp = await getLatestBlockTimestampAsync();
+                const approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
+                const approval1 = approvalFactory1.newSignedApproval(
+                    transaction,
+                    transactionSignerAddress,
+                    approvalExpirationTimeSeconds,
+                );
+                expectContractCallFailedAsync(
+                    mixins.assertValidCoordinatorApprovals.callAsync(
+                        transaction,
+                        transactionSignerAddress,
+                        transaction.signature,
+                        [approvalExpirationTimeSeconds],
+                        [approval1.signature],
+                        { from: approvalSignerAddress2 },
+                    ),
+                    RevertReason.InvalidOrigin,
+                );
+            });
+        }
+    });
+    describe('cancels', () => {
+        it('should allow the tx signer to call `cancelOrder` without approval', async () => {
+            const orders = [defaultOrder];
+            const data = exchangeDataEncoder.encodeOrdersToExchangeData(constants.CANCEL_ORDER, orders);
+            const transaction = transactionFactory.newSignedTransaction(data);
+            await mixins.assertValidCoordinatorApprovals.callAsync(
+                transaction,
+                transactionSignerAddress,
+                transaction.signature,
+                [],
+                [],
+                { from: transactionSignerAddress },
+            );
+        });
+        it('should allow the tx signer to call `batchCancelOrders` without approval', async () => {
+            const orders = [defaultOrder, defaultOrder];
+            const data = exchangeDataEncoder.encodeOrdersToExchangeData(constants.BATCH_CANCEL_ORDERS, orders);
+            const transaction = transactionFactory.newSignedTransaction(data);
+            await mixins.assertValidCoordinatorApprovals.callAsync(
+                transaction,
+                transactionSignerAddress,
+                transaction.signature,
+                [],
+                [],
+                { from: transactionSignerAddress },
+            );
+        });
+        it('should allow the tx signer to call `cancelOrdersUpTo` without approval', async () => {
+            const orders: SignedOrder[] = [];
+            const data = exchangeDataEncoder.encodeOrdersToExchangeData(constants.CANCEL_ORDERS_UP_TO, orders);
+            const transaction = transactionFactory.newSignedTransaction(data);
+            await mixins.assertValidCoordinatorApprovals.callAsync(
+                transaction,
+                transactionSignerAddress,
+                transaction.signature,
+                [],
+                [],
+                { from: transactionSignerAddress },
+            );
+        });
+    });
+});
+// tslint:disable:max-file-line-count

contracts/coordinator/test/utils/approval_factory.ts

@@ -0,0 +1,38 @@
+import { signingUtils } from '@0x/contracts-test-utils';
+import { SignatureType, SignedZeroExTransaction } from '@0x/types';
+import { BigNumber } from '@0x/utils';
+import * as ethUtil from 'ethereumjs-util';
+
+import { hashUtils, SignedCoordinatorApproval } from './index';
+
+export class ApprovalFactory {
+    private readonly _privateKey: Buffer;
+    private readonly _verifyingContractAddress: string;
+
+    constructor(privateKey: Buffer, verifyingContractAddress: string) {
+        this._privateKey = privateKey;
+        this._verifyingContractAddress = verifyingContractAddress;
+    }
+
+    public newSignedApproval(
+        transaction: SignedZeroExTransaction,
+        txOrigin: string,
+        approvalExpirationTimeSeconds: BigNumber,
+        signatureType: SignatureType = SignatureType.EthSign,
+    ): SignedCoordinatorApproval {
+        const approvalHashBuff = hashUtils.getApprovalHashBuffer(
+            transaction,
+            this._verifyingContractAddress,
+            txOrigin,
+            approvalExpirationTimeSeconds,
+        );
+        const signatureBuff = signingUtils.signMessage(approvalHashBuff, this._privateKey, signatureType);
+        const signedApproval = {
+            txOrigin,
+            transaction,
+            approvalExpirationTimeSeconds,
+            signature: ethUtil.addHexPrefix(signatureBuff.toString('hex')),
+        };
+        return signedApproval;
+    }
+}

contracts/coordinator/test/utils/constants.ts

@@ -0,0 +1,12 @@
+import { BigNumber } from '@0x/utils';
+
+export const constants = {
+    SINGLE_FILL_FN_NAMES: ['fillOrder', 'fillOrKillOrder', 'fillOrderNoThrow'],
+    BATCH_FILL_FN_NAMES: ['batchFillOrders', 'batchFillOrKillOrders', 'batchFillOrdersNoThrow'],
+    MARKET_FILL_FN_NAMES: ['marketBuyOrders', 'marketBuyOrdersNoThrow', 'marketSellOrders', 'marketSellOrdersNoThrow'],
+    MATCH_ORDERS: 'matchOrders',
+    CANCEL_ORDER: 'cancelOrder',
+    BATCH_CANCEL_ORDERS: 'batchCancelOrders',
+    CANCEL_ORDERS_UP_TO: 'cancelOrdersUpTo',
+    TIME_BUFFER: new BigNumber(1000),
+};

contracts/coordinator/test/utils/coordinator_registry_wrapper.ts

@@ -0,0 +1,65 @@
+import { LogDecoder, txDefaults } from '@0x/contracts-test-utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
+import { TransactionReceiptWithDecodedLogs, ZeroExProvider } from 'ethereum-types';
+
+import { artifacts, CoordinatorRegistryContract } from '../../src';
+
+export class CoordinatorRegistryWrapper {
+    private readonly _web3Wrapper: Web3Wrapper;
+    private readonly _provider: ZeroExProvider;
+    private readonly _logDecoder: LogDecoder;
+    private _coordinatorRegistryContract?: CoordinatorRegistryContract;
+    /**
+     * Instanitates an CoordinatorRegistryWrapper
+     * @param provider Web3 provider to use for all JSON RPC requests
+     * Instance of CoordinatorRegistryWrapper
+     */
+    constructor(provider: ZeroExProvider) {
+        this._web3Wrapper = new Web3Wrapper(provider);
+        this._provider = provider;
+        this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts);
+    }
+    public async deployCoordinatorRegistryAsync(): Promise<CoordinatorRegistryContract> {
+        this._coordinatorRegistryContract = await CoordinatorRegistryContract.deployFrom0xArtifactAsync(
+            artifacts.CoordinatorRegistry,
+            this._provider,
+            txDefaults,
+            artifacts,
+        );
+        if (this._coordinatorRegistryContract === undefined) {
+            throw new Error(`Failed to deploy Coordinator Registry contract.`);
+        }
+        return this._coordinatorRegistryContract;
+    }
+    public async setCoordinatorEndpointAsync(
+        coordinatorOperator: string,
+        coordinatorEndpoint: string,
+    ): Promise<TransactionReceiptWithDecodedLogs> {
+        this._assertCoordinatorRegistryDeployed();
+        const txReceipt = await this._logDecoder.getTxWithDecodedLogsAsync(
+            await (this
+                ._coordinatorRegistryContract as CoordinatorRegistryContract).setCoordinatorEndpoint.sendTransactionAsync(
+                coordinatorEndpoint,
+                {
+                    from: coordinatorOperator,
+                },
+            ),
+        );
+        return txReceipt;
+    }
+    public async getCoordinatorEndpointAsync(coordinatorOperator: string): Promise<string> {
+        this._assertCoordinatorRegistryDeployed();
+        const coordinatorEndpoint = await (this
+            ._coordinatorRegistryContract as CoordinatorRegistryContract).getCoordinatorEndpoint.callAsync(
+            coordinatorOperator,
+        );
+        return coordinatorEndpoint;
+    }
+    private _assertCoordinatorRegistryDeployed(): void {
+        if (this._coordinatorRegistryContract === undefined) {
+            throw new Error(
+                'The Coordinator Registry contract was not deployed through the CoordinatorRegistryWrapper. Call `deployCoordinatorRegistryAsync` to deploy.',
+            );
+        }
+    }
+}

contracts/coordinator/test/utils/exchange_data_encoder.ts

@@ -0,0 +1,47 @@
+import { IExchangeContract } from '@0x/contracts-exchange';
+import { constants as devConstants, provider } from '@0x/contracts-test-utils';
+import { SignedOrder } from '@0x/types';
+
+import { constants } from './index';
+
+export const exchangeDataEncoder = {
+    encodeOrdersToExchangeData(fnName: string, orders: SignedOrder[]): string {
+        const exchangeInstance = new IExchangeContract(devConstants.NULL_ADDRESS, provider);
+        let data;
+        if (constants.SINGLE_FILL_FN_NAMES.indexOf(fnName) !== -1) {
+            data = (exchangeInstance as any)[fnName].getABIEncodedTransactionData(
+                orders[0],
+                orders[0].takerAssetAmount,
+                orders[0].signature,
+            );
+        } else if (constants.BATCH_FILL_FN_NAMES.indexOf(fnName) !== -1) {
+            data = (exchangeInstance as any)[fnName].getABIEncodedTransactionData(
+                orders,
+                orders.map(order => order.takerAssetAmount),
+                orders.map(order => order.signature),
+            );
+        } else if (constants.MARKET_FILL_FN_NAMES.indexOf(fnName) !== -1) {
+            data = (exchangeInstance as any)[fnName].getABIEncodedTransactionData(
+                orders,
+                orders.map(order => order.takerAssetAmount).reduce((prev, curr) => prev.plus(curr)),
+                orders.map(order => order.signature),
+            );
+        } else if (fnName === constants.MATCH_ORDERS) {
+            data = exchangeInstance.matchOrders.getABIEncodedTransactionData(
+                orders[0],
+                orders[1],
+                orders[0].signature,
+                orders[1].signature,
+            );
+        } else if (fnName === constants.CANCEL_ORDER) {
+            data = exchangeInstance.cancelOrder.getABIEncodedTransactionData(orders[0]);
+        } else if (fnName === constants.BATCH_CANCEL_ORDERS) {
+            data = exchangeInstance.batchCancelOrders.getABIEncodedTransactionData(orders);
+        } else if (fnName === constants.CANCEL_ORDERS_UP_TO) {
+            data = exchangeInstance.cancelOrdersUpTo.getABIEncodedTransactionData(devConstants.ZERO_AMOUNT);
+        } else {
+            throw new Error(`Error: ${fnName} not a supported function`);
+        }
+        return data;
+    },
+};

contracts/coordinator/test/utils/hash_utils.ts

@@ -0,0 +1,33 @@
+import { eip712Utils } from '@0x/order-utils';
+import { SignedZeroExTransaction } from '@0x/types';
+import { BigNumber, signTypedDataUtils } from '@0x/utils';
+import * as _ from 'lodash';
+
+export const hashUtils = {
+    getApprovalHashBuffer(
+        transaction: SignedZeroExTransaction,
+        verifyingContractAddress: string,
+        txOrigin: string,
+        approvalExpirationTimeSeconds: BigNumber,
+    ): Buffer {
+        const typedData = eip712Utils.createCoordinatorApprovalTypedData(
+            transaction,
+            verifyingContractAddress,
+            txOrigin,
+            approvalExpirationTimeSeconds,
+        );
+        const hashBuffer = signTypedDataUtils.generateTypedDataHash(typedData);
+        return hashBuffer;
+    },
+    getApprovalHashHex(
+        transaction: SignedZeroExTransaction,
+        verifyingContractAddress: string,
+        txOrigin: string,
+        approvalExpirationTimeSeconds: BigNumber,
+    ): string {
+        const hashHex = `0x${hashUtils
+            .getApprovalHashBuffer(transaction, verifyingContractAddress, txOrigin, approvalExpirationTimeSeconds)
+            .toString('hex')}`;
+        return hashHex;
+    },
+};

contracts/coordinator/test/utils/index.ts

@@ -0,0 +1,5 @@
+export { hashUtils } from './hash_utils';
+export { ApprovalFactory } from './approval_factory';
+export { constants } from './constants';
+export { exchangeDataEncoder } from './exchange_data_encoder';
+export * from './types';