Publish

- @0x/contracts-asset-proxy@2.3.0-beta.1
 - @0x/contracts-coordinator@2.1.0-beta.1
 - @0x/contracts-dev-utils@0.1.0-beta.1
 - @0x/contracts-erc1155@1.2.0-beta.1
 - @0x/contracts-erc20@2.3.0-beta.1
 - @0x/contracts-erc721@2.2.0-beta.1
 - @0x/contracts-exchange-forwarder@3.1.0-beta.1
 - @0x/contracts-exchange-libs@3.1.0-beta.1
 - @0x/contracts-exchange@2.2.0-beta.1
 - @0x/contracts-extensions@4.1.0-beta.1
 - @0x/contracts-integrations@1.0.1
 - @0x/contracts-multisig@3.2.0-beta.1
 - @0x/contracts-staking@1.1.0-beta.1
 - @0x/contracts-test-utils@3.2.0-beta.1
 - @0x/contracts-tests@0.0.2
 - @0x/contracts-utils@3.3.0-beta.1
 - 0x.js@8.0.0-beta.0
 - @0x/abi-gen-wrappers@5.4.0-beta.1
 - @0x/abi-gen@4.4.0-beta.1
 - @0x/assert@2.2.0-beta.1
 - @0x/asset-buyer@6.2.0-beta.1
 - @0x/asset-swapper@2.1.0-beta.1
 - @0x/base-contract@5.5.0-beta.1
 - @0x/connect@5.1.0-beta.1
 - @0x/contract-addresses@3.3.0-beta.2
 - @0x/contract-artifacts@2.3.0-beta.2
 - @0x/contract-wrappers@12.2.0-beta.1
 - @0x/contracts-gen@1.1.0-beta.1
 - @0x/dev-utils@2.4.0-beta.1
 - ethereum-types@2.2.0-beta.1
 - @0x/instant@1.0.33
 - @0x/json-schemas@4.1.0-beta.1
 - @0x/migrations@4.4.0-beta.1
 - @0x/monorepo-scripts@1.0.39
 - @0x/order-utils@8.5.0-beta.1
 - @0x/orderbook@0.1.0-beta.1
 - @0x/sol-compiler@3.2.0-beta.1
 - @0x/sol-coverage@3.1.0-beta.1
 - @0x/sol-doc@2.1.0-beta.1
 - @0x/sol-profiler@3.2.0-beta.1
 - @0x/sol-resolver@2.1.0-beta.1
 - @0x/sol-trace@2.1.0-beta.1
 - @0x/sol-tracing-utils@6.1.0-beta.1
 - @0x/sra-spec@2.1.0-beta.1
 - @0x/subproviders@5.1.0-beta.1
 - @0x/testnet-faucets@1.0.89
 - @0x/tslint-config@3.1.0-beta.1
 - @0x/types@2.5.0-beta.1
 - @0x/typescript-typings@4.4.0-beta.1
 - @0x/utils@4.6.0-beta.1
 - @0x/web3-wrapper@6.1.0-beta.1

.circleci/config.yml

@@ -23,37 +23,21 @@ jobs:
             #       command: npm set prefix=/home/circleci/npm && echo 'export PATH=$HOME/circleci/npm/bin:$PATH' >> /home/circleci/.bashrc
             - run:
                   name: install-yarn
-                  command: npm install --global yarn@1.9.4
+                  command: npm install --global yarn@1.17.0
             - run:
                   name: yarn
                   command: yarn --frozen-lockfile --ignore-engines install || yarn --frozen-lockfile --ignore-engines install
             - setup_remote_docker
-            - run: yarn build:ci:no_website
+            - run: yarn build:ci
             - run: yarn build:ts
             - save_cache:
                   key: repo-{{ .Environment.CIRCLE_SHA1 }}
                   paths:
                       - ~/repo
-            - save_cache:
-                  key: python-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/packages/python-contract-wrappers/generated
-            - store_artifacts:
-                  path: ~/repo/packages/python-contract-wrappers/generated
             - store_artifacts:
                   path: ~/repo/packages/abi-gen/test-cli/output
             - store_artifacts:
                   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:
@@ -63,19 +47,41 @@ jobs:
             - 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:
+            - 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-tests @0x/contracts-staking
+    test-exchange-ganache-3.0:
+        resource_class: medium+
         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
+            - run: yarn wsrun test:circleci @0x/contracts-exchange
+    test-integrations-ganache-3.0:
+        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-integrations
+    test-contracts-rest-ganache-3.0:
+        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-asset-proxy @0x/contracts-exchange-forwarder @0x/contracts-tests @0x/contracts-staking @0x/contracts-coordinator
+            # TODO(dorothy-zbornak): Re-enable after updating this package for
+            # 3.0. At that time, also remove exclusion from monorepo
+            # package.json's test script.
+            # - run: yarn wsrun test:circleci @0x/contracts-extensions
     test-publish:
         resource_class: medium+
         docker:
@@ -86,7 +92,9 @@ jobs:
             - restore_cache:
                   keys:
                       - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run: yarn test:publish:circleci
+            - run:
+                command: yarn test:publish:circleci
+                no_output_timeout: 1800
     test-doc-generation:
         docker:
             - image: nikolaik/python-nodejs:python3.7-nodejs8
@@ -95,7 +103,9 @@ jobs:
             - restore_cache:
                   keys:
                       - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run: yarn test:generate_docs:circleci
+            - run:
+                command: yarn test:generate_docs:circleci
+                no_output_timeout: 1200
     test-rest:
         docker:
             - image: nikolaik/python-nodejs:python3.7-nodejs8
@@ -106,15 +116,23 @@ jobs:
                       - 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
+            # TODO (xianny): Needs to be updated for 3.0
+            # - run: yarn wsrun test:circleci @0x/asset-buyer
+            # TODO: Needs to be updated for 3.0.  At that time, also remove
+            # exclusion from monorepo package.json's test script.
+            # - run: yarn wsrun test:circleci @0x/asset-swapper
             - 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
+            # TODO (xianny): Needs to be updated for 3.0
+            # - 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
+            # TODO: Needs to be updated for 3.0. At that time, also remove
+            # exclusion from monorepo package.json's test script.
+            # - run: yarn wsrun test:circleci @0x/orderbook
             - 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
@@ -182,20 +200,40 @@ jobs:
         working_directory: ~/repo
         docker:
             - image: nikolaik/python-nodejs:python3.7-nodejs8
-            - image: 0xorg/ganache-cli:2.2.2
-            - image: 0xorg/launch-kit-backend:74bcc39
+            - image: 0xorg/ganache-cli:4.4.0-beta.1
               environment:
-                  RPC_URL: http://localhost:8545
+                  VERSION: 4.4.0-beta.1
+                  SNAPSHOT_NAME: 0x_ganache_snapshot-v3-beta
+            - image: 0xorg/mesh:6.0.0-beta-0xv3
+              environment:
+                  ETHEREUM_RPC_URL: 'http://localhost:8545'
+                  ETHEREUM_NETWORK_ID: '50'
+                  ETHEREUM_CHAIN_ID: '1337'
+                  USE_BOOTSTRAP_LIST: 'true'
+                  VERBOSITY: 3
+                  PRIVATE_KEY_PATH: ''
+                  BLOCK_POLLING_INTERVAL: '5s'
+                  P2P_LISTEN_PORT: '60557'
+              command: |
+                  sh -c "waitForGanache () { until printf 'POST /\r\nContent-Length: 26\r\n\r\n{\"method\":\"net_listening\"}' | nc localhost 8545 | grep true; do continue; done }; waitForGanache && ./mesh"
+            - image: 0xorg/launch-kit-backend:v3
+              environment:
+                  RPC_URL: 'http://localhost:8545'
                   NETWORK_ID: 50
                   WHITELIST_ALL_TOKENS: True
+                  FEE_RECIPIENT: '0x0000000000000000000000000000000000000001'
+                  MAKER_FEE_UNIT_AMOUNT: 0
+                  TAKER_FEE_UNIT_AMOUNT: 0
+                  MESH_ENDPOINT: 'ws://localhost:60557'
               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"
+                  sh -c "waitForMesh () { sleep 5; }; waitForMesh && node_modules/.bin/forever ts/lib/index.js"
         steps:
             - checkout
             - restore_cache:
                   key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
             - restore_cache:
-                  key: python-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
+                  keys:
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
             - run:
                   command: |
                       cd python-packages
@@ -210,8 +248,14 @@ jobs:
             - run:
                   command: |
                       cd python-packages
-                      ./parallel_without_sra_client coverage run setup.py test
+                      ./parallel coverage run setup.py test
                       ./build_docs
+            - run:
+                  command: |
+                      # copy generated wrappers into contract_wrappers/build,
+                      # JUST so CircleCI will persist them as build artifacts.
+                      cd python-packages/contract_wrappers/src/zero_ex
+                      for i in contract_wrappers/[^__]*/; do mkdir -p ../../build/$i; cp $i/__init__.py ../../build/$i; done
             - save_cache:
                   key: coverage-python-contract-addresses-{{ .Environment.CIRCLE_SHA1 }}
                   paths:
@@ -236,10 +280,6 @@ jobs:
                   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/erc20_token/__init__.py
-            - store_artifacts:
-                  path: ~/repo/python-packages/contract_wrappers/src/zero_ex/contract_wrappers/exchange/__init__.py
             - store_artifacts:
                   path: ~/repo/python-packages/contract_addresses/build
             - store_artifacts:
@@ -289,7 +329,8 @@ jobs:
             - restore_cache:
                   key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
             - restore_cache:
-                  key: python-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
+                  keys:
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
             - run:
                   command: |
                       python -m ensurepip
@@ -298,6 +339,7 @@ jobs:
                       ./install
                       ./lint
     static-tests:
+        resource_class: large
         working_directory: ~/repo
         docker:
             - image: nikolaik/python-nodejs:python3.7-nodejs8
@@ -308,6 +350,7 @@ jobs:
             - run: yarn lerna run lint
             - run: yarn prettier:ci
             - run: yarn deps_versions:ci
+            - run: yarn diff_md_docs:ci
             - run: cd packages/0x.js && yarn build:umd:prod
             - run: yarn bundlewatch
     submit-coverage:
@@ -387,17 +430,15 @@ workflows:
     main:
         jobs:
             - build
-            - build-website:
+            - test-exchange-ganache-3.0:
                   requires:
                       - build
-            - test-contracts-ganache:
+            - test-integrations-ganache-3.0:
+                  requires:
+                      - build
+            - test-contracts-rest-ganache-3.0:
                   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
@@ -412,13 +453,15 @@ workflows:
                       - build
             - submit-coverage:
                   requires:
+                      - test-contracts-rest-ganache-3.0
+                      - test-exchange-ganache-3.0
                       - test-rest
-                      - test-python
-            - static-tests-python:
-                  requires:
-                      - test-python
+                      - static-tests
             - test-python:
                   requires:
                       - build
+            - static-tests-python:
+                  requires:
+                      - build
             # skip python tox run for now, as we don't yet have multiple test environments to support.
-            #- test-rest-python
+            # - test-rest-python

.github/autolabeler.yml

@@ -13,7 +13,6 @@ contracts: ['contracts']
 @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']
@@ -33,7 +32,5 @@ contracts: ['contracts']
 @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']

.gitignore

@@ -40,9 +40,12 @@ build/Release
 node_modules/
 jspm_packages/
 
-# Typescript v1 declaration files
+# TypeScript v1 declaration files
 typings/
 
+# NVM config
+.nvmrc
+
 # Optional npm cache directory
 .npm
 .npmrc
@@ -75,13 +78,12 @@ TODO.md
 # VSCode file
 .vscode
 
-packages/website/public/bundle*
-packages/dev-tools-pages/public/bundle*
-
 # server cli
 packages/testnet-faucets/server/
 
 # generated contract artifacts/
+contracts/integrations/generated-artifacts/
+contracts/staking/generated-artifacts/
 contracts/coordinator/generated-artifacts/
 contracts/exchange/generated-artifacts/
 contracts/asset-proxy/generated-artifacts/
@@ -97,9 +99,25 @@ contracts/dev-utils/generated-artifacts/
 packages/sol-tracing-utils/test/fixtures/artifacts/
 python-packages/contract_artifacts/src/zero_ex/contract_artifacts/artifacts/
 
+# generated truffle contract artifacts/
+contracts/staking/build/
+contracts/coordinator/build/
+contracts/exchange/build/
+contracts/asset-proxy/build/
+contracts/multisig/build/
+contracts/utils/build/
+contracts/exchange-libs/build/
+contracts/erc20/build/
+contracts/erc721/build/
+contracts/erc1155/build/
+contracts/extensions/build/
+contracts/exchange-forwarder/build/
+contracts/dev-utils/build/
+
 # generated contract wrappers
-packages/abi-gen-wrappers/src/generated-wrappers/
 packages/python-contract-wrappers/generated/
+contracts/integrations/generated-wrappers/
+contracts/staking/generated-wrappers/
 contracts/coordinator/generated-wrappers/
 contracts/exchange/generated-wrappers/
 contracts/asset-proxy/generated-wrappers/
@@ -112,6 +130,7 @@ 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/dev_utils/__init__.py
 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
@@ -120,6 +139,8 @@ python-packages/contract_wrappers/src/zero_ex/contract_wrappers/coordinator_regi
 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/erc1155_mintable/__init__.py
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/erc1155_proxy/__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
@@ -130,18 +151,13 @@ python-packages/contract_wrappers/src/zero_ex/contract_wrappers/i_validator/__in
 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/static_call_proxy/__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
 
-# cli test output
-packages/abi-gen/test-cli/output
-
 # solc-bin in sol-compiler
 packages/sol-compiler/solc_bin/
 
-# Monorepo scripts
-packages/*/scripts/
-
 # python stuff
 .eggs
 .mypy_cache
@@ -152,5 +168,14 @@ __pycache__
 python-packages/*/src/*.egg-info
 python-packages/*/.coverage
 
-# python keeps package-local copies of json schemas
+# python keeps package-local copies of json schemas and contract addresses
 python-packages/json_schemas/src/zero_ex/json_schemas/schemas
+python-packages/contract_addresses/src/zero_ex/contract_addresses/addresses.json
+
+# 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*

.prettierignore

@@ -1,5 +1,9 @@
 lib
 .nyc_output
+/contracts/integrations/generated-wrappers
+/contracts/integrations/generated-artifacts
+/contracts/staking/generated-wrappers
+/contracts/staking/generated-artifacts
 /contracts/coordinator/generated-wrappers
 /contracts/coordinator/generated-artifacts
 /contracts/exchange/generated-wrappers
@@ -24,11 +28,23 @@ lib
 /contracts/exchange-forwarder/generated-artifacts
 /contracts/dev-utils/generated-wrappers
 /contracts/dev-utils/generated-artifacts
+/contracts/staking/build/
+/contracts/coordinator/build/
+/contracts/exchange/build/
+/contracts/asset-proxy/build/
+/contracts/multisig/build/
+/contracts/utils/build/
+/contracts/exchange-libs/build/
+/contracts/erc20/build/
+/contracts/erc721/build/
+/contracts/erc1155/build/
+/contracts/extensions/build/
+/contracts/exchange-forwarder/build/
+/contracts/dev-utils/build/
 /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
 scripts/postpublish_utils.js
 packages/sol-coverage/test/fixtures/artifacts
@@ -38,3 +54,4 @@ packages/sol-coverage/test/fixtures/artifacts
 packages/abi-gen/test-cli/fixtures/artifacts/AbiGenDummy.json
 packages/abi-gen/test-cli/fixtures/artifacts/LibDummy.json
 packages/abi-gen/test-cli/fixtures/artifacts/TestLibDummy.json
+packages/*/docs

CODEOWNERS

@@ -7,7 +7,6 @@
 # Website
 packages/asset-buyer/  @BMillman19 @fragosti @steveklebanoff
 packages/instant/  @BMillman19 @fragosti @steveklebanoff
-packages/website/  @BMillman19 @fragosti @fabioberger @steveklebanoff
 
 # Dev tools & setup
 .circleci/ @LogvinovLeon

CONTRIBUTING.md

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

README.md

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

contracts/asset-proxy/.solhintignore

@@ -0,0 +1,2 @@
+# solhint can't parse `abi.decode` syntax.
+contracts/src/ERC1155Proxy.sol

contracts/asset-proxy/CHANGELOG.json

@@ -1,4 +1,79 @@
 [
+    {
+        "version": "2.3.0-beta.1",
+        "changes": [
+            {
+                "note": "ERC20Wrapper and ERC1155ProxyWrapper constructors now require an instance of DevUtilsContract",
+                "pr": 2034
+            }
+        ],
+        "timestamp": 1573159180
+    },
+    {
+        "version": "2.3.0-beta.0",
+        "changes": [
+            {
+                "note": "Disallow the zero address from being made an authorized address in MixinAuthorizable, and created an archive directory that includes an old version of Ownable",
+                "pr": 2019
+            },
+            {
+                "note": "Remove `LibAssetProxyIds` contract",
+                "pr": 2055
+            },
+            {
+                "note": "Compile and export all contracts, artifacts, and wrappers by default",
+                "pr": 2055
+            },
+            {
+                "note": "Remove unused dependency on IAuthorizable in IAssetProxy",
+                "pr": 1910
+            },
+            {
+                "note": "Add `ERC20BridgeProxy`",
+                "pr": 2220
+            },
+            {
+                "note": "Add `Eth2DaiBridge`",
+                "pr": 2221
+            },
+            {
+                "note": "Add `UniswapBridge`",
+                "pr": 2233
+            },
+            {
+                "note": "Replaced `SafeMath` with `LibSafeMath`",
+                "pr": 2254
+            }
+        ],
+        "timestamp": 1570135330
+    },
+    {
+        "timestamp": 1568744790,
+        "version": "2.2.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "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",
@@ -96,6 +171,18 @@
             {
                 "note": "Update tests to use contract-built-in `awaitTransactionSuccessAsync`",
                 "pr": 1797
+            },
+            {
+                "note": "Make `ERC721Wrapper.setApprovalForAll()` take an owner address instead of a token ID",
+                "pr": 1819
+            },
+            {
+                "note": "Automatically set unlimited proxy allowances in `ERC721.setBalancesAndAllowancesAsync()`",
+                "pr": 1819
+            },
+            {
+                "note": "Add `setProxyAllowanceForAllAsync()` to `ERC1155ProxyWrapper`.",
+                "pr": 1819
             }
         ],
         "timestamp": 1557507213

contracts/asset-proxy/CHANGELOG.md

@@ -5,6 +5,33 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.3.0-beta.1 - _November 7, 2019_
+
+    * ERC20Wrapper and ERC1155ProxyWrapper constructors now require an instance of DevUtilsContract (#2034)
+
+## v2.3.0-beta.0 - _October 3, 2019_
+
+    * Disallow the zero address from being made an authorized address in MixinAuthorizable, and created an archive directory that includes an old version of Ownable (#2019)
+    * Remove `LibAssetProxyIds` contract (#2055)
+    * Compile and export all contracts, artifacts, and wrappers by default (#2055)
+    * Remove unused dependency on IAuthorizable in IAssetProxy (#1910)
+    * Add `ERC20BridgeProxy` (#2220)
+    * Add `Eth2DaiBridge` (#2221)
+    * Add `UniswapBridge` (#2233)
+    * Replaced `SafeMath` with `LibSafeMath` (#2254)
+
+## v2.2.8 - _September 17, 2019_
+
+    * Dependencies updated
+
+## v2.2.7 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v2.2.6 - _August 22, 2019_
+
+    * Dependencies updated
+
 ## v2.2.5 - _August 8, 2019_
 
     * Dependencies updated
@@ -46,6 +73,9 @@ CHANGELOG
 ## v2.1.2 - _May 10, 2019_
 
     * Update tests to use contract-built-in `awaitTransactionSuccessAsync` (#1797)
+    * Make `ERC721Wrapper.setApprovalForAll()` take an owner address instead of a token ID (#1819)
+    * Automatically set unlimited proxy allowances in `ERC721.setBalancesAndAllowancesAsync()` (#1819)
+    * Add `setProxyAllowanceForAllAsync()` to `ERC1155ProxyWrapper`. (#1819)
 
 ## v2.1.1 - _April 11, 2019_
 

contracts/asset-proxy/README.md

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

contracts/asset-proxy/compiler.json

@@ -22,17 +22,5 @@
                 ]
             }
         }
-    },
-    "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/archive/MixinAssetProxyDispatcher.sol

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -16,16 +16,16 @@
 
 */
 
-pragma solidity ^0.5.5;
+pragma solidity ^0.5.9;
 
-import "@0x/contracts-utils/contracts/src/Ownable.sol";
-import "./mixins/MAssetProxyDispatcher.sol";
-import "./interfaces/IAssetProxy.sol";
+import "../archive/Ownable.sol";
+import "../src/interfaces/IAssetProxy.sol";
+import "../src/interfaces/IAssetProxyDispatcher.sol";
 
 
 contract MixinAssetProxyDispatcher is
     Ownable,
-    MAssetProxyDispatcher
+    IAssetProxyDispatcher
 {
     // Mapping from Asset Proxy Id's to their respective Asset Proxy
     mapping (bytes4 => address) public assetProxies;
@@ -69,7 +69,7 @@ contract MixinAssetProxyDispatcher is
     /// @param from Address to transfer token from.
     /// @param to Address to transfer token to.
     /// @param amount Amount of token to transfer.
-    function dispatchTransferFrom(
+    function _dispatchTransferFrom(
         bytes memory assetData,
         address from,
         address to,
@@ -84,7 +84,7 @@ contract MixinAssetProxyDispatcher is
                 assetData.length > 3,
                 "LENGTH_GREATER_THAN_3_REQUIRED"
             );
-            
+
             // Lookup assetProxy. We do not use `LibBytes.readBytes4` for gas efficiency reasons.
             bytes4 assetProxyId;
             assembly {
@@ -100,10 +100,10 @@ contract MixinAssetProxyDispatcher is
                 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                           |
@@ -127,12 +127,12 @@ contract MixinAssetProxyDispatcher is
                 // `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:
@@ -142,7 +142,7 @@ contract MixinAssetProxyDispatcher is
                 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)
@@ -159,7 +159,7 @@ contract MixinAssetProxyDispatcher is
                     assetProxy,             // call address of asset proxy
                     0,                      // don't send any ETH
                     cdStart,                // pointer to start of input
-                    sub(cdEnd, cdStart),    // length of input  
+                    sub(cdEnd, cdStart),    // length of input
                     cdStart,                // write output over input
                     512                     // reserve 512 bytes for output
                 )

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

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -16,15 +16,15 @@
 
 */
 
-pragma solidity ^0.5.5;
+pragma solidity ^0.5.9;
 
-import "@0x/contracts-utils/contracts/src/Ownable.sol";
-import "./mixins/MAuthorizable.sol";
+import "../archive/Ownable.sol";
+import "../src/interfaces/IAuthorizable.sol";
 
 
 contract MixinAuthorizable is
     Ownable,
-    MAuthorizable
+    IAuthorizable
 {
     /// @dev Only authorized addresses can invoke functions with this modifier.
     modifier onlyAuthorized {

contracts/asset-proxy/contracts/archive/Ownable.sol

@@ -0,0 +1,33 @@
+pragma solidity ^0.5.9;
+
+import "@0x/contracts-utils/contracts/src/interfaces/IOwnable.sol";
+
+
+contract Ownable is
+    IOwnable
+{
+    address public owner;
+
+    constructor ()
+        public
+    {
+        owner = msg.sender;
+    }
+
+    modifier onlyOwner() {
+        require(
+            msg.sender == owner,
+            "ONLY_CONTRACT_OWNER"
+        );
+        _;
+    }
+
+    function transferOwnership(address newOwner)
+        public
+        onlyOwner
+    {
+        if (newOwner != address(0)) {
+            owner = newOwner;
+        }
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -19,18 +19,18 @@
 pragma solidity ^0.5.9;
 
 import "@0x/contracts-utils/contracts/src/LibBytes.sol";
-import "@0x/contracts-utils/contracts/src/SafeMath.sol";
+import "@0x/contracts-utils/contracts/src/LibSafeMath.sol";
 import "@0x/contracts-erc1155/contracts/src/interfaces/IERC1155.sol";
-import "./MixinAuthorizable.sol";
+import "../archive/MixinAuthorizable.sol";
 import "./interfaces/IAssetProxy.sol";
 
 
 contract ERC1155Proxy is
     MixinAuthorizable,
-    SafeMath,
     IAssetProxy
 {
     using LibBytes for bytes;
+    using LibSafeMath for uint256;
 
     // Id of this proxy.
     bytes4 constant internal PROXY_ID = bytes4(keccak256("ERC1155Assets(address,uint256[],uint256[],bytes)"));
@@ -69,9 +69,9 @@ contract ERC1155Proxy is
         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 
+            // 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);
+            scaledValues[i] = values[i].safeMul(amount);
         }
 
         // Execute `safeBatchTransferFrom` call

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

@@ -0,0 +1,126 @@
+/*
+
+  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.9;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-utils/contracts/src/LibBytes.sol";
+import "@0x/contracts-utils/contracts/src/LibSafeMath.sol";
+import "@0x/contracts-utils/contracts/src/Authorizable.sol";
+import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
+import "./interfaces/IAssetProxy.sol";
+import "./interfaces/IERC20Bridge.sol";
+
+
+contract ERC20BridgeProxy is
+    IAssetProxy,
+    Authorizable
+{
+    using LibBytes for bytes;
+    using LibSafeMath for uint256;
+
+    // @dev Id of this proxy. Also the result of a successful bridge call.
+    //      bytes4(keccak256("ERC20Bridge(address,address,bytes)"))
+    bytes4 constant private PROXY_ID = 0xdc1600f3;
+
+    /// @dev Calls a bridge contract to transfer `amount` of ERC20 from `from`
+    ///      to `to`. Asserts that the balance of `to` has increased by `amount`.
+    /// @param assetData Abi-encoded data for this asset proxy encoded as:
+    ///          abi.encodeWithSelector(
+    ///             bytes4 PROXY_ID,
+    ///             address tokenAddress,
+    ///             address bridgeAddress,
+    ///             bytes bridgeData
+    ///          )
+    /// @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
+        onlyAuthorized
+    {
+        // Extract asset data fields.
+        (
+            address tokenAddress,
+            address bridgeAddress,
+            bytes memory bridgeData
+        ) = abi.decode(
+            assetData.sliceDestructive(4, assetData.length),
+            (address, address, bytes)
+        );
+
+        // Remember the balance of `to` before calling the bridge.
+        uint256 balanceBefore = balanceOf(tokenAddress, to);
+        // Call the bridge, who should transfer `amount` of `tokenAddress` to
+        // `to`.
+        bytes4 success = IERC20Bridge(bridgeAddress).bridgeTransferFrom(
+            tokenAddress,
+            from,
+            to,
+            amount,
+            bridgeData
+        );
+        // Bridge must return the proxy ID to indicate success.
+        require(success == PROXY_ID, "BRIDGE_FAILED");
+        // Ensure that the balance of `to` has increased by at least `amount`.
+        require(
+            balanceBefore.safeAdd(amount) <= balanceOf(tokenAddress, to),
+            "BRIDGE_UNDERPAY"
+        );
+    }
+
+    /// @dev Gets the proxy id associated with this asset proxy.
+    /// @return proxyId The proxy id.
+    function getProxyId()
+        external
+        pure
+        returns (bytes4 proxyId)
+    {
+        return PROXY_ID;
+    }
+
+    /// @dev Retrieves the balance of `owner` for this asset.
+    /// @return balance The balance of the ERC20 token being transferred by this
+    ///         asset proxy.
+    function balanceOf(bytes calldata assetData, address owner)
+        external
+        view
+        returns (uint256 balance)
+    {
+        (address tokenAddress) = abi.decode(
+            assetData.sliceDestructive(4, assetData.length),
+            (address)
+        );
+        return balanceOf(tokenAddress, owner);
+    }
+
+    /// @dev Retrieves the balance of `owner` given an ERC20 address.
+    /// @return balance The balance of the ERC20 token for `owner`.
+    function balanceOf(address tokenAddress, address owner)
+        private
+        view
+        returns (uint256 balance)
+    {
+        return IERC20Token(tokenAddress).balanceOf(owner);
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -16,9 +16,9 @@
 
 */
 
-pragma solidity ^0.5.5;
+pragma solidity ^0.5.9;
 
-import "./MixinAuthorizable.sol";
+import "../archive/MixinAuthorizable.sol";
 
 
 contract ERC20Proxy is
@@ -26,9 +26,9 @@ contract ERC20Proxy is
 {
     // Id of this proxy.
     bytes4 constant internal PROXY_ID = bytes4(keccak256("ERC20Token(address)"));
-    
+
     // solhint-disable-next-line payable-fallback
-    function () 
+    function ()
         external
     {
         assembly {
@@ -117,13 +117,13 @@ contract ERC20Proxy is
                 // * 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.
@@ -147,7 +147,7 @@ contract ERC20Proxy is
                 // 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. 
+                // returned nothing, or returned a non-zero 32 byte value.
                 success := and(success, or(
                     iszero(returndatasize),
                     and(
@@ -158,7 +158,7 @@ contract ERC20Proxy is
                 if success {
                     return(0, 0)
                 }
-                
+
                 // Revert with `Error("TRANSFER_FAILED")`
                 mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
                 mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)

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

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -16,9 +16,9 @@
 
 */
 
-pragma solidity ^0.5.5;
+pragma solidity ^0.5.9;
 
-import "./MixinAuthorizable.sol";
+import "../archive/MixinAuthorizable.sol";
 
 
 contract ERC721Proxy is
@@ -28,7 +28,7 @@ contract ERC721Proxy is
     bytes4 constant internal PROXY_ID = bytes4(keccak256("ERC721Token(address,uint256)"));
 
     // solhint-disable-next-line payable-fallback
-    function () 
+    function ()
         external
     {
         assembly {
@@ -93,10 +93,10 @@ contract ERC721Proxy is
                 // | 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                   |
@@ -121,7 +121,7 @@ contract ERC721Proxy is
                 // 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.
@@ -145,7 +145,7 @@ contract ERC721Proxy is
                 if success {
                     return(0, 0)
                 }
-                
+
                 // Revert with `Error("TRANSFER_FAILED")`
                 mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
                 mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)

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

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -16,10 +16,10 @@
 
 */
 
-pragma solidity ^0.5.5;
+pragma solidity ^0.5.9;
 
-import "./MixinAssetProxyDispatcher.sol";
-import "./MixinAuthorizable.sol";
+import "../archive/MixinAssetProxyDispatcher.sol";
+import "../archive/MixinAuthorizable.sol";
 
 
 contract MultiAssetProxy is
@@ -105,7 +105,7 @@ contract MultiAssetProxy is
                 // |          | 36          |         |   2. offset to nestedAssetData (*)  |
                 // | Data     |             |         | amounts:                            |
                 // |          | 68          | 32      | amounts Length                      |
-                // |          | 100         | a       | amounts Contents                    | 
+                // |          | 100         | a       | amounts Contents                    |
                 // |          |             |         | nestedAssetData:                    |
                 // |          | 100 + a     | 32      | nestedAssetData Length              |
                 // |          | 132 + a     | b       | nestedAssetData Contents (offsets)  |
@@ -149,8 +149,8 @@ contract MultiAssetProxy is
                 // + 32 (amounts offset)
                 let nestedAssetDataOffset := calldataload(add(assetDataOffset, 68))
 
-                // In order to find the start of the `amounts` contents, we must add: 
-                // assetDataOffset 
+                // In order to find the start of the `amounts` contents, we must add:
+                // assetDataOffset
                 // + 32 (assetData len)
                 // + 4 (assetProxyId)
                 // + amountsOffset
@@ -160,8 +160,8 @@ contract MultiAssetProxy is
                 // 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 
+                // In order to find the start of the `nestedAssetData` contents, we must add:
+                // assetDataOffset
                 // + 32 (assetData len)
                 // + 4 (assetProxyId)
                 // + nestedAssetDataOffset
@@ -190,10 +190,10 @@ contract MultiAssetProxy is
 
                 // 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)
 
@@ -208,7 +208,7 @@ contract MultiAssetProxy is
                     let amountsElement := calldataload(add(amountsContentsStart, i))
                     let totalAmount := mul(amountsElement, amount)
 
-                    // Revert if `amount` != 0 and multiplication resulted in an overflow 
+                    // Revert if `amount` != 0 and multiplication resulted in an overflow
                     if iszero(or(
                         iszero(amount),
                         eq(div(totalAmount, amount), amountsElement)
@@ -228,7 +228,7 @@ contract MultiAssetProxy is
                     let nestedAssetDataElementOffset := calldataload(add(nestedAssetDataContentsStart, i))
 
                     // In order to find the start of the `nestedAssetData[i]` contents, we must add:
-                    // assetDataOffset 
+                    // assetDataOffset
                     // + 32 (assetData len)
                     // + 4 (assetProxyId)
                     // + nestedAssetDataOffset
@@ -274,7 +274,7 @@ contract MultiAssetProxy is
                         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")`
@@ -284,7 +284,7 @@ contract MultiAssetProxy is
                         mstore(96, 0)
                         revert(0, 100)
                     }
-    
+
                     // Copy `nestedAssetData[i]` from calldata to memory
                     calldatacopy(
                         132,                                // memory slot after `amounts[i]`
@@ -298,7 +298,7 @@ contract MultiAssetProxy is
                         assetProxy,                             // call address of asset proxy
                         0,                                      // don't send any ETH
                         0,                                      // pointer to start of input
-                        add(164, nestedAssetDataElementLen),    // length 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
                     )

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

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.

contracts/asset-proxy/contracts/src/bridges/Eth2DaiBridge.sol

@@ -0,0 +1,98 @@
+/*
+
+  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.9;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
+import "@0x/contracts-erc20/contracts/src/LibERC20Token.sol";
+import "@0x/contracts-exchange-libs/contracts/src/IWallet.sol";
+import "../interfaces/IERC20Bridge.sol";
+import "../interfaces/IEth2Dai.sol";
+
+
+// solhint-disable space-after-comma
+contract Eth2DaiBridge is
+    IERC20Bridge,
+    IWallet
+{
+    /* Mainnet addresses */
+    address constant public ETH2DAI_ADDRESS = 0x39755357759cE0d7f32dC8dC45414CCa409AE24e;
+
+    /// @dev Callback for `IERC20Bridge`. Tries to buy `amount` of
+    ///      `toTokenAddress` tokens by selling the entirety of the opposing asset
+    ///      (DAI or WETH) to the Eth2Dai contract, then transfers the bought
+    ///      tokens to `to`.
+    /// @param toTokenAddress The token to give to `to` (either DAI or WETH).
+    /// @param to The recipient of the bought tokens.
+    /// @param amount Minimum amount of `toTokenAddress` tokens to buy.
+    /// @param bridgeData The abi-encoeded "from" token address.
+    /// @return success The magic bytes if successful.
+    function bridgeTransferFrom(
+        address toTokenAddress,
+        address /* from */,
+        address to,
+        uint256 amount,
+        bytes calldata bridgeData
+    )
+        external
+        returns (bytes4 success)
+    {
+        // Decode the bridge data to get the `fromTokenAddress`.
+        (address fromTokenAddress) = abi.decode(bridgeData, (address));
+
+        IEth2Dai exchange = _getEth2DaiContract();
+        // Grant an allowance to the exchange to spend `fromTokenAddress` token.
+        LibERC20Token.approve(fromTokenAddress, address(exchange), uint256(-1));
+
+        // Try to sell all of this contract's `fromTokenAddress` token balance.
+        uint256 boughtAmount = _getEth2DaiContract().sellAllAmount(
+            address(fromTokenAddress),
+            IERC20Token(fromTokenAddress).balanceOf(address(this)),
+            toTokenAddress,
+            amount
+        );
+        // Transfer the converted `toToken`s to `to`.
+        LibERC20Token.transfer(toTokenAddress, to, boughtAmount);
+        return BRIDGE_SUCCESS;
+    }
+
+    /// @dev `SignatureType.Wallet` callback, so that this bridge can be the maker
+    ///      and sign for itself in orders. Always succeeds.
+    /// @return magicValue Magic success bytes, always.
+    function isValidSignature(
+        bytes32,
+        bytes calldata
+    )
+        external
+        view
+        returns (bytes4 magicValue)
+    {
+        return LEGACY_WALLET_MAGIC_VALUE;
+    }
+
+    /// @dev Overridable way to get the eth2dai contract.
+    /// @return exchange The Eth2Dai exchange contract.
+    function _getEth2DaiContract()
+        internal
+        view
+        returns (IEth2Dai exchange)
+    {
+        return IEth2Dai(ETH2DAI_ADDRESS);
+    }
+}

contracts/asset-proxy/contracts/src/bridges/UniswapBridge.sol

@@ -0,0 +1,219 @@
+/*
+
+  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.9;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
+import "@0x/contracts-erc20/contracts/src/interfaces/IEtherToken.sol";
+import "@0x/contracts-erc20/contracts/src/LibERC20Token.sol";
+import "@0x/contracts-exchange-libs/contracts/src/IWallet.sol";
+import "../interfaces/IUniswapExchangeFactory.sol";
+import "../interfaces/IUniswapExchange.sol";
+import "../interfaces/IERC20Bridge.sol";
+
+
+// solhint-disable space-after-comma
+// solhint-disable not-rely-on-time
+contract UniswapBridge is
+    IERC20Bridge,
+    IWallet
+{
+    /* Mainnet addresses */
+    address constant private UNISWAP_EXCHANGE_FACTORY_ADDRESS = 0xc0a47dFe034B400B47bDaD5FecDa2621de6c4d95;
+    address constant private WETH_ADDRESS = 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2;
+
+    // Struct to hold `bridgeTransferFrom()` local variables in memory and to avoid
+    // stack overflows.
+    struct WithdrawToState {
+        IUniswapExchange exchange;
+        uint256 fromTokenBalance;
+        IEtherToken weth;
+    }
+
+    // solhint-disable no-empty-blocks
+    /// @dev Payable fallback to receive ETH from uniswap.
+    function ()
+        external
+        payable
+    {}
+
+    /// @dev Callback for `IERC20Bridge`. Tries to buy `amount` of
+    ///      `toTokenAddress` tokens by selling the entirety of the `fromTokenAddress`
+    ///      token encoded in the bridge data.
+    /// @param toTokenAddress The token to buy and transfer to `to`.
+    /// @param to The recipient of the bought tokens.
+    /// @param amount Minimum amount of `toTokenAddress` tokens to buy.
+    /// @param bridgeData The abi-encoded "from" token address.
+    /// @return success The magic bytes if successful.
+    function bridgeTransferFrom(
+        address toTokenAddress,
+        address /* from */,
+        address to,
+        uint256 amount,
+        bytes calldata bridgeData
+    )
+        external
+        returns (bytes4 success)
+    {
+        // State memory object to avoid stack overflows.
+        WithdrawToState memory state;
+        // Decode the bridge data to get the `fromTokenAddress`.
+        (address fromTokenAddress) = abi.decode(bridgeData, (address));
+
+        // Just transfer the tokens if they're the same.
+        if (fromTokenAddress == toTokenAddress) {
+            LibERC20Token.transfer(fromTokenAddress, to, amount);
+            return BRIDGE_SUCCESS;
+        }
+
+        // Get the exchange for the token pair.
+        state.exchange = _getUniswapExchangeForTokenPair(
+            fromTokenAddress,
+            toTokenAddress
+        );
+        // Get our balance of `fromTokenAddress` token.
+        state.fromTokenBalance = IERC20Token(fromTokenAddress).balanceOf(address(this));
+        // Get the weth contract.
+        state.weth = getWethContract();
+
+        // Convert from WETH to a token.
+        if (fromTokenAddress == address(state.weth)) {
+            // Unwrap the WETH.
+            state.weth.withdraw(state.fromTokenBalance);
+            // Buy as much of `toTokenAddress` token with ETH as possible and
+            // transfer it to `to`.
+            state.exchange.ethToTokenTransferInput.value(state.fromTokenBalance)(
+                // Minimum buy amount.
+                amount,
+                // Expires after this block.
+                block.timestamp,
+                // Recipient is `to`.
+                to
+            );
+
+        // Convert from a token to WETH.
+        } else if (toTokenAddress == address(state.weth)) {
+            // Grant the exchange an allowance.
+            _grantExchangeAllowance(state.exchange, fromTokenAddress);
+            // Buy as much ETH with `fromTokenAddress` token as possible.
+            uint256 ethBought = state.exchange.tokenToEthSwapInput(
+                // Sell all tokens we hold.
+                state.fromTokenBalance,
+                // Minimum buy amount.
+                amount,
+                // Expires after this block.
+                block.timestamp
+            );
+            // Wrap the ETH.
+            state.weth.deposit.value(ethBought)();
+            // Transfer the WETH to `to`.
+            IEtherToken(toTokenAddress).transfer(to, ethBought);
+
+        // Convert from one token to another.
+        } else {
+            // Grant the exchange an allowance.
+            _grantExchangeAllowance(state.exchange, fromTokenAddress);
+            // Buy as much `toTokenAddress` token with `fromTokenAddress` token
+            // and transfer it to `to`.
+            state.exchange.tokenToTokenTransferInput(
+                // Sell all tokens we hold.
+                state.fromTokenBalance,
+                // Minimum buy amount.
+                amount,
+                // No minimum intermediate ETH buy amount.
+                0,
+                // Expires after this block.
+                block.timestamp,
+                // Recipient is `to`.
+                to,
+                // Convert to `toTokenAddress`.
+                toTokenAddress
+            );
+        }
+        return BRIDGE_SUCCESS;
+    }
+
+    /// @dev `SignatureType.Wallet` callback, so that this bridge can be the maker
+    ///      and sign for itself in orders. Always succeeds.
+    /// @return magicValue Success bytes, always.
+    function isValidSignature(
+        bytes32,
+        bytes calldata
+    )
+        external
+        view
+        returns (bytes4 magicValue)
+    {
+        return LEGACY_WALLET_MAGIC_VALUE;
+    }
+
+    /// @dev Overridable way to get the weth contract.
+    /// @return token The WETH contract.
+    function getWethContract()
+        public
+        view
+        returns (IEtherToken token)
+    {
+        return IEtherToken(WETH_ADDRESS);
+    }
+
+    /// @dev Overridable way to get the uniswap exchange factory contract.
+    /// @return factory The exchange factory contract.
+    function getUniswapExchangeFactoryContract()
+        public
+        view
+        returns (IUniswapExchangeFactory factory)
+    {
+        return IUniswapExchangeFactory(UNISWAP_EXCHANGE_FACTORY_ADDRESS);
+    }
+
+    /// @dev Grants an unlimited allowance to the exchange for its token
+    ///      on behalf of this contract.
+    /// @param exchange The Uniswap token exchange.
+    /// @param tokenAddress The token address for the exchange.
+    function _grantExchangeAllowance(IUniswapExchange exchange, address tokenAddress)
+        private
+    {
+        LibERC20Token.approve(tokenAddress, address(exchange), uint256(-1));
+    }
+
+    /// @dev Retrieves the uniswap exchange for a given token pair.
+    ///      In the case of a WETH-token exchange, this will be the non-WETH token.
+    ///      In th ecase of a token-token exchange, this will be the first token.
+    /// @param fromTokenAddress The address of the token we are converting from.
+    /// @param toTokenAddress The address of the token we are converting to.
+    /// @return exchange The uniswap exchange.
+    function _getUniswapExchangeForTokenPair(
+        address fromTokenAddress,
+        address toTokenAddress
+    )
+        private
+        view
+        returns (IUniswapExchange exchange)
+    {
+        address exchangeTokenAddress = fromTokenAddress;
+        // Whichever isn't WETH is the exchange token.
+        if (fromTokenAddress == address(getWethContract())) {
+            exchangeTokenAddress = toTokenAddress;
+        }
+        exchange = getUniswapExchangeFactoryContract().getExchange(exchangeTokenAddress);
+        require(address(exchange) != address(0), "NO_UNISWAP_EXCHANGE_FOR_TOKEN");
+        return exchange;
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -17,7 +17,7 @@
 */
 
 // solhint-disable
-pragma solidity ^0.5.5;
+pragma solidity ^0.5.9;
 pragma experimental ABIEncoderV2;
 
 
@@ -26,33 +26,63 @@ pragma experimental ABIEncoderV2;
 // This argument is ABI encoded as one of the methods of this interface.
 interface IAssetData {
 
+    /// @dev Function signature for encoding ERC20 assetData.
+    /// @param tokenAddress Address of ERC20Token contract.
     function ERC20Token(address tokenAddress)
         external;
-    
+
+    /// @dev Function signature for encoding ERC721 assetData.
+    /// @param tokenAddress Address of ERC721 token contract.
+    /// @param tokenId Id of ERC721 token to be transferred.
     function ERC721Token(
         address tokenAddress,
         uint256 tokenId
     )
         external;
 
+    /// @dev Function signature for encoding ERC1155 assetData.
+    /// @param tokenAddress Address of ERC1155 token contract.
+    /// @param tokenIds Array of ids of tokens to be transferred.
+    /// @param values Array of values that correspond to each token id to be transferred.
+    ///        Note that each value will be multiplied by the amount being filled in the order before transferring.
+    /// @param callbackData Extra data to be passed to receiver's `onERC1155Received` callback function.
     function ERC1155Assets(
         address tokenAddress,
         uint256[] calldata tokenIds,
-        uint256[] calldata tokenValues,
+        uint256[] calldata values,
         bytes calldata callbackData
     )
         external;
 
+    /// @dev Function signature for encoding MultiAsset assetData.
+    /// @param values Array of amounts that correspond to each asset to be transferred.
+    ///        Note that each value will be multiplied by the amount being filled in the order before transferring.
+    /// @param nestedAssetData Array of assetData fields that will be be dispatched to their correspnding AssetProxy contract.
     function MultiAsset(
-        uint256[] calldata amounts,
+        uint256[] calldata values,
         bytes[] calldata nestedAssetData
     )
         external;
 
+    /// @dev Function signature for encoding StaticCall assetData.
+    /// @param staticCallTargetAddress Address that will execute the staticcall.
+    /// @param staticCallData Data that will be executed via staticcall on the staticCallTargetAddress.
+    /// @param expectedReturnDataHash Keccak-256 hash of the expected staticcall return data.
     function StaticCall(
-        address callTarget,
+        address staticCallTargetAddress,
         bytes calldata staticCallData,
-        bytes32 callResultHash
+        bytes32 expectedReturnDataHash
+    )
+        external;
+
+    /// @dev Function signature for encoding ERC20Bridge assetData.
+    /// @param tokenAddress Address of token to transfer.
+    /// @param bridgeAddress Address of the bridge contract.
+    /// @param bridgeData Arbitrary data to be passed to the bridge contract.
+    function ERC20Bridge(
+        address tokenAddress,
+        address bridgeAddress,
+        bytes calldata bridgeData
     )
         external;
 }

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

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -16,9 +16,7 @@
 
 */
 
-pragma solidity ^0.5.5;
-
-import "./IAuthorizable.sol";
+pragma solidity ^0.5.9;
 
 
 contract IAssetProxy {

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

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -16,11 +16,17 @@
 
 */
 
-pragma solidity ^0.5.5;
+pragma solidity ^0.5.9;
 
 
 contract IAssetProxyDispatcher {
 
+    // Logs registration of new asset proxy
+    event AssetProxyRegistered(
+        bytes4 id,              // Id of new registered AssetProxy.
+        address assetProxy      // Address of new registered AssetProxy.
+    );
+
     /// @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.

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

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -16,7 +16,7 @@
 
 */
 
-pragma solidity ^0.5.5;
+pragma solidity ^0.5.9;
 
 import "@0x/contracts-utils/contracts/src/interfaces/IOwnable.sol";
 
@@ -24,6 +24,18 @@ import "@0x/contracts-utils/contracts/src/interfaces/IOwnable.sol";
 contract IAuthorizable is
     IOwnable
 {
+    // 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 Authorizes an address.
     /// @param target Address to authorize.
     function addAuthorizedAddress(address target)
@@ -42,7 +54,7 @@ contract IAuthorizable is
         uint256 index
     )
         external;
-    
+
     /// @dev Gets all authorized addresses.
     /// @return Array of authorized addresses.
     function getAuthorizedAddresses()

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

@@ -0,0 +1,43 @@
+/*
+
+  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.9;
+
+
+contract IERC20Bridge {
+
+    // @dev Result of a successful bridge call.
+    bytes4 constant internal BRIDGE_SUCCESS = 0xdc1600f3;
+
+    /// @dev Transfers `amount` of the ERC20 `tokenAddress` from `from` to `to`.
+    /// @param tokenAddress The address of the ERC20 token to transfer.
+    /// @param from Address to transfer asset from.
+    /// @param to Address to transfer asset to.
+    /// @param amount Amount of asset to transfer.
+    /// @param bridgeData Arbitrary asset data needed by the bridge contract.
+    /// @return success The magic bytes `0x37708e9b` if successful.
+    function bridgeTransferFrom(
+        address tokenAddress,
+        address from,
+        address to,
+        uint256 amount,
+        bytes calldata bridgeData
+    )
+        external
+        returns (bytes4 success);
+}

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

@@ -0,0 +1,38 @@
+/*
+
+  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.9;
+
+
+interface IEth2Dai {
+
+    /// @dev Sell `sellAmount` of `fromToken` token and receive `toToken` token.
+    /// @param fromToken The token being sold.
+    /// @param sellAmount The amount of `fromToken` token being sold.
+    /// @param toToken The token being bought.
+    /// @param minFillAmount Minimum amount of `toToken` token to buy.
+    /// @return fillAmount Amount of `toToken` bought.
+    function sellAllAmount(
+        address fromToken,
+        uint256 sellAmount,
+        address toToken,
+        uint256 minFillAmount
+    )
+        external
+        returns (uint256 fillAmount);
+}

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

@@ -0,0 +1,77 @@
+/*
+
+  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.9;
+
+
+interface IUniswapExchange {
+
+    /// @dev Buys at least `minTokensBought` tokens with ETH and transfer them
+    ///      to `recipient`.
+    /// @param minTokensBought The minimum number of tokens to buy.
+    /// @param deadline Time when this order expires.
+    /// @param recipient Who to transfer the tokens to.
+    /// @return tokensBought Amount of tokens bought.
+    function ethToTokenTransferInput(
+        uint256 minTokensBought,
+        uint256 deadline,
+        address recipient
+    )
+        external
+        payable
+        returns (uint256 tokensBought);
+
+    /// @dev Buys at least `minEthBought` ETH with tokens.
+    /// @param tokensSold Amount of tokens to sell.
+    /// @param minEthBought The minimum amount of ETH to buy.
+    /// @param deadline Time when this order expires.
+    /// @return ethBought Amount of tokens bought.
+    function tokenToEthSwapInput(
+        uint256 tokensSold,
+        uint256 minEthBought,
+        uint256 deadline
+    )
+        external
+        returns (uint256 ethBought);
+
+    /// @dev Buys at least `minTokensBought` tokens with the exchange token
+    ///      and transfer them to `recipient`.
+    /// @param minTokensBought The minimum number of tokens to buy.
+    /// @param minEthBought The minimum amount of intermediate ETH to buy.
+    /// @param deadline Time when this order expires.
+    /// @param recipient Who to transfer the tokens to.
+    /// @param toTokenAddress The token being bought.
+    /// @return tokensBought Amount of tokens bought.
+    function tokenToTokenTransferInput(
+        uint256 tokensSold,
+        uint256 minTokensBought,
+        uint256 minEthBought,
+        uint256 deadline,
+        address recipient,
+        address toTokenAddress
+    )
+        external
+        returns (uint256 tokensBought);
+
+    /// @dev Retrieves the token that is associated with this exchange.
+    /// @return tokenAddress The token address.
+    function toTokenAddress()
+        external
+        view
+        returns (address tokenAddress);
+}

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

@@ -0,0 +1,32 @@
+/*
+
+  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.9;
+
+import "./IUniswapExchange.sol";
+
+
+interface IUniswapExchangeFactory {
+
+    /// @dev Get the exchange for a token.
+    /// @param tokenAddress The address of the token contract.
+    function getExchange(address tokenAddress)
+        external
+        view
+        returns (IUniswapExchange);
+}

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

@@ -1,40 +0,0 @@
-/*
-
-  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

@@ -1,45 +0,0 @@
-/*
-
-  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

@@ -1,41 +0,0 @@
-/*
-
-  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/TestERC20Bridge.sol

@@ -0,0 +1,108 @@
+/*
+
+  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.9;
+pragma experimental ABIEncoderV2;
+
+import "../src/interfaces/IERC20Bridge.sol";
+
+
+/// @dev Test bridge token
+contract TestERC20BridgeToken {
+    mapping (address => uint256) private _balances;
+
+    function addBalance(address owner, int256 amount)
+        external
+    {
+        setBalance(owner, uint256(int256(balanceOf(owner)) + amount));
+    }
+
+    function setBalance(address owner, uint256 balance)
+        public
+    {
+        _balances[owner] = balance;
+    }
+
+    function balanceOf(address owner)
+        public
+        view
+        returns (uint256)
+    {
+        return _balances[owner];
+    }
+}
+
+
+/// @dev Test bridge contract.
+contract TestERC20Bridge is
+    IERC20Bridge
+{
+    TestERC20BridgeToken public testToken;
+
+    event BridgeWithdrawTo(
+        address tokenAddress,
+        address from,
+        address to,
+        uint256 amount,
+        bytes bridgeData
+    );
+
+    constructor() public {
+        testToken = new TestERC20BridgeToken();
+    }
+
+    function setTestTokenBalance(address owner, uint256 balance)
+        external
+    {
+        testToken.setBalance(owner, balance);
+    }
+
+    function bridgeTransferFrom(
+        address tokenAddress,
+        address from,
+        address to,
+        uint256 amount,
+        bytes calldata bridgeData
+    )
+        external
+        returns (bytes4)
+    {
+        emit BridgeWithdrawTo(
+            tokenAddress,
+            from,
+            to,
+            amount,
+            bridgeData
+        );
+        // Unpack the bridgeData.
+        (
+            int256 transferAmount,
+            bytes memory revertData,
+            bytes memory returnData
+        ) = abi.decode(bridgeData, (int256, bytes, bytes));
+
+        // If `revertData` is set, revert.
+        if (revertData.length != 0) {
+            assembly { revert(add(revertData, 0x20), mload(revertData)) }
+        }
+        // Increase `to`'s balance by `transferAmount`.
+        TestERC20BridgeToken(tokenAddress).addBalance(to, transferAmount);
+        // Return `returnData`.
+        assembly { return(add(returnData, 0x20), mload(returnData)) }
+    }
+}

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

@@ -0,0 +1,202 @@
+/*
+
+  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.9;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
+import "../src/bridges/Eth2DaiBridge.sol";
+import "../src/interfaces/IEth2Dai.sol";
+
+
+// solhint-disable no-simple-event-func-name
+contract TestEvents {
+
+    event TokenTransfer(
+        address token,
+        address from,
+        address to,
+        uint256 amount
+    );
+
+    event TokenApprove(
+        address token,
+        address spender,
+        uint256 allowance
+    );
+
+    function raiseTokenTransfer(
+        address from,
+        address to,
+        uint256 amount
+    )
+        external
+    {
+        emit TokenTransfer(
+            msg.sender,
+            from,
+            to,
+            amount
+        );
+    }
+
+    function raiseTokenApprove(address spender, uint256 allowance)
+        external
+    {
+        emit TokenApprove(msg.sender, spender, allowance);
+    }
+}
+
+
+/// @dev A minimalist ERC20 token.
+contract TestToken {
+
+    mapping (address => uint256) public balances;
+    string private _nextTransferRevertReason;
+    bytes private _nextTransferReturnData;
+
+    /// @dev Just calls `raiseTokenTransfer()` on the caller.
+    function transfer(address to, uint256 amount)
+        external
+        returns (bool)
+    {
+        TestEvents(msg.sender).raiseTokenTransfer(msg.sender, to, amount);
+        if (bytes(_nextTransferRevertReason).length != 0) {
+            revert(_nextTransferRevertReason);
+        }
+        bytes memory returnData = _nextTransferReturnData;
+        assembly { return(add(returnData, 0x20), mload(returnData)) }
+    }
+
+    /// @dev Set the balance for `owner`.
+    function setBalance(address owner, uint256 balance)
+        external
+    {
+        balances[owner] = balance;
+    }
+
+    /// @dev Set the behavior of the `transfer()` call.
+    function setTransferBehavior(
+        string calldata revertReason,
+        bytes calldata returnData
+    )
+        external
+    {
+        _nextTransferRevertReason = revertReason;
+        _nextTransferReturnData = returnData;
+    }
+
+    /// @dev Just calls `raiseTokenApprove()` on the caller.
+    function approve(address spender, uint256 allowance)
+        external
+        returns (bool)
+    {
+        TestEvents(msg.sender).raiseTokenApprove(spender, allowance);
+        return true;
+    }
+
+    /// @dev Retrieve the balance for `owner`.
+    function balanceOf(address owner)
+        external
+        view
+        returns (uint256)
+    {
+        return balances[owner];
+    }
+}
+
+
+/// @dev Eth2DaiBridge overridden to mock tokens and
+///      implement IEth2Dai.
+contract TestEth2DaiBridge is
+    TestEvents,
+    IEth2Dai,
+    Eth2DaiBridge
+{
+    event SellAllAmount(
+        address sellToken,
+        uint256 sellTokenAmount,
+        address buyToken,
+        uint256 minimumFillAmount
+    );
+
+    mapping (address => TestToken)  public testTokens;
+    string private _nextRevertReason;
+    uint256 private _nextFillAmount;
+
+    /// @dev Create a token and set this contract's balance.
+    function createToken(uint256 balance)
+        external
+        returns (address tokenAddress)
+    {
+        TestToken token = new TestToken();
+        testTokens[address(token)] = token;
+        token.setBalance(address(this), balance);
+        return address(token);
+    }
+
+    /// @dev Set the behavior for `IEth2Dai.sellAllAmount()`.
+    function setFillBehavior(string calldata revertReason, uint256 fillAmount)
+        external
+    {
+        _nextRevertReason = revertReason;
+        _nextFillAmount = fillAmount;
+    }
+
+    /// @dev Set the behavior of a token's `transfer()`.
+    function setTransferBehavior(
+        address tokenAddress,
+        string calldata revertReason,
+        bytes calldata returnData
+    )
+        external
+    {
+        testTokens[tokenAddress].setTransferBehavior(revertReason, returnData);
+    }
+
+    /// @dev Implementation of `IEth2Dai.sellAllAmount()`
+    function sellAllAmount(
+        address sellTokenAddress,
+        uint256 sellTokenAmount,
+        address buyTokenAddress,
+        uint256 minimumFillAmount
+    )
+        external
+        returns (uint256 fillAmount)
+    {
+        emit SellAllAmount(
+            sellTokenAddress,
+            sellTokenAmount,
+            buyTokenAddress,
+            minimumFillAmount
+        );
+        if (bytes(_nextRevertReason).length != 0) {
+            revert(_nextRevertReason);
+        }
+        return _nextFillAmount;
+    }
+
+    // @dev This contract will double as the Eth2Dai contract.
+    function _getEth2DaiContract()
+        internal
+        view
+        returns (IEth2Dai)
+    {
+        return IEth2Dai(address(this));
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.

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

@@ -0,0 +1,432 @@
+/*
+
+  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.9;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
+import "@0x/contracts-utils/contracts/src/LibSafeMath.sol";
+import "../src/bridges/UniswapBridge.sol";
+import "../src/interfaces/IUniswapExchangeFactory.sol";
+import "../src/interfaces/IUniswapExchange.sol";
+
+
+// solhint-disable no-simple-event-func-name
+contract TestEventsRaiser {
+
+    event TokenTransfer(
+        address token,
+        address from,
+        address to,
+        uint256 amount
+    );
+
+    event TokenApprove(
+        address spender,
+        uint256 allowance
+    );
+
+    event WethDeposit(
+        uint256 amount
+    );
+
+    event WethWithdraw(
+        uint256 amount
+    );
+
+    event EthToTokenTransferInput(
+        address exchange,
+        uint256 minTokensBought,
+        uint256 deadline,
+        address recipient
+    );
+
+    event TokenToEthSwapInput(
+        address exchange,
+        uint256 tokensSold,
+        uint256 minEthBought,
+        uint256 deadline
+    );
+
+    event TokenToTokenTransferInput(
+        address exchange,
+        uint256 tokensSold,
+        uint256 minTokensBought,
+        uint256 minEthBought,
+        uint256 deadline,
+        address recipient,
+        address toTokenAddress
+    );
+
+    function raiseEthToTokenTransferInput(
+        uint256 minTokensBought,
+        uint256 deadline,
+        address recipient
+    )
+        external
+    {
+        emit EthToTokenTransferInput(
+            msg.sender,
+            minTokensBought,
+            deadline,
+            recipient
+        );
+    }
+
+    function raiseTokenToEthSwapInput(
+        uint256 tokensSold,
+        uint256 minEthBought,
+        uint256 deadline
+    )
+        external
+    {
+        emit TokenToEthSwapInput(
+            msg.sender,
+            tokensSold,
+            minEthBought,
+            deadline
+        );
+    }
+
+    function raiseTokenToTokenTransferInput(
+        uint256 tokensSold,
+        uint256 minTokensBought,
+        uint256 minEthBought,
+        uint256 deadline,
+        address recipient,
+        address toTokenAddress
+    )
+        external
+    {
+        emit TokenToTokenTransferInput(
+            msg.sender,
+            tokensSold,
+            minTokensBought,
+            minEthBought,
+            deadline,
+            recipient,
+            toTokenAddress
+        );
+    }
+
+    function raiseTokenTransfer(
+        address from,
+        address to,
+        uint256 amount
+    )
+        external
+    {
+        emit TokenTransfer(
+            msg.sender,
+            from,
+            to,
+            amount
+        );
+    }
+
+    function raiseTokenApprove(address spender, uint256 allowance)
+        external
+    {
+        emit TokenApprove(spender, allowance);
+    }
+
+    function raiseWethDeposit(uint256 amount)
+        external
+    {
+        emit WethDeposit(amount);
+    }
+
+    function raiseWethWithdraw(uint256 amount)
+        external
+    {
+        emit WethWithdraw(amount);
+    }
+}
+
+
+/// @dev A minimalist ERC20/WETH token.
+contract TestToken {
+
+    using LibSafeMath for uint256;
+
+    mapping (address => uint256) public balances;
+    string private _nextRevertReason;
+
+    /// @dev Set the balance for `owner`.
+    function setBalance(address owner)
+        external
+        payable
+    {
+        balances[owner] = msg.value;
+    }
+
+    /// @dev Set the revert reason for `transfer()`,
+    ///      `deposit()`, and `withdraw()`.
+    function setRevertReason(string calldata reason)
+        external
+    {
+        _nextRevertReason = reason;
+    }
+
+    /// @dev Just calls `raiseTokenTransfer()` on the caller.
+    function transfer(address to, uint256 amount)
+        external
+        returns (bool)
+    {
+        _revertIfReasonExists();
+        TestEventsRaiser(msg.sender).raiseTokenTransfer(msg.sender, to, amount);
+        return true;
+    }
+
+    /// @dev Just calls `raiseTokenApprove()` on the caller.
+    function approve(address spender, uint256 allowance)
+        external
+        returns (bool)
+    {
+        TestEventsRaiser(msg.sender).raiseTokenApprove(spender, allowance);
+        return true;
+    }
+
+    /// @dev `IWETH.deposit()` that increases balances and calls
+    ///     `raiseWethDeposit()` on the caller.
+    function deposit()
+        external
+        payable
+    {
+        _revertIfReasonExists();
+        balances[msg.sender] += balances[msg.sender].safeAdd(msg.value);
+        TestEventsRaiser(msg.sender).raiseWethDeposit(msg.value);
+    }
+
+    /// @dev `IWETH.withdraw()` that just reduces balances and calls
+    ///       `raiseWethWithdraw()` on the caller.
+    function withdraw(uint256 amount)
+        external
+    {
+        _revertIfReasonExists();
+        balances[msg.sender] = balances[msg.sender].safeSub(amount);
+        msg.sender.transfer(amount);
+        TestEventsRaiser(msg.sender).raiseWethWithdraw(amount);
+    }
+
+    /// @dev Retrieve the balance for `owner`.
+    function balanceOf(address owner)
+        external
+        view
+        returns (uint256)
+    {
+        return balances[owner];
+    }
+
+    function _revertIfReasonExists()
+        private
+        view
+    {
+        if (bytes(_nextRevertReason).length != 0) {
+            revert(_nextRevertReason);
+        }
+    }
+}
+
+
+contract TestExchange is
+    IUniswapExchange
+{
+    address public tokenAddress;
+    string private _nextRevertReason;
+
+    constructor(address _tokenAddress) public {
+        tokenAddress = _tokenAddress;
+    }
+
+    function setFillBehavior(
+        string calldata revertReason
+    )
+        external
+        payable
+    {
+        _nextRevertReason = revertReason;
+    }
+
+    function ethToTokenTransferInput(
+        uint256 minTokensBought,
+        uint256 deadline,
+        address recipient
+    )
+        external
+        payable
+        returns (uint256 tokensBought)
+    {
+        TestEventsRaiser(msg.sender).raiseEthToTokenTransferInput(
+            minTokensBought,
+            deadline,
+            recipient
+        );
+        _revertIfReasonExists();
+        return address(this).balance;
+    }
+
+    function tokenToEthSwapInput(
+        uint256 tokensSold,
+        uint256 minEthBought,
+        uint256 deadline
+    )
+        external
+        returns (uint256 ethBought)
+    {
+        TestEventsRaiser(msg.sender).raiseTokenToEthSwapInput(
+            tokensSold,
+            minEthBought,
+            deadline
+        );
+        _revertIfReasonExists();
+        uint256 fillAmount = address(this).balance;
+        msg.sender.transfer(fillAmount);
+        return fillAmount;
+    }
+
+    function tokenToTokenTransferInput(
+        uint256 tokensSold,
+        uint256 minTokensBought,
+        uint256 minEthBought,
+        uint256 deadline,
+        address recipient,
+        address toTokenAddress
+    )
+        external
+        returns (uint256 tokensBought)
+    {
+        TestEventsRaiser(msg.sender).raiseTokenToTokenTransferInput(
+            tokensSold,
+            minTokensBought,
+            minEthBought,
+            deadline,
+            recipient,
+            toTokenAddress
+        );
+        _revertIfReasonExists();
+        return address(this).balance;
+    }
+
+    function toTokenAddress()
+        external
+        view
+        returns (address _tokenAddress)
+    {
+        return tokenAddress;
+    }
+
+    function _revertIfReasonExists()
+        private
+        view
+    {
+        if (bytes(_nextRevertReason).length != 0) {
+            revert(_nextRevertReason);
+        }
+    }
+}
+
+
+/// @dev UniswapBridge overridden to mock tokens and implement IUniswapExchangeFactory.
+contract TestUniswapBridge is
+    IUniswapExchangeFactory,
+    TestEventsRaiser,
+    UniswapBridge
+{
+    TestToken public wethToken;
+    // Token address to TestToken instance.
+    mapping (address => TestToken) private _testTokens;
+    // Token address to TestExchange instance.
+    mapping (address => TestExchange) private _testExchanges;
+
+    constructor() public {
+        wethToken = new TestToken();
+        _testTokens[address(wethToken)] = wethToken;
+    }
+
+    /// @dev Sets the balance of this contract for an existing token.
+    ///      The wei attached will be the balance.
+    function setTokenBalance(address tokenAddress)
+        external
+        payable
+    {
+        TestToken token = _testTokens[tokenAddress];
+        token.deposit.value(msg.value)();
+    }
+
+    /// @dev Sets the revert reason for an existing token.
+    function setTokenRevertReason(address tokenAddress, string calldata revertReason)
+        external
+    {
+        TestToken token = _testTokens[tokenAddress];
+        token.setRevertReason(revertReason);
+    }
+
+    /// @dev Create a token and exchange (if they don't exist) for a new token
+    ///      and sets the exchange revert and fill behavior. The wei attached
+    ///      will be the fill amount for the exchange.
+    /// @param tokenAddress The token address. If zero, one will be created.
+    /// @param revertReason The revert reason for exchange operations.
+    function createTokenAndExchange(
+        address tokenAddress,
+        string calldata revertReason
+    )
+        external
+        payable
+        returns (TestToken token, TestExchange exchange)
+    {
+        token = TestToken(tokenAddress);
+        if (tokenAddress == address(0)) {
+            token = new TestToken();
+        }
+        _testTokens[address(token)] = token;
+        exchange = _testExchanges[address(token)];
+        if (address(exchange) == address(0)) {
+            _testExchanges[address(token)] = exchange = new TestExchange(address(token));
+        }
+        exchange.setFillBehavior.value(msg.value)(revertReason);
+        return (token, exchange);
+    }
+
+    /// @dev `IUniswapExchangeFactory.getExchange`
+    function getExchange(address tokenAddress)
+        external
+        view
+        returns (IUniswapExchange)
+    {
+        return IUniswapExchange(_testExchanges[tokenAddress]);
+    }
+
+    // @dev Use `wethToken`.
+    function getWethContract()
+        public
+        view
+        returns (IEtherToken)
+    {
+        return IEtherToken(address(wethToken));
+    }
+
+    // @dev This contract will double as the Uniswap contract.
+    function getUniswapExchangeFactoryContract()
+        public
+        view
+        returns (IUniswapExchangeFactory)
+    {
+        return IUniswapExchangeFactory(address(this));
+    }
+}

contracts/asset-proxy/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-asset-proxy",
-    "version": "2.2.5",
+    "version": "2.3.0-beta.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -12,7 +12,7 @@
     "scripts": {
         "build": "yarn pre_build && tsc -b",
         "build:ci": "yarn build",
-        "pre_build": "run-s compile generate_contract_wrappers",
+        "pre_build": "run-s compile contracts:gen 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",
@@ -22,7 +22,7 @@
         "compile": "sol-compiler",
         "watch": "sol-compiler -w",
         "clean": "shx rm -rf lib generated-artifacts generated-wrappers",
-        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
+        "generate_contract_wrappers": "abi-gen --debug --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",
@@ -31,10 +31,11 @@
         "coverage:report:lcov": "istanbul report lcov",
         "test:circleci": "yarn test",
         "contracts:gen": "contracts-gen",
-        "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
+        "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol",
+        "compile:truffle": "truffle compile"
     },
     "config": {
-        "abis": "./generated-artifacts/@(ERC1155Proxy|ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAuthorizable|MixinAuthorizable|MultiAssetProxy|StaticCallProxy|TestStaticCallTarget).json",
+        "abis": "./generated-artifacts/@(ERC1155Proxy|ERC20BridgeProxy|ERC20Proxy|ERC721Proxy|Eth2DaiBridge|IAssetData|IAssetProxy|IAssetProxyDispatcher|IAuthorizable|IERC20Bridge|IEth2Dai|IUniswapExchange|IUniswapExchangeFactory|MixinAssetProxyDispatcher|MixinAuthorizable|MultiAssetProxy|Ownable|StaticCallProxy|TestERC20Bridge|TestEth2DaiBridge|TestStaticCallTarget|TestUniswapBridge|UniswapBridge).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {
@@ -47,12 +48,12 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^4.1.0",
-        "@0x/contracts-gen": "^1.0.13",
-        "@0x/contracts-test-utils": "^3.1.13",
-        "@0x/dev-utils": "^2.3.0",
-        "@0x/sol-compiler": "^3.1.12",
-        "@0x/tslint-config": "^3.0.1",
+        "@0x/abi-gen": "^4.4.0-beta.1",
+        "@0x/contracts-gen": "^1.1.0-beta.1",
+        "@0x/contracts-test-utils": "^3.2.0-beta.1",
+        "@0x/dev-utils": "^2.4.0-beta.1",
+        "@0x/sol-compiler": "^3.2.0-beta.1",
+        "@0x/tslint-config": "^3.1.0-beta.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "*",
@@ -65,21 +66,23 @@
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "solhint": "^1.4.1",
+        "truffle": "^5.0.32",
         "tslint": "5.11.0",
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.3.1",
-        "@0x/contracts-erc1155": "^1.1.12",
-        "@0x/contracts-erc20": "^2.2.11",
-        "@0x/contracts-erc721": "^2.1.12",
-        "@0x/contracts-utils": "^3.2.1",
-        "@0x/order-utils": "^8.2.5",
-        "@0x/types": "^2.4.1",
-        "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.5.0",
-        "@0x/web3-wrapper": "^6.0.10",
-        "ethereum-types": "^2.1.4",
+        "@0x/base-contract": "^5.5.0-beta.1",
+        "@0x/contracts-dev-utils": "^0.1.0-beta.1",
+        "@0x/contracts-erc1155": "^1.2.0-beta.1",
+        "@0x/contracts-erc20": "^2.3.0-beta.1",
+        "@0x/contracts-erc721": "^2.2.0-beta.1",
+        "@0x/contracts-utils": "^3.3.0-beta.1",
+        "@0x/order-utils": "^8.5.0-beta.1",
+        "@0x/types": "^2.5.0-beta.1",
+        "@0x/typescript-typings": "^4.4.0-beta.1",
+        "@0x/utils": "^4.6.0-beta.1",
+        "@0x/web3-wrapper": "^6.1.0-beta.1",
+        "ethereum-types": "^2.2.0-beta.1",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.11"
     },

contracts/asset-proxy/src/artifacts.ts

@@ -6,24 +6,50 @@
 import { ContractArtifact } from 'ethereum-types';
 
 import * as ERC1155Proxy from '../generated-artifacts/ERC1155Proxy.json';
+import * as ERC20BridgeProxy from '../generated-artifacts/ERC20BridgeProxy.json';
 import * as ERC20Proxy from '../generated-artifacts/ERC20Proxy.json';
 import * as ERC721Proxy from '../generated-artifacts/ERC721Proxy.json';
+import * as Eth2DaiBridge from '../generated-artifacts/Eth2DaiBridge.json';
 import * as IAssetData from '../generated-artifacts/IAssetData.json';
 import * as IAssetProxy from '../generated-artifacts/IAssetProxy.json';
+import * as IAssetProxyDispatcher from '../generated-artifacts/IAssetProxyDispatcher.json';
 import * as IAuthorizable from '../generated-artifacts/IAuthorizable.json';
+import * as IERC20Bridge from '../generated-artifacts/IERC20Bridge.json';
+import * as IEth2Dai from '../generated-artifacts/IEth2Dai.json';
+import * as IUniswapExchange from '../generated-artifacts/IUniswapExchange.json';
+import * as IUniswapExchangeFactory from '../generated-artifacts/IUniswapExchangeFactory.json';
+import * as MixinAssetProxyDispatcher from '../generated-artifacts/MixinAssetProxyDispatcher.json';
 import * as MixinAuthorizable from '../generated-artifacts/MixinAuthorizable.json';
 import * as MultiAssetProxy from '../generated-artifacts/MultiAssetProxy.json';
+import * as Ownable from '../generated-artifacts/Ownable.json';
 import * as StaticCallProxy from '../generated-artifacts/StaticCallProxy.json';
+import * as TestERC20Bridge from '../generated-artifacts/TestERC20Bridge.json';
+import * as TestEth2DaiBridge from '../generated-artifacts/TestEth2DaiBridge.json';
 import * as TestStaticCallTarget from '../generated-artifacts/TestStaticCallTarget.json';
+import * as TestUniswapBridge from '../generated-artifacts/TestUniswapBridge.json';
+import * as UniswapBridge from '../generated-artifacts/UniswapBridge.json';
 export const artifacts = {
+    MixinAssetProxyDispatcher: MixinAssetProxyDispatcher as ContractArtifact,
+    MixinAuthorizable: MixinAuthorizable as ContractArtifact,
+    Ownable: Ownable as ContractArtifact,
     ERC1155Proxy: ERC1155Proxy as ContractArtifact,
+    ERC20BridgeProxy: ERC20BridgeProxy as ContractArtifact,
     ERC20Proxy: ERC20Proxy as ContractArtifact,
     ERC721Proxy: ERC721Proxy as ContractArtifact,
-    MixinAuthorizable: MixinAuthorizable as ContractArtifact,
     MultiAssetProxy: MultiAssetProxy as ContractArtifact,
     StaticCallProxy: StaticCallProxy as ContractArtifact,
+    Eth2DaiBridge: Eth2DaiBridge as ContractArtifact,
+    UniswapBridge: UniswapBridge as ContractArtifact,
     IAssetData: IAssetData as ContractArtifact,
     IAssetProxy: IAssetProxy as ContractArtifact,
+    IAssetProxyDispatcher: IAssetProxyDispatcher as ContractArtifact,
     IAuthorizable: IAuthorizable as ContractArtifact,
+    IERC20Bridge: IERC20Bridge as ContractArtifact,
+    IEth2Dai: IEth2Dai as ContractArtifact,
+    IUniswapExchange: IUniswapExchange as ContractArtifact,
+    IUniswapExchangeFactory: IUniswapExchangeFactory as ContractArtifact,
+    TestERC20Bridge: TestERC20Bridge as ContractArtifact,
+    TestEth2DaiBridge: TestEth2DaiBridge as ContractArtifact,
     TestStaticCallTarget: TestStaticCallTarget as ContractArtifact,
+    TestUniswapBridge: TestUniswapBridge as ContractArtifact,
 };

contracts/asset-proxy/src/wrappers.ts

@@ -4,12 +4,25 @@
  * -----------------------------------------------------------------------------
  */
 export * from '../generated-wrappers/erc1155_proxy';
+export * from '../generated-wrappers/erc20_bridge_proxy';
 export * from '../generated-wrappers/erc20_proxy';
 export * from '../generated-wrappers/erc721_proxy';
+export * from '../generated-wrappers/eth2_dai_bridge';
 export * from '../generated-wrappers/i_asset_data';
 export * from '../generated-wrappers/i_asset_proxy';
+export * from '../generated-wrappers/i_asset_proxy_dispatcher';
 export * from '../generated-wrappers/i_authorizable';
+export * from '../generated-wrappers/i_erc20_bridge';
+export * from '../generated-wrappers/i_eth2_dai';
+export * from '../generated-wrappers/i_uniswap_exchange';
+export * from '../generated-wrappers/i_uniswap_exchange_factory';
+export * from '../generated-wrappers/mixin_asset_proxy_dispatcher';
 export * from '../generated-wrappers/mixin_authorizable';
 export * from '../generated-wrappers/multi_asset_proxy';
+export * from '../generated-wrappers/ownable';
 export * from '../generated-wrappers/static_call_proxy';
+export * from '../generated-wrappers/test_erc20_bridge';
+export * from '../generated-wrappers/test_eth2_dai_bridge';
 export * from '../generated-wrappers/test_static_call_target';
+export * from '../generated-wrappers/test_uniswap_bridge';
+export * from '../generated-wrappers/uniswap_bridge';

contracts/asset-proxy/test/authorizable.ts

@@ -1,11 +1,4 @@
-import {
-    chaiSetup,
-    constants,
-    expectTransactionFailedAsync,
-    provider,
-    txDefaults,
-    web3Wrapper,
-} from '@0x/contracts-test-utils';
+import { chaiSetup, 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';
@@ -27,9 +20,11 @@ describe('Authorizable', () => {
     before(async () => {
         await blockchainLifecycle.startAsync();
     });
+
     after(async () => {
         await blockchainLifecycle.revertAsync();
     });
+
     before(async () => {
         const accounts = await web3Wrapper.getAvailableAddressesAsync();
         [owner, address, notOwner] = _.slice(accounts, 0, 3);
@@ -40,34 +35,31 @@ describe('Authorizable', () => {
             artifacts,
         );
     });
+
     beforeEach(async () => {
         await blockchainLifecycle.startAsync();
     });
+
     afterEach(async () => {
         await blockchainLifecycle.revertAsync();
     });
+
     describe('addAuthorizedAddress', () => {
-        it('should throw if not called by owner', async () => {
-            return expectTransactionFailedAsync(
+        it('should revert if not called by owner', async () => {
+            await 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,
-            );
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(address, { from: owner });
             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,
-            );
+
+        it('should revert if owner attempts to authorize a duplicate address', async () => {
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(address, { from: owner });
             return expectTransactionFailedAsync(
                 authorizable.addAuthorizedAddress.sendTransactionAsync(address, { from: owner }),
                 RevertReason.TargetAlreadyAuthorized,
@@ -76,36 +68,22 @@ describe('Authorizable', () => {
     });
 
     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,
-                }),
+        it('should revert if not called by owner', async () => {
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(address, { from: owner });
+            await 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,
-            );
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(address, { from: owner });
+            await authorizable.removeAuthorizedAddress.awaitTransactionSuccessAsync(address, { from: owner });
             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 () => {
+        it('should revert if owner attempts to remove an address that is not authorized', async () => {
             return expectTransactionFailedAsync(
                 authorizable.removeAuthorizedAddress.sendTransactionAsync(address, {
                     from: owner,
@@ -116,26 +94,19 @@ describe('Authorizable', () => {
     });
 
     describe('removeAuthorizedAddressAtIndex', () => {
-        it('should throw if not called by owner', async () => {
-            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
-                address,
-                { from: owner },
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
+        it('should revert if not called by owner', async () => {
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(address, { from: owner });
             const index = new BigNumber(0);
-            return expectTransactionFailedAsync(
+            await 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,
-            );
+
+        it('should revert if index is >= authorities.length', async () => {
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(address, { from: owner });
             const index = new BigNumber(1);
             return expectTransactionFailedAsync(
                 authorizable.removeAuthorizedAddressAtIndex.sendTransactionAsync(address, index, {
@@ -144,7 +115,8 @@ describe('Authorizable', () => {
                 RevertReason.IndexOutOfBounds,
             );
         });
-        it('should throw if owner attempts to remove an address that is not authorized', async () => {
+
+        it('should revert if owner attempts to remove an address that is not authorized', async () => {
             const index = new BigNumber(0);
             return expectTransactionFailedAsync(
                 authorizable.removeAuthorizedAddressAtIndex.sendTransactionAsync(address, index, {
@@ -153,19 +125,12 @@ describe('Authorizable', () => {
                 RevertReason.TargetNotAuthorized,
             );
         });
-        it('should throw if address at index does not match target', async () => {
+
+        it('should revert 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,
-            );
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(address1, { from: owner });
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(address2, { from: owner });
             const address1Index = new BigNumber(0);
             return expectTransactionFailedAsync(
                 authorizable.removeAuthorizedAddressAtIndex.sendTransactionAsync(address2, address1Index, {
@@ -174,19 +139,13 @@ describe('Authorizable', () => {
                 RevertReason.AuthorizedAddressMismatch,
             );
         });
+
         it('should allow owner to remove an authorized address', async () => {
-            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
-                address,
-                { from: owner },
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(address, { from: owner });
             const index = new BigNumber(0);
-            await authorizable.removeAuthorizedAddressAtIndex.awaitTransactionSuccessAsync(
-                address,
-                index,
-                { from: owner },
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
+            await authorizable.removeAuthorizedAddressAtIndex.awaitTransactionSuccessAsync(address, index, {
+                from: owner,
+            });
             const isAuthorized = await authorizable.authorized.callAsync(address);
             expect(isAuthorized).to.be.false();
         });
@@ -196,19 +155,11 @@ describe('Authorizable', () => {
         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,
-            );
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(address, { from: owner });
             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,
-            );
+            await authorizable.removeAuthorizedAddress.awaitTransactionSuccessAsync(address, { from: owner });
             const afterRemove = await authorizable.getAuthorizedAddresses.callAsync();
             expect(afterRemove).to.have.length(0);
         });

contracts/asset-proxy/test/erc1155_proxy.ts

@@ -1,3 +1,4 @@
+import { DevUtilsContract } from '@0x/contracts-dev-utils';
 import {
     artifacts as erc1155Artifacts,
     DummyERC1155ReceiverBatchTokenReceivedEventArgs,
@@ -15,15 +16,14 @@ import {
     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 { BigNumber } from '@0x/utils';
+import { BigNumber, SafeMathRevertErrors } from '@0x/utils';
 import * as chai from 'chai';
 import { LogWithDecodedArgs } from 'ethereum-types';
 import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
 
-import { artifacts, ERC1155ProxyContract, ERC1155ProxyWrapper } from '../src';
+import { artifacts, ERC1155ProxyContract, ERC1155ProxyWrapper, IAssetDataContract } from '../src';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -59,6 +59,8 @@ describe('ERC1155Proxy', () => {
     // tokens
     let fungibleTokens: BigNumber[];
     let nonFungibleTokensOwnedBySpender: BigNumber[];
+    // devUtils for encoding and decoding assetData
+    let devUtils: DevUtilsContract;
     // tests
     before(async () => {
         await blockchainLifecycle.startAsync();
@@ -72,16 +74,8 @@ describe('ERC1155Proxy', () => {
         const usedAddresses = ([owner, notAuthorized, authorized, spender, receiver] = _.slice(accounts, 0, 5));
         erc1155ProxyWrapper = new ERC1155ProxyWrapper(provider, usedAddresses, owner);
         erc1155Proxy = await erc1155ProxyWrapper.deployProxyAsync();
-        await erc1155Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(
-            authorized,
-            { from: owner },
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
-        await erc1155Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(
-            erc1155Proxy.address,
-            { from: owner },
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
+        await erc1155Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(authorized, { from: owner });
+        await erc1155Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(erc1155Proxy.address, { from: owner });
         // deploy & configure ERC1155 tokens and receiver
         [erc1155Wrapper] = await erc1155ProxyWrapper.deployDummyContractsAsync();
         erc1155Contract = erc1155Wrapper.getContract();
@@ -103,6 +97,8 @@ describe('ERC1155Proxy', () => {
                 tokenBalances.nonFungible[spender][erc1155Contract.address][nonFungibleTokenAsString][0];
             nonFungibleTokensOwnedBySpender.push(nonFungibleTokenHeldBySpender);
         });
+        // set up devUtils
+        devUtils = new DevUtilsContract(constants.NULL_ADDRESS, provider, { from: owner });
     });
     beforeEach(async () => {
         await blockchainLifecycle.startAsync();
@@ -638,7 +634,7 @@ describe('ERC1155Proxy', () => {
                 return value.times(valueMultiplier);
             });
             const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = assetDataUtils.encodeERC1155AssetData(
+            const assetData = await devUtils.encodeERC1155AssetData.callAsync(
                 erc1155ContractAddress,
                 tokensToTransfer,
                 valuesToTransfer,
@@ -696,25 +692,18 @@ describe('ERC1155Proxy', () => {
             const tokenUri = '';
             for (const tokenToCreate of tokensToCreate) {
                 // create token
-                await erc1155Wrapper.getContract().createWithType.awaitTransactionSuccessAsync(
-                    tokenToCreate,
-                    tokenUri,
-                    {
+                await erc1155Wrapper
+                    .getContract()
+                    .createWithType.awaitTransactionSuccessAsync(tokenToCreate, tokenUri, {
                         from: owner,
-                    },
-                    constants.AWAIT_TRANSACTION_MINED_MS,
-                );
+                    });
 
                 // mint balance for spender
-                await erc1155Wrapper.getContract().mintFungible.awaitTransactionSuccessAsync(
-                    tokenToCreate,
-                    [spender],
-                    [spenderInitialBalance],
-                    {
+                await erc1155Wrapper
+                    .getContract()
+                    .mintFungible.awaitTransactionSuccessAsync(tokenToCreate, [spender], [spenderInitialBalance], {
                         from: owner,
-                    },
-                    constants.AWAIT_TRANSACTION_MINED_MS,
-                );
+                    });
             }
             ///// Step 2/5 /////
             // Check balances before transfer
@@ -747,18 +736,16 @@ describe('ERC1155Proxy', () => {
             const tokensToTransfer = [new BigNumber(1), new BigNumber(2)];
             const valuesToTransfer = tokensToTransfer;
             const valueMultiplier = new BigNumber(2);
-            const assetData = assetDataUtils.encodeERC1155AssetData(
-                erc1155ContractAddress,
-                tokensToTransfer,
-                valuesToTransfer,
-                receiverCallbackData,
-            );
-            // remove the function selector and contract address from check, as these change on each test
-            const offsetToTokenIds = 74;
-            const assetDataWithoutContractAddress = assetData.substr(offsetToTokenIds);
-            const expectedAssetDataWithoutContractAddress =
+
+            // hand encode optimized assetData because our tooling (based on LibAssetData.sol/encodeERC1155AssetData) does not use optimized encoding
+            const assetDataContract = new IAssetDataContract(constants.NULL_ADDRESS, provider);
+            const selector = assetDataContract.ERC1155Assets.getSelector();
+            const assetDataWithoutContractAddress =
                 '0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000040102030400000000000000000000000000000000000000000000000000000000';
-            expect(assetDataWithoutContractAddress).to.be.equal(expectedAssetDataWithoutContractAddress);
+            const assetData = `${selector}000000000000000000000000${erc1155ContractAddress.substr(
+                2,
+            )}${assetDataWithoutContractAddress}`;
+
             ///// Step 4/5 /////
             // Transfer token IDs [1, 2] and amounts [1, 2] with a multiplier of 2;
             // the expected trade will be token IDs [1, 2] and amounts [2, 4]
@@ -805,25 +792,18 @@ describe('ERC1155Proxy', () => {
             const tokenUri = '';
             for (const tokenToCreate of tokensToCreate) {
                 // create token
-                await erc1155Wrapper.getContract().createWithType.awaitTransactionSuccessAsync(
-                    tokenToCreate,
-                    tokenUri,
-                    {
+                await erc1155Wrapper
+                    .getContract()
+                    .createWithType.awaitTransactionSuccessAsync(tokenToCreate, tokenUri, {
                         from: owner,
-                    },
-                    constants.AWAIT_TRANSACTION_MINED_MS,
-                );
+                    });
 
                 // mint balance for spender
-                await erc1155Wrapper.getContract().mintFungible.awaitTransactionSuccessAsync(
-                    tokenToCreate,
-                    [spender],
-                    [spenderInitialBalance],
-                    {
+                await erc1155Wrapper
+                    .getContract()
+                    .mintFungible.awaitTransactionSuccessAsync(tokenToCreate, [spender], [spenderInitialBalance], {
                         from: owner,
-                    },
-                    constants.AWAIT_TRANSACTION_MINED_MS,
-                );
+                    });
             }
             ///// Step 2/5 /////
             // Check balances before transfer
@@ -867,7 +847,7 @@ describe('ERC1155Proxy', () => {
             const valuesToTransfer = [new BigNumber(2), new BigNumber(2)];
             const valueMultiplier = new BigNumber(2);
             // create callback data that is the encoded version of `valuesToTransfer`
-            const generatedAssetData = assetDataUtils.encodeERC1155AssetData(
+            const generatedAssetData = await devUtils.encodeERC1155AssetData.callAsync(
                 erc1155ContractAddress,
                 tokensToTransfer,
                 valuesToTransfer,
@@ -937,25 +917,18 @@ describe('ERC1155Proxy', () => {
             const tokenUri = '';
             for (const tokenToCreate of tokensToCreate) {
                 // create token
-                await erc1155Wrapper.getContract().createWithType.awaitTransactionSuccessAsync(
-                    tokenToCreate,
-                    tokenUri,
-                    {
+                await erc1155Wrapper
+                    .getContract()
+                    .createWithType.awaitTransactionSuccessAsync(tokenToCreate, tokenUri, {
                         from: owner,
-                    },
-                    constants.AWAIT_TRANSACTION_MINED_MS,
-                );
+                    });
 
                 // mint balance for spender
-                await erc1155Wrapper.getContract().mintFungible.awaitTransactionSuccessAsync(
-                    tokenToCreate,
-                    [spender],
-                    [spenderInitialBalance],
-                    {
+                await erc1155Wrapper
+                    .getContract()
+                    .mintFungible.awaitTransactionSuccessAsync(tokenToCreate, [spender], [spenderInitialBalance], {
                         from: owner,
-                    },
-                    constants.AWAIT_TRANSACTION_MINED_MS,
-                );
+                    });
             }
             ///// Step 2/5 /////
             // Check balances before transfer
@@ -996,7 +969,7 @@ describe('ERC1155Proxy', () => {
             const valuesToTransfer = [new BigNumber(1), new BigNumber(2)];
             const valueMultiplier = new BigNumber(2);
             // create callback data that is the encoded version of `valuesToTransfer`
-            const generatedAssetData = assetDataUtils.encodeERC1155AssetData(
+            const generatedAssetData = await devUtils.encodeERC1155AssetData.callAsync(
                 erc1155ContractAddress,
                 tokensToTransfer,
                 valuesToTransfer,
@@ -1059,7 +1032,7 @@ describe('ERC1155Proxy', () => {
             const valuesToTransfer = [fungibleValueToTransferLarge];
             const valueMultiplier = valueMultiplierSmall;
             const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = assetDataUtils.encodeERC1155AssetData(
+            const assetData = await devUtils.encodeERC1155AssetData.callAsync(
                 erc1155ContractAddress,
                 tokensToTransfer,
                 valuesToTransfer,
@@ -1106,7 +1079,7 @@ describe('ERC1155Proxy', () => {
             const valuesToTransfer = [fungibleValueToTransferLarge];
             const valueMultiplier = valueMultiplierSmall;
             const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = assetDataUtils.encodeERC1155AssetData(
+            const assetData = await devUtils.encodeERC1155AssetData.callAsync(
                 erc1155ContractAddress,
                 tokensToTransfer,
                 valuesToTransfer,
@@ -1157,7 +1130,7 @@ describe('ERC1155Proxy', () => {
             const valuesToTransfer = [fungibleValueToTransferLarge];
             const valueMultiplier = valueMultiplierSmall;
             const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = assetDataUtils.encodeERC1155AssetData(
+            const assetData = await devUtils.encodeERC1155AssetData.callAsync(
                 erc1155ContractAddress,
                 tokensToTransfer,
                 valuesToTransfer,
@@ -1208,7 +1181,7 @@ describe('ERC1155Proxy', () => {
             const valuesToTransfer = [fungibleValueToTransferLarge];
             const valueMultiplier = valueMultiplierSmall;
             const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = assetDataUtils.encodeERC1155AssetData(
+            const assetData = await devUtils.encodeERC1155AssetData.callAsync(
                 erc1155ContractAddress,
                 tokensToTransfer,
                 valuesToTransfer,
@@ -1259,7 +1232,7 @@ describe('ERC1155Proxy', () => {
             const valuesToTransfer = [fungibleValueToTransferLarge];
             const valueMultiplier = valueMultiplierSmall;
             const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = assetDataUtils.encodeERC1155AssetData(
+            const assetData = await devUtils.encodeERC1155AssetData.callAsync(
                 erc1155ContractAddress,
                 tokensToTransfer,
                 valuesToTransfer,
@@ -1311,7 +1284,7 @@ describe('ERC1155Proxy', () => {
             const valuesToTransfer = [fungibleValueToTransferLarge];
             const valueMultiplier = valueMultiplierSmall;
             const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = assetDataUtils.encodeERC1155AssetData(
+            const assetData = await devUtils.encodeERC1155AssetData.callAsync(
                 erc1155ContractAddress,
                 tokensToTransfer,
                 valuesToTransfer,
@@ -1358,7 +1331,7 @@ describe('ERC1155Proxy', () => {
             const valuesToTransfer = [fungibleValueToTransferLarge];
             const valueMultiplier = valueMultiplierSmall;
             const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = assetDataUtils.encodeERC1155AssetData(
+            const assetData = await devUtils.encodeERC1155AssetData.callAsync(
                 erc1155ContractAddress,
                 tokensToTransfer,
                 valuesToTransfer,
@@ -1409,7 +1382,7 @@ describe('ERC1155Proxy', () => {
             const valuesToTransfer = [fungibleValueToTransferLarge];
             const valueMultiplier = valueMultiplierSmall;
             const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = assetDataUtils.encodeERC1155AssetData(
+            const assetData = await devUtils.encodeERC1155AssetData.callAsync(
                 erc1155ContractAddress,
                 tokensToTransfer,
                 valuesToTransfer,
@@ -1456,7 +1429,7 @@ describe('ERC1155Proxy', () => {
             const valuesToTransfer = [fungibleValueToTransferLarge];
             const valueMultiplier = valueMultiplierSmall;
             const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = assetDataUtils.encodeERC1155AssetData(
+            const assetData = await devUtils.encodeERC1155AssetData.callAsync(
                 erc1155ContractAddress,
                 tokensToTransfer,
                 valuesToTransfer,
@@ -1507,13 +1480,13 @@ describe('ERC1155Proxy', () => {
             const valuesToTransfer = [fungibleValueToTransferLarge];
             const valueMultiplier = valueMultiplierSmall;
             const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = assetDataUtils.encodeERC1155AssetData(
+            const assetData = await devUtils.encodeERC1155AssetData.callAsync(
                 erc1155ContractAddress,
                 tokensToTransfer,
                 valuesToTransfer,
                 receiverCallbackData,
             );
-            const txData = erc1155ProxyWrapper.getTransferFromAbiEncodedTxData(
+            const txData = await erc1155ProxyWrapper.getTransferFromAbiEncodedTxDataAsync(
                 spender,
                 receiverContract,
                 erc1155Contract.address,
@@ -1538,13 +1511,13 @@ describe('ERC1155Proxy', () => {
             const valuesToTransfer = [fungibleValueToTransferLarge];
             const valueMultiplier = valueMultiplierSmall;
             const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = assetDataUtils.encodeERC1155AssetData(
+            const assetData = await devUtils.encodeERC1155AssetData.callAsync(
                 erc1155ContractAddress,
                 tokensToTransfer,
                 valuesToTransfer,
                 receiverCallbackData,
             );
-            const txData = erc1155ProxyWrapper.getTransferFromAbiEncodedTxData(
+            const txData = await erc1155ProxyWrapper.getTransferFromAbiEncodedTxDataAsync(
                 spender,
                 receiverContract,
                 erc1155Contract.address,
@@ -1667,13 +1640,9 @@ describe('ERC1155Proxy', () => {
         it('should propagate revert reason from erc1155 contract failure', async () => {
             // disable transfers
             const shouldRejectTransfer = true;
-            await erc1155Receiver.setRejectTransferFlag.awaitTransactionSuccessAsync(
-                shouldRejectTransfer,
-                {
-                    from: owner,
-                },
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
+            await erc1155Receiver.setRejectTransferFlag.awaitTransactionSuccessAsync(shouldRejectTransfer, {
+                from: owner,
+            });
             // setup test parameters
             const tokenHolders = [spender, receiverContract];
             const tokensToTransfer = fungibleTokens.slice(0, 1);
@@ -1748,9 +1717,14 @@ describe('ERC1155Proxy', () => {
                 nftNotOwnerBalance,
             ];
             await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances);
+            const expectedError = new SafeMathRevertErrors.Uint256BinOpError(
+                SafeMathRevertErrors.BinOpErrorCodes.MultiplicationOverflow,
+                maxUintValue,
+                valueMultiplier,
+            );
             // execute transfer
             // note - this will overflow because we are trying to transfer `maxUintValue * 2` of the 2nd token
-            await expectTransactionFailedAsync(
+            await expect(
                 erc1155ProxyWrapper.transferFromAsync(
                     spender,
                     receiver,
@@ -1761,8 +1735,7 @@ describe('ERC1155Proxy', () => {
                     receiverCallbackData,
                     authorized,
                 ),
-                RevertReason.Uint256Overflow,
-            );
+            ).to.revertWith(expectedError);
         });
         it('should revert if transferring > 1 instances of a non-fungible token (valueMultiplier field >1)', async () => {
             // setup test parameters
@@ -1832,20 +1805,23 @@ describe('ERC1155Proxy', () => {
             // check balances before transfer
             const expectedInitialBalances = [spenderInitialFungibleBalance, receiverInitialFungibleBalance];
             await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances);
-            // execute transfer
-            await expectTransactionFailedAsync(
-                erc1155ProxyWrapper.transferFromAsync(
-                    spender,
-                    receiver,
-                    erc1155Contract.address,
-                    tokensToTransfer,
-                    valuesToTransfer,
-                    valueMultiplier,
-                    receiverCallbackData,
-                    authorized,
-                ),
-                RevertReason.Uint256Underflow,
+            const expectedError = new SafeMathRevertErrors.Uint256BinOpError(
+                SafeMathRevertErrors.BinOpErrorCodes.SubtractionUnderflow,
+                spenderInitialFungibleBalance,
+                valuesToTransfer[0].times(valueMultiplier),
             );
+            // execute transfer
+            const tx = erc1155ProxyWrapper.transferFromAsync(
+                spender,
+                receiver,
+                erc1155Contract.address,
+                tokensToTransfer,
+                valuesToTransfer,
+                valueMultiplier,
+                receiverCallbackData,
+                authorized,
+            );
+            return expect(tx).to.revertWith(expectedError);
         });
         it('should revert if sender allowance is insufficient', async () => {
             // dremove allowance for ERC1155 proxy

contracts/asset-proxy/test/erc20bridge_proxy.ts

@@ -0,0 +1,299 @@
+import {
+    blockchainTests,
+    constants,
+    expect,
+    getRandomInteger,
+    hexLeftPad,
+    hexRightPad,
+    hexSlice,
+    Numberish,
+    randomAddress,
+} from '@0x/contracts-test-utils';
+import { AssetProxyId } from '@0x/types';
+import { AbiEncoder, AuthorizableRevertErrors, BigNumber, StringRevertError } from '@0x/utils';
+import { DecodedLogs } from 'ethereum-types';
+import * as _ from 'lodash';
+
+import {
+    artifacts,
+    ERC20BridgeProxyContract,
+    TestERC20BridgeBridgeWithdrawToEventArgs,
+    TestERC20BridgeContract,
+} from '../src';
+
+blockchainTests.resets('ERC20BridgeProxy unit tests', env => {
+    const PROXY_ID = AssetProxyId.ERC20Bridge;
+    const BRIDGE_SUCCESS_RETURN_DATA = hexRightPad(PROXY_ID);
+    let owner: string;
+    let badCaller: string;
+    let assetProxy: ERC20BridgeProxyContract;
+    let bridgeContract: TestERC20BridgeContract;
+    let testTokenAddress: string;
+
+    before(async () => {
+        [owner, badCaller] = await env.getAccountAddressesAsync();
+        assetProxy = await ERC20BridgeProxyContract.deployFrom0xArtifactAsync(
+            artifacts.ERC20BridgeProxy,
+            env.provider,
+            env.txDefaults,
+            artifacts,
+        );
+        bridgeContract = await TestERC20BridgeContract.deployFrom0xArtifactAsync(
+            artifacts.TestERC20Bridge,
+            env.provider,
+            env.txDefaults,
+            artifacts,
+        );
+        testTokenAddress = await bridgeContract.testToken.callAsync();
+        await assetProxy.addAuthorizedAddress.awaitTransactionSuccessAsync(owner);
+    });
+
+    interface AssetDataOpts {
+        tokenAddress: string;
+        bridgeAddress: string;
+        bridgeData: BridgeDataOpts;
+    }
+
+    interface BridgeDataOpts {
+        transferAmount: Numberish;
+        revertError?: string;
+        returnData: string;
+    }
+
+    function createAssetData(opts?: Partial<AssetDataOpts>): AssetDataOpts {
+        return _.merge(
+            {
+                tokenAddress: testTokenAddress,
+                bridgeAddress: bridgeContract.address,
+                bridgeData: createBridgeData(),
+            },
+            opts,
+        );
+    }
+
+    function createBridgeData(opts?: Partial<BridgeDataOpts>): BridgeDataOpts {
+        return _.merge(
+            {
+                transferAmount: constants.ZERO_AMOUNT,
+                returnData: BRIDGE_SUCCESS_RETURN_DATA,
+            },
+            opts,
+        );
+    }
+
+    function encodeAssetData(opts: AssetDataOpts): string {
+        const encoder = AbiEncoder.createMethod('ERC20BridgeProxy', [
+            { name: 'tokenAddress', type: 'address' },
+            { name: 'bridgeAddress', type: 'address' },
+            { name: 'bridgeData', type: 'bytes' },
+        ]);
+        return encoder.encode([opts.tokenAddress, opts.bridgeAddress, encodeBridgeData(opts.bridgeData)]);
+    }
+
+    function encodeBridgeData(opts: BridgeDataOpts): string {
+        const encoder = AbiEncoder.create([
+            { name: 'transferAmount', type: 'int256' },
+            { name: 'revertData', type: 'bytes' },
+            { name: 'returnData', type: 'bytes' },
+        ]);
+        const revertErrorBytes =
+            opts.revertError !== undefined ? new StringRevertError(opts.revertError).encode() : '0x';
+        return encoder.encode([new BigNumber(opts.transferAmount), revertErrorBytes, opts.returnData]);
+    }
+
+    async function setTestTokenBalanceAsync(_owner: string, balance: Numberish): Promise<void> {
+        await bridgeContract.setTestTokenBalance.awaitTransactionSuccessAsync(_owner, new BigNumber(balance));
+    }
+
+    describe('transferFrom()', () => {
+        interface TransferFromOpts {
+            assetData: AssetDataOpts;
+            from: string;
+            to: string;
+            amount: Numberish;
+        }
+
+        function createTransferFromOpts(opts?: Partial<TransferFromOpts>): TransferFromOpts {
+            const transferAmount = _.get(opts, ['amount'], getRandomInteger(1, 100e18)) as BigNumber;
+            return _.merge(
+                {
+                    assetData: createAssetData({
+                        bridgeData: createBridgeData({
+                            transferAmount,
+                        }),
+                    }),
+                    from: randomAddress(),
+                    to: randomAddress(),
+                    amount: transferAmount,
+                },
+                opts,
+            );
+        }
+
+        async function transferFromAsync(opts?: Partial<TransferFromOpts>, caller?: string): Promise<DecodedLogs> {
+            const _opts = createTransferFromOpts(opts);
+            const { logs } = await assetProxy.transferFrom.awaitTransactionSuccessAsync(
+                encodeAssetData(_opts.assetData),
+                _opts.from,
+                _opts.to,
+                new BigNumber(_opts.amount),
+                { from: caller },
+            );
+            return (logs as any) as DecodedLogs;
+        }
+
+        it('succeeds if the bridge succeeds and balance increases by `amount`', async () => {
+            const tx = transferFromAsync();
+            return expect(tx).to.be.fulfilled('');
+        });
+
+        it('succeeds if balance increases more than `amount`', async () => {
+            const amount = getRandomInteger(1, 100e18);
+            const tx = transferFromAsync({
+                amount,
+                assetData: createAssetData({
+                    bridgeData: createBridgeData({
+                        transferAmount: amount.plus(1),
+                    }),
+                }),
+            });
+            return expect(tx).to.be.fulfilled('');
+        });
+
+        it('passes the correct arguments to the bridge contract', async () => {
+            const opts = createTransferFromOpts();
+            const logs = await transferFromAsync(opts);
+            expect(logs.length).to.eq(1);
+            const args = logs[0].args as TestERC20BridgeBridgeWithdrawToEventArgs;
+            expect(args.tokenAddress).to.eq(opts.assetData.tokenAddress);
+            expect(args.from).to.eq(opts.from);
+            expect(args.to).to.eq(opts.to);
+            expect(args.amount).to.bignumber.eq(opts.amount);
+            expect(args.bridgeData).to.eq(encodeBridgeData(opts.assetData.bridgeData));
+        });
+
+        it('fails if not called by an authorized address', async () => {
+            const tx = transferFromAsync({}, badCaller);
+            return expect(tx).to.revertWith(new AuthorizableRevertErrors.SenderNotAuthorizedError(badCaller));
+        });
+
+        it('fails if asset data is truncated', async () => {
+            const opts = createTransferFromOpts();
+            const truncatedAssetData = hexSlice(encodeAssetData(opts.assetData), 0, -1);
+            const tx = assetProxy.transferFrom.awaitTransactionSuccessAsync(
+                truncatedAssetData,
+                opts.from,
+                opts.to,
+                new BigNumber(opts.amount),
+            );
+            return expect(tx).to.be.rejected();
+        });
+
+        it('fails if bridge returns nothing', async () => {
+            const tx = transferFromAsync({
+                assetData: createAssetData({
+                    bridgeData: createBridgeData({
+                        returnData: '0x',
+                    }),
+                }),
+            });
+            // This will actually revert when the AP tries to decode the return
+            // value.
+            return expect(tx).to.be.rejected();
+        });
+
+        it('fails if bridge returns true', async () => {
+            const tx = transferFromAsync({
+                assetData: createAssetData({
+                    bridgeData: createBridgeData({
+                        returnData: hexLeftPad('0x1'),
+                    }),
+                }),
+            });
+            // This will actually revert when the AP tries to decode the return
+            // value.
+            return expect(tx).to.be.rejected();
+        });
+
+        it('fails if bridge returns 0x1', async () => {
+            const tx = transferFromAsync({
+                assetData: createAssetData({
+                    bridgeData: createBridgeData({
+                        returnData: hexRightPad('0x1'),
+                    }),
+                }),
+            });
+            return expect(tx).to.revertWith('BRIDGE_FAILED');
+        });
+
+        it('fails if bridge is an EOA', async () => {
+            const tx = transferFromAsync({
+                assetData: createAssetData({
+                    bridgeAddress: randomAddress(),
+                }),
+            });
+            // This will actually revert when the AP tries to decode the return
+            // value.
+            return expect(tx).to.be.rejected();
+        });
+
+        it('fails if bridge reverts', async () => {
+            const revertError = 'FOOBAR';
+            const tx = transferFromAsync({
+                assetData: createAssetData({
+                    bridgeData: createBridgeData({
+                        revertError,
+                    }),
+                }),
+            });
+            return expect(tx).to.revertWith(revertError);
+        });
+
+        it('fails if balance of `to` increases by less than `amount`', async () => {
+            const amount = getRandomInteger(1, 100e18);
+            const tx = transferFromAsync({
+                amount,
+                assetData: createAssetData({
+                    bridgeData: createBridgeData({
+                        transferAmount: amount.minus(1),
+                    }),
+                }),
+            });
+            return expect(tx).to.revertWith('BRIDGE_UNDERPAY');
+        });
+
+        it('fails if balance of `to` decreases', async () => {
+            const toAddress = randomAddress();
+            await setTestTokenBalanceAsync(toAddress, 1e18);
+            const tx = transferFromAsync({
+                to: toAddress,
+                assetData: createAssetData({
+                    bridgeData: createBridgeData({
+                        transferAmount: -1,
+                    }),
+                }),
+            });
+            return expect(tx).to.revertWith('BRIDGE_UNDERPAY');
+        });
+    });
+
+    describe('balanceOf()', () => {
+        it('retrieves the balance of the encoded token', async () => {
+            const _owner = randomAddress();
+            const balance = getRandomInteger(1, 100e18);
+            await bridgeContract.setTestTokenBalance.awaitTransactionSuccessAsync(_owner, balance);
+            const assetData = createAssetData({
+                tokenAddress: testTokenAddress,
+            });
+            const actualBalance = await assetProxy.balanceOf.callAsync(encodeAssetData(assetData), _owner);
+            expect(actualBalance).to.bignumber.eq(balance);
+        });
+    });
+
+    describe('getProxyId()', () => {
+        it('returns the correct proxy ID', async () => {
+            const proxyId = await assetProxy.getProxyId.callAsync();
+            expect(proxyId).to.eq(PROXY_ID);
+        });
+    });
+});

contracts/asset-proxy/test/eth2dai_bridge.ts

@@ -0,0 +1,192 @@
+import {
+    blockchainTests,
+    constants,
+    expect,
+    filterLogsToArguments,
+    getRandomInteger,
+    hexLeftPad,
+    hexRandom,
+    Numberish,
+    randomAddress,
+    TransactionHelper,
+} from '@0x/contracts-test-utils';
+import { AssetProxyId } from '@0x/types';
+import { BigNumber, RawRevertError } from '@0x/utils';
+import { DecodedLogs } from 'ethereum-types';
+import * as _ from 'lodash';
+
+import {
+    artifacts,
+    TestEth2DaiBridgeContract,
+    TestEth2DaiBridgeEvents,
+    TestEth2DaiBridgeSellAllAmountEventArgs,
+    TestEth2DaiBridgeTokenApproveEventArgs,
+    TestEth2DaiBridgeTokenTransferEventArgs,
+} from '../src';
+
+blockchainTests.resets('Eth2DaiBridge unit tests', env => {
+    const txHelper = new TransactionHelper(env.web3Wrapper, artifacts);
+    let testContract: TestEth2DaiBridgeContract;
+
+    before(async () => {
+        testContract = await TestEth2DaiBridgeContract.deployFrom0xArtifactAsync(
+            artifacts.TestEth2DaiBridge,
+            env.provider,
+            env.txDefaults,
+            artifacts,
+        );
+    });
+
+    describe('isValidSignature()', () => {
+        it('returns success bytes', async () => {
+            const LEGACY_WALLET_MAGIC_VALUE = '0xb0671381';
+            const result = await testContract.isValidSignature.callAsync(hexRandom(), hexRandom(_.random(0, 32)));
+            expect(result).to.eq(LEGACY_WALLET_MAGIC_VALUE);
+        });
+    });
+
+    describe('bridgeTransferFrom()', () => {
+        interface WithdrawToOpts {
+            toTokenAddress?: string;
+            fromTokenAddress?: string;
+            toAddress: string;
+            amount: Numberish;
+            fromTokenBalance: Numberish;
+            revertReason: string;
+            fillAmount: Numberish;
+            toTokentransferRevertReason: string;
+            toTokenTransferReturnData: string;
+        }
+
+        interface WithdrawToResult {
+            opts: WithdrawToOpts;
+            result: string;
+            logs: DecodedLogs;
+        }
+
+        function createWithdrawToOpts(opts?: Partial<WithdrawToOpts>): WithdrawToOpts {
+            return {
+                toAddress: randomAddress(),
+                amount: getRandomInteger(1, 100e18),
+                revertReason: '',
+                fillAmount: getRandomInteger(1, 100e18),
+                fromTokenBalance: getRandomInteger(1, 100e18),
+                toTokentransferRevertReason: '',
+                toTokenTransferReturnData: hexLeftPad(1),
+                ...opts,
+            };
+        }
+
+        async function withdrawToAsync(opts?: Partial<WithdrawToOpts>): Promise<WithdrawToResult> {
+            const _opts = createWithdrawToOpts(opts);
+            // Set the fill behavior.
+            await testContract.setFillBehavior.awaitTransactionSuccessAsync(
+                _opts.revertReason,
+                new BigNumber(_opts.fillAmount),
+            );
+            // Create tokens and balances.
+            if (_opts.fromTokenAddress === undefined) {
+                [_opts.fromTokenAddress] = await txHelper.getResultAndReceiptAsync(
+                    testContract.createToken,
+                    new BigNumber(_opts.fromTokenBalance),
+                );
+            }
+            if (_opts.toTokenAddress === undefined) {
+                [_opts.toTokenAddress] = await txHelper.getResultAndReceiptAsync(
+                    testContract.createToken,
+                    constants.ZERO_AMOUNT,
+                );
+            }
+            // Set the transfer behavior of `toTokenAddress`.
+            await testContract.setTransferBehavior.awaitTransactionSuccessAsync(
+                _opts.toTokenAddress,
+                _opts.toTokentransferRevertReason,
+                _opts.toTokenTransferReturnData,
+            );
+            // Call bridgeTransferFrom().
+            const [result, { logs }] = await txHelper.getResultAndReceiptAsync(
+                testContract.bridgeTransferFrom,
+                // "to" token address
+                _opts.toTokenAddress,
+                // Random from address.
+                randomAddress(),
+                // To address.
+                _opts.toAddress,
+                new BigNumber(_opts.amount),
+                // ABI-encode the "from" token address as the bridge data.
+                hexLeftPad(_opts.fromTokenAddress as string),
+            );
+            return {
+                opts: _opts,
+                result,
+                logs: (logs as any) as DecodedLogs,
+            };
+        }
+
+        it('returns magic bytes on success', async () => {
+            const BRIDGE_SUCCESS_RETURN_DATA = AssetProxyId.ERC20Bridge;
+            const { result } = await withdrawToAsync();
+            expect(result).to.eq(BRIDGE_SUCCESS_RETURN_DATA);
+        });
+
+        it('calls `Eth2Dai.sellAllAmount()`', async () => {
+            const { opts, logs } = await withdrawToAsync();
+            const transfers = filterLogsToArguments<TestEth2DaiBridgeSellAllAmountEventArgs>(
+                logs,
+                TestEth2DaiBridgeEvents.SellAllAmount,
+            );
+            expect(transfers.length).to.eq(1);
+            expect(transfers[0].sellToken).to.eq(opts.fromTokenAddress);
+            expect(transfers[0].buyToken).to.eq(opts.toTokenAddress);
+            expect(transfers[0].sellTokenAmount).to.bignumber.eq(opts.fromTokenBalance);
+            expect(transfers[0].minimumFillAmount).to.bignumber.eq(opts.amount);
+        });
+
+        it('sets an unlimited allowance on the `fromTokenAddress` token', async () => {
+            const { opts, logs } = await withdrawToAsync();
+            const approvals = filterLogsToArguments<TestEth2DaiBridgeTokenApproveEventArgs>(
+                logs,
+                TestEth2DaiBridgeEvents.TokenApprove,
+            );
+            expect(approvals.length).to.eq(1);
+            expect(approvals[0].token).to.eq(opts.fromTokenAddress);
+            expect(approvals[0].spender).to.eq(testContract.address);
+            expect(approvals[0].allowance).to.bignumber.eq(constants.MAX_UINT256);
+        });
+
+        it('transfers filled amount to `to`', async () => {
+            const { opts, logs } = await withdrawToAsync();
+            const transfers = filterLogsToArguments<TestEth2DaiBridgeTokenTransferEventArgs>(
+                logs,
+                TestEth2DaiBridgeEvents.TokenTransfer,
+            );
+            expect(transfers.length).to.eq(1);
+            expect(transfers[0].token).to.eq(opts.toTokenAddress);
+            expect(transfers[0].from).to.eq(testContract.address);
+            expect(transfers[0].to).to.eq(opts.toAddress);
+            expect(transfers[0].amount).to.bignumber.eq(opts.fillAmount);
+        });
+
+        it('fails if `Eth2Dai.sellAllAmount()` reverts', async () => {
+            const opts = createWithdrawToOpts({ revertReason: 'FOOBAR' });
+            const tx = withdrawToAsync(opts);
+            return expect(tx).to.revertWith(opts.revertReason);
+        });
+
+        it('fails if `toTokenAddress.transfer()` reverts', async () => {
+            const opts = createWithdrawToOpts({ toTokentransferRevertReason: 'FOOBAR' });
+            const tx = withdrawToAsync(opts);
+            return expect(tx).to.revertWith(opts.toTokentransferRevertReason);
+        });
+
+        it('fails if `toTokenAddress.transfer()` returns false', async () => {
+            const opts = createWithdrawToOpts({ toTokenTransferReturnData: hexLeftPad(0) });
+            const tx = withdrawToAsync(opts);
+            return expect(tx).to.revertWith(new RawRevertError(hexLeftPad(0)));
+        });
+
+        it('succeeds if `toTokenAddress.transfer()` returns true', async () => {
+            await withdrawToAsync({ toTokenTransferReturnData: hexLeftPad(1) });
+        });
+    });
+});

contracts/asset-proxy/test/proxies.ts

@@ -1,3 +1,4 @@
+import { DevUtilsContract } from '@0x/contracts-dev-utils';
 import { ERC1155MintableContract, Erc1155Wrapper } from '@0x/contracts-erc1155';
 import {
     artifacts as erc20Artifacts,
@@ -22,7 +23,6 @@ import {
     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 { BigNumber } from '@0x/utils';
 import * as chai from 'chai';
@@ -56,6 +56,7 @@ describe('Asset Transfer Proxies', () => {
     let fromAddress: string;
     let toAddress: string;
 
+    let devUtils: DevUtilsContract;
     let erc20TokenA: DummyERC20TokenContract;
     let erc20TokenB: DummyERC20TokenContract;
     let erc721TokenA: DummyERC721TokenContract;
@@ -91,6 +92,7 @@ describe('Asset Transfer Proxies', () => {
         const accounts = await web3Wrapper.getAvailableAddressesAsync();
         const usedAddresses = ([owner, notAuthorized, authorized, fromAddress, toAddress] = _.slice(accounts, 0, 5));
 
+        devUtils = new DevUtilsContract(constants.NULL_ADDRESS, provider);
         erc20Wrapper = new ERC20Wrapper(provider, usedAddresses, owner);
         erc721Wrapper = new ERC721Wrapper(provider, usedAddresses, owner);
 
@@ -105,64 +107,24 @@ describe('Asset Transfer Proxies', () => {
         );
 
         // Configure ERC20Proxy
-        await erc20Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(
-            authorized,
-            { from: owner },
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
-        await erc20Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(
-            multiAssetProxy.address,
-            { from: owner },
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
+        await erc20Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(authorized, { from: owner });
+        await erc20Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(multiAssetProxy.address, { from: owner });
 
         // Configure ERC721Proxy
-        await erc721Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(
-            authorized,
-            { from: owner },
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
-        await erc721Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(
-            multiAssetProxy.address,
-            { from: owner },
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
+        await erc721Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(authorized, { from: owner });
+        await erc721Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(multiAssetProxy.address, { from: owner });
 
         // Configure ERC115Proxy
         erc1155ProxyWrapper = new ERC1155ProxyWrapper(provider, usedAddresses, owner);
         erc1155Proxy = await erc1155ProxyWrapper.deployProxyAsync();
-        await erc1155Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(
-            authorized,
-            { from: owner },
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
-        await erc1155Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(
-            multiAssetProxy.address,
-            { from: owner },
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
+        await erc1155Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(authorized, { from: owner });
+        await erc1155Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(multiAssetProxy.address, { from: owner });
 
         // Configure MultiAssetProxy
-        await multiAssetProxy.addAuthorizedAddress.awaitTransactionSuccessAsync(
-            authorized,
-            { from: owner },
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
-        await multiAssetProxy.registerAssetProxy.awaitTransactionSuccessAsync(
-            erc20Proxy.address,
-            { from: owner },
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
-        await multiAssetProxy.registerAssetProxy.awaitTransactionSuccessAsync(
-            erc721Proxy.address,
-            { from: owner },
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
-        await multiAssetProxy.registerAssetProxy.awaitTransactionSuccessAsync(
-            erc1155Proxy.address,
-            { from: owner },
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
+        await multiAssetProxy.addAuthorizedAddress.awaitTransactionSuccessAsync(authorized, { from: owner });
+        await multiAssetProxy.registerAssetProxy.awaitTransactionSuccessAsync(erc20Proxy.address, { from: owner });
+        await multiAssetProxy.registerAssetProxy.awaitTransactionSuccessAsync(erc721Proxy.address, { from: owner });
+        await multiAssetProxy.registerAssetProxy.awaitTransactionSuccessAsync(erc1155Proxy.address, { from: owner });
 
         // Deploy and configure ERC20 tokens
         const numDummyErc20ToDeploy = 2;
@@ -192,19 +154,13 @@ describe('Asset Transfer Proxies', () => {
         );
 
         await erc20Wrapper.setBalancesAndAllowancesAsync();
-        await noReturnErc20Token.setBalance.awaitTransactionSuccessAsync(
-            fromAddress,
-            constants.INITIAL_ERC20_BALANCE,
-            {
-                from: owner,
-            },
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
+        await noReturnErc20Token.setBalance.awaitTransactionSuccessAsync(fromAddress, constants.INITIAL_ERC20_BALANCE, {
+            from: owner,
+        });
         await noReturnErc20Token.approve.awaitTransactionSuccessAsync(
             erc20Proxy.address,
             constants.INITIAL_ERC20_ALLOWANCE,
             { from: fromAddress },
-            constants.AWAIT_TRANSACTION_MINED_MS,
         );
         await multipleReturnErc20Token.setBalance.awaitTransactionSuccessAsync(
             fromAddress,
@@ -212,13 +168,11 @@ describe('Asset Transfer Proxies', () => {
             {
                 from: owner,
             },
-            constants.AWAIT_TRANSACTION_MINED_MS,
         );
         await multipleReturnErc20Token.approve.awaitTransactionSuccessAsync(
             erc20Proxy.address,
             constants.INITIAL_ERC20_ALLOWANCE,
             { from: fromAddress },
-            constants.AWAIT_TRANSACTION_MINED_MS,
         );
 
         // Deploy and configure ERC721 tokens and receiver
@@ -278,7 +232,7 @@ describe('Asset Transfer Proxies', () => {
         describe('transferFrom', () => {
             it('should successfully transfer tokens', async () => {
                 // Construct ERC20 asset data
-                const encodedAssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
+                const encodedAssetData = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
                 // Perform a transfer from fromAddress to toAddress
                 const erc20Balances = await erc20Wrapper.getBalancesAsync();
                 const amount = new BigNumber(10);
@@ -308,7 +262,7 @@ describe('Asset Transfer Proxies', () => {
 
             it('should successfully transfer tokens that do not return a value', async () => {
                 // Construct ERC20 asset data
-                const encodedAssetData = assetDataUtils.encodeERC20AssetData(noReturnErc20Token.address);
+                const encodedAssetData = await devUtils.encodeERC20AssetData.callAsync(noReturnErc20Token.address);
                 // Perform a transfer from fromAddress to toAddress
                 const initialFromBalance = await noReturnErc20Token.balanceOf.callAsync(fromAddress);
                 const initialToBalance = await noReturnErc20Token.balanceOf.callAsync(toAddress);
@@ -337,7 +291,9 @@ describe('Asset Transfer Proxies', () => {
             it('should successfully transfer tokens and ignore extra assetData', async () => {
                 // Construct ERC20 asset data
                 const extraData = '0102030405060708';
-                const encodedAssetData = `${assetDataUtils.encodeERC20AssetData(erc20TokenA.address)}${extraData}`;
+                const encodedAssetData = `${await devUtils.encodeERC20AssetData.callAsync(
+                    erc20TokenA.address,
+                )}${extraData}`;
                 // Perform a transfer from fromAddress to toAddress
                 const erc20Balances = await erc20Wrapper.getBalancesAsync();
                 const amount = new BigNumber(10);
@@ -367,7 +323,7 @@ describe('Asset Transfer Proxies', () => {
 
             it('should do nothing if transferring 0 amount of a token', async () => {
                 // Construct ERC20 asset data
-                const encodedAssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
+                const encodedAssetData = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
                 // Perform a transfer from fromAddress to toAddress
                 const erc20Balances = await erc20Wrapper.getBalancesAsync();
                 const amount = new BigNumber(0);
@@ -397,7 +353,7 @@ describe('Asset Transfer Proxies', () => {
 
             it('should revert if allowances are too low', async () => {
                 // Construct ERC20 asset data
-                const encodedAssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
+                const encodedAssetData = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
                 // Create allowance less than transfer amount. Set allowance on proxy.
                 const allowance = new BigNumber(0);
                 const amount = new BigNumber(10);
@@ -407,12 +363,9 @@ describe('Asset Transfer Proxies', () => {
                     toAddress,
                     amount,
                 );
-                await erc20TokenA.approve.awaitTransactionSuccessAsync(
-                    erc20Proxy.address,
-                    allowance,
-                    { from: fromAddress },
-                    constants.AWAIT_TRANSACTION_MINED_MS,
-                );
+                await erc20TokenA.approve.awaitTransactionSuccessAsync(erc20Proxy.address, allowance, {
+                    from: fromAddress,
+                });
                 const erc20Balances = await erc20Wrapper.getBalancesAsync();
                 // Perform a transfer; expect this to fail.
                 await expectTransactionFailedAsync(
@@ -429,7 +382,7 @@ describe('Asset Transfer Proxies', () => {
 
             it('should revert if allowances are too low and token does not return a value', async () => {
                 // Construct ERC20 asset data
-                const encodedAssetData = assetDataUtils.encodeERC20AssetData(noReturnErc20Token.address);
+                const encodedAssetData = await devUtils.encodeERC20AssetData.callAsync(noReturnErc20Token.address);
                 // Create allowance less than transfer amount. Set allowance on proxy.
                 const allowance = new BigNumber(0);
                 const amount = new BigNumber(10);
@@ -439,12 +392,9 @@ describe('Asset Transfer Proxies', () => {
                     toAddress,
                     amount,
                 );
-                await noReturnErc20Token.approve.awaitTransactionSuccessAsync(
-                    erc20Proxy.address,
-                    allowance,
-                    { from: fromAddress },
-                    constants.AWAIT_TRANSACTION_MINED_MS,
-                );
+                await noReturnErc20Token.approve.awaitTransactionSuccessAsync(erc20Proxy.address, allowance, {
+                    from: fromAddress,
+                });
                 const initialFromBalance = await noReturnErc20Token.balanceOf.callAsync(fromAddress);
                 const initialToBalance = await noReturnErc20Token.balanceOf.callAsync(toAddress);
                 // Perform a transfer; expect this to fail.
@@ -464,7 +414,7 @@ describe('Asset Transfer Proxies', () => {
 
             it('should revert if caller is not authorized', async () => {
                 // Construct ERC20 asset data
-                const encodedAssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
+                const encodedAssetData = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
                 // Perform a transfer from fromAddress to toAddress
                 const amount = new BigNumber(10);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
@@ -488,7 +438,9 @@ describe('Asset Transfer Proxies', () => {
 
             it('should revert if token returns more than 32 bytes', async () => {
                 // Construct ERC20 asset data
-                const encodedAssetData = assetDataUtils.encodeERC20AssetData(multipleReturnErc20Token.address);
+                const encodedAssetData = await devUtils.encodeERC20AssetData.callAsync(
+                    multipleReturnErc20Token.address,
+                );
                 const amount = new BigNumber(10);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     encodedAssetData,
@@ -535,7 +487,10 @@ describe('Asset Transfer Proxies', () => {
         describe('transferFrom', () => {
             it('should successfully transfer tokens', async () => {
                 // Construct ERC721 asset data
-                const encodedAssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
+                const encodedAssetData = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
                 // Verify pre-condition
                 const ownerFromAsset = await erc721TokenA.ownerOf.callAsync(erc721AFromTokenId);
                 expect(ownerFromAsset).to.be.equal(fromAddress);
@@ -563,7 +518,7 @@ describe('Asset Transfer Proxies', () => {
             it('should successfully transfer tokens and ignore extra assetData', async () => {
                 // Construct ERC721 asset data
                 const extraData = '0102030405060708';
-                const encodedAssetData = `${assetDataUtils.encodeERC721AssetData(
+                const encodedAssetData = `${await devUtils.encodeERC721AssetData.callAsync(
                     erc721TokenA.address,
                     erc721AFromTokenId,
                 )}${extraData}`;
@@ -593,7 +548,10 @@ describe('Asset Transfer Proxies', () => {
 
             it('should not call onERC721Received when transferring to a smart contract', async () => {
                 // Construct ERC721 asset data
-                const encodedAssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
+                const encodedAssetData = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
                 // Verify pre-condition
                 const ownerFromAsset = await erc721TokenA.ownerOf.callAsync(erc721AFromTokenId);
                 expect(ownerFromAsset).to.be.equal(fromAddress);
@@ -623,7 +581,10 @@ describe('Asset Transfer Proxies', () => {
 
             it('should revert if transferring 0 amount of a token', async () => {
                 // Construct ERC721 asset data
-                const encodedAssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
+                const encodedAssetData = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
                 // Verify pre-condition
                 const ownerFromAsset = await erc721TokenA.ownerOf.callAsync(erc721AFromTokenId);
                 expect(ownerFromAsset).to.be.equal(fromAddress);
@@ -649,7 +610,10 @@ describe('Asset Transfer Proxies', () => {
 
             it('should revert if transferring > 1 amount of a token', async () => {
                 // Construct ERC721 asset data
-                const encodedAssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
+                const encodedAssetData = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
                 // Verify pre-condition
                 const ownerFromAsset = await erc721TokenA.ownerOf.callAsync(erc721AFromTokenId);
                 expect(ownerFromAsset).to.be.equal(fromAddress);
@@ -675,17 +639,21 @@ describe('Asset Transfer Proxies', () => {
 
             it('should revert if allowances are too low', async () => {
                 // Construct ERC721 asset data
-                const encodedAssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
+                const encodedAssetData = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
                 // Verify pre-condition
                 const ownerFromAsset = await erc721TokenA.ownerOf.callAsync(erc721AFromTokenId);
                 expect(ownerFromAsset).to.be.equal(fromAddress);
-                // Remove transfer approval for fromAddress.
-                await erc721TokenA.approve.awaitTransactionSuccessAsync(
-                    constants.NULL_ADDRESS,
-                    erc721AFromTokenId,
-                    { from: fromAddress },
-                    constants.AWAIT_TRANSACTION_MINED_MS,
-                );
+                // Remove blanket transfer approval for fromAddress.
+                await erc721TokenA.setApprovalForAll.awaitTransactionSuccessAsync(erc721Proxy.address, false, {
+                    from: fromAddress,
+                });
+                // Remove token transfer approval for fromAddress.
+                await erc721TokenA.approve.awaitTransactionSuccessAsync(constants.NULL_ADDRESS, erc721AFromTokenId, {
+                    from: fromAddress,
+                });
                 // Perform a transfer; expect this to fail.
                 const amount = new BigNumber(1);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
@@ -708,7 +676,10 @@ describe('Asset Transfer Proxies', () => {
 
             it('should revert if caller is not authorized', async () => {
                 // Construct ERC721 asset data
-                const encodedAssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
+                const encodedAssetData = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
                 // Verify pre-condition
                 const ownerFromAsset = await erc721TokenA.ownerOf.callAsync(erc721AFromTokenId);
                 expect(ownerFromAsset).to.be.equal(fromAddress);
@@ -755,10 +726,10 @@ describe('Asset Transfer Proxies', () => {
             it('should transfer a single ERC20 token', async () => {
                 const inputAmount = new BigNumber(1);
                 const erc20Amount = new BigNumber(10);
-                const erc20AssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
+                const erc20AssetData = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
                 const amounts = [erc20Amount];
                 const nestedAssetData = [erc20AssetData];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -786,7 +757,7 @@ describe('Asset Transfer Proxies', () => {
             it('should dispatch an ERC20 transfer when input amount is 0', async () => {
                 const inputAmount = constants.ZERO_AMOUNT;
                 const erc20Amount = new BigNumber(10);
-                const erc20AssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
+                const erc20AssetData = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
                 const amounts = [erc20Amount];
                 const nestedAssetData = [erc20AssetData];
                 const assetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(amounts, nestedAssetData);
@@ -817,11 +788,11 @@ describe('Asset Transfer Proxies', () => {
                 const inputAmount = new BigNumber(1);
                 const erc20Amount1 = new BigNumber(10);
                 const erc20Amount2 = new BigNumber(20);
-                const erc20AssetData1 = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
-                const erc20AssetData2 = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
+                const erc20AssetData1 = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
+                const erc20AssetData2 = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
                 const amounts = [erc20Amount1, erc20Amount2];
                 const nestedAssetData = [erc20AssetData1, erc20AssetData2];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -850,11 +821,11 @@ describe('Asset Transfer Proxies', () => {
                 const inputAmount = new BigNumber(1);
                 const erc20Amount1 = new BigNumber(10);
                 const erc20Amount2 = new BigNumber(20);
-                const erc20AssetData1 = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
-                const erc20AssetData2 = assetDataUtils.encodeERC20AssetData(erc20TokenB.address);
+                const erc20AssetData1 = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
+                const erc20AssetData2 = await devUtils.encodeERC20AssetData.callAsync(erc20TokenB.address);
                 const amounts = [erc20Amount1, erc20Amount2];
                 const nestedAssetData = [erc20AssetData1, erc20AssetData2];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -889,10 +860,13 @@ describe('Asset Transfer Proxies', () => {
             it('should transfer a single ERC721 token', async () => {
                 const inputAmount = new BigNumber(1);
                 const erc721Amount = new BigNumber(1);
-                const erc721AssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
+                const erc721AssetData = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
                 const amounts = [erc721Amount];
                 const nestedAssetData = [erc721AssetData];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -915,8 +889,11 @@ describe('Asset Transfer Proxies', () => {
             it('should successfully transfer multiple of the same ERC721 token', async () => {
                 const erc721Balances = await erc721Wrapper.getBalancesAsync();
                 const erc721AFromTokenId2 = erc721Balances[fromAddress][erc721TokenA.address][1];
-                const erc721AssetData1 = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
-                const erc721AssetData2 = assetDataUtils.encodeERC721AssetData(
+                const erc721AssetData1 = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
+                const erc721AssetData2 = await devUtils.encodeERC721AssetData.callAsync(
                     erc721TokenA.address,
                     erc721AFromTokenId2,
                 );
@@ -924,7 +901,7 @@ describe('Asset Transfer Proxies', () => {
                 const erc721Amount = new BigNumber(1);
                 const amounts = [erc721Amount, erc721Amount];
                 const nestedAssetData = [erc721AssetData1, erc721AssetData2];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -950,13 +927,19 @@ describe('Asset Transfer Proxies', () => {
                 expect(newOwnerFromAsset2).to.be.equal(toAddress);
             });
             it('should successfully transfer multiple different ERC721 tokens', async () => {
-                const erc721AssetData1 = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
-                const erc721AssetData2 = assetDataUtils.encodeERC721AssetData(erc721TokenB.address, erc721BFromTokenId);
+                const erc721AssetData1 = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
+                const erc721AssetData2 = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenB.address,
+                    erc721BFromTokenId,
+                );
                 const inputAmount = new BigNumber(1);
                 const erc721Amount = new BigNumber(1);
                 const amounts = [erc721Amount, erc721Amount];
                 const nestedAssetData = [erc721AssetData1, erc721AssetData2];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -997,7 +980,7 @@ describe('Asset Transfer Proxies', () => {
                 ];
                 await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances);
                 // encode erc1155 asset data
-                const erc1155AssetData = assetDataUtils.encodeERC1155AssetData(
+                const erc1155AssetData = await devUtils.encodeERC1155AssetData.callAsync(
                     erc1155Contract.address,
                     tokensToTransfer,
                     valuesToTransfer,
@@ -1007,7 +990,7 @@ describe('Asset Transfer Proxies', () => {
                 const multiAssetAmount = new BigNumber(5);
                 const amounts = [valueMultiplier];
                 const nestedAssetData = [erc1155AssetData];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1053,7 +1036,7 @@ describe('Asset Transfer Proxies', () => {
                 ];
                 await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances);
                 // encode erc1155 asset data
-                const erc1155AssetData = assetDataUtils.encodeERC1155AssetData(
+                const erc1155AssetData = await devUtils.encodeERC1155AssetData.callAsync(
                     erc1155Contract.address,
                     tokensToTransfer,
                     valuesToTransfer,
@@ -1063,7 +1046,7 @@ describe('Asset Transfer Proxies', () => {
                 const multiAssetAmount = new BigNumber(5);
                 const amounts = [valueMultiplier];
                 const nestedAssetData = [erc1155AssetData];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1117,7 +1100,7 @@ describe('Asset Transfer Proxies', () => {
                 ];
                 await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances);
                 // encode erc1155 asset data
-                const erc1155AssetData = assetDataUtils.encodeERC1155AssetData(
+                const erc1155AssetData = await devUtils.encodeERC1155AssetData.callAsync(
                     erc1155Contract.address,
                     tokensToTransfer,
                     valuesToTransfer,
@@ -1127,7 +1110,7 @@ describe('Asset Transfer Proxies', () => {
                 const multiAssetAmount = new BigNumber(1);
                 const amounts = [valueMultiplier];
                 const nestedAssetData = [erc1155AssetData];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1174,13 +1157,13 @@ describe('Asset Transfer Proxies', () => {
                 await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances);
                 await erc1155Wrapper2.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances);
                 // encode erc1155 asset data
-                const erc1155AssetData1 = assetDataUtils.encodeERC1155AssetData(
+                const erc1155AssetData1 = await devUtils.encodeERC1155AssetData.callAsync(
                     erc1155Contract.address,
                     tokensToTransfer,
                     valuesToTransfer,
                     receiverCallbackData,
                 );
-                const erc1155AssetData2 = assetDataUtils.encodeERC1155AssetData(
+                const erc1155AssetData2 = await devUtils.encodeERC1155AssetData.callAsync(
                     erc1155Contract2.address,
                     tokensToTransfer,
                     valuesToTransfer,
@@ -1190,7 +1173,7 @@ describe('Asset Transfer Proxies', () => {
                 const multiAssetAmount = new BigNumber(5);
                 const amounts = [valueMultiplier, valueMultiplier];
                 const nestedAssetData = [erc1155AssetData1, erc1155AssetData2];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1221,15 +1204,18 @@ describe('Asset Transfer Proxies', () => {
                 // setup test parameters
                 const inputAmount = new BigNumber(1);
                 const erc20Amount = new BigNumber(10);
-                const erc20AssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
+                const erc20AssetData = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
                 const erc721Amount = new BigNumber(1);
-                const erc721AssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
+                const erc721AssetData = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
                 const erc1155TokenHolders = [fromAddress, toAddress];
                 const erc1155TokensToTransfer = erc1155FungibleTokens.slice(0, 1);
                 const erc1155ValuesToTransfer = [new BigNumber(25)];
                 const erc1155Amount = new BigNumber(23);
                 const erc1155ReceiverCallbackData = '0x0102030405';
-                const erc1155AssetData = assetDataUtils.encodeERC1155AssetData(
+                const erc1155AssetData = await devUtils.encodeERC1155AssetData.callAsync(
                     erc1155Contract.address,
                     erc1155TokensToTransfer,
                     erc1155ValuesToTransfer,
@@ -1237,7 +1223,7 @@ describe('Asset Transfer Proxies', () => {
                 );
                 const amounts = [erc20Amount, erc721Amount, erc1155Amount];
                 const nestedAssetData = [erc20AssetData, erc721AssetData, erc1155AssetData];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1292,12 +1278,15 @@ describe('Asset Transfer Proxies', () => {
             it('should successfully transfer a combination of ERC20 and ERC721 tokens', async () => {
                 const inputAmount = new BigNumber(1);
                 const erc20Amount = new BigNumber(10);
-                const erc20AssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
+                const erc20AssetData = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
                 const erc721Amount = new BigNumber(1);
-                const erc721AssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
+                const erc721AssetData = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
                 const amounts = [erc20Amount, erc721Amount];
                 const nestedAssetData = [erc20AssetData, erc721AssetData];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1329,13 +1318,19 @@ describe('Asset Transfer Proxies', () => {
             it('should successfully transfer tokens and ignore extra assetData', async () => {
                 const inputAmount = new BigNumber(1);
                 const erc20Amount = new BigNumber(10);
-                const erc20AssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
+                const erc20AssetData = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
                 const erc721Amount = new BigNumber(1);
-                const erc721AssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
+                const erc721AssetData = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
                 const amounts = [erc20Amount, erc721Amount];
                 const nestedAssetData = [erc20AssetData, erc721AssetData];
                 const extraData = '0102030405060708090001020304050607080900010203040506070809000102';
-                const assetData = `${assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData)}${extraData}`;
+                const assetData = `${await devUtils.encodeMultiAssetData.callAsync(
+                    amounts,
+                    nestedAssetData,
+                )}${extraData}`;
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1368,11 +1363,11 @@ describe('Asset Transfer Proxies', () => {
                 const inputAmount = new BigNumber(100);
                 const erc20Amount1 = new BigNumber(10);
                 const erc20Amount2 = new BigNumber(20);
-                const erc20AssetData1 = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
-                const erc20AssetData2 = assetDataUtils.encodeERC20AssetData(erc20TokenB.address);
+                const erc20AssetData1 = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
+                const erc20AssetData2 = await devUtils.encodeERC20AssetData.callAsync(erc20TokenB.address);
                 const amounts = [erc20Amount1, erc20Amount2];
                 const nestedAssetData = [erc20AssetData1, erc20AssetData2];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1408,19 +1403,25 @@ describe('Asset Transfer Proxies', () => {
                 const inputAmount = new BigNumber(1);
                 const erc20Amount1 = new BigNumber(10);
                 const erc20Amount2 = new BigNumber(20);
-                const erc20AssetData1 = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
-                const erc20AssetData2 = assetDataUtils.encodeERC20AssetData(erc20TokenB.address);
+                const erc20AssetData1 = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
+                const erc20AssetData2 = await devUtils.encodeERC20AssetData.callAsync(erc20TokenB.address);
                 const erc721Amount = new BigNumber(1);
                 const erc721Balances = await erc721Wrapper.getBalancesAsync();
                 const erc721AFromTokenId2 = erc721Balances[fromAddress][erc721TokenA.address][1];
                 const erc721BFromTokenId2 = erc721Balances[fromAddress][erc721TokenB.address][1];
-                const erc721AssetData1 = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
-                const erc721AssetData2 = assetDataUtils.encodeERC721AssetData(
+                const erc721AssetData1 = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
+                const erc721AssetData2 = await devUtils.encodeERC721AssetData.callAsync(
                     erc721TokenA.address,
                     erc721AFromTokenId2,
                 );
-                const erc721AssetData3 = assetDataUtils.encodeERC721AssetData(erc721TokenB.address, erc721BFromTokenId);
-                const erc721AssetData4 = assetDataUtils.encodeERC721AssetData(
+                const erc721AssetData3 = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenB.address,
+                    erc721BFromTokenId,
+                );
+                const erc721AssetData4 = await devUtils.encodeERC721AssetData.callAsync(
                     erc721TokenB.address,
                     erc721BFromTokenId2,
                 );
@@ -1433,7 +1434,7 @@ describe('Asset Transfer Proxies', () => {
                     erc721AssetData3,
                     erc721AssetData4,
                 ];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1485,13 +1486,16 @@ describe('Asset Transfer Proxies', () => {
             it('should revert if a single transfer fails', async () => {
                 const inputAmount = new BigNumber(1);
                 const erc20Amount = new BigNumber(10);
-                const erc20AssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
+                const erc20AssetData = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
                 // 2 is an invalid erc721 amount
                 const erc721Amount = new BigNumber(2);
-                const erc721AssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
+                const erc721AssetData = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
                 const amounts = [erc20Amount, erc721Amount];
                 const nestedAssetData = [erc20AssetData, erc721AssetData];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1510,15 +1514,17 @@ describe('Asset Transfer Proxies', () => {
             it('should revert if an AssetProxy is not registered', async () => {
                 const inputAmount = new BigNumber(1);
                 const erc20Amount = new BigNumber(10);
-                const erc20AssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
+                const erc20AssetData = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
                 const erc721Amount = new BigNumber(1);
-                const erc721AssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
+                const erc721AssetData = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
                 const invalidProxyId = '0x12345678';
                 const invalidErc721AssetData = `${invalidProxyId}${erc721AssetData.slice(10)}`;
                 const amounts = [erc20Amount, erc721Amount];
                 const nestedAssetData = [erc20AssetData, invalidErc721AssetData];
-                // HACK: This is used to get around validation built into assetDataUtils
-                const assetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1537,12 +1543,14 @@ describe('Asset Transfer Proxies', () => {
             it('should revert if the length of `amounts` does not match the length of `nestedAssetData`', async () => {
                 const inputAmount = new BigNumber(1);
                 const erc20Amount = new BigNumber(10);
-                const erc20AssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
-                const erc721AssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
+                const erc20AssetData = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
+                const erc721AssetData = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
                 const amounts = [erc20Amount];
                 const nestedAssetData = [erc20AssetData, erc721AssetData];
-                // HACK: This is used to get around validation built into assetDataUtils
-                const assetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1561,10 +1569,10 @@ describe('Asset Transfer Proxies', () => {
             it('should revert if amounts multiplication results in an overflow', async () => {
                 const inputAmount = new BigNumber(2).pow(128);
                 const erc20Amount = new BigNumber(2).pow(128);
-                const erc20AssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
+                const erc20AssetData = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
                 const amounts = [erc20Amount];
                 const nestedAssetData = [erc20AssetData];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1583,13 +1591,12 @@ describe('Asset Transfer Proxies', () => {
             it('should revert if an element of `nestedAssetData` is < 4 bytes long', async () => {
                 const inputAmount = new BigNumber(1);
                 const erc20Amount = new BigNumber(10);
-                const erc20AssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
+                const erc20AssetData = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
                 const erc721Amount = new BigNumber(1);
                 const erc721AssetData = '0x123456';
                 const amounts = [erc20Amount, erc721Amount];
                 const nestedAssetData = [erc20AssetData, erc721AssetData];
-                // HACK: This is used to get around validation built into assetDataUtils
-                const assetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1608,12 +1615,15 @@ describe('Asset Transfer Proxies', () => {
             it('should revert if caller is not authorized', async () => {
                 const inputAmount = new BigNumber(1);
                 const erc20Amount = new BigNumber(10);
-                const erc20AssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
+                const erc20AssetData = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
                 const erc721Amount = new BigNumber(1);
-                const erc721AssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
+                const erc721AssetData = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
                 const amounts = [erc20Amount, erc721Amount];
                 const nestedAssetData = [erc20AssetData, erc721AssetData];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1632,12 +1642,15 @@ describe('Asset Transfer Proxies', () => {
             it('should revert if asset data overflows beyond the bounds of calldata', async () => {
                 const inputAmount = new BigNumber(1);
                 const erc20Amount = new BigNumber(10);
-                const erc20AssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
+                const erc20AssetData = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
                 const erc721Amount = new BigNumber(1);
-                const erc721AssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
+                const erc721AssetData = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
                 const amounts = [erc20Amount, erc721Amount];
                 const nestedAssetData = [erc20AssetData, erc721AssetData];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1662,12 +1675,15 @@ describe('Asset Transfer Proxies', () => {
             it('should revert if asset data resolves to a location beyond the bounds of calldata', async () => {
                 const inputAmount = new BigNumber(1);
                 const erc20Amount = new BigNumber(10);
-                const erc20AssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
+                const erc20AssetData = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
                 const erc721Amount = new BigNumber(1);
-                const erc721AssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
+                const erc721AssetData = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
                 const amounts = [erc20Amount, erc721Amount];
                 const nestedAssetData = [erc20AssetData, erc721AssetData];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1693,12 +1709,15 @@ describe('Asset Transfer Proxies', () => {
                 // setup test parameters
                 const inputAmount = new BigNumber(1);
                 const erc20Amount = new BigNumber(10);
-                const erc20AssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
+                const erc20AssetData = await devUtils.encodeERC20AssetData.callAsync(erc20TokenA.address);
                 const erc721Amount = new BigNumber(1);
-                const erc721AssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
+                const erc721AssetData = await devUtils.encodeERC721AssetData.callAsync(
+                    erc721TokenA.address,
+                    erc721AFromTokenId,
+                );
                 const amounts = [erc20Amount, erc721Amount];
                 const nestedAssetData = [erc20AssetData, erc721AssetData];
-                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
+                const assetData = await devUtils.encodeMultiAssetData.callAsync(amounts, nestedAssetData);
                 const extraData = '01';
                 const assetDataWithExtraData = `${assetData}${extraData}`;
                 const badData = assetProxyInterface.transferFrom.getABIEncodedTransactionData(

contracts/asset-proxy/test/static_call_proxy.ts

@@ -1,3 +1,4 @@
+import { DevUtilsContract } from '@0x/contracts-dev-utils';
 import {
     chaiSetup,
     constants,
@@ -8,7 +9,6 @@ import {
     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';
@@ -25,6 +25,7 @@ describe('StaticCallProxy', () => {
     let fromAddress: string;
     let toAddress: string;
 
+    let devUtils: DevUtilsContract;
     let staticCallProxy: IAssetProxyContract;
     let staticCallTarget: TestStaticCallTargetContract;
 
@@ -43,7 +44,14 @@ describe('StaticCallProxy', () => {
             txDefaults,
             artifacts,
         );
-        staticCallProxy = new IAssetProxyContract(staticCallProxyWithoutTransferFrom.address, provider, txDefaults);
+        devUtils = new DevUtilsContract(constants.NULL_ADDRESS, provider);
+        staticCallProxy = new IAssetProxyContract(
+            staticCallProxyWithoutTransferFrom.address,
+            provider,
+            txDefaults,
+            {},
+            StaticCallProxyContract.deployedBytecode,
+        );
         staticCallTarget = await TestStaticCallTargetContract.deployFrom0xArtifactAsync(
             artifacts.TestStaticCallTarget,
             provider,
@@ -80,7 +88,7 @@ describe('StaticCallProxy', () => {
         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(
+            const assetData = await devUtils.encodeStaticCallAssetData.callAsync(
                 staticCallTarget.address,
                 staticCallData,
                 expectedResultHash,
@@ -108,9 +116,11 @@ describe('StaticCallProxy', () => {
         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 assetData = (await devUtils.encodeStaticCallAssetData.callAsync(
+                staticCallTarget.address,
+                staticCallData,
+                expectedResultHash,
+            )).slice(0, -128);
             const assetDataByteLen = (assetData.length - 2) / 2;
             expect((assetDataByteLen - 4) % 32).to.equal(0);
             await expectTransactionFailedWithoutReasonAsync(
@@ -120,7 +130,7 @@ describe('StaticCallProxy', () => {
         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(
+            const assetData = await devUtils.encodeStaticCallAssetData.callAsync(
                 staticCallTarget.address,
                 staticCallData,
                 expectedResultHash,
@@ -141,7 +151,7 @@ describe('StaticCallProxy', () => {
         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(
+            const assetData = await devUtils.encodeStaticCallAssetData.callAsync(
                 staticCallTarget.address,
                 staticCallData,
                 expectedResultHash,
@@ -153,7 +163,7 @@ describe('StaticCallProxy', () => {
         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(
+            const assetData = await devUtils.encodeStaticCallAssetData.callAsync(
                 staticCallTarget.address,
                 staticCallData,
                 expectedResultHash,
@@ -167,7 +177,7 @@ describe('StaticCallProxy', () => {
             const staticCallData = staticCallTarget.isOddNumber.getABIEncodedTransactionData(new BigNumber(0));
             const trueAsBuffer = ethUtil.toBuffer('0x0000000000000000000000000000000000000000000000000000000000000001');
             const expectedResultHash = ethUtil.bufferToHex(ethUtil.sha3(trueAsBuffer));
-            const assetData = assetDataUtils.encodeStaticCallAssetData(
+            const assetData = await devUtils.encodeStaticCallAssetData.callAsync(
                 staticCallTarget.address,
                 staticCallData,
                 expectedResultHash,
@@ -180,7 +190,7 @@ describe('StaticCallProxy', () => {
         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(
+            const assetData = await devUtils.encodeStaticCallAssetData.callAsync(
                 staticCallTarget.address,
                 staticCallData,
                 expectedResultHash,
@@ -190,14 +200,18 @@ describe('StaticCallProxy', () => {
         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);
+            const assetData = await devUtils.encodeStaticCallAssetData.callAsync(
+                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(
+            const assetData = await devUtils.encodeStaticCallAssetData.callAsync(
                 staticCallTarget.address,
                 staticCallData,
                 expectedResultHash,
@@ -208,7 +222,7 @@ describe('StaticCallProxy', () => {
             const dynamicInput = '0x0102030405060708';
             const staticCallData = staticCallTarget.dynamicInputFunction.getABIEncodedTransactionData(dynamicInput);
             const expectedResultHash = constants.KECCAK256_NULL;
-            const assetData = assetDataUtils.encodeStaticCallAssetData(
+            const assetData = await devUtils.encodeStaticCallAssetData.callAsync(
                 staticCallTarget.address,
                 staticCallData,
                 expectedResultHash,
@@ -231,7 +245,7 @@ describe('StaticCallProxy', () => {
             const expectedResultHash = ethUtil.bufferToHex(
                 ethUtil.sha3(ethUtil.toBuffer(encodedExpectedResultWithOffset)),
             );
-            const assetData = assetDataUtils.encodeStaticCallAssetData(
+            const assetData = await devUtils.encodeStaticCallAssetData.callAsync(
                 staticCallTarget.address,
                 staticCallData,
                 expectedResultHash,

contracts/asset-proxy/test/uniswap_bridge.ts

@@ -0,0 +1,365 @@
+import {
+    blockchainTests,
+    constants,
+    expect,
+    filterLogs,
+    filterLogsToArguments,
+    getRandomInteger,
+    hexLeftPad,
+    hexRandom,
+    Numberish,
+    randomAddress,
+    TransactionHelper,
+} from '@0x/contracts-test-utils';
+import { AssetProxyId } from '@0x/types';
+import { BigNumber } from '@0x/utils';
+import { DecodedLogs } from 'ethereum-types';
+import * as _ from 'lodash';
+
+import {
+    artifacts,
+    TestUniswapBridgeContract,
+    TestUniswapBridgeEthToTokenTransferInputEventArgs as EthToTokenTransferInputArgs,
+    TestUniswapBridgeEvents as ContractEvents,
+    TestUniswapBridgeTokenApproveEventArgs as TokenApproveArgs,
+    TestUniswapBridgeTokenToEthSwapInputEventArgs as TokenToEthSwapInputArgs,
+    TestUniswapBridgeTokenToTokenTransferInputEventArgs as TokenToTokenTransferInputArgs,
+    TestUniswapBridgeTokenTransferEventArgs as TokenTransferArgs,
+    TestUniswapBridgeWethDepositEventArgs as WethDepositArgs,
+    TestUniswapBridgeWethWithdrawEventArgs as WethWithdrawArgs,
+} from '../src';
+
+blockchainTests.resets('UniswapBridge unit tests', env => {
+    const txHelper = new TransactionHelper(env.web3Wrapper, artifacts);
+    let testContract: TestUniswapBridgeContract;
+    let wethTokenAddress: string;
+
+    before(async () => {
+        testContract = await TestUniswapBridgeContract.deployFrom0xArtifactAsync(
+            artifacts.TestUniswapBridge,
+            env.provider,
+            env.txDefaults,
+            artifacts,
+        );
+        wethTokenAddress = await testContract.wethToken.callAsync();
+    });
+
+    describe('isValidSignature()', () => {
+        it('returns success bytes', async () => {
+            const LEGACY_WALLET_MAGIC_VALUE = '0xb0671381';
+            const result = await testContract.isValidSignature.callAsync(hexRandom(), hexRandom(_.random(0, 32)));
+            expect(result).to.eq(LEGACY_WALLET_MAGIC_VALUE);
+        });
+    });
+
+    describe('bridgeTransferFrom()', () => {
+        interface WithdrawToOpts {
+            fromTokenAddress: string;
+            toTokenAddress: string;
+            fromTokenBalance: Numberish;
+            toAddress: string;
+            amount: Numberish;
+            exchangeRevertReason: string;
+            exchangeFillAmount: Numberish;
+            toTokenRevertReason: string;
+            fromTokenRevertReason: string;
+        }
+
+        function createWithdrawToOpts(opts?: Partial<WithdrawToOpts>): WithdrawToOpts {
+            return {
+                fromTokenAddress: constants.NULL_ADDRESS,
+                toTokenAddress: constants.NULL_ADDRESS,
+                fromTokenBalance: getRandomInteger(1, 1e18),
+                toAddress: randomAddress(),
+                amount: getRandomInteger(1, 1e18),
+                exchangeRevertReason: '',
+                exchangeFillAmount: getRandomInteger(1, 1e18),
+                toTokenRevertReason: '',
+                fromTokenRevertReason: '',
+                ...opts,
+            };
+        }
+
+        interface WithdrawToResult {
+            opts: WithdrawToOpts;
+            result: string;
+            logs: DecodedLogs;
+            blockTime: number;
+        }
+
+        async function withdrawToAsync(opts?: Partial<WithdrawToOpts>): Promise<WithdrawToResult> {
+            const _opts = createWithdrawToOpts(opts);
+            // Create the "from" token and exchange.
+            [[_opts.fromTokenAddress]] = await txHelper.getResultAndReceiptAsync(
+                testContract.createTokenAndExchange,
+                _opts.fromTokenAddress,
+                _opts.exchangeRevertReason,
+                { value: new BigNumber(_opts.exchangeFillAmount) },
+            );
+            // Create the "to" token and exchange.
+            [[_opts.toTokenAddress]] = await txHelper.getResultAndReceiptAsync(
+                testContract.createTokenAndExchange,
+                _opts.toTokenAddress,
+                _opts.exchangeRevertReason,
+                { value: new BigNumber(_opts.exchangeFillAmount) },
+            );
+            await testContract.setTokenRevertReason.awaitTransactionSuccessAsync(
+                _opts.toTokenAddress,
+                _opts.toTokenRevertReason,
+            );
+            await testContract.setTokenRevertReason.awaitTransactionSuccessAsync(
+                _opts.fromTokenAddress,
+                _opts.fromTokenRevertReason,
+            );
+            // Set the token balance for the token we're converting from.
+            await testContract.setTokenBalance.awaitTransactionSuccessAsync(_opts.fromTokenAddress, {
+                value: new BigNumber(_opts.fromTokenBalance),
+            });
+            // Call bridgeTransferFrom().
+            const [result, receipt] = await txHelper.getResultAndReceiptAsync(
+                testContract.bridgeTransferFrom,
+                // The "to" token address.
+                _opts.toTokenAddress,
+                // The "from" address.
+                randomAddress(),
+                // The "to" address.
+                _opts.toAddress,
+                // The amount to transfer to "to"
+                new BigNumber(_opts.amount),
+                // ABI-encoded "from" token address.
+                hexLeftPad(_opts.fromTokenAddress),
+            );
+            return {
+                opts: _opts,
+                result,
+                logs: (receipt.logs as any) as DecodedLogs,
+                blockTime: await env.web3Wrapper.getBlockTimestampAsync(receipt.blockNumber),
+            };
+        }
+
+        async function getExchangeForTokenAsync(tokenAddress: string): Promise<string> {
+            return testContract.getExchange.callAsync(tokenAddress);
+        }
+
+        it('returns magic bytes on success', async () => {
+            const { result } = await withdrawToAsync();
+            expect(result).to.eq(AssetProxyId.ERC20Bridge);
+        });
+
+        it('just transfers tokens to `to` if the same tokens are in play', async () => {
+            const [[tokenAddress]] = await txHelper.getResultAndReceiptAsync(
+                testContract.createTokenAndExchange,
+                constants.NULL_ADDRESS,
+                '',
+            );
+            const { opts, result, logs } = await withdrawToAsync({
+                fromTokenAddress: tokenAddress,
+                toTokenAddress: tokenAddress,
+            });
+            expect(result).to.eq(AssetProxyId.ERC20Bridge);
+            const transfers = filterLogsToArguments<TokenTransferArgs>(logs, ContractEvents.TokenTransfer);
+            expect(transfers.length).to.eq(1);
+            expect(transfers[0].token).to.eq(tokenAddress);
+            expect(transfers[0].from).to.eq(testContract.address);
+            expect(transfers[0].to).to.eq(opts.toAddress);
+            expect(transfers[0].amount).to.bignumber.eq(opts.amount);
+        });
+
+        describe('token -> token', () => {
+            it('calls `IUniswapExchange.tokenToTokenTransferInput()', async () => {
+                const { opts, logs, blockTime } = await withdrawToAsync();
+                const exchangeAddress = await getExchangeForTokenAsync(opts.fromTokenAddress);
+                const calls = filterLogsToArguments<TokenToTokenTransferInputArgs>(
+                    logs,
+                    ContractEvents.TokenToTokenTransferInput,
+                );
+                expect(calls.length).to.eq(1);
+                expect(calls[0].exchange).to.eq(exchangeAddress);
+                expect(calls[0].tokensSold).to.bignumber.eq(opts.fromTokenBalance);
+                expect(calls[0].minTokensBought).to.bignumber.eq(opts.amount);
+                expect(calls[0].minEthBought).to.bignumber.eq(0);
+                expect(calls[0].deadline).to.bignumber.eq(blockTime);
+                expect(calls[0].recipient).to.eq(opts.toAddress);
+                expect(calls[0].toTokenAddress).to.eq(opts.toTokenAddress);
+            });
+
+            it('sets allowance for "from" token', async () => {
+                const { opts, logs } = await withdrawToAsync();
+                const approvals = filterLogsToArguments<TokenApproveArgs>(logs, ContractEvents.TokenApprove);
+                const exchangeAddress = await getExchangeForTokenAsync(opts.fromTokenAddress);
+                expect(approvals.length).to.eq(1);
+                expect(approvals[0].spender).to.eq(exchangeAddress);
+                expect(approvals[0].allowance).to.bignumber.eq(constants.MAX_UINT256);
+            });
+
+            it('sets allowance for "from" token on subsequent calls', async () => {
+                const { opts } = await withdrawToAsync();
+                const { logs } = await withdrawToAsync(opts);
+                const approvals = filterLogsToArguments<TokenApproveArgs>(logs, ContractEvents.TokenApprove);
+                const exchangeAddress = await getExchangeForTokenAsync(opts.fromTokenAddress);
+                expect(approvals.length).to.eq(1);
+                expect(approvals[0].spender).to.eq(exchangeAddress);
+                expect(approvals[0].allowance).to.bignumber.eq(constants.MAX_UINT256);
+            });
+
+            it('fails if "from" token does not exist', async () => {
+                const tx = testContract.bridgeTransferFrom.awaitTransactionSuccessAsync(
+                    randomAddress(),
+                    randomAddress(),
+                    randomAddress(),
+                    getRandomInteger(1, 1e18),
+                    hexLeftPad(randomAddress()),
+                );
+                return expect(tx).to.revertWith('NO_UNISWAP_EXCHANGE_FOR_TOKEN');
+            });
+
+            it('fails if the exchange fails', async () => {
+                const revertReason = 'FOOBAR';
+                const tx = withdrawToAsync({
+                    exchangeRevertReason: revertReason,
+                });
+                return expect(tx).to.revertWith(revertReason);
+            });
+        });
+
+        describe('token -> ETH', () => {
+            it('calls `IUniswapExchange.tokenToEthSwapInput()`, `WETH.deposit()`, then `transfer()`', async () => {
+                const { opts, logs, blockTime } = await withdrawToAsync({
+                    toTokenAddress: wethTokenAddress,
+                });
+                const exchangeAddress = await getExchangeForTokenAsync(opts.fromTokenAddress);
+                let calls: any = filterLogs<TokenToEthSwapInputArgs>(logs, ContractEvents.TokenToEthSwapInput);
+                expect(calls.length).to.eq(1);
+                expect(calls[0].args.exchange).to.eq(exchangeAddress);
+                expect(calls[0].args.tokensSold).to.bignumber.eq(opts.fromTokenBalance);
+                expect(calls[0].args.minEthBought).to.bignumber.eq(opts.amount);
+                expect(calls[0].args.deadline).to.bignumber.eq(blockTime);
+                calls = filterLogs<WethDepositArgs>(
+                    logs.slice(calls[0].logIndex as number),
+                    ContractEvents.WethDeposit,
+                );
+                expect(calls.length).to.eq(1);
+                expect(calls[0].args.amount).to.bignumber.eq(opts.exchangeFillAmount);
+                calls = filterLogs<TokenTransferArgs>(
+                    logs.slice(calls[0].logIndex as number),
+                    ContractEvents.TokenTransfer,
+                );
+                expect(calls.length).to.eq(1);
+                expect(calls[0].args.token).to.eq(opts.toTokenAddress);
+                expect(calls[0].args.from).to.eq(testContract.address);
+                expect(calls[0].args.to).to.eq(opts.toAddress);
+                expect(calls[0].args.amount).to.bignumber.eq(opts.exchangeFillAmount);
+            });
+
+            it('sets allowance for "from" token', async () => {
+                const { opts, logs } = await withdrawToAsync({
+                    toTokenAddress: wethTokenAddress,
+                });
+                const transfers = filterLogsToArguments<TokenApproveArgs>(logs, ContractEvents.TokenApprove);
+                const exchangeAddress = await getExchangeForTokenAsync(opts.fromTokenAddress);
+                expect(transfers.length).to.eq(1);
+                expect(transfers[0].spender).to.eq(exchangeAddress);
+                expect(transfers[0].allowance).to.bignumber.eq(constants.MAX_UINT256);
+            });
+
+            it('sets allowance for "from" token on subsequent calls', async () => {
+                const { opts } = await withdrawToAsync({
+                    toTokenAddress: wethTokenAddress,
+                });
+                const { logs } = await withdrawToAsync(opts);
+                const approvals = filterLogsToArguments<TokenApproveArgs>(logs, ContractEvents.TokenApprove);
+                const exchangeAddress = await getExchangeForTokenAsync(opts.fromTokenAddress);
+                expect(approvals.length).to.eq(1);
+                expect(approvals[0].spender).to.eq(exchangeAddress);
+                expect(approvals[0].allowance).to.bignumber.eq(constants.MAX_UINT256);
+            });
+
+            it('fails if "from" token does not exist', async () => {
+                const tx = testContract.bridgeTransferFrom.awaitTransactionSuccessAsync(
+                    randomAddress(),
+                    randomAddress(),
+                    randomAddress(),
+                    getRandomInteger(1, 1e18),
+                    hexLeftPad(wethTokenAddress),
+                );
+                return expect(tx).to.revertWith('NO_UNISWAP_EXCHANGE_FOR_TOKEN');
+            });
+
+            it('fails if `WETH.deposit()` fails', async () => {
+                const revertReason = 'FOOBAR';
+                const tx = withdrawToAsync({
+                    toTokenAddress: wethTokenAddress,
+                    toTokenRevertReason: revertReason,
+                });
+                return expect(tx).to.revertWith(revertReason);
+            });
+
+            it('fails if the exchange fails', async () => {
+                const revertReason = 'FOOBAR';
+                const tx = withdrawToAsync({
+                    toTokenAddress: wethTokenAddress,
+                    exchangeRevertReason: revertReason,
+                });
+                return expect(tx).to.revertWith(revertReason);
+            });
+        });
+
+        describe('ETH -> token', () => {
+            it('calls  `WETH.withdraw()`, then `IUniswapExchange.ethToTokenTransferInput()`', async () => {
+                const { opts, logs, blockTime } = await withdrawToAsync({
+                    fromTokenAddress: wethTokenAddress,
+                });
+                const exchangeAddress = await getExchangeForTokenAsync(opts.toTokenAddress);
+                let calls: any = filterLogs<WethWithdrawArgs>(logs, ContractEvents.WethWithdraw);
+                expect(calls.length).to.eq(1);
+                expect(calls[0].args.amount).to.bignumber.eq(opts.fromTokenBalance);
+                calls = filterLogs<EthToTokenTransferInputArgs>(
+                    logs.slice(calls[0].logIndex as number),
+                    ContractEvents.EthToTokenTransferInput,
+                );
+                expect(calls.length).to.eq(1);
+                expect(calls[0].args.exchange).to.eq(exchangeAddress);
+                expect(calls[0].args.minTokensBought).to.bignumber.eq(opts.amount);
+                expect(calls[0].args.deadline).to.bignumber.eq(blockTime);
+                expect(calls[0].args.recipient).to.eq(opts.toAddress);
+            });
+
+            it('does not set any allowance', async () => {
+                const { logs } = await withdrawToAsync({
+                    fromTokenAddress: wethTokenAddress,
+                });
+                const approvals = filterLogsToArguments<TokenApproveArgs>(logs, ContractEvents.TokenApprove);
+                expect(approvals).to.be.empty('');
+            });
+
+            it('fails if "to" token does not exist', async () => {
+                const tx = testContract.bridgeTransferFrom.awaitTransactionSuccessAsync(
+                    wethTokenAddress,
+                    randomAddress(),
+                    randomAddress(),
+                    getRandomInteger(1, 1e18),
+                    hexLeftPad(randomAddress()),
+                );
+                return expect(tx).to.revertWith('NO_UNISWAP_EXCHANGE_FOR_TOKEN');
+            });
+
+            it('fails if the `WETH.withdraw()` fails', async () => {
+                const revertReason = 'FOOBAR';
+                const tx = withdrawToAsync({
+                    fromTokenAddress: wethTokenAddress,
+                    fromTokenRevertReason: revertReason,
+                });
+                return expect(tx).to.revertWith(revertReason);
+            });
+
+            it('fails if the exchange fails', async () => {
+                const revertReason = 'FOOBAR';
+                const tx = withdrawToAsync({
+                    fromTokenAddress: wethTokenAddress,
+                    exchangeRevertReason: revertReason,
+                });
+                return expect(tx).to.revertWith(revertReason);
+            });
+        });
+    });
+});

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

@@ -1,3 +1,4 @@
+import { DevUtilsContract } from '@0x/contracts-dev-utils';
 import { artifacts as erc1155Artifacts, ERC1155MintableContract, Erc1155Wrapper } from '@0x/contracts-erc1155';
 import {
     constants,
@@ -7,7 +8,6 @@ import {
     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';
@@ -26,6 +26,7 @@ export class ERC1155ProxyWrapper {
     private readonly _logDecoder: LogDecoder;
     private readonly _dummyTokenWrappers: Erc1155Wrapper[];
     private readonly _assetProxyInterface: IAssetProxyContract;
+    private readonly _devUtils: DevUtilsContract;
     private _proxyContract?: ERC1155ProxyContract;
     private _proxyIdIfExists?: string;
     private _initialTokenIdsByOwner: ERC1155HoldingsByOwner = { fungible: {}, nonFungible: {} };
@@ -37,6 +38,7 @@ export class ERC1155ProxyWrapper {
         this._logDecoder = new LogDecoder(this._web3Wrapper, allArtifacts);
         this._dummyTokenWrappers = [];
         this._assetProxyInterface = new IAssetProxyContract(constants.NULL_ADDRESS, provider);
+        this._devUtils = new DevUtilsContract(constants.NULL_ADDRESS, provider);
         this._tokenOwnerAddresses = tokenOwnerAddresses;
         this._contractOwnerAddress = contractOwnerAddress;
         this._fungibleTokenIds = [];
@@ -95,7 +97,7 @@ export class ERC1155ProxyWrapper {
      * @param extraData extra data to append to `transferFrom` transaction. Optional.
      * @return abi encoded tx data.
      */
-    public getTransferFromAbiEncodedTxData(
+    public async getTransferFromAbiEncodedTxDataAsync(
         from: string,
         to: string,
         contractAddress: string,
@@ -105,11 +107,11 @@ export class ERC1155ProxyWrapper {
         receiverCallbackData: string,
         authorizedSender: string,
         assetData_?: string,
-    ): string {
+    ): Promise<string> {
         this._validateProxyContractExistsOrThrow();
         const assetData =
             assetData_ === undefined
-                ? assetDataUtils.encodeERC1155AssetData(
+                ? await this._devUtils.encodeERC1155AssetData.callAsync(
                       contractAddress,
                       tokensToTransfer,
                       valuesToTransfer,
@@ -169,7 +171,7 @@ export class ERC1155ProxyWrapper {
         this._validateProxyContractExistsOrThrow();
         const assetData =
             assetData_ === undefined
-                ? assetDataUtils.encodeERC1155AssetData(
+                ? await this._devUtils.encodeERC1155AssetData.callAsync(
                       contractAddress,
                       tokensToTransfer,
                       valuesToTransfer,
@@ -336,6 +338,22 @@ export class ERC1155ProxyWrapper {
         };
         return holdingsByOwner;
     }
+    /**
+     * @dev Set the approval for the proxy on behalf of `userAddress` .
+     * @param userAddress owner of ERC1155 tokens.
+     * @param contractAddress address of ERC1155 contract.
+     * @param isApproved Whether to approve the proxy for all or not.
+     */
+    public async setProxyAllowanceForAllAsync(
+        userAddress: string,
+        contractAddress: string,
+        isApproved: boolean,
+    ): Promise<void> {
+        this._validateProxyContractExistsOrThrow();
+        const tokenWrapper = this.getContractWrapper(contractAddress);
+        const operator = (this._proxyContract as ERC1155ProxyContract).address;
+        await tokenWrapper.setApprovalForAllAsync(userAddress, operator, isApproved);
+    }
     /**
      * @dev Checks if proxy is approved to transfer tokens on behalf of `userAddress`.
      * @param userAddress owner of ERC1155 tokens.

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

@@ -1,6 +1,6 @@
+import { DevUtilsContract } from '@0x/contracts-dev-utils';
 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';
@@ -12,6 +12,7 @@ export class ERC20Wrapper {
     private readonly _contractOwnerAddress: string;
     private readonly _provider: ZeroExProvider;
     private readonly _dummyTokenContracts: DummyERC20TokenContract[];
+    private readonly _devUtils: DevUtilsContract;
     private _proxyContract?: ERC20ProxyContract;
     private _proxyIdIfExists?: string;
     /**
@@ -26,6 +27,7 @@ export class ERC20Wrapper {
         this._provider = provider;
         this._tokenOwnerAddresses = tokenOwnerAddresses;
         this._contractOwnerAddress = contractOwnerAddress;
+        this._devUtils = new DevUtilsContract(constants.NULL_ADDRESS, provider);
     }
     public async deployDummyTokensAsync(
         numberToDeploy: number,
@@ -70,46 +72,39 @@ export class ERC20Wrapper {
                     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 tokenContract = await this._getTokenContractFromAssetDataAsync(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);
+        const tokenContract = await this._getTokenContractFromAssetDataAsync(assetData);
         await tokenContract.setBalance.awaitTransactionSuccessAsync(
             userAddress,
             amount,
             { from: this._contractOwnerAddress },
-            constants.AWAIT_TRANSACTION_MINED_MS,
+            { pollingIntervalMs: constants.AWAIT_TRANSACTION_MINED_MS },
         );
     }
     public async getProxyAllowanceAsync(userAddress: string, assetData: string): Promise<BigNumber> {
-        const tokenContract = this._getTokenContractFromAssetData(assetData);
+        const tokenContract = await this._getTokenContractFromAssetDataAsync(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 tokenContract = await this._getTokenContractFromAssetDataAsync(assetData);
         const proxyAddress = (this._proxyContract as ERC20ProxyContract).address;
-        await tokenContract.approve.awaitTransactionSuccessAsync(
-            proxyAddress,
-            amount,
-            { from: userAddress },
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
+        await tokenContract.approve.awaitTransactionSuccessAsync(proxyAddress, amount, { from: userAddress });
     }
     public async getBalancesAsync(): Promise<ERC20BalancesByOwner> {
         this._validateDummyTokenContractsExistOrThrow();
@@ -151,9 +146,8 @@ export class ERC20Wrapper {
         const tokenAddresses = _.map(this._dummyTokenContracts, dummyTokenContract => dummyTokenContract.address);
         return tokenAddresses;
     }
-    private _getTokenContractFromAssetData(assetData: string): DummyERC20TokenContract {
-        const erc20ProxyData = assetDataUtils.decodeERC20AssetData(assetData);
-        const tokenAddress = erc20ProxyData.tokenAddress;
+    private async _getTokenContractFromAssetDataAsync(assetData: string): Promise<DummyERC20TokenContract> {
+        const [proxyId, tokenAddress] = await this._devUtils.decodeERC20AssetData.callAsync(assetData); // tslint:disable-line:no-unused-variable
         const tokenContractIfExists = _.find(this._dummyTokenContracts, c => c.address === tokenAddress);
         if (tokenContractIfExists === undefined) {
             throw new Error(`Token: ${tokenAddress} was not deployed through ERC20Wrapper`);

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

@@ -71,7 +71,7 @@ export class ERC721Wrapper {
                     }
                     this._initialTokenIdsByOwner[tokenOwnerAddress][dummyTokenContract.address].push(tokenId);
 
-                    await this.approveProxyAsync(dummyTokenContract.address, tokenId);
+                    await this.approveProxyForAllAsync(dummyTokenContract.address, tokenOwnerAddress, true);
                 }
             }
         }
@@ -86,26 +86,21 @@ export class ERC721Wrapper {
         const proxyAddress = (this._proxyContract as ERC721ProxyContract).address;
         await this.approveAsync(proxyAddress, tokenAddress, tokenId);
     }
-    public async approveProxyForAllAsync(tokenAddress: string, tokenId: BigNumber, isApproved: boolean): Promise<void> {
+    public async approveProxyForAllAsync(
+        tokenAddress: string,
+        ownerAddress: string,
+        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,
-        );
+        await tokenContract.setApprovalForAll.awaitTransactionSuccessAsync(proxyAddress, isApproved, {
+            from: ownerAddress,
+        });
     }
     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,
-        );
+        await tokenContract.approve.awaitTransactionSuccessAsync(to, tokenId, { from: tokenOwner });
     }
     public async transferFromAsync(
         tokenAddress: string,
@@ -114,31 +109,19 @@ export class ERC721Wrapper {
         userAddress: string,
     ): Promise<void> {
         const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
-        await tokenContract.transferFrom.awaitTransactionSuccessAsync(
-            currentOwner,
-            userAddress,
-            tokenId,
-            { from: currentOwner },
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
+        await tokenContract.transferFrom.awaitTransactionSuccessAsync(currentOwner, userAddress, tokenId, {
+            from: currentOwner,
+        });
     }
     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,
-        );
+        await tokenContract.mint.awaitTransactionSuccessAsync(userAddress, tokenId, {
+            from: this._contractOwnerAddress,
+        });
     }
     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,
-        );
+        await tokenContract.burn.awaitTransactionSuccessAsync(owner, tokenId, { from: this._contractOwnerAddress });
     }
     public async ownerOfAsync(tokenAddress: string, tokenId: BigNumber): Promise<string> {
         const tokenContract = this._getTokenContractFromAssetData(tokenAddress);

contracts/asset-proxy/truffle-config.js

@@ -0,0 +1,96 @@
+/**
+ * Use this file to configure your truffle project. It's seeded with some
+ * common settings for different networks and features like migrations,
+ * compilation and testing. Uncomment the ones you need or modify
+ * them to suit your project as necessary.
+ *
+ * More information about configuration can be found at:
+ *
+ * truffleframework.com/docs/advanced/configuration
+ *
+ * To deploy via Infura you'll need a wallet provider (like truffle-hdwallet-provider)
+ * to sign your transactions before they're sent to a remote public node. Infura accounts
+ * are available for free at: infura.io/register.
+ *
+ * You'll also need a mnemonic - the twelve word phrase the wallet uses to generate
+ * public/private key pairs. If you're publishing your code to GitHub make sure you load this
+ * phrase from a file you've .gitignored so it doesn't accidentally become public.
+ *
+ */
+
+// const HDWalletProvider = require('truffle-hdwallet-provider');
+// const infuraKey = "fj4jll3k.....";
+//
+// const fs = require('fs');
+// const mnemonic = fs.readFileSync(".secret").toString().trim();
+
+module.exports = {
+    /**
+     * Networks define how you connect to your ethereum client and let you set the
+     * defaults web3 uses to send transactions. If you don't specify one truffle
+     * will spin up a development blockchain for you on port 9545 when you
+     * run `develop` or `test`. You can ask a truffle command to use a specific
+     * network from the command line, e.g
+     *
+     * $ truffle test --network <network-name>
+     */
+
+    networks: {
+        // Useful for testing. The `development` name is special - truffle uses it by default
+        // if it's defined here and no other network is specified at the command line.
+        // You should run a client (like ganache-cli, geth or parity) in a separate terminal
+        // tab if you use this network and you must also set the `host`, `port` and `network_id`
+        // options below to some value.
+        //
+        // development: {
+        //  host: "127.0.0.1",     // Localhost (default: none)
+        //  port: 8545,            // Standard Ethereum port (default: none)
+        //  network_id: "*",       // Any network (default: none)
+        // },
+        // Another network with more advanced options...
+        // advanced: {
+        // port: 8777,             // Custom port
+        // network_id: 1342,       // Custom network
+        // gas: 8500000,           // Gas sent with each transaction (default: ~6700000)
+        // gasPrice: 20000000000,  // 20 gwei (in wei) (default: 100 gwei)
+        // from: <address>,        // Account to send txs from (default: accounts[0])
+        // websockets: true        // Enable EventEmitter interface for web3 (default: false)
+        // },
+        // Useful for deploying to a public network.
+        // NB: It's important to wrap the provider as a function.
+        // ropsten: {
+        // provider: () => new HDWalletProvider(mnemonic, `https://ropsten.infura.io/v3/YOUR-PROJECT-ID`),
+        // network_id: 3,       // Ropsten's id
+        // gas: 5500000,        // Ropsten has a lower block limit than mainnet
+        // confirmations: 2,    // # of confs to wait between deployments. (default: 0)
+        // timeoutBlocks: 200,  // # of blocks before a deployment times out  (minimum/default: 50)
+        // skipDryRun: true     // Skip dry run before migrations? (default: false for public nets )
+        // },
+        // Useful for private networks
+        // private: {
+        // provider: () => new HDWalletProvider(mnemonic, `https://network.io`),
+        // network_id: 2111,   // This network is yours, in the cloud.
+        // production: true    // Treats this network as if it was a public net. (default: false)
+        // }
+    },
+
+    // Set default mocha options here, use special reporters etc.
+    mocha: {
+        // timeout: 100000
+    },
+
+    // Configure your compilers
+    compilers: {
+        solc: {
+            version: '0.5.9',
+            settings: {
+                evmVersion: 'constantinople',
+                optimizer: {
+                    enabled: true,
+                    runs: 1000000,
+                    details: { yul: true, deduplicate: true, cse: true, constantOptimizer: true },
+                },
+            },
+        },
+    },
+};

contracts/asset-proxy/tsconfig.json

@@ -4,15 +4,28 @@
     "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
     "files": [
         "generated-artifacts/ERC1155Proxy.json",
+        "generated-artifacts/ERC20BridgeProxy.json",
         "generated-artifacts/ERC20Proxy.json",
         "generated-artifacts/ERC721Proxy.json",
+        "generated-artifacts/Eth2DaiBridge.json",
         "generated-artifacts/IAssetData.json",
         "generated-artifacts/IAssetProxy.json",
+        "generated-artifacts/IAssetProxyDispatcher.json",
         "generated-artifacts/IAuthorizable.json",
+        "generated-artifacts/IERC20Bridge.json",
+        "generated-artifacts/IEth2Dai.json",
+        "generated-artifacts/IUniswapExchange.json",
+        "generated-artifacts/IUniswapExchangeFactory.json",
+        "generated-artifacts/MixinAssetProxyDispatcher.json",
         "generated-artifacts/MixinAuthorizable.json",
         "generated-artifacts/MultiAssetProxy.json",
+        "generated-artifacts/Ownable.json",
         "generated-artifacts/StaticCallProxy.json",
-        "generated-artifacts/TestStaticCallTarget.json"
+        "generated-artifacts/TestERC20Bridge.json",
+        "generated-artifacts/TestEth2DaiBridge.json",
+        "generated-artifacts/TestStaticCallTarget.json",
+        "generated-artifacts/TestUniswapBridge.json",
+        "generated-artifacts/UniswapBridge.json"
     ],
     "exclude": ["./deploy/solc/solc_bin"]
 }

contracts/coordinator/.solhintignore

@@ -0,0 +1,2 @@
+# solhint can't parse `abi.decode` syntax.
+contracts/src/MixinCoordinatorApprovalVerifier.sol

contracts/coordinator/CHANGELOG.json

@@ -1,4 +1,86 @@
 [
+    {
+        "version": "2.1.0-beta.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1573159180
+    },
+    {
+        "version": "2.1.0-beta.0",
+        "changes": [
+            {
+                "note": "Add chainId to domain separator",
+                "pr": 1742
+            },
+            {
+                "note": "Inherit Exchange domain constants from `exchange-libs` to reduce code duplication",
+                "pr": 1742
+            },
+            {
+                "note": "Update domain separator",
+                "pr": 1742
+            },
+            {
+                "note": "Refactor contract to use new ITransactions interface",
+                "pr": 1753
+            },
+            {
+                "note": "Add verifyingContractIfExists arg to LibEIP712CoordinatorDomain constructor",
+                "pr": 1753
+            },
+            {
+                "note": "Remove LibZeroExTransaction contract",
+                "pr": 1753
+            },
+            {
+                "note": "Update tests for arbitrary fee tokens (ZEIP-28).",
+                "pr": 1819
+            },
+            {
+                "note": "Update for new `marketXOrders` consolidation.",
+                "pr": 2042
+            },
+            {
+                "note": "Use built in selectors instead of hard coded constants",
+                "pr": 2055
+            },
+            {
+                "note": "Compile and export all contracts, artifacts, and wrappers by default",
+                "pr": 2055
+            }
+        ],
+        "timestamp": 1570135330
+    },
+    {
+        "timestamp": 1568744790,
+        "version": "2.0.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1567521715,
+        "version": "2.0.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1566446343,
+        "version": "2.0.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1565296576,
         "version": "2.0.10",

contracts/coordinator/CHANGELOG.md

@@ -5,6 +5,35 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.1.0-beta.1 - _November 7, 2019_
+
+    * Dependencies updated
+
+## v2.1.0-beta.0 - _October 3, 2019_
+
+    * Add chainId to domain separator (#1742)
+    * Inherit Exchange domain constants from `exchange-libs` to reduce code duplication (#1742)
+    * Update domain separator (#1742)
+    * Refactor contract to use new ITransactions interface (#1753)
+    * Add verifyingContractIfExists arg to LibEIP712CoordinatorDomain constructor (#1753)
+    * Remove LibZeroExTransaction contract (#1753)
+    * Update tests for arbitrary fee tokens (ZEIP-28). (#1819)
+    * Update for new `marketXOrders` consolidation. (#2042)
+    * Use built in selectors instead of hard coded constants (#2055)
+    * Compile and export all contracts, artifacts, and wrappers by default (#2055)
+
+## v2.0.13 - _September 17, 2019_
+
+    * Dependencies updated
+
+## v2.0.12 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v2.0.11 - _August 22, 2019_
+
+    * Dependencies updated
+
 ## v2.0.10 - _August 8, 2019_
 
     * Dependencies updated

contracts/coordinator/README.md

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

contracts/coordinator/compiler.json

@@ -21,6 +21,5 @@
                 ]
             }
         }
-    },
-    "contracts": ["src/Coordinator.sol", "src/registry/CoordinatorRegistry.sol"]
+    }
 }

contracts/coordinator/contracts/src/Coordinator.sol

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -16,10 +16,12 @@
 
 */
 
-pragma solidity ^0.5.5;
-pragma experimental "ABIEncoderV2";
+pragma solidity ^0.5.9;
+pragma experimental ABIEncoderV2;
 
+import "@0x/contracts-exchange-libs/contracts/src/LibEIP712ExchangeDomain.sol";
 import "./libs/LibConstants.sol";
+import "./libs/LibEIP712CoordinatorDomain.sol";
 import "./MixinSignatureValidator.sol";
 import "./MixinCoordinatorApprovalVerifier.sol";
 import "./MixinCoordinatorCore.sol";
@@ -32,8 +34,12 @@ contract Coordinator is
     MixinCoordinatorApprovalVerifier,
     MixinCoordinatorCore
 {
-    constructor (address _exchange)
+    /// @param exchange Address of the 0x Exchange contract.
+    /// @param chainId Chain ID of the network this contract is deployed on.
+    constructor (address exchange, uint256 chainId)
         public
-        LibConstants(_exchange)
+        LibConstants(exchange)
+        LibEIP712CoordinatorDomain(chainId, address(0))
+        LibEIP712ExchangeDomain(chainId, exchange)
     {}
 }

contracts/coordinator/contracts/src/MixinCoordinatorApprovalVerifier.sol

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -16,26 +16,28 @@
 
 */
 
-pragma solidity ^0.5.5;
-pragma experimental "ABIEncoderV2";
+pragma solidity ^0.5.9;
+pragma experimental ABIEncoderV2;
 
-import "@0x/contracts-exchange-libs/contracts/src/LibExchangeSelectors.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibEIP712ExchangeDomain.sol";
 import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
-import "@0x/contracts-utils/contracts/src/LibBytes.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibZeroExTransaction.sol";
 import "@0x/contracts-utils/contracts/src/LibAddressArray.sol";
+import "@0x/contracts-utils/contracts/src/LibBytes.sol";
+import "@0x/contracts-utils/contracts/src/LibRichErrors.sol";
+import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
 import "./libs/LibCoordinatorApproval.sol";
-import "./libs/LibZeroExTransaction.sol";
-import "./mixins/MSignatureValidator.sol";
-import "./mixins/MCoordinatorApprovalVerifier.sol";
+import "./libs/LibCoordinatorRichErrors.sol";
+import "./interfaces/ICoordinatorSignatureValidator.sol";
+import "./interfaces/ICoordinatorApprovalVerifier.sol";
 
 
 // solhint-disable avoid-tx-origin
 contract MixinCoordinatorApprovalVerifier is
-    LibExchangeSelectors,
     LibCoordinatorApproval,
-    LibZeroExTransaction,
-    MSignatureValidator,
-    MCoordinatorApprovalVerifier
+    LibEIP712ExchangeDomain,
+    ICoordinatorSignatureValidator,
+    ICoordinatorApprovalVerifier
 {
     using LibBytes for bytes;
     using LibAddressArray for address[];
@@ -45,13 +47,12 @@ contract MixinCoordinatorApprovalVerifier is
     /// @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.
+    /// @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
@@ -63,12 +64,11 @@ contract MixinCoordinatorApprovalVerifier is
         // No approval is required for non-fill methods
         if (orders.length > 0) {
             // Revert if approval is invalid for transaction orders
-            assertValidTransactionOrdersApproval(
+            _assertValidTransactionOrdersApproval(
                 transaction,
                 orders,
                 txOrigin,
                 transactionSignature,
-                approvalExpirationTimeSeconds,
                 approvalSignatures
             );
         }
@@ -76,7 +76,7 @@ contract MixinCoordinatorApprovalVerifier is
 
     /// @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.
+    /// @return orders The orders from the Exchange calldata.
     function decodeOrdersFromFillData(bytes memory data)
         public
         pure
@@ -84,9 +84,8 @@ contract MixinCoordinatorApprovalVerifier is
     {
         bytes4 selector = data.readBytes4(0);
         if (
-            selector == FILL_ORDER_SELECTOR ||
-            selector == FILL_ORDER_NO_THROW_SELECTOR ||
-            selector == FILL_OR_KILL_ORDER_SELECTOR
+            selector == IExchange(address(0)).fillOrder.selector ||
+            selector == IExchange(address(0)).fillOrKillOrder.selector
         ) {
             // Decode single order
             (LibOrder.Order memory order) = abi.decode(
@@ -96,13 +95,13 @@ contract MixinCoordinatorApprovalVerifier is
             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
+            selector == IExchange(address(0)).batchFillOrders.selector ||
+            selector == IExchange(address(0)).batchFillOrdersNoThrow.selector ||
+            selector == IExchange(address(0)).batchFillOrKillOrders.selector ||
+            selector == IExchange(address(0)).marketBuyOrdersNoThrow.selector ||
+            selector == IExchange(address(0)).marketBuyOrdersFillOrKill.selector ||
+            selector == IExchange(address(0)).marketSellOrdersNoThrow.selector ||
+            selector == IExchange(address(0)).marketSellOrdersFillOrKill.selector
         ) {
             // Decode all orders
             // solhint-disable indent
@@ -110,7 +109,10 @@ contract MixinCoordinatorApprovalVerifier is
                 data.slice(4, data.length),
                 (LibOrder.Order[])
             );
-        } else if (selector == MATCH_ORDERS_SELECTOR) {
+        } else if (
+            selector == IExchange(address(0)).matchOrders.selector ||
+            selector == IExchange(address(0)).matchOrdersWithMaximalFill.selector
+        ) {
             // Decode left and right orders
             (LibOrder.Order memory leftOrder, LibOrder.Order memory rightOrder) = abi.decode(
                 data.slice(4, data.length),
@@ -130,27 +132,24 @@ contract MixinCoordinatorApprovalVerifier is
     /// @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(
+    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"
-        );
+        if (tx.origin != txOrigin) {
+            LibRichErrors.rrevert(LibCoordinatorRichErrors.InvalidOriginError(txOrigin));
+        }
 
         // Hash 0x transaction
-        bytes32 transactionHash = getTransactionHash(transaction);
+        bytes32 transactionHash = LibZeroExTransaction.getTypedDataHash(transaction, EIP712_EXCHANGE_DOMAIN_HASH);
 
         // Create empty list of approval signers
         address[] memory approvalSignerAddresses = new address[](0);
@@ -158,21 +157,12 @@ contract MixinCoordinatorApprovalVerifier is
         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
+                transactionSignature: transactionSignature
             });
 
-            // 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]);
@@ -194,10 +184,12 @@ contract MixinCoordinatorApprovalVerifier is
             // Ensure feeRecipient of order has approved this 0x transaction
             address approverAddress = orders[i].feeRecipientAddress;
             bool isOrderApproved = approvalSignerAddresses.contains(approverAddress);
-            require(
-                isOrderApproved,
-                "INVALID_APPROVAL_SIGNATURE"
-            );
+            if (!isOrderApproved) {
+                LibRichErrors.rrevert(LibCoordinatorRichErrors.InvalidApprovalSignatureError(
+                    transactionHash,
+                    approverAddress
+                ));
+            }
         }
     }
 }

contracts/coordinator/contracts/src/MixinCoordinatorCore.sol

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -16,50 +16,57 @@
 
 */
 
-pragma solidity ^0.5.5;
-pragma experimental "ABIEncoderV2";
+pragma solidity ^0.5.9;
+pragma experimental ABIEncoderV2;
 
-import "./libs/LibZeroExTransaction.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibZeroExTransaction.sol";
+import "@0x/contracts-utils/contracts/src/Refundable.sol";
 import "./libs/LibConstants.sol";
-import "./mixins/MCoordinatorApprovalVerifier.sol";
 import "./interfaces/ICoordinatorCore.sol";
+import "./interfaces/ICoordinatorApprovalVerifier.sol";
 
 
+// solhint-disable no-empty-blocks
 contract MixinCoordinatorCore is
+    Refundable,
     LibConstants,
-    MCoordinatorApprovalVerifier,
+    ICoordinatorApprovalVerifier,
     ICoordinatorCore
 {
-    /// @dev Executes a 0x transaction that has been signed by the feeRecipients that correspond to each order in the transaction's Exchange calldata.
+
+    /// @dev A payable fallback function that makes this contract "payable". This is necessary to allow
+    ///      this contract to gracefully handle refunds from the Exchange.
+    function ()
+        external
+        payable
+    {}
+
+    /// @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.
+    /// @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
+        payable
+        refundFinalBalance
     {
         // 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
-        );
+        EXCHANGE.executeTransaction.value(msg.value)(transaction, transactionSignature);
     }
 }

contracts/coordinator/contracts/src/MixinSignatureValidator.sol

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -16,38 +16,48 @@
 
 */
 
-pragma solidity ^0.5.5;
+pragma solidity ^0.5.9;
 
 import "@0x/contracts-utils/contracts/src/LibBytes.sol";
-import "./mixins/MSignatureValidator.sol";
+import "@0x/contracts-utils/contracts/src/LibRichErrors.sol";
+import "./interfaces/ICoordinatorSignatureValidator.sol";
+import "./libs/LibCoordinatorRichErrors.sol";
 
 
 contract MixinSignatureValidator is
-    MSignatureValidator
+    ICoordinatorSignatureValidator
 {
     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.
+    /// @return signerAddress Address of the signer.
     function getSignerAddress(bytes32 hash, bytes memory signature)
         public
         pure
         returns (address signerAddress)
     {
-        require(
-            signature.length > 0,
-            "LENGTH_GREATER_THAN_0_REQUIRED"
-        );
+        uint256 signatureLength = signature.length;
+        if (signatureLength == 0) {
+            LibRichErrors.rrevert(LibCoordinatorRichErrors.SignatureError(
+                LibCoordinatorRichErrors.SignatureErrorCodes.INVALID_LENGTH,
+                hash,
+                signature
+            ));
+        }
 
         // Pop last byte off of signature byte array.
-        uint8 signatureTypeRaw = uint8(signature.popLastByte());
+        uint8 signatureTypeRaw = uint8(signature[signature.length - 1]);
 
         // Ensure signature is supported
-        require(
-            signatureTypeRaw < uint8(SignatureType.NSignatureTypes),
-            "SIGNATURE_UNSUPPORTED"
-        );
+        if (signatureTypeRaw >= uint8(SignatureType.NSignatureTypes)) {
+            LibRichErrors.rrevert(LibCoordinatorRichErrors.SignatureError(
+                LibCoordinatorRichErrors.SignatureErrorCodes.UNSUPPORTED,
+                hash,
+                signature
+            ));
+        }
 
         SignatureType signatureType = SignatureType(signatureTypeRaw);
 
@@ -57,25 +67,32 @@ contract MixinSignatureValidator is
         // 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");
+            LibRichErrors.rrevert(LibCoordinatorRichErrors.SignatureError(
+                LibCoordinatorRichErrors.SignatureErrorCodes.ILLEGAL,
+                hash,
+                signature
+            ));
 
         // 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");
+            LibRichErrors.rrevert(LibCoordinatorRichErrors.SignatureError(
+                LibCoordinatorRichErrors.SignatureErrorCodes.INVALID,
+                hash,
+                signature
+            ));
 
         // Signature using EIP712
         } else if (signatureType == SignatureType.EIP712) {
-            require(
-                signature.length == 65,
-                "LENGTH_65_REQUIRED"
-            );
+            if (signatureLength != 66) {
+                LibRichErrors.rrevert(LibCoordinatorRichErrors.SignatureError(
+                    LibCoordinatorRichErrors.SignatureErrorCodes.INVALID_LENGTH,
+                    hash,
+                    signature
+                ));
+            }
             uint8 v = uint8(signature[0]);
             bytes32 r = signature.readBytes32(1);
             bytes32 s = signature.readBytes32(33);
@@ -89,10 +106,13 @@ contract MixinSignatureValidator is
 
         // Signed using web3.eth_sign
         } else if (signatureType == SignatureType.EthSign) {
-            require(
-                signature.length == 65,
-                "LENGTH_65_REQUIRED"
-            );
+            if (signatureLength != 66) {
+                LibRichErrors.rrevert(LibCoordinatorRichErrors.SignatureError(
+                    LibCoordinatorRichErrors.SignatureErrorCodes.INVALID_LENGTH,
+                    hash,
+                    signature
+                ));
+            }
             uint8 v = uint8(signature[0]);
             bytes32 r = signature.readBytes32(1);
             bytes32 s = signature.readBytes32(33);
@@ -113,6 +133,10 @@ contract MixinSignatureValidator is
         // that we currently support. In this case returning false
         // may lead the caller to incorrectly believe that the
         // signature was invalid.)
-        revert("SIGNATURE_UNSUPPORTED");
+        LibRichErrors.rrevert(LibCoordinatorRichErrors.SignatureError(
+            LibCoordinatorRichErrors.SignatureErrorCodes.UNSUPPORTED,
+            hash,
+            signature
+        ));
     }
 }

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

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -16,11 +16,11 @@
 
 */
 
-pragma solidity ^0.5.5;
-pragma experimental "ABIEncoderV2";
+pragma solidity ^0.5.9;
+pragma experimental ABIEncoderV2;
 
 import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
-import "../libs/LibZeroExTransaction.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibZeroExTransaction.sol";
 
 
 contract ICoordinatorApprovalVerifier {
@@ -30,13 +30,12 @@ contract ICoordinatorApprovalVerifier {
     /// @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.
+    /// @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
@@ -44,7 +43,7 @@ contract ICoordinatorApprovalVerifier {
 
     /// @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.
+    /// @return orders The orders from the Exchange calldata.
     function decodeOrdersFromFillData(bytes memory data)
         public
         pure

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

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -16,26 +16,27 @@
 
 */
 
-pragma solidity ^0.5.5;
-pragma experimental "ABIEncoderV2";
+pragma solidity ^0.5.9;
+pragma experimental ABIEncoderV2;
 
-import "../libs/LibZeroExTransaction.sol";
+import "@0x/contracts-exchange-libs/contracts/src/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.
+    /// @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.
+    /// @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;
+        public
+        payable;
 }

contracts/coordinator/contracts/src/interfaces/ICoordinatorSignatureValidator.sol

@@ -0,0 +1,45 @@
+/*
+
+  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.9;
+
+
+contract ICoordinatorSignatureValidator {
+
+   // Allowed signature types.
+    enum SignatureType {
+        Illegal,                // 0x00, default value
+        Invalid,                // 0x01
+        EIP712,                 // 0x02
+        EthSign,                // 0x03
+        Wallet,                 // 0x04
+        Validator,              // 0x05
+        PreSigned,              // 0x06
+        EIP1271Wallet,          // 0x07
+        NSignatureTypes         // 0x08, number of signature types. Always leave at end.
+    }
+
+    /// @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.
+    /// @return signerAddress Address of the signer. 
+    function getSignerAddress(bytes32 hash, bytes memory signature)
+        public
+        pure
+        returns (address signerAddress);
+}

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

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -16,19 +16,21 @@
 
 */
 
-pragma solidity ^0.5.5;
+pragma solidity ^0.5.9;
 
-import "../interfaces/ITransactions.sol";
+import "@0x/contracts-exchange/contracts/src/interfaces/ITransactions.sol";
 
 
+// solhint-disable var-name-mixedcase
 contract LibConstants {
 
-     // solhint-disable-next-line var-name-mixedcase
+    // The 0x Exchange contract.
     ITransactions internal EXCHANGE;
 
-    constructor (address _exchange)
+    /// @param exchange Address of the 0x Exchange contract.
+    constructor (address exchange)
         public
     {
-        EXCHANGE = ITransactions(_exchange);
+        EXCHANGE = ITransactions(exchange);
     }
 }

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

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -16,49 +16,52 @@
 
 */
 
-pragma solidity ^0.5.5;
-pragma experimental "ABIEncoderV2";
+pragma solidity ^0.5.9;
+pragma experimental ABIEncoderV2;
 
-import "./LibEIP712Domain.sol";
+import "./LibEIP712CoordinatorDomain.sol";
 
 
 contract LibCoordinatorApproval is
-    LibEIP712Domain
+    LibEIP712CoordinatorDomain
 {
     // Hash for the EIP712 Coordinator approval message
     // keccak256(abi.encodePacked(
     //     "CoordinatorApproval(",
     //     "address txOrigin,",
     //     "bytes32 transactionHash,",
-    //     "bytes transactionSignature,",
-    //     "uint256 approvalExpirationTimeSeconds",
+    //     "bytes transactionSignature",
     //     ")"
     // ));
-    bytes32 constant internal EIP712_COORDINATOR_APPROVAL_SCHEMA_HASH = 0x2fbcdbaa76bc7589916958ae919dfbef04d23f6bbf26de6ff317b32c6cc01e05;
+    bytes32 constant public EIP712_COORDINATOR_APPROVAL_SCHEMA_HASH =
+        0xa6511c04ca44625d50986f8c36bedc09366207a17b96e347094053a9f8507168;
 
     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.
+    /// @dev Calculates the EIP712 hash of the Coordinator approval mesasage using the domain
+    ///      separator of this contract.
+    /// @param approval Coordinator approval message containing the transaction hash, and transaction
+    ///        signature.
+    /// @return approvalHash 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));
+        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)
+    /// @dev Calculates the EIP712 hash of the Coordinator approval mesasage with no domain separator.
+    /// @param approval Coordinator approval message containing the transaction hash, and transaction
+    //         signature.
+    /// @return result EIP712 hash of the Coordinator approval message with no domain separator.
+    function _hashCoordinatorApproval(CoordinatorApproval memory approval)
         internal
         pure
         returns (bytes32 result)
@@ -67,7 +70,6 @@ contract LibCoordinatorApproval is
         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(
@@ -75,7 +77,6 @@ contract LibCoordinatorApproval is
         //     approval.txOrigin,
         //     approval.transactionHash,
         //     keccak256(approval.transactionSignature)
-        //     approval.approvalExpirationTimeSeconds,
         // ));
 
         assembly {
@@ -89,9 +90,8 @@ contract LibCoordinatorApproval is
             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)
+            result := keccak256(memPtr, 128)
         }
         return result;
     }

contracts/coordinator/contracts/src/libs/LibCoordinatorRichErrors.sol

@@ -0,0 +1,87 @@
+/*
+
+  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.9;
+
+
+library LibCoordinatorRichErrors {
+    enum SignatureErrorCodes {
+        INVALID_LENGTH,
+        UNSUPPORTED,
+        ILLEGAL,
+        INVALID
+    }
+
+    // bytes4(keccak256("SignatureError(uint8,bytes32,bytes)"))
+    bytes4 internal constant SIGNATURE_ERROR_SELECTOR =
+        0x779c5223;
+
+    // bytes4(keccak256("InvalidOriginError(address)"))
+    bytes4 internal constant INVALID_ORIGIN_ERROR_SELECTOR =
+        0xa458d7ff;
+
+    // bytes4(keccak256("InvalidApprovalSignatureError(bytes32,address)"))
+    bytes4 internal constant INVALID_APPROVAL_SIGNATURE_ERROR_SELECTOR =
+        0xd789b640;
+
+    // solhint-disable func-name-mixedcase
+    function SignatureError(
+        SignatureErrorCodes errorCode,
+        bytes32 hash,
+        bytes memory signature
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            SIGNATURE_ERROR_SELECTOR,
+            errorCode,
+            hash,
+            signature
+        );
+    }
+
+    function InvalidOriginError(
+        address expectedOrigin
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            INVALID_ORIGIN_ERROR_SELECTOR,
+            expectedOrigin
+        );
+    }
+
+    function InvalidApprovalSignatureError(
+        bytes32 transactionHash,
+        address approverAddress
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            INVALID_APPROVAL_SIGNATURE_ERROR_SELECTOR,
+            transactionHash,
+            approverAddress
+        );
+    }
+}

contracts/coordinator/contracts/src/libs/LibEIP712CoordinatorDomain.sol

@@ -0,0 +1,66 @@
+/*
+
+  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.9;
+
+import "@0x/contracts-utils/contracts/src/LibEIP712.sol";
+
+
+contract LibEIP712CoordinatorDomain {
+
+    // EIP712 Domain Name value for the Coordinator
+    string constant public EIP712_COORDINATOR_DOMAIN_NAME = "0x Protocol Coordinator";
+
+    // EIP712 Domain Version value for the Coordinator
+    string constant public EIP712_COORDINATOR_DOMAIN_VERSION = "3.0.0";
+
+    // Hash of the EIP712 Domain Separator data for the Coordinator
+    // solhint-disable-next-line var-name-mixedcase
+    bytes32 public EIP712_COORDINATOR_DOMAIN_HASH;
+
+    /// @param chainId Chain ID of the network this contract is deployed on.
+    /// @param verifyingContractAddressIfExists Address of the verifying contract (null if the address of this contract)
+    constructor (
+        uint256 chainId,
+        address verifyingContractAddressIfExists
+    )
+        public
+    {
+        address verifyingContractAddress = verifyingContractAddressIfExists == address(0)
+            ? address(this)
+            : verifyingContractAddressIfExists;
+        EIP712_COORDINATOR_DOMAIN_HASH = LibEIP712.hashEIP712Domain(
+            EIP712_COORDINATOR_DOMAIN_NAME,
+            EIP712_COORDINATOR_DOMAIN_VERSION,
+            chainId,
+            verifyingContractAddress
+        );
+    }
+
+    /// @dev Calculates EIP712 encoding for a hash struct in the EIP712 domain
+    ///      of this contract.
+    /// @param hashStruct The EIP712 hash struct.
+    /// @return result EIP712 hash applied to this EIP712 Domain.
+    function _hashEIP712CoordinatorMessage(bytes32 hashStruct)
+        internal
+        view
+        returns (bytes32 result)
+    {
+        return LibEIP712.hashEIP712Message(EIP712_COORDINATOR_DOMAIN_HASH, hashStruct);
+    }
+}

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

@@ -1,131 +0,0 @@
-/*
-
-  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

@@ -1,95 +0,0 @@
-/*
-
-  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

@@ -1,46 +0,0 @@
-/*
-
-  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/registry/CoordinatorRegistry.sol

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -16,7 +16,7 @@
 
 */
 
-pragma solidity ^0.5.5;
+pragma solidity ^0.5.9;
 
 import "./MixinCoordinatorRegistryCore.sol";
 

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

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -16,7 +16,7 @@
 
 */
 
-pragma solidity ^0.5.5;
+pragma solidity ^0.5.9;
 
 import "./interfaces/ICoordinatorRegistryCore.sol";
 
@@ -29,7 +29,7 @@ contract MixinCoordinatorRegistryCore is
     mapping (address => string) internal coordinatorEndpoints;
 
     /// @dev Called by a Coordinator operator to set the endpoint of their Coordinator.
-    /// @param coordinatorEndpoint endpoint of the Coordinator.
+    /// @param coordinatorEndpoint Endpoint of the Coordinator as a string.
     function setCoordinatorEndpoint(string calldata coordinatorEndpoint) external {
         address coordinatorOperator = msg.sender;
         coordinatorEndpoints[coordinatorOperator] = coordinatorEndpoint;
@@ -37,7 +37,8 @@ contract MixinCoordinatorRegistryCore is
     }
 
     /// @dev Gets the endpoint for a Coordinator.
-    /// @param coordinatorOperator operator of the Coordinator endpoint.
+    /// @param coordinatorOperator Operator of the Coordinator endpoint.
+    /// @return coordinatorEndpoint Endpoint of the Coordinator as a string.
     function getCoordinatorEndpoint(address coordinatorOperator)
         external
         view

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

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -16,7 +16,7 @@
 
 */
 
-pragma solidity ^0.5.5;
+pragma solidity ^0.5.9;
 
 
 // solhint-disable no-empty-blocks
@@ -29,11 +29,12 @@ contract ICoordinatorRegistryCore
     );
 
     /// @dev Called by a Coordinator operator to set the endpoint of their Coordinator.
-    /// @param coordinatorEndpoint endpoint of the Coordinator.
+    /// @param coordinatorEndpoint Endpoint of the Coordinator as a string.
     function setCoordinatorEndpoint(string calldata coordinatorEndpoint) external;
 
     /// @dev Gets the endpoint for a Coordinator.
-    /// @param coordinatorOperator operator of the Coordinator endpoint.
+    /// @param coordinatorOperator Operator of the Coordinator endpoint.
+    /// @return coordinatorEndpoint Endpoint of the Coordinator as a string.
     function getCoordinatorEndpoint(address coordinatorOperator)
         external
         view

contracts/coordinator/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-coordinator",
-    "version": "2.0.10",
+    "version": "2.1.0-beta.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -12,7 +12,7 @@
     "scripts": {
         "build": "yarn pre_build && tsc -b",
         "build:ci": "yarn build",
-        "pre_build": "run-s compile generate_contract_wrappers",
+        "pre_build": "run-s compile contracts:gen 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",
@@ -22,7 +22,7 @@
         "compile": "sol-compiler",
         "watch": "sol-compiler -w",
         "clean": "shx rm -rf lib generated-artifacts generated-wrappers",
-        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
+        "generate_contract_wrappers": "abi-gen --debug --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",
@@ -31,10 +31,11 @@
         "coverage:report:lcov": "istanbul report lcov",
         "test:circleci": "yarn test",
         "contracts:gen": "contracts-gen",
-        "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
+        "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol",
+        "compile:truffle": "truffle compile"
     },
     "config": {
-        "abis": "./generated-artifacts/@(Coordinator|CoordinatorRegistry).json",
+        "abis": "./generated-artifacts/@(Coordinator|CoordinatorRegistry|ICoordinatorApprovalVerifier|ICoordinatorCore|ICoordinatorRegistryCore|ICoordinatorSignatureValidator|LibConstants|LibCoordinatorApproval|LibCoordinatorRichErrors|LibEIP712CoordinatorDomain|MixinCoordinatorApprovalVerifier|MixinCoordinatorCore|MixinCoordinatorRegistryCore|MixinSignatureValidator).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {
@@ -47,12 +48,17 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^4.1.0",
-        "@0x/contracts-gen": "^1.0.13",
-        "@0x/contracts-test-utils": "^3.1.13",
-        "@0x/dev-utils": "^2.3.0",
-        "@0x/sol-compiler": "^3.1.12",
-        "@0x/tslint-config": "^3.0.1",
+        "@0x/abi-gen": "^4.4.0-beta.1",
+        "@0x/contracts-asset-proxy": "^2.3.0-beta.1",
+        "@0x/contracts-dev-utils": "^0.1.0-beta.1",
+        "@0x/contracts-erc20": "^2.3.0-beta.1",
+        "@0x/contracts-exchange": "^2.2.0-beta.1",
+        "@0x/contracts-gen": "^1.1.0-beta.1",
+        "@0x/contracts-test-utils": "^3.2.0-beta.1",
+        "@0x/dev-utils": "^2.4.0-beta.1",
+        "@0x/order-utils": "^8.5.0-beta.1",
+        "@0x/sol-compiler": "^3.2.0-beta.1",
+        "@0x/tslint-config": "^3.1.0-beta.1",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
         "@types/node": "*",
@@ -60,29 +66,24 @@
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
+        "lodash": "^4.17.11",
         "make-promises-safe": "^1.1.0",
         "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "solhint": "^1.4.1",
+        "truffle": "^5.0.32",
         "tslint": "5.11.0",
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^5.3.1",
-        "@0x/contracts-asset-proxy": "^2.2.5",
-        "@0x/contracts-erc20": "^2.2.11",
-        "@0x/contracts-exchange": "^2.1.11",
-        "@0x/contracts-exchange-libs": "^3.0.5",
-        "@0x/contracts-utils": "^3.2.1",
-        "@0x/order-utils": "^8.2.5",
-        "@0x/types": "^2.4.1",
-        "@0x/typescript-typings": "^4.2.4",
-        "@0x/utils": "^4.5.0",
-        "@0x/web3-wrapper": "^6.0.10",
-        "ethereum-types": "^2.1.4",
-        "ethereumjs-util": "^5.1.1",
-        "lodash": "^4.17.11"
+        "@0x/base-contract": "^5.5.0-beta.1",
+        "@0x/types": "^2.5.0-beta.1",
+        "@0x/typescript-typings": "^4.4.0-beta.1",
+        "@0x/utils": "^4.6.0-beta.1",
+        "@0x/web3-wrapper": "^6.1.0-beta.1",
+        "ethereum-types": "^2.2.0-beta.1",
+        "ethereumjs-util": "^5.1.1"
     },
     "publishConfig": {
         "access": "public"

contracts/coordinator/src/artifacts.ts

@@ -7,7 +7,31 @@ import { ContractArtifact } from 'ethereum-types';
 
 import * as Coordinator from '../generated-artifacts/Coordinator.json';
 import * as CoordinatorRegistry from '../generated-artifacts/CoordinatorRegistry.json';
+import * as ICoordinatorApprovalVerifier from '../generated-artifacts/ICoordinatorApprovalVerifier.json';
+import * as ICoordinatorCore from '../generated-artifacts/ICoordinatorCore.json';
+import * as ICoordinatorRegistryCore from '../generated-artifacts/ICoordinatorRegistryCore.json';
+import * as ICoordinatorSignatureValidator from '../generated-artifacts/ICoordinatorSignatureValidator.json';
+import * as LibConstants from '../generated-artifacts/LibConstants.json';
+import * as LibCoordinatorApproval from '../generated-artifacts/LibCoordinatorApproval.json';
+import * as LibCoordinatorRichErrors from '../generated-artifacts/LibCoordinatorRichErrors.json';
+import * as LibEIP712CoordinatorDomain from '../generated-artifacts/LibEIP712CoordinatorDomain.json';
+import * as MixinCoordinatorApprovalVerifier from '../generated-artifacts/MixinCoordinatorApprovalVerifier.json';
+import * as MixinCoordinatorCore from '../generated-artifacts/MixinCoordinatorCore.json';
+import * as MixinCoordinatorRegistryCore from '../generated-artifacts/MixinCoordinatorRegistryCore.json';
+import * as MixinSignatureValidator from '../generated-artifacts/MixinSignatureValidator.json';
 export const artifacts = {
     Coordinator: Coordinator as ContractArtifact,
+    MixinCoordinatorApprovalVerifier: MixinCoordinatorApprovalVerifier as ContractArtifact,
+    MixinCoordinatorCore: MixinCoordinatorCore as ContractArtifact,
+    MixinSignatureValidator: MixinSignatureValidator as ContractArtifact,
+    ICoordinatorApprovalVerifier: ICoordinatorApprovalVerifier as ContractArtifact,
+    ICoordinatorCore: ICoordinatorCore as ContractArtifact,
+    ICoordinatorSignatureValidator: ICoordinatorSignatureValidator as ContractArtifact,
+    LibConstants: LibConstants as ContractArtifact,
+    LibCoordinatorApproval: LibCoordinatorApproval as ContractArtifact,
+    LibCoordinatorRichErrors: LibCoordinatorRichErrors as ContractArtifact,
+    LibEIP712CoordinatorDomain: LibEIP712CoordinatorDomain as ContractArtifact,
     CoordinatorRegistry: CoordinatorRegistry as ContractArtifact,
+    MixinCoordinatorRegistryCore: MixinCoordinatorRegistryCore as ContractArtifact,
+    ICoordinatorRegistryCore: ICoordinatorRegistryCore as ContractArtifact,
 };

contracts/coordinator/src/wrappers.ts

@@ -5,3 +5,15 @@
  */
 export * from '../generated-wrappers/coordinator';
 export * from '../generated-wrappers/coordinator_registry';
+export * from '../generated-wrappers/i_coordinator_approval_verifier';
+export * from '../generated-wrappers/i_coordinator_core';
+export * from '../generated-wrappers/i_coordinator_registry_core';
+export * from '../generated-wrappers/i_coordinator_signature_validator';
+export * from '../generated-wrappers/lib_constants';
+export * from '../generated-wrappers/lib_coordinator_approval';
+export * from '../generated-wrappers/lib_coordinator_rich_errors';
+export * from '../generated-wrappers/lib_e_i_p712_coordinator_domain';
+export * from '../generated-wrappers/mixin_coordinator_approval_verifier';
+export * from '../generated-wrappers/mixin_coordinator_core';
+export * from '../generated-wrappers/mixin_coordinator_registry_core';
+export * from '../generated-wrappers/mixin_signature_validator';

contracts/coordinator/test/coordinator.ts

@@ -1,523 +0,0 @@
-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

@@ -1,81 +1,72 @@
-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 { blockchainTests, expect, verifyEvents } from '@0x/contracts-test-utils';
 
-import { CoordinatorRegistryCoordinatorEndpointSetEventArgs } from '../src';
+import { artifacts, CoordinatorRegistryContract, 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', () => {
+blockchainTests.resets('Coordinator Registry tests', env => {
+    let coordinatorRegistry: CoordinatorRegistryContract;
     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();
+        const accounts = await env.getAccountAddressesAsync();
         [, coordinatorOperator] = accounts;
         // deploy coordinator registry
-        coordinatorRegistryWrapper = new CoordinatorRegistryWrapper(provider);
-        await coordinatorRegistryWrapper.deployCoordinatorRegistryAsync();
-    });
-    beforeEach(async () => {
-        await blockchainLifecycle.startAsync();
-    });
-    afterEach(async () => {
-        await blockchainLifecycle.revertAsync();
+        coordinatorRegistry = await CoordinatorRegistryContract.deployFrom0xArtifactAsync(
+            artifacts.CoordinatorRegistry,
+            env.provider,
+            env.txDefaults,
+            artifacts,
+        );
     });
     describe('core', () => {
         it('Should successfully set a Coordinator endpoint', async () => {
-            await coordinatorRegistryWrapper.setCoordinatorEndpointAsync(coordinatorOperator, coordinatorEndpoint);
-            const recordedCoordinatorEndpoint = await coordinatorRegistryWrapper.getCoordinatorEndpointAsync(
+            await coordinatorRegistry.setCoordinatorEndpoint.awaitTransactionSuccessAsync(coordinatorEndpoint, {
+                from: coordinatorOperator,
+            });
+            const recordedCoordinatorEndpoint = await coordinatorRegistry.getCoordinatorEndpoint.callAsync(
                 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(
+            await coordinatorRegistry.setCoordinatorEndpoint.awaitTransactionSuccessAsync(coordinatorEndpoint, {
+                from: coordinatorOperator,
+            });
+            let recordedCoordinatorEndpoint = await coordinatorRegistry.getCoordinatorEndpoint.callAsync(
                 coordinatorOperator,
             );
             expect(recordedCoordinatorEndpoint).to.be.equal(coordinatorEndpoint);
             // unset Coordinator endpoint
-            await coordinatorRegistryWrapper.setCoordinatorEndpointAsync(coordinatorOperator, nilCoordinatorEndpoint);
-            recordedCoordinatorEndpoint = await coordinatorRegistryWrapper.getCoordinatorEndpointAsync(
+            await coordinatorRegistry.setCoordinatorEndpoint.awaitTransactionSuccessAsync(nilCoordinatorEndpoint, {
+                from: coordinatorOperator,
+            });
+            recordedCoordinatorEndpoint = await coordinatorRegistry.getCoordinatorEndpoint.callAsync(
                 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,
+            const txReceipt = await coordinatorRegistry.setCoordinatorEndpoint.awaitTransactionSuccessAsync(
                 coordinatorEndpoint,
+                {
+                    from: coordinatorOperator,
+                },
             );
-            const recordedCoordinatorEndpoint = await coordinatorRegistryWrapper.getCoordinatorEndpointAsync(
+            const recordedCoordinatorEndpoint = await coordinatorRegistry.getCoordinatorEndpoint.callAsync(
                 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);
+            const expectedEvent: CoordinatorRegistryCoordinatorEndpointSetEventArgs = {
+                coordinatorOperator,
+                coordinatorEndpoint,
+            };
+            verifyEvents(txReceipt, [expectedEvent], 'CoordinatorEndpointSet');
         });
     });
 });

contracts/coordinator/test/libs.ts

@@ -1,78 +1,47 @@
-import { addressUtils, chaiSetup, constants, provider, txDefaults, web3Wrapper } from '@0x/contracts-test-utils';
-import { BlockchainLifecycle } from '@0x/dev-utils';
+import { blockchainTests, constants, expect, randomAddress } from '@0x/contracts-test-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', () => {
+blockchainTests.resets('Libs tests', env => {
     let coordinatorContract: CoordinatorContract;
-    const exchangeAddress = addressUtils.generatePseudoRandomAddress();
+    let chainId: number;
+    const exchangeAddress = randomAddress();
 
     before(async () => {
-        await blockchainLifecycle.startAsync();
-    });
-    after(async () => {
-        await blockchainLifecycle.revertAsync();
-    });
-    before(async () => {
+        chainId = await env.getChainIdAsync();
         coordinatorContract = await CoordinatorContract.deployFrom0xArtifactAsync(
             artifacts.Coordinator,
-            provider,
-            txDefaults,
+            env.provider,
+            env.txDefaults,
             artifacts,
             exchangeAddress,
+            new BigNumber(chainId),
         );
     });
-    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),
+                salt: constants.ZERO_AMOUNT,
+                gasPrice: constants.ZERO_AMOUNT,
+                expirationTimeSeconds: constants.ZERO_AMOUNT,
                 signerAddress: constants.NULL_ADDRESS,
                 data: '0x1234',
                 signature: '0x5678',
+                domain: {
+                    verifyingContract: exchangeAddress,
+                    chainId,
+                },
             };
-            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 expectedApprovalHash = hashUtils.getApprovalHashHex(signedTx, coordinatorContract.address, txOrigin);
             const approvalHash = await coordinatorContract.getCoordinatorApprovalHash.callAsync(approval);
             expect(expectedApprovalHash).to.eq(approvalHash);
         });

contracts/coordinator/test/mixins.ts

@@ -1,28 +1,21 @@
+import { constants as exchangeConstants, exchangeDataEncoder, ExchangeFunctionName } from '@0x/contracts-exchange';
 import {
-    addressUtils,
-    chaiSetup,
-    constants as devConstants,
-    expectContractCallFailedAsync,
-    getLatestBlockTimestampAsync,
-    provider,
+    blockchainTests,
+    constants,
+    expect,
+    hexConcat,
+    hexSlice,
+    randomAddress,
     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 { CoordinatorRevertErrors, transactionHashUtils } from '@0x/order-utils';
+import { SignatureType, SignedOrder } from '@0x/types';
+import { BigNumber, LibBytesRevertErrors } from '@0x/utils';
 
-import { ApprovalFactory, artifacts, constants, CoordinatorContract, exchangeDataEncoder } from '../src';
+import { ApprovalFactory, artifacts, CoordinatorContract } from '../src';
 
-chaiSetup.configure();
-const expect = chai.expect;
-const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
-
-describe('Mixins tests', () => {
+blockchainTests.resets('Mixins tests', env => {
+    let chainId: number;
     let transactionSignerAddress: string;
     let approvalSignerAddress1: string;
     let approvalSignerAddress2: string;
@@ -31,152 +24,183 @@ describe('Mixins tests', () => {
     let approvalFactory1: ApprovalFactory;
     let approvalFactory2: ApprovalFactory;
     let defaultOrder: SignedOrder;
-    const exchangeAddress = addressUtils.generatePseudoRandomAddress();
+    const exchangeAddress = randomAddress();
 
     before(async () => {
-        await blockchainLifecycle.startAsync();
-    });
-    after(async () => {
-        await blockchainLifecycle.revertAsync();
-    });
-    before(async () => {
+        chainId = await env.getChainIdAsync();
         mixins = await CoordinatorContract.deployFrom0xArtifactAsync(
             artifacts.Coordinator,
-            provider,
-            txDefaults,
+            env.provider,
+            env.txDefaults,
             artifacts,
             exchangeAddress,
+            new BigNumber(chainId),
         );
-        const accounts = await web3Wrapper.getAvailableAddressesAsync();
-        [transactionSignerAddress, approvalSignerAddress1, approvalSignerAddress2] = accounts.slice(0, 3);
+        const accounts = await env.getAccountAddressesAsync();
+        [transactionSignerAddress, approvalSignerAddress1, approvalSignerAddress2] = accounts;
         defaultOrder = {
-            exchangeAddress: devConstants.NULL_ADDRESS,
-            makerAddress: devConstants.NULL_ADDRESS,
-            takerAddress: devConstants.NULL_ADDRESS,
+            makerAddress: constants.NULL_ADDRESS,
+            takerAddress: constants.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,
+            makerAssetData: constants.NULL_BYTES,
+            takerAssetData: constants.NULL_BYTES,
+            makerAssetAmount: constants.ZERO_AMOUNT,
+            takerAssetAmount: constants.ZERO_AMOUNT,
+            makerFee: constants.ZERO_AMOUNT,
+            takerFee: constants.ZERO_AMOUNT,
+            makerFeeAssetData: constants.NULL_BYTES,
+            takerFeeAssetData: constants.NULL_BYTES,
+            expirationTimeSeconds: constants.ZERO_AMOUNT,
+            salt: constants.ZERO_AMOUNT,
+            signature: constants.NULL_BYTES,
+            exchangeAddress: constants.NULL_ADDRESS,
+            chainId,
         };
-        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);
+        const transactionSignerPrivateKey = constants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(transactionSignerAddress)];
+        const approvalSignerPrivateKey1 = constants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(approvalSignerAddress1)];
+        const approvalSignerPrivateKey2 = constants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(approvalSignerAddress2)];
+        transactionFactory = new TransactionFactory(transactionSignerPrivateKey, exchangeAddress, chainId);
         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 data = constants.NULL_BYTES;
+            const transaction = await transactionFactory.newSignedTransactionAsync({ 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 data = constants.NULL_BYTES;
+            const transaction = await transactionFactory.newSignedTransactionAsync({ 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 data = constants.NULL_BYTES;
+            const transaction = await transactionFactory.newSignedTransactionAsync({ data });
+            transaction.signature = hexConcat(
+                hexSlice(transaction.signature, 0, transaction.signature.length - 1),
+                SignatureType.Illegal,
+            );
             const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
-            expectContractCallFailedAsync(
-                mixins.getSignerAddress.callAsync(transactionHash, transaction.signature),
-                RevertReason.SignatureIllegal,
+            expect(mixins.getSignerAddress.callAsync(transactionHash, transaction.signature)).to.revertWith(
+                new CoordinatorRevertErrors.SignatureError(
+                    CoordinatorRevertErrors.SignatureErrorCodes.Illegal,
+                    transactionHash,
+                    transaction.signature,
+                ),
             );
         });
         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 data = constants.NULL_BYTES;
+            const transaction = await transactionFactory.newSignedTransactionAsync({ data });
+            transaction.signature = hexConcat(SignatureType.Invalid);
             const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
-            expectContractCallFailedAsync(
-                mixins.getSignerAddress.callAsync(transactionHash, transaction.signature),
-                RevertReason.SignatureInvalid,
+            expect(mixins.getSignerAddress.callAsync(transactionHash, transaction.signature)).to.revertWith(
+                new CoordinatorRevertErrors.SignatureError(
+                    CoordinatorRevertErrors.SignatureErrorCodes.Invalid,
+                    transactionHash,
+                    transaction.signature,
+                ),
             );
         });
-        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}`;
+        it('should revert with with a signature type that equals `NSignatureTypes`', async () => {
+            const data = constants.NULL_BYTES;
+            const transaction = await transactionFactory.newSignedTransactionAsync({ data });
+            transaction.signature = hexConcat(
+                hexSlice(transaction.signature, 0, transaction.signature.length - 1),
+                SignatureType.NSignatureTypes,
+            );
             const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
-            expectContractCallFailedAsync(
-                mixins.getSignerAddress.callAsync(transactionHash, transaction.signature),
-                RevertReason.SignatureUnsupported,
+            expect(mixins.getSignerAddress.callAsync(transactionHash, transaction.signature)).to.revertWith(
+                new CoordinatorRevertErrors.SignatureError(
+                    CoordinatorRevertErrors.SignatureErrorCodes.Unsupported,
+                    transactionHash,
+                    transaction.signature,
+                ),
+            );
+        });
+        it("should revert with with a signature type that isn't supported", async () => {
+            const data = constants.NULL_BYTES;
+            const transaction = await transactionFactory.newSignedTransactionAsync({ data });
+            transaction.signature = hexConcat(
+                hexSlice(transaction.signature, 0, transaction.signature.length - 1),
+                SignatureType.Wallet,
+            );
+            const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
+            expect(mixins.getSignerAddress.callAsync(transactionHash, transaction.signature)).to.revertWith(
+                new CoordinatorRevertErrors.SignatureError(
+                    CoordinatorRevertErrors.SignatureErrorCodes.Unsupported,
+                    transactionHash,
+                    transaction.signature,
+                ),
             );
         });
     });
 
     describe('decodeOrdersFromFillData', () => {
-        for (const fnName of constants.SINGLE_FILL_FN_NAMES) {
+        for (const fnName of exchangeConstants.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,
+                    signature: constants.NULL_BYTES,
+                    exchangeAddress: constants.NULL_ADDRESS,
+                    chainId,
                 }));
                 expect(orders).to.deep.eq(decodedSignedOrders);
             });
         }
-        for (const fnName of constants.BATCH_FILL_FN_NAMES) {
+        for (const fnName of exchangeConstants.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,
+                    signature: constants.NULL_BYTES,
+                    exchangeAddress: constants.NULL_ADDRESS,
+                    chainId,
                 }));
                 expect(orders).to.deep.eq(decodedSignedOrders);
             });
         }
-        for (const fnName of constants.MARKET_FILL_FN_NAMES) {
+        for (const fnName of exchangeConstants.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,
+                    signature: constants.NULL_BYTES,
+                    exchangeAddress: constants.NULL_ADDRESS,
+                    chainId,
                 }));
                 expect(orders).to.deep.eq(decodedSignedOrders);
             });
         }
-        for (const fnName of [constants.CANCEL_ORDER, constants.BATCH_CANCEL_ORDERS, constants.CANCEL_ORDERS_UP_TO]) {
+        for (const fnName of exchangeConstants.MATCH_ORDER_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,
+                    signature: constants.NULL_BYTES,
+                    exchangeAddress: constants.NULL_ADDRESS,
+                    chainId,
+                }));
+                expect(orders).to.deep.eq(decodedSignedOrders);
+            });
+        }
+        for (const fnName of exchangeConstants.CANCEL_ORDER_FN_NAMES) {
             it(`should correctly decode the orders for ${fnName} data`, async () => {
                 const orders = [defaultOrder, defaultOrder];
                 const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
@@ -193,534 +217,369 @@ describe('Mixins tests', () => {
         });
         it('should revert if data is less than 4 bytes long', async () => {
             const data = '0x010203';
-            await expectContractCallFailedAsync(
-                mixins.decodeOrdersFromFillData.callAsync(data),
-                RevertReason.LibBytesGreaterOrEqualTo4LengthRequired,
+            const expectedError = new LibBytesRevertErrors.InvalidByteOperationError(
+                LibBytesRevertErrors.InvalidByteOperationErrorCodes.LengthGreaterThanOrEqualsFourRequired,
+                new BigNumber(3), // the length of data
+                new BigNumber(4),
             );
+            return expect(mixins.decodeOrdersFromFillData.callAsync(data)).to.revertWith(expectedError);
         });
     });
 
     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 () => {
+        for (const fnName of exchangeConstants.SINGLE_FILL_FN_NAMES) {
+            it(`Should be successful: function=${fnName}, caller=tx_signer, senderAddress=[verifier], approval_sig=[approver1]`, 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 transaction = await transactionFactory.newSignedTransactionAsync({ data });
+                const approval = approvalFactory1.newSignedApproval(transaction, transactionSignerAddress);
                 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 () => {
+            it(`Should be successful: function=${fnName}, caller=tx_signer, senderAddress=[null], approval_sig=[approver1]`, async () => {
                 const order = {
                     ...defaultOrder,
-                    senderAddress: devConstants.NULL_ADDRESS,
+                    senderAddress: constants.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,
-                );
+                const transaction = await transactionFactory.newSignedTransactionAsync({ data });
+                const approval = approvalFactory1.newSignedApproval(transaction, transactionSignerAddress);
                 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 () => {
+            it(`Should be successful: function=${fnName}, caller=approver1, senderAddress=[verifier], approval_sig=[]`, async () => {
                 const orders = [defaultOrder];
                 const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
-                const transaction = transactionFactory.newSignedTransaction(data);
+                const transaction = await transactionFactory.newSignedTransactionAsync({ 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 () => {
+            it(`Should be successful: function=${fnName}, caller=approver1, senderAddress=[verifier], approval_sig=[approver1]`, 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 transaction = await transactionFactory.newSignedTransactionAsync({ data });
+                const approval = approvalFactory1.newSignedApproval(transaction, transactionSignerAddress);
                 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 () => {
+            it(`Should be successful: function=${fnName}, caller=approver1, senderAddress=[verifier], approval_sig=[]`, async () => {
                 const orders = [defaultOrder];
                 const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
-                const transaction = transactionFactory.newSignedTransaction(data);
+                const transaction = await transactionFactory.newSignedTransactionAsync({ 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 () => {
+            it(`Should revert: function=${fnName}, caller=tx_signer, senderAddress=[verifier], approval_sig=[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(
+                const transaction = await transactionFactory.newSignedTransactionAsync({ data });
+                const approval = approvalFactory1.newSignedApproval(transaction, transactionSignerAddress);
+                const signature = hexConcat(
+                    hexSlice(approval.signature, 0, 2),
+                    '0xFFFFFFFF',
+                    hexSlice(approval.signature, 6),
+                );
+                const tx = mixins.assertValidCoordinatorApprovals.callAsync(
                     transaction,
                     transactionSignerAddress,
-                    approvalExpirationTimeSeconds,
+                    transaction.signature,
+                    [signature],
+                    { from: transactionSignerAddress },
                 );
-                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,
+
+                const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
+                expect(tx).to.revertWith(
+                    new CoordinatorRevertErrors.InvalidApprovalSignatureError(transactionHash, approvalSignerAddress1),
                 );
             });
-            it(`Should revert: function=${fnName}, caller=tx_signer, senderAddress=[verifier], approval_sig=[approver1], expiration=[invalid]`, async () => {
+            it(`Should revert: function=${fnName}, caller=approver2, senderAddress=[verifier], approval_sig=[approver1]`, 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(
+                const transaction = await transactionFactory.newSignedTransactionAsync({ data });
+                const approval = approvalFactory1.newSignedApproval(transaction, transactionSignerAddress);
+
+                const tx = mixins.assertValidCoordinatorApprovals.callAsync(
                     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,
+                    transaction.signature,
+                    [approval.signature],
+                    { from: approvalSignerAddress2 },
                 );
+                expect(tx).to.revertWith(new CoordinatorRevertErrors.InvalidOriginError(transactionSignerAddress));
             });
         }
     });
     describe('Batch order approvals', () => {
         for (const fnName of [
-            ...constants.BATCH_FILL_FN_NAMES,
-            ...constants.MARKET_FILL_FN_NAMES,
-            constants.MATCH_ORDERS,
+            ...exchangeConstants.BATCH_FILL_FN_NAMES,
+            ...exchangeConstants.MARKET_FILL_FN_NAMES,
+            ...exchangeConstants.MATCH_ORDER_FN_NAMES,
         ]) {
-            it(`Should be successful: function=${fnName} caller=tx_signer, senderAddress=[verifier,verifier], feeRecipient=[approver1,approver1], approval_sig=[approver1], expiration=[valid]`, async () => {
+            it(`Should be successful: function=${fnName} caller=tx_signer, senderAddress=[verifier,verifier], feeRecipient=[approver1,approver1], approval_sig=[approver1]`, 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 transaction = await transactionFactory.newSignedTransactionAsync({ data });
+                const approval = approvalFactory1.newSignedApproval(transaction, transactionSignerAddress);
                 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 () => {
+            it(`Should be successful: function=${fnName} caller=tx_signer, senderAddress=[null,null], feeRecipient=[approver1,approver1], approval_sig=[approver1]`, async () => {
                 const orders = [defaultOrder, defaultOrder].map(order => ({
                     ...order,
-                    senderAddress: devConstants.NULL_ADDRESS,
+                    senderAddress: constants.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,
-                );
+                const transaction = await transactionFactory.newSignedTransactionAsync({ data });
+                const approval = approvalFactory1.newSignedApproval(transaction, transactionSignerAddress);
                 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 () => {
+            it(`Should be successful: function=${fnName} caller=tx_signer, senderAddress=[null,null], feeRecipient=[approver1,approver1], approval_sig=[]`, async () => {
                 const orders = [defaultOrder, defaultOrder].map(order => ({
                     ...order,
-                    senderAddress: devConstants.NULL_ADDRESS,
+                    senderAddress: constants.NULL_ADDRESS,
                 }));
                 const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
-                const transaction = transactionFactory.newSignedTransaction(data);
+                const transaction = await transactionFactory.newSignedTransactionAsync({ 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 }];
+            it(`Should be successful: function=${fnName} caller=tx_signer, senderAddress=[verifier,null], feeRecipient=[approver1,approver1], approval_sig=[approver1]`, async () => {
+                const orders = [defaultOrder, { ...defaultOrder, senderAddress: constants.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,
-                );
+                const transaction = await transactionFactory.newSignedTransactionAsync({ data });
+                const approval = approvalFactory1.newSignedApproval(transaction, transactionSignerAddress);
                 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 () => {
+            it(`Should be successful: function=${fnName} caller=tx_signer, senderAddress=[verifier,verifier], feeRecipient=[approver1,approver2], approval_sig=[approver1,approver2]`, 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 transaction = await transactionFactory.newSignedTransactionAsync({ data });
+                const approval1 = approvalFactory1.newSignedApproval(transaction, transactionSignerAddress);
+                const approval2 = approvalFactory2.newSignedApproval(transaction, transactionSignerAddress);
                 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 () => {
+            it(`Should be successful: function=${fnName} caller=approver1, senderAddress=[verifier,verifier], feeRecipient=[approver1,approver1], approval_sig=[]`, async () => {
                 const orders = [defaultOrder, defaultOrder];
                 const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
-                const transaction = transactionFactory.newSignedTransaction(data);
+                const transaction = await transactionFactory.newSignedTransactionAsync({ 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 () => {
+            it(`Should revert: function=${fnName} caller=approver1, senderAddress=[verifier,verifier], feeRecipient=[approver1,approver2], approval_sig=[approver2]`, 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(
+                const transaction = await transactionFactory.newSignedTransactionAsync({ data });
+                const approval2 = approvalFactory2.newSignedApproval(transaction, transactionSignerAddress);
+
+                const tx = mixins.assertValidCoordinatorApprovals.callAsync(
                     transaction,
                     transactionSignerAddress,
-                    approvalExpirationTimeSeconds,
-                );
-                expectContractCallFailedAsync(
-                    mixins.assertValidCoordinatorApprovals.callAsync(
-                        transaction,
-                        transactionSignerAddress,
-                        transaction.signature,
-                        [approvalExpirationTimeSeconds],
-                        [approval2.signature],
-                        { from: approvalSignerAddress1 },
-                    ),
-                    RevertReason.InvalidOrigin,
+                    transaction.signature,
+                    [approval2.signature],
+                    { from: approvalSignerAddress1 },
                 );
+                expect(tx).to.revertWith(new CoordinatorRevertErrors.InvalidOriginError(transactionSignerAddress));
             });
-            it(`Should revert: function=${fnName} caller=tx_signer, senderAddress=[verifier,verifier], feeRecipient=[approver1, approver1], approval_sig=[], expiration=[]`, async () => {
+            it(`Should revert: function=${fnName} caller=tx_signer, senderAddress=[verifier,verifier], feeRecipient=[approver1, approver1], approval_sig=[]`, 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,
+                const transaction = await transactionFactory.newSignedTransactionAsync({ data });
+                const tx = mixins.assertValidCoordinatorApprovals.callAsync(
+                    transaction,
+                    transactionSignerAddress,
+                    transaction.signature,
+                    [],
+                    { from: transactionSignerAddress },
+                );
+
+                const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
+                expect(tx).to.revertWith(
+                    new CoordinatorRevertErrors.InvalidApprovalSignatureError(transactionHash, approvalSignerAddress1),
                 );
             });
-            it(`Should revert: function=${fnName} caller=tx_signer, senderAddress=[verifier,verifier], feeRecipient=[approver1, approver1], approval_sig=[invalid], expiration=[valid]`, async () => {
+            it(`Should revert: function=${fnName} caller=tx_signer, senderAddress=[verifier,verifier], feeRecipient=[approver1, approver1], approval_sig=[invalid]`, 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(
+                const transaction = await transactionFactory.newSignedTransactionAsync({ data });
+                const approval = approvalFactory1.newSignedApproval(transaction, transactionSignerAddress);
+                const signature = hexConcat(
+                    hexSlice(approval.signature, 0, 2),
+                    '0xFFFFFFFF',
+                    hexSlice(approval.signature, 6),
+                );
+                const tx = mixins.assertValidCoordinatorApprovals.callAsync(
                     transaction,
                     transactionSignerAddress,
-                    approvalExpirationTimeSeconds,
+                    transaction.signature,
+                    [signature],
+                    { from: transactionSignerAddress },
                 );
-                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,
+
+                const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
+                expect(tx).to.revertWith(
+                    new CoordinatorRevertErrors.InvalidApprovalSignatureError(transactionHash, approvalSignerAddress1),
                 );
             });
-            it(`Should revert: function=${fnName} caller=tx_signer, senderAddress=[verifier,verifier], feeRecipient=[approver1, approver2], approval_sig=[valid,invalid], expiration=[valid,valid]`, async () => {
+            it(`Should revert: function=${fnName} caller=tx_signer, senderAddress=[verifier,verifier], feeRecipient=[approver1, approver2], approval_sig=[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 approvalExpirationTimeSeconds = new BigNumber(currentTimestamp).plus(constants.TIME_BUFFER);
-                const approval1 = approvalFactory1.newSignedApproval(
+                const transaction = await transactionFactory.newSignedTransactionAsync({ data });
+                const approval1 = approvalFactory1.newSignedApproval(transaction, transactionSignerAddress);
+                const approval2 = approvalFactory2.newSignedApproval(transaction, transactionSignerAddress);
+                const approvalSignature2 = hexConcat(
+                    hexSlice(approval2.signature, 0, 2),
+                    '0xFFFFFFFF',
+                    hexSlice(approval2.signature, 6),
+                );
+                const tx = mixins.assertValidCoordinatorApprovals.callAsync(
                     transaction,
                     transactionSignerAddress,
-                    approvalExpirationTimeSeconds,
+                    transaction.signature,
+                    [approval1.signature, approvalSignature2],
+                    { from: transactionSignerAddress },
                 );
-                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,
+
+                const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
+                expect(tx).to.revertWith(
+                    new CoordinatorRevertErrors.InvalidApprovalSignatureError(transactionHash, approvalSignerAddress2),
                 );
             });
-            it(`Should revert: function=${fnName} caller=approver1, senderAddress=[verifier,verifier], feeRecipient=[approver1, approver2], approval_sig=[invalid], expiration=[valid]`, async () => {
+            it(`Should revert: function=${fnName} caller=approver1, senderAddress=[verifier,verifier], feeRecipient=[approver1, approver2], approval_sig=[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).plus(constants.TIME_BUFFER);
-                const approval2 = approvalFactory2.newSignedApproval(
-                    transaction,
-                    transactionSignerAddress,
-                    approvalExpirationTimeSeconds,
+                const transaction = await transactionFactory.newSignedTransactionAsync({ data });
+                const approval2 = approvalFactory2.newSignedApproval(transaction, transactionSignerAddress);
+                const approvalSignature2 = hexConcat(
+                    hexSlice(approval2.signature, 0, 2),
+                    '0xFFFFFFFF',
+                    hexSlice(approval2.signature, 6),
                 );
-                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,
+                const tx = mixins.assertValidCoordinatorApprovals.callAsync(
+                    transaction,
+                    approvalSignerAddress1,
+                    transaction.signature,
+                    [approvalSignature2],
+                    { from: approvalSignerAddress1 },
+                );
+
+                const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
+                expect(tx).to.revertWith(
+                    new CoordinatorRevertErrors.InvalidApprovalSignatureError(transactionHash, approvalSignerAddress2),
                 );
             });
-            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 () => {
+            it(`Should revert: function=${fnName} caller=approver2, senderAddress=[verifier,verifier], feeRecipient=[approver1, approver1], approval_sig=[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(
+                const transaction = await transactionFactory.newSignedTransactionAsync({ data });
+                const approval1 = approvalFactory1.newSignedApproval(transaction, transactionSignerAddress);
+
+                const tx = mixins.assertValidCoordinatorApprovals.callAsync(
                     transaction,
                     transactionSignerAddress,
-                    approvalExpirationTimeSeconds,
-                );
-                expectContractCallFailedAsync(
-                    mixins.assertValidCoordinatorApprovals.callAsync(
-                        transaction,
-                        transactionSignerAddress,
-                        transaction.signature,
-                        [approvalExpirationTimeSeconds],
-                        [approval1.signature],
-                        { from: approvalSignerAddress2 },
-                    ),
-                    RevertReason.InvalidOrigin,
+                    transaction.signature,
+                    [approval1.signature],
+                    { from: approvalSignerAddress2 },
                 );
+                expect(tx).to.revertWith(new CoordinatorRevertErrors.InvalidOriginError(transactionSignerAddress));
             });
         }
     });
     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);
+            const data = exchangeDataEncoder.encodeOrdersToExchangeData(ExchangeFunctionName.CancelOrder, orders);
+            const transaction = await transactionFactory.newSignedTransactionAsync({ 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);
+            const data = exchangeDataEncoder.encodeOrdersToExchangeData(ExchangeFunctionName.BatchCancelOrders, orders);
+            const transaction = await transactionFactory.newSignedTransactionAsync({ 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);
+            const data = exchangeDataEncoder.encodeOrdersToExchangeData(ExchangeFunctionName.CancelOrdersUpTo);
+            const transaction = await transactionFactory.newSignedTransactionAsync({ data });
             await mixins.assertValidCoordinatorApprovals.callAsync(
                 transaction,
                 transactionSignerAddress,
                 transaction.signature,
                 [],
-                [],
                 { from: transactionSignerAddress },
             );
         });

contracts/coordinator/test/utils/approval_factory.ts

@@ -1,7 +1,5 @@
-import { signingUtils } from '@0x/contracts-test-utils';
+import { hexConcat, 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';
 
@@ -9,29 +7,22 @@ export class ApprovalFactory {
     private readonly _privateKey: Buffer;
     private readonly _verifyingContractAddress: string;
 
-    constructor(privateKey: Buffer, verifyingContractAddress: string) {
+    constructor(privateKey: Buffer, verifyingContract: string) {
         this._privateKey = privateKey;
-        this._verifyingContractAddress = verifyingContractAddress;
+        this._verifyingContractAddress = verifyingContract;
     }
 
     public newSignedApproval(
         transaction: SignedZeroExTransaction,
         txOrigin: string,
-        approvalExpirationTimeSeconds: BigNumber,
         signatureType: SignatureType = SignatureType.EthSign,
     ): SignedCoordinatorApproval {
-        const approvalHashBuff = hashUtils.getApprovalHashBuffer(
-            transaction,
-            this._verifyingContractAddress,
-            txOrigin,
-            approvalExpirationTimeSeconds,
-        );
+        const approvalHashBuff = hashUtils.getApprovalHashBuffer(transaction, this._verifyingContractAddress, txOrigin);
         const signatureBuff = signingUtils.signMessage(approvalHashBuff, this._privateKey, signatureType);
         const signedApproval = {
             txOrigin,
             transaction,
-            approvalExpirationTimeSeconds,
-            signature: ethUtil.addHexPrefix(signatureBuff.toString('hex')),
+            signature: hexConcat(signatureBuff),
         };
         return signedApproval;
     }

contracts/coordinator/test/utils/constants.ts

@@ -1,12 +0,0 @@
-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

@@ -1,65 +0,0 @@
-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

@@ -1,47 +0,0 @@
-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

@@ -1,33 +1,16 @@
+import { hexConcat } from '@0x/contracts-test-utils';
 import { eip712Utils } from '@0x/order-utils';
 import { SignedZeroExTransaction } from '@0x/types';
-import { BigNumber, signTypedDataUtils } from '@0x/utils';
-import * as _ from 'lodash';
+import { signTypedDataUtils } from '@0x/utils';
 
 export const hashUtils = {
-    getApprovalHashBuffer(
-        transaction: SignedZeroExTransaction,
-        verifyingContractAddress: string,
-        txOrigin: string,
-        approvalExpirationTimeSeconds: BigNumber,
-    ): Buffer {
-        const typedData = eip712Utils.createCoordinatorApprovalTypedData(
-            transaction,
-            verifyingContractAddress,
-            txOrigin,
-            approvalExpirationTimeSeconds,
-        );
+    getApprovalHashBuffer(transaction: SignedZeroExTransaction, verifyingContract: string, txOrigin: string): Buffer {
+        const typedData = eip712Utils.createCoordinatorApprovalTypedData(transaction, verifyingContract, txOrigin);
         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')}`;
+    getApprovalHashHex(transaction: SignedZeroExTransaction, verifyingContract: string, txOrigin: string): string {
+        const hashHex = hexConcat(hashUtils.getApprovalHashBuffer(transaction, verifyingContract, txOrigin));
         return hashHex;
     },
 };

contracts/coordinator/test/utils/index.ts

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

contracts/coordinator/test/utils/types.ts

@@ -1,10 +1,8 @@
 import { SignedZeroExTransaction } from '@0x/types';
-import { BigNumber } from '@0x/utils';
 
 export interface CoordinatorApproval {
     transaction: SignedZeroExTransaction;
     txOrigin: string;
-    approvalExpirationTimeSeconds: BigNumber;
 }
 
 export interface SignedCoordinatorApproval extends CoordinatorApproval {

contracts/coordinator/truffle-config.js

@@ -0,0 +1,96 @@
+/**
+ * Use this file to configure your truffle project. It's seeded with some
+ * common settings for different networks and features like migrations,
+ * compilation and testing. Uncomment the ones you need or modify
+ * them to suit your project as necessary.
+ *
+ * More information about configuration can be found at:
+ *
+ * truffleframework.com/docs/advanced/configuration
+ *
+ * To deploy via Infura you'll need a wallet provider (like truffle-hdwallet-provider)
+ * to sign your transactions before they're sent to a remote public node. Infura accounts
+ * are available for free at: infura.io/register.
+ *
+ * You'll also need a mnemonic - the twelve word phrase the wallet uses to generate
+ * public/private key pairs. If you're publishing your code to GitHub make sure you load this
+ * phrase from a file you've .gitignored so it doesn't accidentally become public.
+ *
+ */
+
+// const HDWalletProvider = require('truffle-hdwallet-provider');
+// const infuraKey = "fj4jll3k.....";
+//
+// const fs = require('fs');
+// const mnemonic = fs.readFileSync(".secret").toString().trim();
+
+module.exports = {
+    /**
+     * Networks define how you connect to your ethereum client and let you set the
+     * defaults web3 uses to send transactions. If you don't specify one truffle
+     * will spin up a development blockchain for you on port 9545 when you
+     * run `develop` or `test`. You can ask a truffle command to use a specific
+     * network from the command line, e.g
+     *
+     * $ truffle test --network <network-name>
+     */
+
+    networks: {
+        // Useful for testing. The `development` name is special - truffle uses it by default
+        // if it's defined here and no other network is specified at the command line.
+        // You should run a client (like ganache-cli, geth or parity) in a separate terminal
+        // tab if you use this network and you must also set the `host`, `port` and `network_id`
+        // options below to some value.
+        //
+        // development: {
+        //  host: "127.0.0.1",     // Localhost (default: none)
+        //  port: 8545,            // Standard Ethereum port (default: none)
+        //  network_id: "*",       // Any network (default: none)
+        // },
+        // Another network with more advanced options...
+        // advanced: {
+        // port: 8777,             // Custom port
+        // network_id: 1342,       // Custom network
+        // gas: 8500000,           // Gas sent with each transaction (default: ~6700000)
+        // gasPrice: 20000000000,  // 20 gwei (in wei) (default: 100 gwei)
+        // from: <address>,        // Account to send txs from (default: accounts[0])
+        // websockets: true        // Enable EventEmitter interface for web3 (default: false)
+        // },
+        // Useful for deploying to a public network.
+        // NB: It's important to wrap the provider as a function.
+        // ropsten: {
+        // provider: () => new HDWalletProvider(mnemonic, `https://ropsten.infura.io/v3/YOUR-PROJECT-ID`),
+        // network_id: 3,       // Ropsten's id
+        // gas: 5500000,        // Ropsten has a lower block limit than mainnet
+        // confirmations: 2,    // # of confs to wait between deployments. (default: 0)
+        // timeoutBlocks: 200,  // # of blocks before a deployment times out  (minimum/default: 50)
+        // skipDryRun: true     // Skip dry run before migrations? (default: false for public nets )
+        // },
+        // Useful for private networks
+        // private: {
+        // provider: () => new HDWalletProvider(mnemonic, `https://network.io`),
+        // network_id: 2111,   // This network is yours, in the cloud.
+        // production: true    // Treats this network as if it was a public net. (default: false)
+        // }
+    },
+
+    // Set default mocha options here, use special reporters etc.
+    mocha: {
+        // timeout: 100000
+    },
+
+    // Configure your compilers
+    compilers: {
+        solc: {
+            version: '0.5.9',
+            settings: {
+                evmVersion: 'constantinople',
+                optimizer: {
+                    enabled: true,
+                    runs: 1000000,
+                    details: { yul: true, deduplicate: true, cse: true, constantOptimizer: true },
+                },
+            },
+        },
+    },
+};

contracts/coordinator/tsconfig.json

@@ -2,6 +2,21 @@
     "extends": "../../tsconfig",
     "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
     "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
-    "files": ["generated-artifacts/Coordinator.json", "generated-artifacts/CoordinatorRegistry.json"],
+    "files": [
+        "generated-artifacts/Coordinator.json",
+        "generated-artifacts/CoordinatorRegistry.json",
+        "generated-artifacts/ICoordinatorApprovalVerifier.json",
+        "generated-artifacts/ICoordinatorCore.json",
+        "generated-artifacts/ICoordinatorRegistryCore.json",
+        "generated-artifacts/ICoordinatorSignatureValidator.json",
+        "generated-artifacts/LibConstants.json",
+        "generated-artifacts/LibCoordinatorApproval.json",
+        "generated-artifacts/LibCoordinatorRichErrors.json",
+        "generated-artifacts/LibEIP712CoordinatorDomain.json",
+        "generated-artifacts/MixinCoordinatorApprovalVerifier.json",
+        "generated-artifacts/MixinCoordinatorCore.json",
+        "generated-artifacts/MixinCoordinatorRegistryCore.json",
+        "generated-artifacts/MixinSignatureValidator.json"
+    ],
     "exclude": ["./deploy/solc/solc_bin"]
 }

contracts/dev-utils/CHANGELOG.json

@@ -1,4 +1,67 @@
 [
+    {
+        "version": "0.1.0-beta.1",
+        "changes": [
+            {
+                "note": "Add `encodeStaticCallAssetData` and `decodeStaticCallAssetData` in LibAssetData",
+                "pr": 2034
+            },
+            {
+                "note": "Add `revertIfInvalidAssetData` in LibAssetData",
+                "pr": 2034
+            }
+        ],
+        "timestamp": 1573159180
+    },
+    {
+        "version": "0.1.0-beta.0",
+        "changes": [
+            {
+                "note": "Use built in selectors instead of hard coded constants",
+                "pr": 2055
+            },
+            {
+                "note": "Compile and export all contracts, artifacts, and wrappers by default",
+                "pr": 2055
+            },
+            {
+                "note": "Add `marketBuy/SellOrdersNoThrow` and `marketBuy/SellOrdersFillOrKill` to `LibTransactionDecoder`.",
+                "pr": 2075
+            },
+            {
+                "note": "`run_mocha` package script runs with `UNLIMITED_CONTRACT_SIZE=true` environment variable.",
+                "pr": 2075
+            }
+        ],
+        "timestamp": 1570135330
+    },
+    {
+        "timestamp": 1568744790,
+        "version": "0.0.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1567521715,
+        "version": "0.0.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1566446343,
+        "version": "0.0.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1565296576,
         "version": "0.0.7",
@@ -89,6 +152,14 @@
             {
                 "note": "Add support for StaticCallProxy",
                 "pr": 1863
+            },
+            {
+                "note": "Add `OrderTransferSimulationUtils` contract for simulating order transfers on-chain",
+                "pr": 1868
+            },
+            {
+                "note": "Updated to use the new rich error pattern from @0x/contracts-exchange",
+                "pr": 1913
             }
         ]
     }

contracts/dev-utils/CHANGELOG.md

@@ -5,6 +5,30 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.1.0-beta.1 - _November 7, 2019_
+
+    * Add `encodeStaticCallAssetData` and `decodeStaticCallAssetData` in LibAssetData (#2034)
+    * Add `revertIfInvalidAssetData` in LibAssetData (#2034)
+
+## v0.1.0-beta.0 - _October 3, 2019_
+
+    * Use built in selectors instead of hard coded constants (#2055)
+    * Compile and export all contracts, artifacts, and wrappers by default (#2055)
+    * Add `marketBuy/SellOrdersNoThrow` and `marketBuy/SellOrdersFillOrKill` to `LibTransactionDecoder`. (#2075)
+    * `run_mocha` package script runs with `UNLIMITED_CONTRACT_SIZE=true` environment variable. (#2075)
+
+## v0.0.10 - _September 17, 2019_
+
+    * Dependencies updated
+
+## v0.0.9 - _September 3, 2019_
+
+    * Dependencies updated
+
+## v0.0.8 - _August 22, 2019_
+
+    * Dependencies updated
+
 ## v0.0.7 - _August 8, 2019_
 
     * Dependencies updated
@@ -41,3 +65,5 @@ CHANGELOG
     * Refactor `LibAssetData` balance/allowance checks to never revert (#1848)
     * Refactor `OrderValidationUtils` to calculate `fillableTakerAssetAmount` (#1848)
     * Add support for StaticCallProxy (#1863)
+    * Add `OrderTransferSimulationUtils` contract for simulating order transfers on-chain (#1868)
+    * Updated to use the new rich error pattern from @0x/contracts-exchange (#1913)

contracts/dev-utils/README.md

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

contracts/dev-utils/compiler.json

@@ -7,7 +7,7 @@
         "evmVersion": "constantinople",
         "optimizer": {
             "enabled": true,
-            "runs": 1000000,
+            "runs": 10000,
             "details": { "yul": true, "deduplicate": true, "cse": true, "constantOptimizer": true }
         },
         "outputSelection": {
@@ -22,11 +22,5 @@
                 ]
             }
         }
-    },
-    "contracts": [
-        "src/DevUtils.sol",
-        "src/LibAssetData.sol",
-        "src/LibTransactionDecoder.sol",
-        "src/EthBalanceChecker.sol"
-    ]
+    }
 }

contracts/dev-utils/contracts/src/DevUtils.sol

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.
@@ -20,6 +20,7 @@ pragma solidity ^0.5.5;
 pragma experimental ABIEncoderV2;
 
 import "./OrderValidationUtils.sol";
+import "./OrderTransferSimulationUtils.sol";
 import "./LibTransactionDecoder.sol";
 import "./EthBalanceChecker.sol";
 
@@ -28,10 +29,12 @@ import "./EthBalanceChecker.sol";
 contract DevUtils is
     OrderValidationUtils,
     LibTransactionDecoder,
-    EthBalanceChecker
+    EthBalanceChecker,
+    OrderTransferSimulationUtils
 {
-    constructor (address _exchange, bytes memory _zrxAssetData)
+    constructor (address _exchange)
         public
-        OrderValidationUtils(_exchange, _zrxAssetData)
+        OrderValidationUtils(_exchange)
+        OrderTransferSimulationUtils(_exchange)
     {}
 }

contracts/dev-utils/contracts/src/EthBalanceChecker.sol

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2018 ZeroEx Intl.
+  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.

contracts/dev-utils/contracts/src/LibAssetData.sol

@@ -20,32 +20,19 @@ pragma solidity ^0.5.5;
 pragma experimental ABIEncoderV2;
 
 import "@0x/contracts-utils/contracts/src/LibBytes.sol";
-import "@0x/contracts-asset-proxy/contracts/src/libs/LibAssetProxyIds.sol";
 import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
+import "@0x/contracts-asset-proxy/contracts/src/interfaces/IAssetData.sol";
+import "@0x/contracts-asset-proxy/contracts/src/interfaces/IAssetProxy.sol";
+import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
+import "@0x/contracts-erc721/contracts/src/interfaces/IERC721Token.sol";
+import "@0x/contracts-erc1155/contracts/src/interfaces/IERC1155.sol";
 
 
-contract LibAssetData is
-    LibAssetProxyIds
-{
+contract LibAssetData {
+
     // 2^256 - 1
     uint256 constant internal _MAX_UINT256 = uint256(-1);
 
-    // ERC20 selectors
-    bytes4 constant internal _ERC20_BALANCE_OF_SELECTOR = 0x70a08231;
-    bytes4 constant internal _ERC20_ALLOWANCE_SELECTOR = 0xdd62ed3e;
-
-    // ERC721 selectors
-    bytes4 constant internal _ERC721_OWNER_OF_SELECTOR = 0x6352211e;
-    bytes4 constant internal _ERC721_IS_APPROVED_FOR_ALL_SELECTOR = 0xe985e9c5;
-    bytes4 constant internal _ERC721_GET_APPROVED_SELECTOR = 0x081812fc;
-
-    // ERC1155 selectors
-    bytes4 constant internal _ERC1155_BALANCE_OF_SELECTOR = 0x00fdd58e;
-    bytes4 constant internal _ERC1155_IS_APPROVED_FOR_ALL_SELECTOR = 0xe985e9c5;
-
-    // `transferFrom` selector for all AssetProxy contracts
-    bytes4 constant internal _ASSET_PROXY_TRANSFER_FROM_SELECTOR = 0xa85e59e4;
-
     using LibBytes for bytes;
 
     // solhint-disable var-name-mixedcase
@@ -60,10 +47,10 @@ contract LibAssetData is
         public
     {
         _EXCHANGE = IExchange(_exchange);
-        _ERC20_PROXY_ADDRESS = _EXCHANGE.getAssetProxy(ERC20_PROXY_ID);
-        _ERC721_PROXY_ADDRESS = _EXCHANGE.getAssetProxy(ERC721_PROXY_ID);
-        _ERC1155_PROXY_ADDRESS = _EXCHANGE.getAssetProxy(ERC1155_PROXY_ID);
-        _STATIC_CALL_PROXY_ADDRESS = _EXCHANGE.getAssetProxy(STATIC_CALL_PROXY_ID);
+        _ERC20_PROXY_ADDRESS = _EXCHANGE.getAssetProxy(IAssetData(address(0)).ERC20Token.selector);
+        _ERC721_PROXY_ADDRESS = _EXCHANGE.getAssetProxy(IAssetData(address(0)).ERC721Token.selector);
+        _ERC1155_PROXY_ADDRESS = _EXCHANGE.getAssetProxy(IAssetData(address(0)).ERC1155Assets.selector);
+        _STATIC_CALL_PROXY_ADDRESS = _EXCHANGE.getAssetProxy(IAssetData(address(0)).StaticCall.selector);
     }
 
     /// @dev Returns the owner's balance of the assets(s) specified in
@@ -81,23 +68,33 @@ contract LibAssetData is
         // Get id of AssetProxy contract
         bytes4 assetProxyId = assetData.readBytes4(0);
 
-        if (assetProxyId == ERC20_PROXY_ID) {
+        if (assetProxyId == IAssetData(address(0)).ERC20Token.selector) {
             // Get ERC20 token address
             address tokenAddress = assetData.readAddress(16);
 
             // Encode data for `balanceOf(ownerAddress)`
-            bytes memory balanceOfData = abi.encodeWithSelector(_ERC20_BALANCE_OF_SELECTOR, ownerAddress);
+            bytes memory balanceOfData = abi.encodeWithSelector(
+                IERC20Token(address(0)).balanceOf.selector,
+                ownerAddress
+            );
 
             // Query balance
             (bool success, bytes memory returnData) = tokenAddress.staticcall(balanceOfData);
             balance = success && returnData.length == 32 ? returnData.readUint256(0) : 0;
-        } else if (assetProxyId == ERC721_PROXY_ID) {
+        } else if (assetProxyId == IAssetData(address(0)).ERC721Token.selector) {
             // Get ERC721 token address and id
             (, address tokenAddress, uint256 tokenId) = decodeERC721AssetData(assetData);
 
             // Check if id is owned by ownerAddress
-            balance = getERC721TokenOwner(tokenAddress, tokenId) == ownerAddress ? 1 : 0;
-        } else if (assetProxyId == ERC1155_PROXY_ID) {
+            bytes memory ownerOfCalldata = abi.encodeWithSelector(
+                IERC721Token(address(0)).ownerOf.selector,
+                tokenId
+            );
+
+            (bool success, bytes memory returnData) = tokenAddress.staticcall(ownerOfCalldata);
+            address currentOwnerAddress = (success && returnData.length == 32) ? returnData.readAddress(12) : address(0);
+            balance = currentOwnerAddress == ownerAddress ? 1 : 0;
+        } else if (assetProxyId == IAssetData(address(0)).ERC1155Assets.selector) {
             // Get ERC1155 token address, array of ids, and array of values
             (, address tokenAddress, uint256[] memory tokenIds, uint256[] memory tokenValues,) = decodeERC1155AssetData(assetData);
 
@@ -105,7 +102,7 @@ contract LibAssetData is
             for (uint256 i = 0; i != length; i++) {
                 // Encode data for `balanceOf(ownerAddress, tokenIds[i])
                 bytes memory balanceOfData = abi.encodeWithSelector(
-                    _ERC1155_BALANCE_OF_SELECTOR,
+                    IERC1155(address(0)).balanceOf.selector,
                     ownerAddress,
                     tokenIds[i]
                 );
@@ -120,10 +117,10 @@ contract LibAssetData is
                     balance = scaledBalance;
                 }
             }
-        } else if (assetProxyId == STATIC_CALL_PROXY_ID) {
+        } else if (assetProxyId == IAssetData(address(0)).StaticCall.selector) {
             // Encode data for `staticCallProxy.transferFrom(assetData,...)`
             bytes memory transferFromData = abi.encodeWithSelector(
-                _ASSET_PROXY_TRANSFER_FROM_SELECTOR,
+                IAssetProxy(address(0)).transferFrom.selector,
                 assetData,
                 address(0),  // `from` address is not used
                 address(0),  // `to` address is not used
@@ -135,7 +132,7 @@ contract LibAssetData is
 
             // Success means that the staticcall can be made an unlimited amount of times
             balance = success ? _MAX_UINT256 : 0;
-        } else if (assetProxyId == MULTI_ASSET_PROXY_ID) {
+        } else if (assetProxyId == IAssetData(address(0)).MultiAsset.selector) {
             // Get array of values and array of assetDatas
             (, uint256[] memory assetAmounts, bytes[] memory nestedAssetData) = decodeMultiAssetData(assetData);
 
@@ -190,7 +187,7 @@ contract LibAssetData is
         // Get id of AssetProxy contract
         bytes4 assetProxyId = assetData.readBytes4(0);
 
-        if (assetProxyId == MULTI_ASSET_PROXY_ID) {
+        if (assetProxyId == IAssetData(address(0)).MultiAsset.selector) {
             // Get array of values and array of assetDatas
             (, uint256[] memory amounts, bytes[] memory nestedAssetData) = decodeMultiAssetData(assetData);
 
@@ -208,13 +205,13 @@ contract LibAssetData is
             return allowance;
         }
 
-        if (assetProxyId == ERC20_PROXY_ID) {
+        if (assetProxyId == IAssetData(address(0)).ERC20Token.selector) {
             // Get ERC20 token address
             address tokenAddress = assetData.readAddress(16);
 
             // Encode data for `allowance(ownerAddress, _ERC20_PROXY_ADDRESS)`
             bytes memory allowanceData = abi.encodeWithSelector(
-                _ERC20_ALLOWANCE_SELECTOR,
+                IERC20Token(address(0)).allowance.selector,
                 ownerAddress,
                 _ERC20_PROXY_ADDRESS
             );
@@ -222,13 +219,13 @@ contract LibAssetData is
             // Query allowance
             (bool success, bytes memory returnData) = tokenAddress.staticcall(allowanceData);
             allowance = success && returnData.length == 32 ? returnData.readUint256(0) : 0;
-        } else if (assetProxyId == ERC721_PROXY_ID) {
+        } else if (assetProxyId == IAssetData(address(0)).ERC721Token.selector) {
             // Get ERC721 token address and id
             (, address tokenAddress, uint256 tokenId) = decodeERC721AssetData(assetData);
 
             // Encode data for `isApprovedForAll(ownerAddress, _ERC721_PROXY_ADDRESS)`
             bytes memory isApprovedForAllData = abi.encodeWithSelector(
-                _ERC721_IS_APPROVED_FOR_ALL_SELECTOR,
+                IERC721Token(address(0)).isApprovedForAll.selector,
                 ownerAddress,
                 _ERC721_PROXY_ADDRESS
             );
@@ -238,7 +235,7 @@ contract LibAssetData is
             // If not approved for all, call `getApproved(tokenId)`
             if (!success || returnData.length != 32 || returnData.readUint256(0) != 1) {
                 // Encode data for `getApproved(tokenId)`
-                bytes memory getApprovedData = abi.encodeWithSelector(_ERC721_GET_APPROVED_SELECTOR, tokenId);
+                bytes memory getApprovedData = abi.encodeWithSelector(IERC721Token(address(0)).getApproved.selector, tokenId);
                 (success, returnData) = tokenAddress.staticcall(getApprovedData);
 
                 // Allowance is 1 if successful and the approved address is the ERC721Proxy
@@ -247,13 +244,13 @@ contract LibAssetData is
                 // Allowance is 2^256 - 1 if `isApprovedForAll` returned true
                 allowance = _MAX_UINT256;
             }
-        } else if (assetProxyId == ERC1155_PROXY_ID) {
+        } else if (assetProxyId == IAssetData(address(0)).ERC1155Assets.selector) {
             // Get ERC1155 token address
             (, address tokenAddress, , , ) = decodeERC1155AssetData(assetData);
 
             // Encode data for `isApprovedForAll(ownerAddress, _ERC1155_PROXY_ADDRESS)`
             bytes memory isApprovedForAllData = abi.encodeWithSelector(
-                _ERC1155_IS_APPROVED_FOR_ALL_SELECTOR,
+                IERC1155(address(0)).isApprovedForAll.selector,
                 ownerAddress,
                 _ERC1155_PROXY_ADDRESS
             );
@@ -261,7 +258,7 @@ contract LibAssetData is
             // Query allowance
             (bool success, bytes memory returnData) = tokenAddress.staticcall(isApprovedForAllData);
             allowance = success && returnData.length == 32 && returnData.readUint256(0) == 1 ? _MAX_UINT256 : 0;
-        } else if (assetProxyId == STATIC_CALL_PROXY_ID) {
+        } else if (assetProxyId == IAssetData(address(0)).StaticCall.selector) {
             // The StaticCallProxy does not require any approvals
             allowance = _MAX_UINT256;
         }
@@ -319,6 +316,29 @@ contract LibAssetData is
         return (balances, allowances);
     }
 
+    /// @dev Decode AssetProxy identifier 
+    /// @param assetData AssetProxy-compliant asset data describing an ERC-20, ERC-721, ERC1155, or MultiAsset asset.
+    /// @return The AssetProxy identifier
+    function decodeAssetProxyId(bytes memory assetData)
+        public
+        pure
+        returns (
+            bytes4 assetProxyId
+        )
+    {
+        assetProxyId = assetData.readBytes4(0);
+
+        require(
+            assetProxyId == IAssetData(address(0)).ERC20Token.selector ||
+            assetProxyId == IAssetData(address(0)).ERC721Token.selector ||
+            assetProxyId == IAssetData(address(0)).ERC1155Assets.selector ||
+            assetProxyId == IAssetData(address(0)).MultiAsset.selector ||
+            assetProxyId == IAssetData(address(0)).StaticCall.selector,
+            "WRONG_PROXY_ID"
+        );
+        return assetProxyId;
+    }
+
     /// @dev Encode ERC-20 asset data into the format described in the AssetProxy contract specification.
     /// @param tokenAddress The address of the ERC-20 contract hosting the asset to be traded.
     /// @return AssetProxy-compliant data describing the asset.
@@ -327,13 +347,13 @@ contract LibAssetData is
         pure
         returns (bytes memory assetData)
     {
-        assetData = abi.encodeWithSelector(ERC20_PROXY_ID, tokenAddress);
+        assetData = abi.encodeWithSelector(IAssetData(address(0)).ERC20Token.selector, tokenAddress);
         return assetData;
     }
 
     /// @dev Decode ERC-20 asset data from the format described in the AssetProxy contract specification.
     /// @param assetData AssetProxy-compliant asset data describing an ERC-20 asset.
-    /// @return The ERC-20 AssetProxy identifier, and the address of the ERC-20 
+    /// @return The AssetProxy identifier, and the address of the ERC-20 
     /// contract hosting this asset.
     function decodeERC20AssetData(bytes memory assetData)
         public
@@ -346,7 +366,7 @@ contract LibAssetData is
         assetProxyId = assetData.readBytes4(0);
 
         require(
-            assetProxyId == ERC20_PROXY_ID,
+            assetProxyId == IAssetData(address(0)).ERC20Token.selector,
             "WRONG_PROXY_ID"
         );
 
@@ -364,7 +384,7 @@ contract LibAssetData is
         returns (bytes memory assetData)
     {
         assetData = abi.encodeWithSelector(
-            ERC721_PROXY_ID,
+            IAssetData(address(0)).ERC721Token.selector,
             tokenAddress,
             tokenId
         );
@@ -388,7 +408,7 @@ contract LibAssetData is
         assetProxyId = assetData.readBytes4(0);
 
         require(
-            assetProxyId == ERC721_PROXY_ID,
+            assetProxyId == IAssetData(address(0)).ERC721Token.selector,
             "WRONG_PROXY_ID"
         );
 
@@ -414,7 +434,7 @@ contract LibAssetData is
         returns (bytes memory assetData)
     {
         assetData = abi.encodeWithSelector(
-            ERC1155_PROXY_ID,
+            IAssetData(address(0)).ERC1155Assets.selector,
             tokenAddress,
             tokenIds,
             tokenValues,
@@ -446,7 +466,7 @@ contract LibAssetData is
         assetProxyId = assetData.readBytes4(0);
 
         require(
-            assetProxyId == ERC1155_PROXY_ID,
+            assetProxyId == IAssetData(address(0)).ERC1155Assets.selector,
             "WRONG_PROXY_ID"
         );
 
@@ -482,7 +502,7 @@ contract LibAssetData is
         returns (bytes memory assetData)
     {
         assetData = abi.encodeWithSelector(
-            MULTI_ASSET_PROXY_ID,
+            IAssetData(address(0)).MultiAsset.selector,
             amounts,
             nestedAssetData
         );
@@ -507,7 +527,7 @@ contract LibAssetData is
         assetProxyId = assetData.readBytes4(0);
 
         require(
-            assetProxyId == MULTI_ASSET_PROXY_ID,
+            assetProxyId == IAssetData(address(0)).MultiAsset.selector,
             "WRONG_PROXY_ID"
         );
 
@@ -519,23 +539,74 @@ contract LibAssetData is
         // solhint-enable indent
     }
 
-    /// @dev Calls `asset.ownerOf(tokenId)`, but returns a null owner instead of reverting on an unowned asset.
-    /// @param tokenAddress Address of ERC721 asset.
-    /// @param tokenId The identifier for the specific NFT.
-    /// @return Owner of tokenId or null address if unowned.
-    function getERC721TokenOwner(address tokenAddress, uint256 tokenId)
+    /// @dev Encode StaticCall asset data into the format described in the AssetProxy contract specification.
+    /// @param staticCallTargetAddress Target address of StaticCall.
+    /// @param staticCallData Data that will be passed to staticCallTargetAddress in the StaticCall.
+    /// @param expectedReturnDataHash Expected Keccak-256 hash of the StaticCall return data.
+    /// @return AssetProxy-compliant asset data describing the set of assets.
+    function encodeStaticCallAssetData(
+        address staticCallTargetAddress,
+        bytes memory staticCallData,
+        bytes32 expectedReturnDataHash
+    )
         public
-        view
-        returns (address ownerAddress)
+        pure
+        returns (bytes memory assetData)
     {
-        bytes memory ownerOfCalldata = abi.encodeWithSelector(
-            _ERC721_OWNER_OF_SELECTOR,
-            tokenId
+        assetData = abi.encodeWithSelector(
+            IAssetData(address(0)).StaticCall.selector,
+            staticCallTargetAddress,
+            staticCallData,
+            expectedReturnDataHash
+        );
+        return assetData;
+    }
+
+    /// @dev Decode StaticCall asset data from the format described in the AssetProxy contract specification.
+    /// @param assetData AssetProxy-compliant asset data describing a StaticCall asset
+    /// @return The StaticCall AssetProxy identifier, the target address of the StaticCAll, the data to be
+    /// passed to the target address, and the expected Keccak-256 hash of the static call return data.
+    function decodeStaticCallAssetData(bytes memory assetData)
+        public
+        pure
+        returns (
+            bytes4 assetProxyId,
+            address staticCallTargetAddress,
+            bytes memory staticCallData,
+            bytes32 expectedReturnDataHash
+        )
+    {
+        assetProxyId = assetData.readBytes4(0);
+
+        require(
+            assetProxyId == IAssetData(address(0)).StaticCall.selector,
+            "WRONG_PROXY_ID"
         );
 
-        (bool success, bytes memory returnData) = tokenAddress.staticcall(ownerOfCalldata);
+        (staticCallTargetAddress, staticCallData, expectedReturnDataHash) = abi.decode(
+            assetData.slice(4, assetData.length),
+            (address, bytes, bytes32)
+        );
+    }
 
-        ownerAddress = (success && returnData.length == 32) ? returnData.readAddress(12) : address(0);
-        return ownerAddress;
+    function revertIfInvalidAssetData(bytes memory assetData)
+        public
+        pure 
+    {
+        bytes4 assetProxyId = assetData.readBytes4(0);
+
+        if (assetProxyId == IAssetData(address(0)).ERC20Token.selector) {
+            decodeERC20AssetData(assetData);
+        } else if (assetProxyId == IAssetData(address(0)).ERC721Token.selector) {
+            decodeERC721AssetData(assetData);
+        } else if (assetProxyId == IAssetData(address(0)).ERC1155Assets.selector) {
+            decodeERC1155AssetData(assetData);
+        } else if (assetProxyId == IAssetData(address(0)).MultiAsset.selector) {
+            decodeMultiAssetData(assetData);
+        } else if (assetProxyId == IAssetData(address(0)).StaticCall.selector) {
+            decodeStaticCallAssetData(assetData);
+        } else {
+            revert("WRONG_PROXY_ID");
+        }
     }
 }

contracts/dev-utils/contracts/src/LibTransactionDecoder.sol

@@ -19,14 +19,13 @@
 pragma solidity ^0.5.5;
 pragma experimental ABIEncoderV2;
 
-import "@0x/contracts-exchange-libs/contracts/src/LibExchangeSelectors.sol";
+import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
 import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
 import "@0x/contracts-utils/contracts/src/LibBytes.sol";
 
 
-contract LibTransactionDecoder is
-    LibExchangeSelectors
-{
+contract LibTransactionDecoder {
+
     using LibBytes for bytes;
 
     /// @dev Decodes the call data for an Exchange contract method call.
@@ -47,72 +46,68 @@ contract LibTransactionDecoder is
     {
         bytes4 functionSelector = transactionData.readBytes4(0);
 
-        if (functionSelector == BATCH_CANCEL_ORDERS_SELECTOR) {
+        if (functionSelector == IExchange(address(0)).batchCancelOrders.selector) {
             functionName = "batchCancelOrders";
-        } else if (functionSelector == BATCH_FILL_ORDERS_SELECTOR) {
+        } else if (functionSelector == IExchange(address(0)).batchFillOrders.selector) {
             functionName = "batchFillOrders";
-        } else if (functionSelector == BATCH_FILL_ORDERS_NO_THROW_SELECTOR) {
+        } else if (functionSelector == IExchange(address(0)).batchFillOrdersNoThrow.selector) {
             functionName = "batchFillOrdersNoThrow";
-        } else if (functionSelector == BATCH_FILL_OR_KILL_ORDERS_SELECTOR) {
+        } else if (functionSelector == IExchange(address(0)).batchFillOrKillOrders.selector) {
             functionName = "batchFillOrKillOrders";
-        } else if (functionSelector == CANCEL_ORDER_SELECTOR) {
+        } else if (functionSelector == IExchange(address(0)).cancelOrder.selector) {
             functionName = "cancelOrder";
-        } else if (functionSelector == FILL_ORDER_SELECTOR) {
+        } else if (functionSelector == IExchange(address(0)).fillOrder.selector) {
             functionName = "fillOrder";
-        } else if (functionSelector == FILL_ORDER_NO_THROW_SELECTOR) {
-            functionName = "fillOrderNoThrow";
-        } else if (functionSelector == FILL_OR_KILL_ORDER_SELECTOR) {
+        } else if (functionSelector == IExchange(address(0)).fillOrKillOrder.selector) {
             functionName = "fillOrKillOrder";
-        } else if (functionSelector == MARKET_BUY_ORDERS_SELECTOR) {
-            functionName = "marketBuyOrders";
-        } else if (functionSelector == MARKET_BUY_ORDERS_NO_THROW_SELECTOR) {
+        } else if (functionSelector == IExchange(address(0)).marketBuyOrdersNoThrow.selector) {
             functionName = "marketBuyOrdersNoThrow";
-        } else if (functionSelector == MARKET_SELL_ORDERS_SELECTOR) {
-            functionName = "marketSellOrders";
-        } else if (functionSelector == MARKET_SELL_ORDERS_NO_THROW_SELECTOR) {
+        } else if (functionSelector == IExchange(address(0)).marketSellOrdersNoThrow.selector) {
             functionName = "marketSellOrdersNoThrow";
-        } else if (functionSelector == MATCH_ORDERS_SELECTOR) {
+        } else if (functionSelector == IExchange(address(0)).marketBuyOrdersFillOrKill.selector) {
+            functionName = "marketBuyOrdersFillOrKill";
+        } else if (functionSelector == IExchange(address(0)).marketSellOrdersFillOrKill.selector) {
+            functionName = "marketSellOrdersFillOrKill";
+        } else if (functionSelector == IExchange(address(0)).matchOrders.selector) {
             functionName = "matchOrders";
         } else if (
-            functionSelector == CANCEL_ORDERS_UP_TO_SELECTOR ||
-            functionSelector == EXECUTE_TRANSACTION_SELECTOR
-            // TODO: add new noThrow cancel functions when https://github.com/0xProject/ZEIPs/issues/35 is merged.
+            functionSelector == IExchange(address(0)).cancelOrdersUpTo.selector ||
+            functionSelector == IExchange(address(0)).executeTransaction.selector
         ) {
             revert("UNIMPLEMENTED");
         } else {
             revert("UNKNOWN_FUNCTION_SELECTOR");
         }
 
-        if (functionSelector == BATCH_CANCEL_ORDERS_SELECTOR) {
+        if (functionSelector == IExchange(address(0)).batchCancelOrders.selector) {
             // solhint-disable-next-line indent
             orders = abi.decode(transactionData.slice(4, transactionData.length), (LibOrder.Order[]));
             takerAssetFillAmounts = new uint256[](0);
             signatures = new bytes[](0);
         } else if (
-            functionSelector == BATCH_FILL_OR_KILL_ORDERS_SELECTOR ||
-            functionSelector == BATCH_FILL_ORDERS_NO_THROW_SELECTOR ||
-            functionSelector == BATCH_FILL_ORDERS_SELECTOR
+            functionSelector == IExchange(address(0)).batchFillOrKillOrders.selector ||
+            functionSelector == IExchange(address(0)).batchFillOrders.selector ||
+            functionSelector == IExchange(address(0)).batchFillOrdersNoThrow.selector
         ) {
             (orders, takerAssetFillAmounts, signatures) = _makeReturnValuesForBatchFill(transactionData);
-        } else if (functionSelector == CANCEL_ORDER_SELECTOR) {
+        } else if (functionSelector == IExchange(address(0)).cancelOrder.selector) {
             orders = new LibOrder.Order[](1);
             orders[0] = abi.decode(transactionData.slice(4, transactionData.length), (LibOrder.Order));
             takerAssetFillAmounts = new uint256[](0);
             signatures = new bytes[](0);
         } else if (
-            functionSelector == FILL_OR_KILL_ORDER_SELECTOR ||
-            functionSelector == FILL_ORDER_SELECTOR ||
-            functionSelector == FILL_ORDER_NO_THROW_SELECTOR
+            functionSelector == IExchange(address(0)).fillOrKillOrder.selector ||
+            functionSelector == IExchange(address(0)).fillOrder.selector
         ) {
             (orders, takerAssetFillAmounts, signatures) = _makeReturnValuesForSingleOrderFill(transactionData);
         } else if (
-            functionSelector == MARKET_BUY_ORDERS_SELECTOR ||
-            functionSelector == MARKET_BUY_ORDERS_NO_THROW_SELECTOR ||
-            functionSelector == MARKET_SELL_ORDERS_SELECTOR ||
-            functionSelector == MARKET_SELL_ORDERS_NO_THROW_SELECTOR
+            functionSelector == IExchange(address(0)).marketBuyOrdersNoThrow.selector ||
+            functionSelector == IExchange(address(0)).marketSellOrdersNoThrow.selector ||
+            functionSelector == IExchange(address(0)).marketBuyOrdersFillOrKill.selector ||
+            functionSelector == IExchange(address(0)).marketSellOrdersFillOrKill.selector
         ) {
             (orders, takerAssetFillAmounts, signatures) = _makeReturnValuesForMarketFill(transactionData);
-        } else if (functionSelector == MATCH_ORDERS_SELECTOR) {
+        } else if (functionSelector == IExchange(address(0)).matchOrders.selector) {
             (
                 LibOrder.Order memory leftOrder,
                 LibOrder.Order memory rightOrder,

contracts/dev-utils/contracts/src/OrderTransferSimulationUtils.sol

@@ -0,0 +1,160 @@
+/*
+
+  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;
+pragma experimental ABIEncoderV2;
+
+
+import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
+import "@0x/contracts-exchange/contracts/src/libs/LibExchangeRichErrorDecoder.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibExchangeRichErrors.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
+import "@0x/contracts-utils/contracts/src/LibBytes.sol";
+
+
+contract OrderTransferSimulationUtils is
+    LibExchangeRichErrorDecoder
+{
+    using LibBytes for bytes;
+
+    enum OrderTransferResults {
+        TakerAssetDataFailed,     // Transfer of takerAsset failed
+        MakerAssetDataFailed,     // Transfer of makerAsset failed
+        TakerFeeAssetDataFailed,  // Transfer of takerFeeAsset failed
+        MakerFeeAssetDataFailed,  // Transfer of makerFeeAsset failed
+        TransfersSuccessful       // All transfers in the order were successful
+    }
+
+    // keccak256(abi.encodeWithSignature("Error(string)", "TRANSFERS_SUCCESSFUL"));
+    bytes32 constant internal _TRANSFERS_SUCCESSFUL_RESULT_HASH = 0xf43f26ea5a94b478394a975e856464913dc1a8a1ca70939d974aa7c238aa0ce0;
+
+    // solhint-disable var-name-mixedcase
+    IExchange internal _EXCHANGE;
+    // solhint-enable var-name-mixedcase
+
+    constructor (address _exchange)
+        public
+    {
+        _EXCHANGE = IExchange(_exchange);
+    }
+
+    /// @dev Simulates all of the transfers within an order and returns the index of the first failed transfer.
+    /// @param order The order to simulate transfers for.
+    /// @param takerAddress The address of the taker that will fill the order.
+    /// @param takerAssetFillAmount The amount of takerAsset that the taker wished to fill.
+    /// @return The index of the first failed transfer (or 4 if all transfers are successful).
+    function getSimulatedOrderTransferResults(
+        LibOrder.Order memory order,
+        address takerAddress,
+        uint256 takerAssetFillAmount
+    )
+        public
+        returns (OrderTransferResults orderTransferResults)
+    {
+        LibFillResults.FillResults memory fillResults = LibFillResults.calculateFillResults(
+            order,
+            takerAssetFillAmount,
+            _EXCHANGE.protocolFeeMultiplier(),
+            tx.gasprice
+        );
+
+        // Create input arrays
+        bytes[] memory assetData = new bytes[](4);
+        address[] memory fromAddresses = new address[](4);
+        address[] memory toAddresses = new address[](4);
+        uint256[] memory amounts = new uint256[](4);
+
+        // Transfer `takerAsset` from taker to maker
+        assetData[0] = order.takerAssetData;
+        fromAddresses[0] = takerAddress;
+        toAddresses[0] = order.makerAddress;
+        amounts[0] = takerAssetFillAmount;
+
+        // Transfer `makerAsset` from maker to taker
+        assetData[1] = order.makerAssetData;
+        fromAddresses[1] = order.makerAddress;
+        toAddresses[1] = takerAddress;
+        amounts[1] = fillResults.makerAssetFilledAmount;
+
+        // Transfer `takerFeeAsset` from taker to feeRecipient
+        assetData[2] = order.takerFeeAssetData;
+        fromAddresses[2] = takerAddress;
+        toAddresses[2] = order.feeRecipientAddress;
+        amounts[2] = fillResults.takerFeePaid;
+
+        // Transfer `makerFeeAsset` from maker to feeRecipient
+        assetData[3] = order.makerFeeAssetData;
+        fromAddresses[3] = order.makerAddress;
+        toAddresses[3] = order.feeRecipientAddress;
+        amounts[3] = fillResults.makerFeePaid;
+
+        // Encode data for `simulateDispatchTransferFromCalls(assetData, fromAddresses, toAddresses, amounts)`
+        bytes memory simulateDispatchTransferFromCallsData = abi.encodeWithSelector(
+            IExchange(address(0)).simulateDispatchTransferFromCalls.selector,
+            assetData,
+            fromAddresses,
+            toAddresses,
+            amounts
+        );
+
+        // Perform call and catch revert
+        (, bytes memory returnData) = address(_EXCHANGE).call(simulateDispatchTransferFromCallsData);
+
+        bytes4 selector = returnData.readBytes4(0);
+        if (selector == LibExchangeRichErrors.AssetProxyDispatchErrorSelector()) {
+            // Decode AssetProxyDispatchError and return index of failed transfer
+            (, bytes32 failedTransferIndex,) = decodeAssetProxyDispatchError(returnData);
+            return OrderTransferResults(uint8(uint256(failedTransferIndex)));
+        } else if (selector == LibExchangeRichErrors.AssetProxyTransferErrorSelector()) {
+            // Decode AssetProxyTransferError and return index of failed transfer
+            (bytes32 failedTransferIndex, ,) = decodeAssetProxyTransferError(returnData);
+            return OrderTransferResults(uint8(uint256(failedTransferIndex)));
+        } else if (keccak256(returnData) == _TRANSFERS_SUCCESSFUL_RESULT_HASH) {
+            // All transfers were successful
+            return OrderTransferResults.TransfersSuccessful;
+        } else {
+            revert("UNKNOWN_RETURN_DATA");
+        }
+    }
+
+    /// @dev Simulates all of the transfers for each given order and returns the indices of each first failed transfer.
+    /// @param orders Array of orders to individually simulate transfers for.
+    /// @param takerAddresses Array of addresses of takers that will fill each order.
+    /// @param takerAssetFillAmounts Array of amounts of takerAsset that will be filled for each order.
+    /// @return The indices of the first failed transfer (or 4 if all transfers are successful) for each order.
+    function getSimulatedOrdersTransferResults(
+        LibOrder.Order[] memory orders,
+        address[] memory takerAddresses,
+        uint256[] memory takerAssetFillAmounts
+    )
+        public
+        returns (OrderTransferResults[] memory orderTransferResults)
+    {
+        uint256 length = orders.length;
+        orderTransferResults = new OrderTransferResults[](length);
+        for (uint256 i = 0; i != length; i++) {
+            orderTransferResults[i] = getSimulatedOrderTransferResults(
+                orders[i],
+                takerAddresses[i],
+                takerAssetFillAmounts[i]
+            );
+        }
+        return orderTransferResults;
+    }
+}