Publish

- @0x/contracts-asset-proxy@2.2.6 - @0x/contracts-coordinator@2.0.11 - @0x/contracts-dev-utils@0.0.8 - @0x/contracts-erc1155@1.1.13 - @0x/contracts-erc20@2.2.12 - @0x/contracts-erc721@2.1.13 - @0x/contracts-exchange-forwarder@3.0.10 - @0x/contracts-exchange-libs@3.0.6 - @0x/contracts-exchange@2.1.12 - @0x/contracts-extensions@4.0.6 - @0x/contracts-multisig@3.1.12 - @0x/contracts-test-utils@3.1.14 - @0x/contracts-utils@3.2.2 - 0x.js@7.0.0 - @0x/abi-gen-templates@2.4.2 - @0x/abi-gen-wrappers@5.3.0 - @0x/abi-gen@4.1.1 - @0x/assert@2.1.4 - @0x/asset-buyer@6.1.12 - @0x/asset-swapper@1.0.2 - @0x/base-contract@5.3.2 - @0x/connect@5.0.17 - @0x/contract-addresses@3.1.0 - @0x/contract-artifacts@2.2.0 - @0x/contract-wrappers@11.1.0 - @0x/dev-utils@2.3.1 - @0x/fill-scenarios@3.0.17 - @0x/instant@1.0.29 - @0x/json-schemas@4.0.0 - @0x/migrations@4.3.0 - @0x/monorepo-scripts@1.0.35 - @0x/order-utils@8.3.0 - @0x/python-contract-wrappers@1.0.4 - @0x/sol-compiler@3.1.13 - @0x/sol-coverage@3.0.10 - @0x/sol-doc@2.0.17 - @0x/sol-profiler@3.1.12 - @0x/sol-trace@2.0.18 - @0x/sol-tracing-utils@6.0.17 - @0x/sra-spec@2.0.15 - @0x/subproviders@5.0.2 - @0x/testnet-faucets@1.0.85 - @0x/web3-wrapper@6.0.11 - @0x/website@0.0.88
Updated CHANGELOGS
2019-08-22 14:13:00 +10:00 · 2019-08-22 14:12:40 +10:00 · 2019-08-21 18:39:07 -07:00 · 2019-08-21 14:54:17 -07:00 · 2019-08-21 14:30:55 -07:00 · 2019-08-21 14:30:55 -07:00
2392 changed files with 172491 additions and 173710 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,21 +23,37 @@ 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.17.0
+                  command: npm install --global yarn@1.9.4
            - run:
                  name: yarn
                  command: yarn --frozen-lockfile --ignore-engines install || yarn --frozen-lockfile --ignore-engines install
            - setup_remote_docker
-            - run: yarn build:ci
+            - run: yarn build:ci:no_website
            - 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/contract-wrappers/generated_docs
+                  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:
@@ -47,41 +63,19 @@ 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-tests @0x/contracts-staking
-    test-exchange-ganache-3.0:
-        resource_class: medium+
+            - run: yarn wsrun test:circleci @0x/contracts-multisig @0x/contracts-utils @0x/contracts-exchange-libs @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-extensions @0x/contracts-asset-proxy @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-coordinator @0x/contracts-dev-utils
+    test-contracts-geth:
        docker:
            - image: nikolaik/python-nodejs:python3.7-nodejs8
+            - image: 0xorg/devnet
        working_directory: ~/repo
        steps:
            - restore_cache:
                  keys:
                      - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - 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 @0x/contracts-erc20-bridge-sampler 
-            # 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
+            # HACK(albrow): we need to sleep 10 seconds to ensure the devnet is
+            # initialized
+            - run: sleep 10 && TEST_PROVIDER=geth yarn wsrun test:circleci @0x/contracts-multisig @0x/contracts-utils @0x/contracts-exchange-libs @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-extensions @0x/contracts-asset-proxy @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-coordinator @0x/contracts-dev-utils
    test-publish:
        resource_class: medium+
        docker:
@@ -92,9 +86,7 @@ jobs:
            - restore_cache:
                  keys:
                      - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run:
-                  command: yarn test:publish:circleci
-                  no_output_timeout: 1800
+            - run: yarn test:publish:circleci
    test-doc-generation:
        docker:
            - image: nikolaik/python-nodejs:python3.7-nodejs8
@@ -103,9 +95,7 @@ jobs:
            - restore_cache:
                  keys:
                      - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run:
-                  command: yarn test:generate_docs:circleci
-                  no_output_timeout: 1200
+            - run: yarn test:generate_docs:circleci
    test-rest:
        docker:
            - image: nikolaik/python-nodejs:python3.7-nodejs8
@@ -116,16 +106,15 @@ 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-swapper
+            - run: yarn wsrun test:circleci @0x/asset-buyer
            - run: yarn wsrun test:circleci @0x/contract-artifacts
            - run: yarn wsrun test:circleci @0x/assert
            - run: yarn wsrun test:circleci @0x/base-contract
            - run: yarn wsrun test:circleci @0x/connect
-            - run: yarn wsrun test:circleci @0x/contract-wrappers-test
+            - run: yarn wsrun test:circleci @0x/contract-wrappers
            - run: yarn wsrun test:circleci @0x/dev-utils
            - run: yarn wsrun test:circleci @0x/json-schemas
            - run: yarn wsrun test:circleci @0x/order-utils
-            - run: yarn wsrun test:circleci @0x/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
@@ -142,9 +131,9 @@ jobs:
                  paths:
                      - ~/repo/packages/assert/coverage/lcov.info
            - save_cache:
-                  key: coverage-asset-swapper-{{ .Environment.CIRCLE_SHA1 }}
+                  key: coverage-asset-buyer-{{ .Environment.CIRCLE_SHA1 }}
                  paths:
-                      - ~/repo/packages/asset-swapper/coverage/lcov.info
+                      - ~/repo/packages/asset-buyer/coverage/lcov.info
            - save_cache:
                  key: coverage-base-contract-{{ .Environment.CIRCLE_SHA1 }}
                  paths:
@@ -154,9 +143,9 @@ jobs:
                  paths:
                      - ~/repo/packages/connect/coverage/lcov.info
            - save_cache:
-                  key: coverage-contract-wrappers-test-{{ .Environment.CIRCLE_SHA1 }}
+                  key: coverage-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
                  paths:
-                      - ~/repo/packages/contract-wrappers-test/coverage/lcov.info
+                      - ~/repo/packages/contract-wrappers/coverage/lcov.info
            - save_cache:
                  key: coverage-dev-utils-{{ .Environment.CIRCLE_SHA1 }}
                  paths:
@@ -193,37 +182,20 @@ jobs:
        working_directory: ~/repo
        docker:
            - image: nikolaik/python-nodejs:python3.7-nodejs8
-            - image: 0xorg/ganache-cli
-            - image: 0xorg/mesh:0xV3
+            - image: 0xorg/ganache-cli:2.2.2
+            - image: 0xorg/launch-kit-backend:74bcc39
              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'
-                  CHAIN_ID: 1337
+                  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 "waitForMesh () { sleep 30; }; waitForMesh && node_modules/.bin/forever ts/lib/index.js"
+                  sh -c "until printf 'POST /\r\nContent-Length: 26\r\n\r\n{\"method\":\"net_listening\"}' | nc localhost 8545 | grep true; do continue; done; node_modules/.bin/forever ts/lib/index.js"
        steps:
            - checkout
            - restore_cache:
                  key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
            - restore_cache:
-                  keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+                  key: python-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
            - run:
                  command: |
                      cd python-packages
@@ -238,14 +210,8 @@ jobs:
            - run:
                  command: |
                      cd python-packages
-                      ./parallel coverage run setup.py test
+                      ./parallel_without_sra_client 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:
@@ -270,6 +236,10 @@ 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:
@@ -319,8 +289,7 @@ jobs:
            - restore_cache:
                  key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
            - restore_cache:
-                  keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+                  key: python-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
            - run:
                  command: |
                      python -m ensurepip
@@ -329,7 +298,6 @@ jobs:
                      ./install
                      ./lint
    static-tests:
-        resource_class: large
        working_directory: ~/repo
        docker:
            - image: nikolaik/python-nodejs:python3.7-nodejs8
@@ -340,7 +308,6 @@ 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:
@@ -359,7 +326,7 @@ jobs:
                      - coverage-assert-{{ .Environment.CIRCLE_SHA1 }}
            - restore_cache:
                  keys:
-                      - coverage-asset-swapper-{{ .Environment.CIRCLE_SHA1 }}
+                      - coverage-asset-buyer-{{ .Environment.CIRCLE_SHA1 }}
            - restore_cache:
                  keys:
                      - coverage-base-contract-{{ .Environment.CIRCLE_SHA1 }}
@@ -368,7 +335,7 @@ jobs:
                      - coverage-connect-{{ .Environment.CIRCLE_SHA1 }}
            - restore_cache:
                  keys:
-                      - coverage-contract-wrappers-test-{{ .Environment.CIRCLE_SHA1 }}
+                      - coverage-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
            - restore_cache:
                  keys:
                      - coverage-dev-utils-{{ .Environment.CIRCLE_SHA1 }}
@@ -420,15 +387,17 @@ workflows:
    main:
        jobs:
            - build
-            - test-exchange-ganache-3.0:
+            - build-website:
                  requires:
                      - build
-            - test-integrations-ganache-3.0:
-                  requires:
-                      - build
-            - test-contracts-rest-ganache-3.0:
+            - test-contracts-ganache:
                  requires:
                      - build
+            # TODO(albrow): Tests always fail on Geth right now because our fork
+            # is outdated. Uncomment once we have updated our Geth fork.
+            # - test-contracts-geth:
+            #       requires:
+            #           - build
            - test-rest:
                  requires:
                      - build
@@ -443,15 +412,13 @@ workflows:
                      - build
            - submit-coverage:
                  requires:
-                      - test-contracts-rest-ganache-3.0
-                      - test-exchange-ganache-3.0
                      - test-rest
-                      - static-tests
+                      - test-python
+            - static-tests-python:
+                  requires:
+                      - test-python
            - 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
--- a/.github/autolabeler.yml
+++ b/.github/autolabeler.yml
@@ -13,21 +13,27 @@ 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']
@0x/sol-tracing-utils: ['packages/sol-tracing-utils']
@0x/utils: ['packages/utils']
@0x/tslint-config: ['packages/tslint-config']
-@0x/asset-swapper: ['packages/asset-swapper']
+@0x/asset-buyer: ['packages/asset-buyer']
@0x/order-utils: ['packages/order-utils']
@0x/assert: ['packages/assert']
@0x/base-contract: ['packages/base-contract']
@0x/typescript-typings: ['packages/typescript-typings']
 0x.js: ['packages/0x.js']
+@0x/abi-gen-wrappers: ['packages/abi-gen-wrappers']
@0x/contract-artifacts: ['packages/contract-artifacts']
@0x/dev-utils: ['packages/dev-utils']
@0x/contract-wrappers: ['packages/contract-wrappers']
@0x/json-schemas: ['packages/json-schemas']
@0x/ethereum-types: ['ethereum-types']
@0x/connect: ['packages/connect']
+@0x/fill-scenarios: ['packages/fill-scenarios']
+@0x/dev-tools-pages: ['packages/dev-tools-pages']
+@0x/testnet-faucets: ['packages/testnet-faucets']
+@0x/monorepo-scripts: ['packages/monorepo-scripts']
--- a/.gitignore
+++ b/.gitignore
@@ -40,12 +40,9 @@ build/Release
 node_modules/
 jspm_packages/

-# TypeScript v1 declaration files
+# Typescript v1 declaration files
 typings/

-# NVM config
-.nvmrc
-
 # Optional npm cache directory
 .npm
 .npmrc
@@ -78,89 +75,43 @@ 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/erc20-bridge-sampler/generated-artifacts/
-contracts/erc20-bridge-sampler/test/generated-artifacts/
-contracts/integrations/generated-artifacts/
-contracts/integrations/test/generated-artifacts/
-contracts/staking/generated-artifacts/
-contracts/staking/test/generated-artifacts/
 contracts/coordinator/generated-artifacts/
-contracts/coordinator/test/generated-artifacts/
 contracts/exchange/generated-artifacts/
-contracts/exchange/test/generated-artifacts/
 contracts/asset-proxy/generated-artifacts/
-contracts/asset-proxy/test/generated-artifacts/
 contracts/multisig/generated-artifacts/
-contracts/multisig/test/generated-artifacts/
 contracts/utils/generated-artifacts/
-contracts/utils/test/generated-artifacts/
 contracts/exchange-libs/generated-artifacts/
-contracts/exchange-libs/test/generated-artifacts/
 contracts/erc20/generated-artifacts/
-contracts/erc20/test/generated-artifacts/
 contracts/erc721/generated-artifacts/
-contracts/erc721/test/generated-artifacts/
 contracts/erc1155/generated-artifacts/
-contracts/erc1155/test/generated-artifacts/
 contracts/extensions/generated-artifacts/
-contracts/extensions/test/generated-artifacts/
 contracts/exchange-forwarder/generated-artifacts/
-contracts/exchange-forwarder/test/generated-artifacts/
 contracts/dev-utils/generated-artifacts/
-contracts/dev-utils/test/generated-artifacts/
 packages/sol-tracing-utils/test/fixtures/artifacts/
 python-packages/contract_artifacts/src/zero_ex/contract_artifacts/artifacts/

-# generated truffle contract artifacts/
-contracts/erc20-bridge-sampler/build/
-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/erc20-bridge-sampler/generated-wrappers/
-contracts/erc20-bridge-sampler/test/generated-wrappers/
-contracts/integrations/generated-wrappers/
-contracts/integrations/test/generated-wrappers/
-contracts/staking/generated-wrappers/
-contracts/staking/test/generated-wrappers/
 contracts/coordinator/generated-wrappers/
-contracts/coordinator/test/generated-wrappers/
 contracts/exchange/generated-wrappers/
-contracts/exchange/test/generated-wrappers/
 contracts/asset-proxy/generated-wrappers/
-contracts/asset-proxy/test/generated-wrappers/
 contracts/multisig/generated-wrappers/
-contracts/multisig/test/generated-wrappers/
 contracts/utils/generated-wrappers/
-contracts/utils/test/generated-wrappers/
 contracts/exchange-libs/generated-wrappers/
-contracts/exchange-libs/test/generated-wrappers/
 contracts/erc20/generated-wrappers/
-contracts/erc20/test/generated-wrappers/
 contracts/erc721/generated-wrappers/
-contracts/erc721/test/generated-wrappers/
 contracts/erc1155/generated-wrappers/
-contracts/erc1155/test/generated-wrappers/
 contracts/extensions/generated-wrappers/
-contracts/extensions/test/generated-wrappers/
 contracts/exchange-forwarder/generated-wrappers/
-contracts/exchange-forwarder/test/generated-wrappers/
 contracts/dev-utils/generated-wrappers/
-contracts/dev-utils/test/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
@@ -169,28 +120,25 @@ 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_bridge_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
+python-packages/contract_wrappers/src/zero_ex/contract_wrappers/eth_balance_checker/__init__.py
 python-packages/contract_wrappers/src/zero_ex/contract_wrappers/forwarder/__init__.py
 python-packages/contract_wrappers/src/zero_ex/contract_wrappers/i_asset_proxy/__init__.py
 python-packages/contract_wrappers/src/zero_ex/contract_wrappers/i_validator/__init__.py
 python-packages/contract_wrappers/src/zero_ex/contract_wrappers/i_wallet/__init__.py
 python-packages/contract_wrappers/src/zero_ex/contract_wrappers/multi_asset_proxy/__init__.py
 python-packages/contract_wrappers/src/zero_ex/contract_wrappers/order_validator/__init__.py
-python-packages/contract_wrappers/src/zero_ex/contract_wrappers/staking/__init__.py
-python-packages/contract_wrappers/src/zero_ex/contract_wrappers/staking_proxy/__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
-python-packages/contract_wrappers/src/zero_ex/contract_wrappers/zrx_vault/__init__.py

 # solc-bin in sol-compiler
 packages/sol-compiler/solc_bin/

+# Monorepo scripts
+packages/*/scripts/
+
 # python stuff
 .eggs
 .mypy_cache
@@ -201,14 +149,5 @@ __pycache__
 python-packages/*/src/*.egg-info
 python-packages/*/.coverage

-# python keeps package-local copies of json schemas and contract addresses
+# python keeps package-local copies of json schemas
 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*
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,82 +1,34 @@
 lib
 .nyc_output
-/contracts/integrations/generated-wrappers
-/contracts/integrations/test/generated-wrappers
-/contracts/integrations/generated-artifacts
-/contracts/integrations/test/generated-artifacts
-/contracts/staking/generated-wrappers
-/contracts/staking/test/generated-wrappers
-/contracts/staking/generated-artifacts
-/contracts/staking/test/generated-artifacts
 /contracts/coordinator/generated-wrappers
-/contracts/coordinator/test/generated-wrappers
 /contracts/coordinator/generated-artifacts
-/contracts/coordinator/test/generated-artifacts
 /contracts/exchange/generated-wrappers
-/contracts/exchange/test/generated-wrappers
 /contracts/exchange/generated-artifacts
-/contracts/exchange/test/generated-artifacts
 /contracts/asset-proxy/generated-wrappers
-/contracts/asset-proxy/test/generated-wrappers
 /contracts/asset-proxy/generated-artifacts
-/contracts/asset-proxy/test/generated-artifacts
 /contracts/multisig/generated-wrappers
-/contracts/multisig/test/generated-wrappers
 /contracts/multisig/generated-artifacts
-/contracts/multisig/test/generated-artifacts
 /contracts/utils/generated-wrappers
-/contracts/utils/test/generated-wrappers
 /contracts/utils/generated-artifacts
-/contracts/utils/test/generated-artifacts
 /contracts/exchange-libs/generated-wrappers
-/contracts/exchange-libs/test/generated-wrappers
 /contracts/exchange-libs/generated-artifacts
-/contracts/exchange-libs/test/generated-artifacts
 /contracts/erc20/generated-wrappers
-/contracts/erc20/test/generated-wrappers
 /contracts/erc20/generated-artifacts
-/contracts/erc20/test/generated-artifacts
-/contracts/erc20-bridge-sampler/generated-wrappers
-/contracts/erc20-bridge-sampler/test/generated-wrappers
-/contracts/erc20-bridge-sampler/generated-artifacts
-/contracts/erc20-bridge-sampler/test/generated-artifacts
 /contracts/erc721/generated-wrappers
-/contracts/erc721/test/generated-wrappers
 /contracts/erc721/generated-artifacts
-/contracts/erc721/test/generated-artifacts
 /contracts/erc1155/generated-wrappers
-/contracts/erc1155/test/generated-wrappers
 /contracts/erc1155/generated-artifacts
-/contracts/erc1155/test/generated-artifacts
 /contracts/extensions/generated-wrappers
-/contracts/extensions/test/generated-wrappers
 /contracts/extensions/generated-artifacts
-/contracts/extensions/test/generated-artifacts
 /contracts/exchange-forwarder/generated-wrappers
-/contracts/exchange-forwarder/test/generated-wrappers
 /contracts/exchange-forwarder/generated-artifacts
-/contracts/exchange-forwarder/test/generated-artifacts
 /contracts/dev-utils/generated-wrappers
-/contracts/dev-utils/test/generated-wrappers
 /contracts/dev-utils/generated-artifacts
-/contracts/dev-utils/test/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
@@ -86,4 +38,3 @@ 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
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,6 +1,6 @@
 {
-    "printWidth": 120,
    "tabWidth": 4,
-    "singleQuote": true,
-    "trailingComma": "all"
+    "printWidth": 120,
+    "trailingComma": all,
+    "singleQuote": true
 }
--- a/5
+++ b/5
@@ -5,8 +5,9 @@
 # https://git-scm.com/docs/gitignore#_pattern_format

 # Website
-packages/asset-swapper/  @BMillman19 @fragosti @dave4506
-packages/instant/  @BMillman19 @fragosti @dave4506
+packages/asset-buyer/  @BMillman19 @fragosti @steveklebanoff
+packages/instant/  @BMillman19 @fragosti @steveklebanoff
+packages/website/  @BMillman19 @fragosti @fabioberger @steveklebanoff

 # Dev tools & setup
 .circleci/ @LogvinovLeon
--- a/CONTRIBUTING.md
+++ b/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/missing-import`
+-   e.g `fix/broken-wiki-link`
 -   If the PR only edits a single package, add it's name too
-    -   e.g `fix/subproviders/missing-import`
+    -   e.g `fix/website/broken-wiki-link`

 ### 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
--- a/README.md
+++ b/README.md
@@ -6,16 +6,21 @@

 This repository is a monorepo including the 0x protocol smart contracts and numerous developer tools. Each public sub-package is independently published to NPM.

-[website-url]: https://0x.org
+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

 [![CircleCI](https://circleci.com/gh/0xProject/0x-monorepo.svg?style=svg&circle-token=61bf7cd8c9b4e11b132089dfcffdd1be277d1e0c)](https://circleci.com/gh/0xProject/0x-monorepo)
 [![Coverage Status](https://coveralls.io/repos/github/0xProject/0x-monorepo/badge.svg?branch=development)](https://coveralls.io/github/0xProject/0x-monorepo?branch=development)
-[![Discord](https://img.shields.io/badge/chat-discord.chat-yellow.svg?style=flat)](https://discordapp.com/invite/d3FTX3M)
+[![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)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)

 ## Packages

-Visit our [developer portal](https://0x.org/docs/tools/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://0xproject.com/docs/order-utils) for a comprehensive list of core & community maintained packages. All packages maintained with this monorepo are listed below.

 ### Python Packages

@@ -43,13 +48,12 @@ These packages are all under development. See [/contracts/README.md](/contracts/
 | [`@0x/contracts-exchange-libs`](/contracts/exchange-libs)           | [![npm](https://img.shields.io/npm/v/@0x/contracts-exchange-libs.svg)](https://www.npmjs.com/package/@0x/contracts-exchange-libs)           | Protocol specific libraries used within the [`Exchange`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#exchange) contract                                                                                 |
 | [`@0x/contracts-extensions`](/contracts/extensions)                 | [![npm](https://img.shields.io/npm/v/@0x/contracts-extensions.svg)](https://www.npmjs.com/package/@0x/contracts-extensions)                 | Contracts that interact with and extend the functionality of the core protocol                                                                                                                                                                        |
 | [`@0x/contracts-multisig`](/contracts/multisig)                     | [![npm](https://img.shields.io/npm/v/@0x/contracts-multisig.svg)](https://www.npmjs.com/package/@0x/contracts-multisig)                     | Various implementations of multisignature wallets, including the [`AssetProxyOwner`](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/v2-specification.md#assetproxyowner) contract that has permissions to upgrade the protocol |
-| [`@0x/contracts-test-utils`](/contracts/test-utils)                 | [![npm](https://img.shields.io/npm/v/@0x/contracts-test-utils.svg)](https://www.npmjs.com/package/@0x/contracts-test-utils)                 | TypeScript/Javascript shared utilities used for testing contracts                                                                                                                                                                                     |
+| [`@0x/contracts-test-utils`](/contracts/test-utils)                 | [![npm](https://img.shields.io/npm/v/@0x/contracts-test-utils.svg)](https://www.npmjs.com/package/@0x/contracts-test-utils)                 | Typescript/Javascript shared utilities used for testing contracts                                                                                                                                                                                     |
 | [`@0x/contracts-utils`](/contracts/utils)                           | [![npm](https://img.shields.io/npm/v/@0x/contracts-utils.svg)](https://www.npmjs.com/package/@0x/contracts-utils)                           | Generic libraries and utilities used throughout all of the contracts                                                                                                                                                                                  |
 | [`@0x/contracts-coordinator`](/contracts/coordinator)               | [![npm](https://img.shields.io/npm/v/@0x/contracts-coordinator.svg)](https://www.npmjs.com/package/@0x/contracts-coordinator)               | A contract that allows users to execute 0x transactions with permission from a Coordinator                                                                                                                                                            |
 | [`@0x/contracts-dev-utils`](/contracts/dev-utils)                   | [![npm](https://img.shields.io/npm/v/@0x/contracts-dev-utils.svg)](https://www.npmjs.com/package/@0x/contracts-dev-utils)                   | A contract contains utility functions for developers (such as validating many orders using a single eth_call)                                                                                                                                         |
-| [`@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

@@ -61,9 +65,11 @@ These packages are all under development. See [/contracts/README.md](/contracts/
 | [`@0x/order-utils`](/packages/order-utils)               | [![npm](https://img.shields.io/npm/v/@0x/order-utils.svg)](https://www.npmjs.com/package/@0x/order-utils)               | A set of utilities for generating, parsing, signing and validating 0x orders                      |
 | [`@0x/json-schemas`](/packages/json-schemas)             | [![npm](https://img.shields.io/npm/v/@0x/json-schemas.svg)](https://www.npmjs.com/package/@0x/json-schemas)             | 0x-related JSON schemas                                                                           |  |
 | [`@0x/migrations`](/packages/migrations)                 | [![npm](https://img.shields.io/npm/v/@0x/migrations.svg)](https://www.npmjs.com/package/@0x/migrations)                 | Migration tool for deploying 0x smart contracts on private testnets                               |
-| [`@0x/contract-artifacts`](/packages/contract-artifacts) | [![npm](https://img.shields.io/npm/v/@0x/contract-artifacts.svg)](https://www.npmjs.com/package/@0x/contract-artifacts) | 0x smart contract compilation artifacts                                                           |  |
+| [`@0x/contract-artifacts`](/packages/contract-artifacts) | [![npm](https://img.shields.io/npm/v/@0x/contract-artifacts.svg)](https://www.npmjs.com/package/@0x/contract-artifacts) | 0x smart contract compilation artifacts                                                           |
+| [`@0x/abi-gen-wrappers`](/packages/abi-gen-wrappers)     | [![npm](https://img.shields.io/npm/v/@0x/abi-gen-wrappers.svg)](https://www.npmjs.com/package/@0x/abi-gen-wrappers)     | Low-level 0x smart contract wrappers generated using `@0x/abi-gen`                                |
 | [`@0x/sra-spec`](/packages/sra-spec)                     | [![npm](https://img.shields.io/npm/v/@0x/sra-spec.svg)](https://www.npmjs.com/package/@0x/sra-spec)                     | OpenAPI specification for the Standard Relayer API                                                |
 | [`@0x/connect`](/packages/connect)                       | [![npm](https://img.shields.io/npm/v/@0x/connect.svg)](https://www.npmjs.com/package/@0x/connect)                       | An HTTP/WS client for interacting with the Standard Relayer API                                   |
+| [`@0x/asset-buyer`](/packages/asset-buyer)               | [![npm](https://img.shields.io/npm/v/@0x/asset-buyer.svg)](https://www.npmjs.com/package/@0x/asset-buyer)               | Convenience package for discovering and buying assets with Ether                                  |
 | [`@0x/asset-swapper`](/packages/asset-swapper)           | [![npm](https://img.shields.io/npm/v/@0x/asset-swapper.svg)](https://www.npmjs.com/package/@0x/asset-swapper)           | Convenience package for discovering and performing swaps for any ERC20 Assets                     |

 #### Ethereum tooling
@@ -91,12 +97,15 @@ 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

-| Package                            | Description                                                                      |
-| ---------------------------------- | -------------------------------------------------------------------------------- |
-| [`@0x/instant`](/packages/instant) | A free and flexible way to offer simple crypto purchasing in any app or website. |
+| Package                                            | Description                                                                      |
+| -------------------------------------------------- | -------------------------------------------------------------------------------- |
+| [`@0x/instant`](/packages/instant)                 | A free and flexible way to offer simple crypto purchasing in any app or website. |
+| [`@0x/testnet-faucets`](/packages/testnet-faucets) | A faucet micro-service that dispenses test ERC20 tokens or Ether                 |
+| [`@0x/website`](/packages/website)                 | 0x website                                                                       |

 ## Usage

--- a/contracts/README.md
+++ b/contracts/README.md
@@ -13,4 +13,4 @@

 #### Development

-Building solidity files will update the contract artifact in `{package-name}/generated-artifacts/{contract}.json`, but does not automatically update the `contract-artifacts` or `contract-wrappers` packages, which are generated from the artifact JSON. See `contract-artifacts/README.md` for instructions on updating these packages.
+Building solidity files will update the contract artifact in `{package-name}/generated-artifacts/{contract}.json`, but does not automatically update the `abi-gen-wrappers` package, which are generated from the artifact JSON. To ensure consistency, clean and rebuild `abi-gen-wrappers` after any changes to the artifact JSON.
--- a/contracts/asset-proxy/.solhintignore
+++ b/contracts/asset-proxy/.solhintignore
@@ -1,2 +0,0 @@
-# solhint can't parse `abi.decode` syntax.
-contracts/src/ERC1155Proxy.sol
--- a/contracts/asset-proxy/CHANGELOG.json
+++ b/contracts/asset-proxy/CHANGELOG.json
@@ -1,171 +1,4 @@
 [
-    {
-        "timestamp": 1576540892,
-        "version": "3.0.2",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1575931811,
-        "version": "3.0.1",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "version": "3.0.0",
-        "changes": [
-            {
-                "note": "Implement `KyberBridge`.",
-                "pr": 2352
-            },
-            {
-                "note": "Drastically reduced bundle size by adding .npmignore, only exporting specific artifacts/wrappers/utils",
-                "pr": 2330
-            },
-            {
-                "note": "ERC20Wrapper and ERC1155ProxyWrapper constructors now require an instance of DevUtilsContract",
-                "pr": 2034
-            },
-            {
-                "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": 1575296764
-    },
-    {
-        "version": "2.3.0-beta.4",
-        "changes": [
-            {
-                "note": "Implement `KyberBridge`.",
-                "pr": 2352
-            },
-            {
-                "note": "Implement `DydxBridge`.",
-                "pr": 2365
-            }
-        ],
-        "timestamp": 1575290197
-    },
-    {
-        "version": "2.3.0-beta.3",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ],
-        "timestamp": 1574238768
-    },
-    {
-        "version": "2.3.0-beta.2",
-        "changes": [
-            {
-                "note": "Drastically reduced bundle size by adding .npmignore, only exporting specific artifacts/wrappers/utils",
-                "pr": 2330
-            }
-        ],
-        "timestamp": 1574030254
-    },
-    {
-        "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",
@@ -272,18 +105,6 @@
            {
                "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
--- a/contracts/asset-proxy/CHANGELOG.md
+++ b/contracts/asset-proxy/CHANGELOG.md
@@ -5,64 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## v3.0.2 - _December 17, 2019_
-
-    * Dependencies updated
-
-## v3.0.1 - _December 9, 2019_
-
-    * Dependencies updated
-
-## v3.0.0 - _December 2, 2019_
-
-    * Implement `KyberBridge`. (#2352)
-    * Drastically reduced bundle size by adding .npmignore, only exporting specific artifacts/wrappers/utils (#2330)
-    * ERC20Wrapper and ERC1155ProxyWrapper constructors now require an instance of DevUtilsContract (#2034)
-    * 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.3.0-beta.4 - _December 2, 2019_
-
-    * Implement `KyberBridge`. (#2352)
-    * Implement `DydxBridge`. (#2365)
-
-## v2.3.0-beta.3 - _November 20, 2019_
-
-    * Dependencies updated
-
-## v2.3.0-beta.2 - _November 17, 2019_
-
-    * Drastically reduced bundle size by adding .npmignore, only exporting specific artifacts/wrappers/utils (#2330)
-
-## 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
@@ -108,9 +50,6 @@ 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_

--- a/contracts/asset-proxy/README.md
+++ b/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 this 0x [guide](https://0x.org/docs/guides/0x-cheat-sheet) 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 the 0x [wiki](https://0xproject.com/wiki#Deployed-Addresses) 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://0x.org/docs/guides/bug-bounty-program).
+A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0xproject.com/wiki#Bug-Bounty).

 ## Contributing

--- a/contracts/asset-proxy/compiler.json
+++ b/contracts/asset-proxy/compiler.json
@@ -1,5 +1,5 @@
 {
-    "artifactsDir": "./test/generated-artifacts",
+    "artifactsDir": "./generated-artifacts",
    "contractsDir": "./contracts",
    "useDockerisedSolc": false,
    "isOfflineMode": false,
@@ -22,5 +22,17 @@
                ]
            }
        }
-    }
+    },
+    "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"
+    ]
 }
--- a/contracts/asset-proxy/contracts/archive/Ownable.sol
+++ b/contracts/asset-proxy/contracts/archive/Ownable.sol
@@ -1,33 +0,0 @@
-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;
-        }
-    }
-}
--- a/contracts/asset-proxy/contracts/src/ERC1155Proxy.sol
+++ b/contracts/asset-proxy/contracts/src/ERC1155Proxy.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -19,18 +19,18 @@
 pragma solidity ^0.5.9;

 import "@0x/contracts-utils/contracts/src/LibBytes.sol";
-import "@0x/contracts-utils/contracts/src/LibSafeMath.sol";
+import "@0x/contracts-utils/contracts/src/SafeMath.sol";
 import "@0x/contracts-erc1155/contracts/src/interfaces/IERC1155.sol";
-import "../archive/MixinAuthorizable.sol";
+import "./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] = values[i].safeMul(amount);
+            scaledValues[i] = safeMul(values[i], amount);
        }

        // Execute `safeBatchTransferFrom` call
--- a/contracts/asset-proxy/contracts/src/ERC20BridgeProxy.sol
+++ b/contracts/asset-proxy/contracts/src/ERC20BridgeProxy.sol
@@ -1,126 +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.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);
-    }
-}
--- a/contracts/asset-proxy/contracts/src/ERC20Proxy.sol
+++ b/contracts/asset-proxy/contracts/src/ERC20Proxy.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,9 +16,9 @@

 */

-pragma solidity ^0.5.9;
+pragma solidity ^0.5.5;

-import "../archive/MixinAuthorizable.sol";
+import "./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)
--- a/contracts/asset-proxy/contracts/src/ERC721Proxy.sol
+++ b/contracts/asset-proxy/contracts/src/ERC721Proxy.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,9 +16,9 @@

 */

-pragma solidity ^0.5.9;
+pragma solidity ^0.5.5;

-import "../archive/MixinAuthorizable.sol";
+import "./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)
--- a/contracts/asset-proxy/contracts/archive/MixinAssetProxyDispatcher.sol
+++ b/contracts/asset-proxy/contracts/archive/MixinAssetProxyDispatcher.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,16 +16,16 @@

 */

-pragma solidity ^0.5.9;
+pragma solidity ^0.5.5;

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


 contract MixinAssetProxyDispatcher is
    Ownable,
-    IAssetProxyDispatcher
+    MAssetProxyDispatcher
 {
    // 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
                )
--- a/contracts/asset-proxy/contracts/archive/MixinAuthorizable.sol
+++ b/contracts/asset-proxy/contracts/archive/MixinAuthorizable.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,15 +16,15 @@

 */

-pragma solidity ^0.5.9;
+pragma solidity ^0.5.5;

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


 contract MixinAuthorizable is
    Ownable,
-    IAuthorizable
+    MAuthorizable
 {
    /// @dev Only authorized addresses can invoke functions with this modifier.
    modifier onlyAuthorized {
--- a/contracts/asset-proxy/contracts/src/MultiAssetProxy.sol
+++ b/contracts/asset-proxy/contracts/src/MultiAssetProxy.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,10 +16,10 @@

 */

-pragma solidity ^0.5.9;
+pragma solidity ^0.5.5;

-import "../archive/MixinAssetProxyDispatcher.sol";
-import "../archive/MixinAuthorizable.sol";
+import "./MixinAssetProxyDispatcher.sol";
+import "./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
                    )
--- a/contracts/asset-proxy/contracts/src/StaticCallProxy.sol
+++ b/contracts/asset-proxy/contracts/src/StaticCallProxy.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
--- a/contracts/asset-proxy/contracts/src/bridges/ChaiBridge.sol
+++ b/contracts/asset-proxy/contracts/src/bridges/ChaiBridge.sol
@@ -1,75 +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.9;
-pragma experimental ABIEncoderV2;
-
-import "../interfaces/IERC20Bridge.sol";
-import "../interfaces/IChai.sol";
-import "@0x/contracts-utils/contracts/src/DeploymentConstants.sol";
-import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
-
-
-// solhint-disable space-after-comma
-contract ChaiBridge is
-    IERC20Bridge,
-    DeploymentConstants
-{
-    /// @dev Withdraws `amount` of `from` address's Dai from the Chai contract.
-    ///      Transfers `amount` of Dai to `to` address.
-    /// @param from Address to transfer asset from.
-    /// @param to Address to transfer asset to.
-    /// @param amount Amount of asset to transfer.
-    /// @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)
-    {
-        // Ensure that only the `ERC20BridgeProxy` can call this function.
-        require(
-            msg.sender == _getERC20BridgeProxyAddress(),
-            "ChaiBridge/ONLY_CALLABLE_BY_ERC20_BRIDGE_PROXY"
-        );
-
-        // Withdraw `from` address's Dai.
-        // NOTE: This contract must be approved to spend Chai on behalf of `from`.
-        bytes memory drawCalldata = abi.encodeWithSelector(
-            IChai(address(0)).draw.selector,
-            from,
-            amount
-        );
-
-        (bool success,) = _getChaiAddress().call(drawCalldata);
-        require(
-            success,
-            "ChaiBridge/DRAW_DAI_FAILED"
-        );
-
-        // Transfer Dai to `to`
-        // This will never fail if the `draw` call was successful
-        IERC20Token(_getDaiAddress()).transfer(to, amount);
-
-        return BRIDGE_SUCCESS;
-    }
-}
--- a/contracts/asset-proxy/contracts/src/bridges/DydxBridge.sol
+++ b/contracts/asset-proxy/contracts/src/bridges/DydxBridge.sol
@@ -1,241 +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.9;
-pragma experimental ABIEncoderV2;
-
-import "@0x/contracts-utils/contracts/src/DeploymentConstants.sol";
-import "@0x/contracts-utils/contracts/src/LibSafeMath.sol";
-import "@0x/contracts-exchange-libs/contracts/src/LibMath.sol";
-import "../interfaces/IERC20Bridge.sol";
-import "../interfaces/IDydxBridge.sol";
-import "../interfaces/IDydx.sol";
-
-
-contract DydxBridge is
-    IERC20Bridge,
-    IDydxBridge,
-    DeploymentConstants
-{
-
-    using LibSafeMath for uint256;
-
-    /// @dev Callback for `IERC20Bridge`. Deposits or withdraws tokens from a dydx account.
-    ///      Notes:
-    ///         1. This bridge must be set as an operator of the input dydx account.
-    ///         2. This function may only be called in the context of the 0x Exchange.
-    ///         3. The maker or taker of the 0x order must be the dydx account owner.
-    ///         4. Deposits into dydx are made from the `from` address.
-    ///         5. Withdrawals from dydx are made to the `to` address.
-    ///         6. Calling this function must always withdraw at least `amount`,
-    ///            otherwise the `ERC20Bridge` will revert.
-    /// @param from The sender of the tokens and owner of the dydx account.
-    /// @param to The recipient of the tokens.
-    /// @param amount Minimum amount of `toTokenAddress` tokens to deposit or withdraw.
-    /// @param encodedBridgeData An abi-encoded `BridgeData` struct.
-    /// @return success The magic bytes if successful.
-    function bridgeTransferFrom(
-        address,
-        address from,
-        address to,
-        uint256 amount,
-        bytes calldata encodedBridgeData
-    )
-        external
-        returns (bytes4 success)
-    {
-        // Ensure that only the `ERC20BridgeProxy` can call this function.
-        require(
-            msg.sender == _getERC20BridgeProxyAddress(),
-            "DydxBridge/ONLY_CALLABLE_BY_ERC20_BRIDGE_PROXY"
-        );
-
-        // Decode bridge data.
-        (BridgeData memory bridgeData) = abi.decode(encodedBridgeData, (BridgeData));
-
-        // The dydx accounts are owned by the `from` address.
-        IDydx.AccountInfo[] memory accounts = _createAccounts(from, bridgeData);
-
-        // Create dydx actions to run on the dydx accounts.
-        IDydx.ActionArgs[] memory actions = _createActions(
-            from,
-            to,
-            amount,
-            bridgeData
-        );
-
-        // Run operation. This will revert on failure.
-        IDydx(_getDydxAddress()).operate(accounts, actions);
-        return BRIDGE_SUCCESS;
-    }
-
-    /// @dev Creates an array of accounts for dydx to operate on.
-    ///      All accounts must belong to the same owner.
-    /// @param accountOwner Owner of the dydx account.
-    /// @param bridgeData A `BridgeData` struct.
-    function _createAccounts(
-        address accountOwner,
-        BridgeData memory bridgeData
-    )
-        internal
-        returns (IDydx.AccountInfo[] memory accounts)
-    {
-        uint256[] memory accountNumbers = bridgeData.accountNumbers;
-        uint256 nAccounts = accountNumbers.length;
-        accounts = new IDydx.AccountInfo[](nAccounts);
-        for (uint256 i = 0; i < nAccounts; ++i) {
-            accounts[i] = IDydx.AccountInfo({
-                owner: accountOwner,
-                number: accountNumbers[i]
-            });
-        }
-    }
-
-    /// @dev Creates an array of actions to carry out on dydx.
-    /// @param depositFrom Deposit value from this address (owner of the dydx account).
-    /// @param withdrawTo Withdraw value to this address.
-    /// @param amount The amount of value available to operate on.
-    /// @param bridgeData A `BridgeData` struct.
-    function _createActions(
-        address depositFrom,
-        address withdrawTo,
-        uint256 amount,
-        BridgeData memory bridgeData
-    )
-        internal
-        returns (IDydx.ActionArgs[] memory actions)
-    {
-        BridgeAction[] memory bridgeActions = bridgeData.actions;
-        uint256 nBridgeActions = bridgeActions.length;
-        actions = new IDydx.ActionArgs[](nBridgeActions);
-        for (uint256 i = 0; i < nBridgeActions; ++i) {
-            // Cache current bridge action.
-            BridgeAction memory bridgeAction = bridgeActions[i];
-
-            // Scale amount, if conversion rate is set.
-            uint256 scaledAmount;
-            if (bridgeAction.conversionRateDenominator > 0) {
-                scaledAmount = LibMath.safeGetPartialAmountFloor(
-                    bridgeAction.conversionRateNumerator,
-                    bridgeAction.conversionRateDenominator,
-                    amount
-                );
-            } else {
-                scaledAmount = amount;
-            }
-
-            // Construct dydx action.
-            if (bridgeAction.actionType == BridgeActionType.Deposit) {
-                // Deposit tokens from the account owner into their dydx account.
-                actions[i] = _createDepositAction(
-                    depositFrom,
-                    scaledAmount,
-                    bridgeAction
-                );
-            } else if (bridgeAction.actionType == BridgeActionType.Withdraw) {
-                // Withdraw tokens from dydx to the `otherAccount`.
-                actions[i] = _createWithdrawAction(
-                    withdrawTo,
-                    scaledAmount,
-                    bridgeAction
-                );
-            } else {
-                // If all values in the `Action` enum are handled then this
-                // revert is unreachable: Solidity will revert when casting
-                // from `uint8` to `Action`.
-                revert("DydxBridge/UNRECOGNIZED_BRIDGE_ACTION");
-            }
-        }
-    }
-
-    /// @dev Returns a dydx `DepositAction`.
-    /// @param depositFrom Deposit tokens from this address who is also the account owner.
-    /// @param amount of tokens to deposit.
-    /// @param bridgeAction A `BridgeAction` struct.
-    /// @return depositAction The encoded dydx action.
-    function _createDepositAction(
-        address depositFrom,
-        uint256 amount,
-        BridgeAction memory bridgeAction
-    )
-        internal
-        pure
-        returns (
-            IDydx.ActionArgs memory depositAction
-        )
-    {
-        // Create dydx amount.
-        IDydx.AssetAmount memory dydxAmount = IDydx.AssetAmount({
-            sign: true,                                 // true if positive.
-            denomination: IDydx.AssetDenomination.Wei,  // Wei => actual token amount held in account.
-            ref: IDydx.AssetReference.Delta,                // Delta => a relative amount.
-            value: amount                               // amount to deposit.
-        });
-
-        // Create dydx deposit action.
-        depositAction = IDydx.ActionArgs({
-            actionType: IDydx.ActionType.Deposit,           // deposit tokens.
-            amount: dydxAmount,                             // amount to deposit.
-            accountId: bridgeAction.accountId,              // index in the `accounts` when calling `operate`.
-            primaryMarketId: bridgeAction.marketId,         // indicates which token to deposit.
-            otherAddress: depositFrom,                      // deposit from the account owner.
-            // unused parameters
-            secondaryMarketId: 0,
-            otherAccountId: 0,
-            data: hex''
-        });
-    }
-
-    /// @dev Returns a dydx `WithdrawAction`.
-    /// @param withdrawTo Withdraw tokens to this address.
-    /// @param amount of tokens to withdraw.
-    /// @param bridgeAction A `BridgeAction` struct.
-    /// @return withdrawAction The encoded dydx action.
-    function _createWithdrawAction(
-        address withdrawTo,
-        uint256 amount,
-        BridgeAction memory bridgeAction
-    )
-        internal
-        pure
-        returns (
-            IDydx.ActionArgs memory withdrawAction
-        )
-    {
-        // Create dydx amount.
-        IDydx.AssetAmount memory amountToWithdraw = IDydx.AssetAmount({
-            sign: false,                                    // false if negative.
-            denomination: IDydx.AssetDenomination.Wei,      // Wei => actual token amount held in account.
-            ref: IDydx.AssetReference.Delta,                // Delta => a relative amount.
-            value: amount                                   // amount to withdraw.
-        });
-
-        // Create withdraw action.
-        withdrawAction = IDydx.ActionArgs({
-            actionType: IDydx.ActionType.Withdraw,          // withdraw tokens.
-            amount: amountToWithdraw,                       // amount to withdraw.
-            accountId: bridgeAction.accountId,              // index in the `accounts` when calling `operate`.
-            primaryMarketId: bridgeAction.marketId,         // indicates which token to withdraw.
-            otherAddress: withdrawTo,                       // withdraw tokens to this address.
-            // unused parameters
-            secondaryMarketId: 0,
-            otherAccountId: 0,
-            data: hex''
-        });
-    }
-}
--- a/contracts/asset-proxy/contracts/src/bridges/Eth2DaiBridge.sol
+++ b/contracts/asset-proxy/contracts/src/bridges/Eth2DaiBridge.sol
@@ -1,87 +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.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 "@0x/contracts-utils/contracts/src/DeploymentConstants.sol";
-import "../interfaces/IERC20Bridge.sol";
-import "../interfaces/IEth2Dai.sol";
-
-
-// solhint-disable space-after-comma
-contract Eth2DaiBridge is
-    IERC20Bridge,
-    IWallet,
-    DeploymentConstants
-{
-    /// @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 = IEth2Dai(_getEth2DaiAddress());
-        // 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 = exchange.sellAllAmount(
-            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;
-    }
-}
--- a/contracts/asset-proxy/contracts/src/bridges/KyberBridge.sol
+++ b/contracts/asset-proxy/contracts/src/bridges/KyberBridge.sol
@@ -1,146 +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.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 "@0x/contracts-utils/contracts/src/DeploymentConstants.sol";
-import "../interfaces/IERC20Bridge.sol";
-import "../interfaces/IKyberNetworkProxy.sol";
-
-
-// solhint-disable space-after-comma
-contract KyberBridge is
-    IERC20Bridge,
-    IWallet,
-    DeploymentConstants
-{
-    // @dev Structure used internally to get around stack limits.
-    struct TradeState {
-        IKyberNetworkProxy kyber;
-        IEtherToken weth;
-        address fromTokenAddress;
-        uint256 fromTokenBalance;
-        uint256 payableAmount;
-    }
-
-    /// @dev Kyber ETH pseudo-address.
-    address constant public KYBER_ETH_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
-    /// @dev `bridgeTransferFrom()` failure result.
-    bytes4 constant private BRIDGE_FAILED = 0x0;
-    /// @dev Precision of Kyber rates.
-    uint256 constant private KYBER_RATE_BASE = 10 ** 18;
-
-    // solhint-disable no-empty-blocks
-    /// @dev Payable fallback to receive ETH from Kyber.
-    function ()
-        external
-        payable
-    {}
-
-    /// @dev Callback for `IKyberBridge`. Tries to buy `amount` of
-    ///      `toTokenAddress` tokens by selling the entirety of the opposing asset
-    ///      to the `KyberNetworkProxy` contract, then transfers the bought
-    ///      tokens to `to`.
-    /// @param toTokenAddress The token to give to `to`.
-    /// @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)
-    {
-        TradeState memory state;
-        state.kyber = IKyberNetworkProxy(_getKyberNetworkProxyAddress());
-        state.weth = IEtherToken(_getWethAddress());
-        // Decode the bridge data to get the `fromTokenAddress`.
-        (state.fromTokenAddress) = abi.decode(bridgeData, (address));
-        state.fromTokenBalance = IERC20Token(state.fromTokenAddress).balanceOf(address(this));
-        if (state.fromTokenBalance == 0) {
-            // Return failure if no input tokens.
-            return BRIDGE_FAILED;
-        }
-        if (state.fromTokenAddress == toTokenAddress) {
-            // Just transfer the tokens if they're the same.
-            LibERC20Token.transfer(state.fromTokenAddress, to, state.fromTokenBalance);
-            return BRIDGE_SUCCESS;
-        } else if (state.fromTokenAddress != address(state.weth)) {
-            // If the input token is not WETH, grant an allowance to the exchange
-            // to spend them.
-            LibERC20Token.approve(state.fromTokenAddress, address(state.kyber), uint256(-1));
-        } else {
-            // If the input token is WETH, unwrap it and attach it to the call.
-            state.fromTokenAddress = KYBER_ETH_ADDRESS;
-            state.payableAmount = state.fromTokenBalance;
-            state.weth.withdraw(state.fromTokenBalance);
-        }
-        bool isToTokenWeth = toTokenAddress == address(state.weth);
-
-        // Try to sell all of this contract's input token balance through
-        // `KyberNetworkProxy.trade()`.
-        uint256 boughtAmount = state.kyber.trade.value(state.payableAmount)(
-            // Input token.
-            state.fromTokenAddress,
-            // Sell amount.
-            state.fromTokenBalance,
-            // Output token.
-            isToTokenWeth ? KYBER_ETH_ADDRESS : toTokenAddress,
-            // Transfer to this contract if converting to ETH, otherwise
-            // transfer directly to the recipient.
-            isToTokenWeth ? address(uint160(address(this))) : address(uint160(to)),
-            // Buy as much as possible.
-            uint256(-1),
-            // Compute the minimum conversion rate, which is expressed in units with
-            // 18 decimal places.
-            (KYBER_RATE_BASE * amount) / state.fromTokenBalance,
-            // No affiliate address.
-            address(0)
-        );
-        // Wrap ETH output and transfer to recipient.
-        if (isToTokenWeth) {
-            state.weth.deposit.value(boughtAmount)();
-            state.weth.transfer(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;
-    }
-}
--- a/contracts/asset-proxy/contracts/src/bridges/UniswapBridge.sol
+++ b/contracts/asset-proxy/contracts/src/bridges/UniswapBridge.sol
@@ -1,200 +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.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 "@0x/contracts-utils/contracts/src/DeploymentConstants.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,
-    DeploymentConstants
-{
-    // 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 = IEtherToken(_getWethAddress());
-
-        // 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 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 == _getWethAddress()) {
-            exchangeTokenAddress = toTokenAddress;
-        }
-        exchange = IUniswapExchange(
-            IUniswapExchangeFactory(_getUniswapExchangeFactoryAddress())
-            .getExchange(exchangeTokenAddress)
-        );
-        require(address(exchange) != address(0), "NO_UNISWAP_EXCHANGE_FOR_TOKEN");
-        return exchange;
-    }
-}
--- a/contracts/asset-proxy/contracts/src/interfaces/IAssetData.sol
+++ b/contracts/asset-proxy/contracts/src/interfaces/IAssetData.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -17,7 +17,7 @@
 */

 // solhint-disable
-pragma solidity ^0.5.9;
+pragma solidity ^0.5.5;
 pragma experimental ABIEncoderV2;


@@ -26,63 +26,33 @@ 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 values,
+        uint256[] calldata tokenValues,
        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 values,
+        uint256[] calldata amounts,
        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 staticCallTargetAddress,
+        address callTarget,
        bytes calldata staticCallData,
-        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
+        bytes32 callResultHash
    )
        external;
 }
--- a/contracts/asset-proxy/contracts/src/interfaces/IAssetProxy.sol
+++ b/contracts/asset-proxy/contracts/src/interfaces/IAssetProxy.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,7 +16,9 @@

 */

-pragma solidity ^0.5.9;
+pragma solidity ^0.5.5;
+
+import "./IAuthorizable.sol";


 contract IAssetProxy {
--- a/contracts/asset-proxy/contracts/src/interfaces/IAssetProxyDispatcher.sol
+++ b/contracts/asset-proxy/contracts/src/interfaces/IAssetProxyDispatcher.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,17 +16,11 @@

 */

-pragma solidity ^0.5.9;
+pragma solidity ^0.5.5;


 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.
--- a/contracts/asset-proxy/contracts/src/interfaces/IAuthorizable.sol
+++ b/contracts/asset-proxy/contracts/src/interfaces/IAuthorizable.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,7 +16,7 @@

 */

-pragma solidity ^0.5.9;
+pragma solidity ^0.5.5;

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

@@ -24,18 +24,6 @@ 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)
@@ -54,7 +42,7 @@ contract IAuthorizable is
        uint256 index
    )
        external;
-
+    
    /// @dev Gets all authorized addresses.
    /// @return Array of authorized addresses.
    function getAuthorizedAddresses()
--- a/contracts/asset-proxy/contracts/src/interfaces/IChai.sol
+++ b/contracts/asset-proxy/contracts/src/interfaces/IChai.sol
@@ -1,33 +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.9;
-
-
-// The actual Chai contract can be found here: https://github.com/dapphub/chai
-contract IChai {
-
-    /// @dev Withdraws Dai owned by `src`
-    /// @param src Address that owns Dai.
-    /// @param wad Amount of Dai to withdraw.
-    function draw(
-        address src,
-        uint256 wad
-    )
-        external;
-}
--- a/contracts/asset-proxy/contracts/src/interfaces/IDydx.sol
+++ b/contracts/asset-proxy/contracts/src/interfaces/IDydx.sol
@@ -1,89 +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.9;
-pragma experimental ABIEncoderV2;
-
-
-interface IDydx {
-
-    /// @dev Represents the unique key that specifies an account
-    struct AccountInfo {
-        address owner;  // The address that owns the account
-        uint256 number; // A nonce that allows a single address to control many accounts
-    }
-
-    enum ActionType {
-        Deposit,   // supply tokens
-        Withdraw,  // borrow tokens
-        Transfer,  // transfer balance between accounts
-        Buy,       // buy an amount of some token (externally)
-        Sell,      // sell an amount of some token (externally)
-        Trade,     // trade tokens against another account
-        Liquidate, // liquidate an undercollateralized or expiring account
-        Vaporize,  // use excess tokens to zero-out a completely negative account
-        Call       // send arbitrary data to an address
-    }
-
-    /// @dev Arguments that are passed to Solo in an ordered list as part of a single operation.
-    /// Each ActionArgs has an actionType which specifies which action struct that this data will be
-    /// parsed into before being processed.
-    struct ActionArgs {
-        ActionType actionType;
-        uint256 accountId;
-        AssetAmount amount;
-        uint256 primaryMarketId;
-        uint256 secondaryMarketId;
-        address otherAddress;
-        uint256 otherAccountId;
-        bytes data;
-    }
-
-    enum AssetDenomination {
-        Wei, // the amount is denominated in wei
-        Par  // the amount is denominated in par
-    }
-
-    enum AssetReference {
-        Delta, // the amount is given as a delta from the current value
-        Target // the amount is given as an exact number to end up at
-    }
-
-    struct AssetAmount {
-        bool sign; // true if positive
-        AssetDenomination denomination;
-        AssetReference ref;
-        uint256 value;
-    }
-
-    /// @dev The main entry-point to Solo that allows users and contracts to manage accounts.
-    ///      Take one or more actions on one or more accounts. The msg.sender must be the owner or
-    ///      operator of all accounts except for those being liquidated, vaporized, or traded with.
-    ///      One call to operate() is considered a singular "operation". Account collateralization is
-    ///      ensured only after the completion of the entire operation.
-    /// @param  accounts  A list of all accounts that will be used in this operation. Cannot contain
-    ///                   duplicates. In each action, the relevant account will be referred-to by its
-    ///                   index in the list.
-    /// @param  actions   An ordered list of all actions that will be taken in this operation. The
-    ///                   actions will be processed in order.
-    function operate(
-        AccountInfo[] calldata accounts,
-        ActionArgs[] calldata actions
-    )
-        external;
-}
--- a/contracts/asset-proxy/contracts/src/interfaces/IDydxBridge.sol
+++ b/contracts/asset-proxy/contracts/src/interfaces/IDydxBridge.sol
@@ -1,42 +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.9;
-
-
-interface IDydxBridge {
-
-    /// @dev This is the subset of `IDydx.ActionType` that are supported by the bridge.
-    enum BridgeActionType {
-        Deposit,                    // Deposit tokens into dydx account.
-        Withdraw                    // Withdraw tokens from dydx account.
-    }
-
-    struct BridgeAction {
-        BridgeActionType actionType;            // Action to run on dydx account.
-        uint256 accountId;                      // Index in `BridgeData.accountNumbers` for this action.
-        uint256 marketId;                       // Market to operate on.
-        uint256 conversionRateNumerator;        // Optional. If set, transfer amount is scaled by (conversionRateNumerator/conversionRateDenominator).
-        uint256 conversionRateDenominator;      // Optional. If set, transfer amount is scaled by (conversionRateNumerator/conversionRateDenominator).
-    }
-
-    struct BridgeData {
-        uint256[] accountNumbers;               // Account number used to identify the owner's specific account.
-        BridgeAction[] actions;                 // Actions to carry out on the owner's accounts.
-    }
-}
--- a/contracts/asset-proxy/contracts/src/interfaces/IERC20Bridge.sol
+++ b/contracts/asset-proxy/contracts/src/interfaces/IERC20Bridge.sol
@@ -1,43 +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.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);
-}
--- a/contracts/asset-proxy/contracts/src/interfaces/IEth2Dai.sol
+++ b/contracts/asset-proxy/contracts/src/interfaces/IEth2Dai.sol
@@ -1,38 +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.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);
-}
--- a/contracts/asset-proxy/contracts/src/interfaces/IKyberNetworkProxy.sol
+++ b/contracts/asset-proxy/contracts/src/interfaces/IKyberNetworkProxy.sol
@@ -1,46 +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.9;
-
-
-interface IKyberNetworkProxy {
-
-    /// @dev Sells `sellTokenAddress` tokens for `buyTokenAddress` tokens.
-    /// @param sellTokenAddress Token to sell.
-    /// @param sellAmount Amount of tokens to sell.
-    /// @param buyTokenAddress Token to buy.
-    /// @param recipientAddress Address to send bought tokens to.
-    /// @param maxBuyTokenAmount A limit on the amount of tokens to buy.
-    /// @param minConversionRate The minimal conversion rate. If actual rate
-    ///        is lower, trade is canceled.
-    /// @param walletId The wallet ID to send part of the fees
-    /// @return boughtAmount Amount of tokens bought.
-    function trade(
-        address sellTokenAddress,
-        uint256 sellAmount,
-        address buyTokenAddress,
-        address payable recipientAddress,
-        uint256 maxBuyTokenAmount,
-        uint256 minConversionRate,
-        address walletId
-    )
-        external
-        payable
-        returns(uint256 boughtAmount);
-}
--- a/contracts/asset-proxy/contracts/src/interfaces/IUniswapExchange.sol
+++ b/contracts/asset-proxy/contracts/src/interfaces/IUniswapExchange.sol
@@ -1,70 +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.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);
-}
--- a/contracts/asset-proxy/contracts/src/interfaces/IUniswapExchangeFactory.sol
+++ b/contracts/asset-proxy/contracts/src/interfaces/IUniswapExchangeFactory.sol
@@ -1,32 +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.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 (address);
-}
--- a/contracts/asset-proxy/contracts/src/libs/LibAssetProxyIds.sol
+++ b/contracts/asset-proxy/contracts/src/libs/LibAssetProxyIds.sol
@@ -0,0 +1,40 @@
+/*
+
+  Copyright 2019 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.5.5;
+
+
+contract LibAssetProxyIds {
+
+    // AssetProxy Ids are equiavalent the first 4 bytes of the keccak256 hash of the function signature assigned to each AssetProxy.
+
+    // ERC20Token(address)
+    bytes4 constant public ERC20_PROXY_ID = 0xf47261b0;
+
+    // ERC721Token(address,uint256)
+    bytes4 constant public ERC721_PROXY_ID = 0x02571792;
+
+    // ERC1155Assets(address,uint256[],uint256[],bytes)
+    bytes4 constant public ERC1155_PROXY_ID = 0xa7cb5fb7;
+
+    // MultiAsset(uint256[],bytes[])
+    bytes4 constant public MULTI_ASSET_PROXY_ID = 0x94cfcdd7;
+
+    // StaticCall(address,bytes,bytes32)
+    bytes4 constant public STATIC_CALL_PROXY_ID = 0xc339d10a;
+}
--- a/contracts/asset-proxy/contracts/src/mixins/MAssetProxyDispatcher.sol
+++ b/contracts/asset-proxy/contracts/src/mixins/MAssetProxyDispatcher.sol
@@ -0,0 +1,45 @@
+/*
+
+  Copyright 2018 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.5.5;
+
+import "../interfaces/IAssetProxyDispatcher.sol";
+
+
+contract MAssetProxyDispatcher is
+    IAssetProxyDispatcher
+{
+    // Logs registration of new asset proxy
+    event AssetProxyRegistered(
+        bytes4 id,              // Id of new registered AssetProxy.
+        address assetProxy      // Address of new registered AssetProxy.
+    );
+
+    /// @dev Forwards arguments to assetProxy and calls `transferFrom`. Either succeeds or throws.
+    /// @param assetData Byte array encoded for the asset.
+    /// @param from Address to transfer token from.
+    /// @param to Address to transfer token to.
+    /// @param amount Amount of token to transfer.
+    function dispatchTransferFrom(
+        bytes memory assetData,
+        address from,
+        address to,
+        uint256 amount
+    )
+        internal;
+}
--- a/contracts/asset-proxy/contracts/src/mixins/MAuthorizable.sol
+++ b/contracts/asset-proxy/contracts/src/mixins/MAuthorizable.sol
@@ -0,0 +1,41 @@
+/*
+
+  Copyright 2018 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.5.5;
+
+import "../interfaces/IAuthorizable.sol";
+
+
+contract MAuthorizable is
+    IAuthorizable
+{
+    // Event logged when a new address is authorized.
+    event AuthorizedAddressAdded(
+        address indexed target,
+        address indexed caller
+    );
+
+    // Event logged when a currently authorized address is unauthorized.
+    event AuthorizedAddressRemoved(
+        address indexed target,
+        address indexed caller
+    );
+
+    /// @dev Only authorized addresses can invoke functions with this modifier.
+    modifier onlyAuthorized { revert(); _; }
+}
--- a/contracts/asset-proxy/contracts/test/TestChaiBridge.sol
+++ b/contracts/asset-proxy/contracts/test/TestChaiBridge.sol
@@ -1,80 +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.9;
-pragma experimental ABIEncoderV2;
-
-import "../src/bridges/ChaiBridge.sol";
-import "@0x/contracts-erc20/contracts/src/ERC20Token.sol";
-
-
-contract TestChaiDai is
-    ERC20Token
-{
-    address private constant ALWAYS_REVERT_ADDRESS = address(1);
-
-    function draw(
-        address from,
-        uint256 amount
-    )
-        external
-    {
-        if (from == ALWAYS_REVERT_ADDRESS) {
-            revert();
-        }
-        balances[msg.sender] += amount;
-    }
-}
-
-
-contract TestChaiBridge is
-    ChaiBridge
-{
-    address public testChaiDai;
-    address private constant ALWAYS_REVERT_ADDRESS = address(1);
-
-    constructor()
-        public
-    {
-        testChaiDai = address(new TestChaiDai());
-    }
-
-    function _getDaiAddress()
-        internal
-        view
-        returns (address)
-    {
-        return testChaiDai;
-    }
-
-    function _getChaiAddress()
-        internal
-        view
-        returns (address)
-    {
-        return testChaiDai;
-    }
-
-    function _getERC20BridgeProxyAddress()
-        internal
-        view
-        returns (address)
-    {
-        return msg.sender == ALWAYS_REVERT_ADDRESS ? address(0) : msg.sender;
-    }
-}
--- a/contracts/asset-proxy/contracts/test/TestDydxBridge.sol
+++ b/contracts/asset-proxy/contracts/test/TestDydxBridge.sol
@@ -1,101 +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.9;
-pragma experimental ABIEncoderV2;
-
-import "../src/bridges/DydxBridge.sol";
-
-
-// solhint-disable space-after-comma
-contract TestDydxBridge is
-    IDydx,
-    DydxBridge
-{
-
-    address private constant ALWAYS_REVERT_ADDRESS = address(1);
-
-    event OperateAccount(
-        address owner,
-        uint256 number
-    );
-
-    event OperateAction(
-        ActionType actionType,
-        uint256 accountId,
-        bool amountSign,
-        AssetDenomination amountDenomination,
-        AssetReference amountRef,
-        uint256 amountValue,
-        uint256 primaryMarketId,
-        uint256 secondaryMarketId,
-        address otherAddress,
-        uint256 otherAccountId,
-        bytes data
-    );
-
-    /// @dev Simulates `operate` in dydx contract.
-    ///      Emits events so that arguments can be validated client-side.
-    function operate(
-        AccountInfo[] calldata accounts,
-        ActionArgs[] calldata actions
-    )
-        external
-    {
-        for (uint i = 0; i < accounts.length; ++i) {
-            emit OperateAccount(
-                accounts[i].owner,
-                accounts[i].number
-            );
-        }
-
-        for (uint i = 0; i < actions.length; ++i) {
-            emit OperateAction(
-                actions[i].actionType,
-                actions[i].accountId,
-                actions[i].amount.sign,
-                actions[i].amount.denomination,
-                actions[i].amount.ref,
-                actions[i].amount.value,
-                actions[i].primaryMarketId,
-                actions[i].secondaryMarketId,
-                actions[i].otherAddress,
-                actions[i].otherAccountId,
-                actions[i].data
-            );
-        }
-    }
-
-    /// @dev overrides `_getDydxAddress()` from `DeploymentConstants` to return this address.
-    function _getDydxAddress()
-        internal
-        view
-        returns (address)
-    {
-        return address(this);
-    }
-
-    /// @dev overrides `_getERC20BridgeProxyAddress()` from `DeploymentConstants` for testing.
-    function _getERC20BridgeProxyAddress()
-        internal
-        view
-        returns (address)
-    {
-        return msg.sender == ALWAYS_REVERT_ADDRESS ? address(0) : msg.sender;
-    }
-}
--- a/contracts/asset-proxy/contracts/test/TestERC20Bridge.sol
+++ b/contracts/asset-proxy/contracts/test/TestERC20Bridge.sol
@@ -1,108 +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.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)) }
-    }
-}
--- a/contracts/asset-proxy/contracts/test/TestEth2DaiBridge.sol
+++ b/contracts/asset-proxy/contracts/test/TestEth2DaiBridge.sol
@@ -1,202 +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.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 _getEth2DaiAddress()
-        internal
-        view
-        returns (address)
-    {
-        return address(this);
-    }
-}
--- a/contracts/asset-proxy/contracts/test/TestKyberBridge.sol
+++ b/contracts/asset-proxy/contracts/test/TestKyberBridge.sol
@@ -1,322 +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.9;
-pragma experimental ABIEncoderV2;
-
-import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
-import "../src/bridges/KyberBridge.sol";
-import "../src/interfaces/IKyberNetworkProxy.sol";
-
-
-// solhint-disable no-simple-event-func-name
-interface ITestContract {
-
-    function wethWithdraw(
-        address payable ownerAddress,
-        uint256 amount
-    )
-        external;
-
-    function wethDeposit(
-        address ownerAddress
-    )
-        external
-        payable;
-
-    function tokenTransfer(
-        address ownerAddress,
-        address recipientAddress,
-        uint256 amount
-    )
-        external
-        returns (bool success);
-
-    function tokenApprove(
-        address ownerAddress,
-        address spenderAddress,
-        uint256 allowance
-    )
-        external
-        returns (bool success);
-
-    function tokenBalanceOf(
-        address ownerAddress
-    )
-        external
-        view
-        returns (uint256 balance);
-}
-
-
-/// @dev A minimalist ERC20/WETH token.
-contract TestToken {
-
-    ITestContract private _testContract;
-
-    constructor() public {
-        _testContract = ITestContract(msg.sender);
-    }
-
-    function approve(address spender, uint256 allowance)
-        external
-        returns (bool)
-    {
-        return _testContract.tokenApprove(
-            msg.sender,
-            spender,
-            allowance
-        );
-    }
-
-    function transfer(address recipient, uint256 amount)
-        external
-        returns (bool)
-    {
-        return _testContract.tokenTransfer(
-            msg.sender,
-            recipient,
-            amount
-        );
-    }
-
-    function withdraw(uint256 amount)
-        external
-    {
-        return _testContract.wethWithdraw(msg.sender, amount);
-    }
-
-    function deposit()
-        external
-        payable
-    {
-        return _testContract.wethDeposit.value(msg.value)(msg.sender);
-    }
-
-    function balanceOf(address owner)
-        external
-        view
-        returns (uint256)
-    {
-        return _testContract.tokenBalanceOf(owner);
-    }
-}
-
-
-/// @dev KyberBridge overridden to mock tokens and implement IKyberBridge.
-contract TestKyberBridge is
-    KyberBridge,
-    ITestContract,
-    IKyberNetworkProxy
-{
-    event KyberBridgeTrade(
-        uint256 msgValue,
-        address sellTokenAddress,
-        uint256 sellAmount,
-        address buyTokenAddress,
-        address payable recipientAddress,
-        uint256 maxBuyTokenAmount,
-        uint256 minConversionRate,
-        address walletId
-    );
-
-    event KyberBridgeWethWithdraw(
-        address ownerAddress,
-        uint256 amount
-    );
-
-    event KyberBridgeWethDeposit(
-        uint256 msgValue,
-        address ownerAddress,
-        uint256 amount
-    );
-
-    event KyberBridgeTokenApprove(
-        address tokenAddress,
-        address ownerAddress,
-        address spenderAddress,
-        uint256 allowance
-    );
-
-    event KyberBridgeTokenTransfer(
-        address tokenAddress,
-        address ownerAddress,
-        address recipientAddress,
-        uint256 amount
-    );
-
-    IEtherToken public weth;
-    mapping (address => mapping (address => uint256)) private _tokenBalances;
-    uint256 private _nextFillAmount;
-
-    constructor() public {
-        weth = IEtherToken(address(new TestToken()));
-    }
-
-    /// @dev Implementation of `IKyberNetworkProxy.trade()`
-    function trade(
-        address sellTokenAddress,
-        uint256 sellAmount,
-        address buyTokenAddress,
-        address payable recipientAddress,
-        uint256 maxBuyTokenAmount,
-        uint256 minConversionRate,
-        address walletId
-    )
-        external
-        payable
-        returns(uint256 boughtAmount)
-    {
-        emit KyberBridgeTrade(
-            msg.value,
-            sellTokenAddress,
-            sellAmount,
-            buyTokenAddress,
-            recipientAddress,
-            maxBuyTokenAmount,
-            minConversionRate,
-            walletId
-        );
-        return _nextFillAmount;
-    }
-
-    function createToken()
-        external
-        returns (address tokenAddress)
-    {
-        return address(new TestToken());
-    }
-
-    function setNextFillAmount(uint256 amount)
-        external
-        payable
-    {
-        if (msg.value != 0) {
-            require(amount == msg.value, "VALUE_AMOUNT_MISMATCH");
-            grantTokensTo(address(weth), address(this), msg.value);
-        }
-        _nextFillAmount = amount;
-    }
-
-    function wethDeposit(
-        address ownerAddress
-    )
-        external
-        payable
-    {
-        require(msg.sender == address(weth), "ONLY_WETH");
-        grantTokensTo(address(weth), ownerAddress, msg.value);
-        emit KyberBridgeWethDeposit(
-            msg.value,
-            ownerAddress,
-            msg.value
-        );
-    }
-
-    function wethWithdraw(
-        address payable ownerAddress,
-        uint256 amount
-    )
-        external
-    {
-        require(msg.sender == address(weth), "ONLY_WETH");
-        _tokenBalances[address(weth)][ownerAddress] -= amount;
-        ownerAddress.transfer(amount);
-        emit KyberBridgeWethWithdraw(
-            ownerAddress,
-            amount
-        );
-    }
-
-    function tokenApprove(
-        address ownerAddress,
-        address spenderAddress,
-        uint256 allowance
-    )
-        external
-        returns (bool success)
-    {
-        emit KyberBridgeTokenApprove(
-            msg.sender,
-            ownerAddress,
-            spenderAddress,
-            allowance
-        );
-        return true;
-    }
-
-    function tokenTransfer(
-        address ownerAddress,
-        address recipientAddress,
-        uint256 amount
-    )
-        external
-        returns (bool success)
-    {
-        _tokenBalances[msg.sender][ownerAddress] -= amount;
-        _tokenBalances[msg.sender][recipientAddress] += amount;
-        emit KyberBridgeTokenTransfer(
-            msg.sender,
-            ownerAddress,
-            recipientAddress,
-            amount
-        );
-        return true;
-    }
-
-    function tokenBalanceOf(
-        address ownerAddress
-    )
-        external
-        view
-        returns (uint256 balance)
-    {
-        return _tokenBalances[msg.sender][ownerAddress];
-    }
-
-    function grantTokensTo(address tokenAddress, address ownerAddress, uint256 amount)
-        public
-        payable
-    {
-        _tokenBalances[tokenAddress][ownerAddress] += amount;
-        if (tokenAddress != address(weth)) {
-            // Send back ether if not WETH.
-            msg.sender.transfer(msg.value);
-        } else {
-            require(msg.value == amount, "VALUE_AMOUNT_MISMATCH");
-        }
-    }
-
-    // @dev overridden to point to this contract.
-    function _getKyberNetworkProxyAddress()
-        internal
-        view
-        returns (address)
-    {
-        return address(this);
-    }
-
-    // @dev overridden to point to test WETH.
-    function _getWethAddress()
-        internal
-        view
-        returns (address)
-    {
-        return address(weth);
-    }
-}
--- a/contracts/asset-proxy/contracts/test/TestStaticCallTarget.sol
+++ b/contracts/asset-proxy/contracts/test/TestStaticCallTarget.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
--- a/contracts/asset-proxy/contracts/test/TestUniswapBridge.sol
+++ b/contracts/asset-proxy/contracts/test/TestUniswapBridge.sol
@@ -1,432 +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.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 (address)
-    {
-        return address(_testExchanges[tokenAddress]);
-    }
-
-    // @dev Use `wethToken`.
-    function _getWethAddress()
-        internal
-        view
-        returns (address)
-    {
-        return address(wethToken);
-    }
-
-    // @dev This contract will double as the Uniswap contract.
-    function _getUniswapExchangeFactoryAddress()
-        internal
-        view
-        returns (address)
-    {
-        return address(this);
-    }
-}
--- a/contracts/asset-proxy/package.json
+++ b/contracts/asset-proxy/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-asset-proxy",
-    "version": "3.0.2",
+    "version": "2.2.6",
    "engines": {
        "node": ">=6.12"
    },
@@ -12,7 +12,7 @@
    "scripts": {
        "build": "yarn pre_build && tsc -b",
        "build:ci": "yarn build",
-        "pre_build": "run-s compile contracts:gen generate_contract_wrappers contracts:copy",
+        "pre_build": "run-s compile generate_contract_wrappers",
        "test": "yarn run_mocha",
        "rebuild_and_test": "run-s build test",
        "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
@@ -21,24 +21,20 @@
        "run_mocha": "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*.js' --timeout 100000 --bail --exit",
        "compile": "sol-compiler",
        "watch": "sol-compiler -w",
-        "clean": "shx rm -rf lib test/generated-artifacts test/generated-wrappers generated-artifacts generated-wrappers",
-        "generate_contract_wrappers": "abi-gen --debug --abis  ${npm_package_config_abis} --output test/generated-wrappers --backend ethers",
-        "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./test/generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude ./test/generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
-        "fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./test/generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude ./test/generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
+        "clean": "shx rm -rf lib generated-artifacts generated-wrappers",
+        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
+        "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
+        "fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
        "coverage:report:text": "istanbul report text",
        "coverage:report:html": "istanbul report html && open coverage/index.html",
        "profiler:report:html": "istanbul report html && open coverage/index.html",
        "coverage:report:lcov": "istanbul report lcov",
        "test:circleci": "yarn test",
-        "contracts:gen": "contracts-gen generate",
-        "contracts:copy": "contracts-gen copy",
-        "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol",
-        "compile:truffle": "truffle compile",
-        "docs:md": "ts-doc-gen --sourceDir='$PROJECT_FILES' --output=$MD_FILE_DIR --fileExtension=mdx --tsconfig=./typedoc-tsconfig.json",
-        "docs:json": "typedoc --excludePrivate --excludeExternals --excludeProtected --ignoreCompilerErrors --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES"
+        "contracts:gen": "contracts-gen",
+        "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
    },
    "config": {
-        "abis": "./test/generated-artifacts/@(ChaiBridge|DydxBridge|ERC1155Proxy|ERC20BridgeProxy|ERC20Proxy|ERC721Proxy|Eth2DaiBridge|IAssetData|IAssetProxy|IAssetProxyDispatcher|IAuthorizable|IChai|IDydx|IDydxBridge|IERC20Bridge|IEth2Dai|IKyberNetworkProxy|IUniswapExchange|IUniswapExchangeFactory|KyberBridge|MixinAssetProxyDispatcher|MixinAuthorizable|MultiAssetProxy|Ownable|StaticCallProxy|TestChaiBridge|TestDydxBridge|TestERC20Bridge|TestEth2DaiBridge|TestKyberBridge|TestStaticCallTarget|TestUniswapBridge|UniswapBridge).json",
+        "abis": "./generated-artifacts/@(ERC1155Proxy|ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAuthorizable|MixinAuthorizable|MultiAssetProxy|StaticCallProxy|TestStaticCallTarget).json",
        "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
    },
    "repository": {
@@ -51,15 +47,12 @@
    },
    "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
    "devDependencies": {
-        "@0x/abi-gen": "^5.0.2",
-        "@0x/contracts-gen": "^2.0.2",
-        "@0x/contracts-test-utils": "^5.0.1",
-        "@0x/contracts-utils": "^4.0.2",
-        "@0x/dev-utils": "^3.0.2",
-        "@0x/sol-compiler": "^4.0.2",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.0.0",
-        "@0x/types": "^3.1.1",
+        "@0x/abi-gen": "^4.1.1",
+        "@0x/contracts-gen": "^1.0.13",
+        "@0x/contracts-test-utils": "^3.1.14",
+        "@0x/dev-utils": "^2.3.1",
+        "@0x/sol-compiler": "^3.1.13",
+        "@0x/tslint-config": "^3.0.1",
        "@types/lodash": "4.14.104",
        "@types/mocha": "^5.2.7",
        "@types/node": "*",
@@ -67,29 +60,27 @@
        "chai-as-promised": "^7.1.0",
        "chai-bignumber": "^3.0.0",
        "dirty-chai": "^2.0.1",
-        "ethereumjs-util": "^5.1.1",
        "make-promises-safe": "^1.1.0",
        "mocha": "^6.2.0",
        "npm-run-all": "^4.1.2",
        "shx": "^0.2.2",
        "solhint": "^1.4.1",
-        "truffle": "^5.0.32",
        "tslint": "5.11.0",
-        "typedoc": "^0.15.0",
        "typescript": "3.0.1"
    },
    "dependencies": {
-        "@0x/base-contract": "^6.0.2",
-        "@0x/contracts-dev-utils": "^1.0.2",
-        "@0x/contracts-erc1155": "^2.0.2",
-        "@0x/contracts-erc20": "^3.0.2",
-        "@0x/contracts-erc721": "^3.0.2",
-        "@0x/contracts-exchange-libs": "^4.0.2",
-        "@0x/order-utils": "^10.0.1",
-        "@0x/typescript-typings": "^5.0.1",
-        "@0x/utils": "^5.1.1",
-        "@0x/web3-wrapper": "^7.0.2",
-        "ethereum-types": "^3.0.0",
+        "@0x/base-contract": "^5.3.2",
+        "@0x/contracts-erc1155": "^1.1.13",
+        "@0x/contracts-erc20": "^2.2.12",
+        "@0x/contracts-erc721": "^2.1.13",
+        "@0x/contracts-utils": "^3.2.2",
+        "@0x/order-utils": "^8.3.0",
+        "@0x/types": "^2.4.1",
+        "@0x/typescript-typings": "^4.2.4",
+        "@0x/utils": "^4.5.0",
+        "@0x/web3-wrapper": "^6.0.11",
+        "ethereum-types": "^2.1.4",
+        "ethereumjs-util": "^5.1.1",
        "lodash": "^4.17.11"
    },
    "publishConfig": {
--- a/contracts/asset-proxy/src/artifacts.ts
+++ b/contracts/asset-proxy/src/artifacts.ts
@@ -5,71 +5,25 @@
 */
 import { ContractArtifact } from 'ethereum-types';

-import * as ChaiBridge from '../generated-artifacts/ChaiBridge.json';
-import * as DydxBridge from '../generated-artifacts/DydxBridge.json';
 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 IChai from '../generated-artifacts/IChai.json';
-import * as IDydx from '../generated-artifacts/IDydx.json';
-import * as IDydxBridge from '../generated-artifacts/IDydxBridge.json';
-import * as IERC20Bridge from '../generated-artifacts/IERC20Bridge.json';
-import * as IEth2Dai from '../generated-artifacts/IEth2Dai.json';
-import * as IKyberNetworkProxy from '../generated-artifacts/IKyberNetworkProxy.json';
-import * as IUniswapExchange from '../generated-artifacts/IUniswapExchange.json';
-import * as IUniswapExchangeFactory from '../generated-artifacts/IUniswapExchangeFactory.json';
-import * as KyberBridge from '../generated-artifacts/KyberBridge.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 TestChaiBridge from '../generated-artifacts/TestChaiBridge.json';
-import * as TestDydxBridge from '../generated-artifacts/TestDydxBridge.json';
-import * as TestERC20Bridge from '../generated-artifacts/TestERC20Bridge.json';
-import * as TestEth2DaiBridge from '../generated-artifacts/TestEth2DaiBridge.json';
-import * as TestKyberBridge from '../generated-artifacts/TestKyberBridge.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,
-    ChaiBridge: ChaiBridge as ContractArtifact,
-    DydxBridge: DydxBridge as ContractArtifact,
-    Eth2DaiBridge: Eth2DaiBridge as ContractArtifact,
-    KyberBridge: KyberBridge as ContractArtifact,
-    UniswapBridge: UniswapBridge as ContractArtifact,
    IAssetData: IAssetData as ContractArtifact,
    IAssetProxy: IAssetProxy as ContractArtifact,
-    IAssetProxyDispatcher: IAssetProxyDispatcher as ContractArtifact,
    IAuthorizable: IAuthorizable as ContractArtifact,
-    IChai: IChai as ContractArtifact,
-    IDydx: IDydx as ContractArtifact,
-    IDydxBridge: IDydxBridge as ContractArtifact,
-    IERC20Bridge: IERC20Bridge as ContractArtifact,
-    IEth2Dai: IEth2Dai as ContractArtifact,
-    IKyberNetworkProxy: IKyberNetworkProxy as ContractArtifact,
-    IUniswapExchange: IUniswapExchange as ContractArtifact,
-    IUniswapExchangeFactory: IUniswapExchangeFactory as ContractArtifact,
-    TestChaiBridge: TestChaiBridge as ContractArtifact,
-    TestDydxBridge: TestDydxBridge as ContractArtifact,
-    TestERC20Bridge: TestERC20Bridge as ContractArtifact,
-    TestEth2DaiBridge: TestEth2DaiBridge as ContractArtifact,
-    TestKyberBridge: TestKyberBridge as ContractArtifact,
    TestStaticCallTarget: TestStaticCallTarget as ContractArtifact,
-    TestUniswapBridge: TestUniswapBridge as ContractArtifact,
 };
--- a/contracts/asset-proxy/src/index.ts
+++ b/contracts/asset-proxy/src/index.ts
@@ -1,65 +1,3 @@
-export { artifacts } from './artifacts';
-export {
-    ERC1155ProxyContract,
-    ERC20BridgeProxyContract,
-    ERC20ProxyContract,
-    ERC721ProxyContract,
-    Eth2DaiBridgeContract,
-    DydxBridgeContract,
-    IAssetDataContract,
-    IAssetProxyContract,
-    MultiAssetProxyContract,
-    StaticCallProxyContract,
-    TestStaticCallTargetContract,
-    UniswapBridgeContract,
-} from './wrappers';
-
-export { ERC20Wrapper } from './erc20_wrapper';
-export { ERC721Wrapper } from './erc721_wrapper';
-export { ERC1155ProxyWrapper } from './erc1155_proxy_wrapper';
-export { ERC1155MintableContract, Erc1155Wrapper } from '@0x/contracts-erc1155';
-export { DummyERC20TokenContract } from '@0x/contracts-erc20';
-export { DummyERC721TokenContract } from '@0x/contracts-erc721';
-export {
-    ERC1155HoldingsByOwner,
-    ERC20BalancesByOwner,
-    ERC721TokenIdsByOwner,
-    ERC1155FungibleHoldingsByOwner,
-    ERC1155NonFungibleHoldingsByOwner,
-} from '@0x/contracts-test-utils';
-export {
-    TransactionReceiptWithDecodedLogs,
-    Provider,
-    ZeroExProvider,
-    JSONRPCRequestPayload,
-    JSONRPCErrorCallback,
-    TransactionReceiptStatus,
-    JSONRPCResponsePayload,
-    JSONRPCResponseError,
-    ContractArtifact,
-    ContractChains,
-    CompilerOpts,
-    StandardContractOutput,
-    CompilerSettings,
-    ContractChainData,
-    ContractAbi,
-    DevdocOutput,
-    EvmOutput,
-    CompilerSettingsMetadata,
-    OptimizerSettings,
-    OutputField,
-    ParamDescription,
-    EvmBytecodeOutput,
-    AbiDefinition,
-    FunctionAbi,
-    EventAbi,
-    RevertErrorAbi,
-    EventParameter,
-    DataItem,
-    MethodAbi,
-    ConstructorAbi,
-    FallbackAbi,
-    ConstructorStateMutability,
-    TupleDataItem,
-    StateMutability,
-} from 'ethereum-types';
+export * from './artifacts';
+export * from './wrappers';
+export * from '../test/utils';
--- a/contracts/asset-proxy/src/wrappers.ts
+++ b/contracts/asset-proxy/src/wrappers.ts
@@ -3,36 +3,13 @@
 * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
 * -----------------------------------------------------------------------------
 */
-export * from '../generated-wrappers/chai_bridge';
-export * from '../generated-wrappers/dydx_bridge';
 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_chai';
-export * from '../generated-wrappers/i_dydx';
-export * from '../generated-wrappers/i_dydx_bridge';
-export * from '../generated-wrappers/i_erc20_bridge';
-export * from '../generated-wrappers/i_eth2_dai';
-export * from '../generated-wrappers/i_kyber_network_proxy';
-export * from '../generated-wrappers/i_uniswap_exchange';
-export * from '../generated-wrappers/i_uniswap_exchange_factory';
-export * from '../generated-wrappers/kyber_bridge';
-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_chai_bridge';
-export * from '../generated-wrappers/test_dydx_bridge';
-export * from '../generated-wrappers/test_erc20_bridge';
-export * from '../generated-wrappers/test_eth2_dai_bridge';
-export * from '../generated-wrappers/test_kyber_bridge';
 export * from '../generated-wrappers/test_static_call_target';
-export * from '../generated-wrappers/test_uniswap_bridge';
-export * from '../generated-wrappers/uniswap_bridge';
--- a/contracts/asset-proxy/test/artifacts.ts
+++ b/contracts/asset-proxy/test/artifacts.ts
@@ -1,75 +0,0 @@
-/*
- * -----------------------------------------------------------------------------
- * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
- * -----------------------------------------------------------------------------
- */
-import { ContractArtifact } from 'ethereum-types';
-
-import * as ChaiBridge from '../test/generated-artifacts/ChaiBridge.json';
-import * as DydxBridge from '../test/generated-artifacts/DydxBridge.json';
-import * as ERC1155Proxy from '../test/generated-artifacts/ERC1155Proxy.json';
-import * as ERC20BridgeProxy from '../test/generated-artifacts/ERC20BridgeProxy.json';
-import * as ERC20Proxy from '../test/generated-artifacts/ERC20Proxy.json';
-import * as ERC721Proxy from '../test/generated-artifacts/ERC721Proxy.json';
-import * as Eth2DaiBridge from '../test/generated-artifacts/Eth2DaiBridge.json';
-import * as IAssetData from '../test/generated-artifacts/IAssetData.json';
-import * as IAssetProxy from '../test/generated-artifacts/IAssetProxy.json';
-import * as IAssetProxyDispatcher from '../test/generated-artifacts/IAssetProxyDispatcher.json';
-import * as IAuthorizable from '../test/generated-artifacts/IAuthorizable.json';
-import * as IChai from '../test/generated-artifacts/IChai.json';
-import * as IDydx from '../test/generated-artifacts/IDydx.json';
-import * as IDydxBridge from '../test/generated-artifacts/IDydxBridge.json';
-import * as IERC20Bridge from '../test/generated-artifacts/IERC20Bridge.json';
-import * as IEth2Dai from '../test/generated-artifacts/IEth2Dai.json';
-import * as IKyberNetworkProxy from '../test/generated-artifacts/IKyberNetworkProxy.json';
-import * as IUniswapExchange from '../test/generated-artifacts/IUniswapExchange.json';
-import * as IUniswapExchangeFactory from '../test/generated-artifacts/IUniswapExchangeFactory.json';
-import * as KyberBridge from '../test/generated-artifacts/KyberBridge.json';
-import * as MixinAssetProxyDispatcher from '../test/generated-artifacts/MixinAssetProxyDispatcher.json';
-import * as MixinAuthorizable from '../test/generated-artifacts/MixinAuthorizable.json';
-import * as MultiAssetProxy from '../test/generated-artifacts/MultiAssetProxy.json';
-import * as Ownable from '../test/generated-artifacts/Ownable.json';
-import * as StaticCallProxy from '../test/generated-artifacts/StaticCallProxy.json';
-import * as TestChaiBridge from '../test/generated-artifacts/TestChaiBridge.json';
-import * as TestDydxBridge from '../test/generated-artifacts/TestDydxBridge.json';
-import * as TestERC20Bridge from '../test/generated-artifacts/TestERC20Bridge.json';
-import * as TestEth2DaiBridge from '../test/generated-artifacts/TestEth2DaiBridge.json';
-import * as TestKyberBridge from '../test/generated-artifacts/TestKyberBridge.json';
-import * as TestStaticCallTarget from '../test/generated-artifacts/TestStaticCallTarget.json';
-import * as TestUniswapBridge from '../test/generated-artifacts/TestUniswapBridge.json';
-import * as UniswapBridge from '../test/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,
-    MultiAssetProxy: MultiAssetProxy as ContractArtifact,
-    StaticCallProxy: StaticCallProxy as ContractArtifact,
-    ChaiBridge: ChaiBridge as ContractArtifact,
-    DydxBridge: DydxBridge as ContractArtifact,
-    Eth2DaiBridge: Eth2DaiBridge as ContractArtifact,
-    KyberBridge: KyberBridge as ContractArtifact,
-    UniswapBridge: UniswapBridge as ContractArtifact,
-    IAssetData: IAssetData as ContractArtifact,
-    IAssetProxy: IAssetProxy as ContractArtifact,
-    IAssetProxyDispatcher: IAssetProxyDispatcher as ContractArtifact,
-    IAuthorizable: IAuthorizable as ContractArtifact,
-    IChai: IChai as ContractArtifact,
-    IDydx: IDydx as ContractArtifact,
-    IDydxBridge: IDydxBridge as ContractArtifact,
-    IERC20Bridge: IERC20Bridge as ContractArtifact,
-    IEth2Dai: IEth2Dai as ContractArtifact,
-    IKyberNetworkProxy: IKyberNetworkProxy as ContractArtifact,
-    IUniswapExchange: IUniswapExchange as ContractArtifact,
-    IUniswapExchangeFactory: IUniswapExchangeFactory as ContractArtifact,
-    TestChaiBridge: TestChaiBridge as ContractArtifact,
-    TestDydxBridge: TestDydxBridge as ContractArtifact,
-    TestERC20Bridge: TestERC20Bridge as ContractArtifact,
-    TestEth2DaiBridge: TestEth2DaiBridge as ContractArtifact,
-    TestKyberBridge: TestKyberBridge as ContractArtifact,
-    TestStaticCallTarget: TestStaticCallTarget as ContractArtifact,
-    TestUniswapBridge: TestUniswapBridge as ContractArtifact,
-};
--- a/contracts/asset-proxy/test/authorizable.ts
+++ b/contracts/asset-proxy/test/authorizable.ts
@@ -1,13 +1,18 @@
-import { chaiSetup, expectTransactionFailedAsync, provider, txDefaults, web3Wrapper } from '@0x/contracts-test-utils';
+import {
+    chaiSetup,
+    constants,
+    expectTransactionFailedAsync,
+    provider,
+    txDefaults,
+    web3Wrapper,
+} from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { RevertReason } from '@0x/types';
 import { BigNumber } from '@0x/utils';
 import * as chai from 'chai';
 import * as _ from 'lodash';

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

 chaiSetup.configure();
 const expect = chai.expect;
@@ -22,11 +27,9 @@ 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);
@@ -37,57 +40,74 @@ describe('Authorizable', () => {
            artifacts,
        );
    });
-
    beforeEach(async () => {
        await blockchainLifecycle.startAsync();
    });
-
    afterEach(async () => {
        await blockchainLifecycle.revertAsync();
    });
-
    describe('addAuthorizedAddress', () => {
-        it('should revert if not called by owner', async () => {
-            await expectTransactionFailedAsync(
-                authorizable.addAuthorizedAddress(notOwner).sendTransactionAsync({ from: notOwner }),
+        it('should throw if not called by owner', async () => {
+            return expectTransactionFailedAsync(
+                authorizable.addAuthorizedAddress.sendTransactionAsync(notOwner, { from: notOwner }),
                RevertReason.OnlyContractOwner,
            );
        });
-
        it('should allow owner to add an authorized address', async () => {
-            await authorizable.addAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
-            const isAuthorized = await authorizable.authorized(address).callAsync();
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            const isAuthorized = await authorizable.authorized.callAsync(address);
            expect(isAuthorized).to.be.true();
        });
-
-        it('should revert if owner attempts to authorize a duplicate address', async () => {
-            await authorizable.addAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
+        it('should throw if owner attempts to authorize a duplicate address', async () => {
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
            return expectTransactionFailedAsync(
-                authorizable.addAuthorizedAddress(address).sendTransactionAsync({ from: owner }),
+                authorizable.addAuthorizedAddress.sendTransactionAsync(address, { from: owner }),
                RevertReason.TargetAlreadyAuthorized,
            );
        });
    });

    describe('removeAuthorizedAddress', () => {
-        it('should revert if not called by owner', async () => {
-            await authorizable.addAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
-            await expectTransactionFailedAsync(
-                authorizable.removeAuthorizedAddress(address).sendTransactionAsync({ from: notOwner }),
+        it('should throw if not called by owner', async () => {
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            return expectTransactionFailedAsync(
+                authorizable.removeAuthorizedAddress.sendTransactionAsync(address, {
+                    from: notOwner,
+                }),
                RevertReason.OnlyContractOwner,
            );
        });

        it('should allow owner to remove an authorized address', async () => {
-            await authorizable.addAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
-            await authorizable.removeAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
-            const isAuthorized = await authorizable.authorized(address).callAsync();
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            await authorizable.removeAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            const isAuthorized = await authorizable.authorized.callAsync(address);
            expect(isAuthorized).to.be.false();
        });

-        it('should revert if owner attempts to remove an address that is not authorized', async () => {
+        it('should throw if owner attempts to remove an address that is not authorized', async () => {
            return expectTransactionFailedAsync(
-                authorizable.removeAuthorizedAddress(address).sendTransactionAsync({
+                authorizable.removeAuthorizedAddress.sendTransactionAsync(address, {
                    from: owner,
                }),
                RevertReason.TargetNotAuthorized,
@@ -96,73 +116,100 @@ describe('Authorizable', () => {
    });

    describe('removeAuthorizedAddressAtIndex', () => {
-        it('should revert if not called by owner', async () => {
-            await authorizable.addAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
+        it('should throw if not called by owner', async () => {
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
            const index = new BigNumber(0);
-            await expectTransactionFailedAsync(
-                authorizable.removeAuthorizedAddressAtIndex(address, index).sendTransactionAsync({
+            return expectTransactionFailedAsync(
+                authorizable.removeAuthorizedAddressAtIndex.sendTransactionAsync(address, index, {
                    from: notOwner,
                }),
                RevertReason.OnlyContractOwner,
            );
        });
-
-        it('should revert if index is >= authorities.length', async () => {
-            await authorizable.addAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
+        it('should throw if index is >= authorities.length', async () => {
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
            const index = new BigNumber(1);
            return expectTransactionFailedAsync(
-                authorizable.removeAuthorizedAddressAtIndex(address, index).sendTransactionAsync({
+                authorizable.removeAuthorizedAddressAtIndex.sendTransactionAsync(address, index, {
                    from: owner,
                }),
                RevertReason.IndexOutOfBounds,
            );
        });
-
-        it('should revert if owner attempts to remove an address that is not authorized', async () => {
+        it('should throw if owner attempts to remove an address that is not authorized', async () => {
            const index = new BigNumber(0);
            return expectTransactionFailedAsync(
-                authorizable.removeAuthorizedAddressAtIndex(address, index).sendTransactionAsync({
+                authorizable.removeAuthorizedAddressAtIndex.sendTransactionAsync(address, index, {
                    from: owner,
                }),
                RevertReason.TargetNotAuthorized,
            );
        });
-
-        it('should revert if address at index does not match target', async () => {
+        it('should throw if address at index does not match target', async () => {
            const address1 = address;
            const address2 = notOwner;
-            await authorizable.addAuthorizedAddress(address1).awaitTransactionSuccessAsync({ from: owner });
-            await authorizable.addAuthorizedAddress(address2).awaitTransactionSuccessAsync({ from: owner });
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address1,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address2,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
            const address1Index = new BigNumber(0);
            return expectTransactionFailedAsync(
-                authorizable.removeAuthorizedAddressAtIndex(address2, address1Index).sendTransactionAsync({
+                authorizable.removeAuthorizedAddressAtIndex.sendTransactionAsync(address2, address1Index, {
                    from: owner,
                }),
                RevertReason.AuthorizedAddressMismatch,
            );
        });
-
        it('should allow owner to remove an authorized address', async () => {
-            await authorizable.addAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
            const index = new BigNumber(0);
-            await authorizable.removeAuthorizedAddressAtIndex(address, index).awaitTransactionSuccessAsync({
-                from: owner,
-            });
-            const isAuthorized = await authorizable.authorized(address).callAsync();
+            await authorizable.removeAuthorizedAddressAtIndex.awaitTransactionSuccessAsync(
+                address,
+                index,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            const isAuthorized = await authorizable.authorized.callAsync(address);
            expect(isAuthorized).to.be.false();
        });
    });

    describe('getAuthorizedAddresses', () => {
        it('should return all authorized addresses', async () => {
-            const initial = await authorizable.getAuthorizedAddresses().callAsync();
+            const initial = await authorizable.getAuthorizedAddresses.callAsync();
            expect(initial).to.have.length(0);
-            await authorizable.addAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
-            const afterAdd = await authorizable.getAuthorizedAddresses().callAsync();
+            await authorizable.addAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            const afterAdd = await authorizable.getAuthorizedAddresses.callAsync();
            expect(afterAdd).to.have.length(1);
            expect(afterAdd).to.include(address);
-            await authorizable.removeAuthorizedAddress(address).awaitTransactionSuccessAsync({ from: owner });
-            const afterRemove = await authorizable.getAuthorizedAddresses().callAsync();
+            await authorizable.removeAuthorizedAddress.awaitTransactionSuccessAsync(
+                address,
+                { from: owner },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
+            const afterRemove = await authorizable.getAuthorizedAddresses.callAsync();
            expect(afterRemove).to.have.length(0);
        });
    });
--- a/contracts/asset-proxy/test/chai_bridge.ts
+++ b/contracts/asset-proxy/test/chai_bridge.ts
@@ -1,60 +0,0 @@
-import { ERC20TokenContract } from '@0x/contracts-erc20';
-import { blockchainTests, constants, expect, randomAddress } from '@0x/contracts-test-utils';
-import { AssetProxyId, RevertReason } from '@0x/types';
-import { BigNumber } from '@0x/utils';
-
-import { artifacts } from './artifacts';
-import { TestChaiBridgeContract } from './wrappers';
-
-blockchainTests.resets('ChaiBridge unit tests', env => {
-    let chaiBridgeContract: TestChaiBridgeContract;
-    let testDaiContract: ERC20TokenContract;
-    let fromAddress: string;
-    let toAddress: string;
-
-    const alwaysRevertAddress = '0x0000000000000000000000000000000000000001';
-    const amount = new BigNumber(1);
-
-    before(async () => {
-        [fromAddress, toAddress] = await env.getAccountAddressesAsync();
-        chaiBridgeContract = await TestChaiBridgeContract.deployFrom0xArtifactAsync(
-            artifacts.TestChaiBridge,
-            env.provider,
-            env.txDefaults,
-            artifacts,
-        );
-        const testChaiDaiAddress = await chaiBridgeContract.testChaiDai().callAsync();
-        testDaiContract = new ERC20TokenContract(testChaiDaiAddress, env.provider, env.txDefaults);
-    });
-
-    describe('bridgeTransferFrom()', () => {
-        it('fails if not called by ERC20BridgeProxy', async () => {
-            return expect(
-                chaiBridgeContract
-                    .bridgeTransferFrom(randomAddress(), fromAddress, toAddress, amount, constants.NULL_BYTES)
-                    .awaitTransactionSuccessAsync({ from: alwaysRevertAddress }),
-            ).to.revertWith(RevertReason.ChaiBridgeOnlyCallableByErc20BridgeProxy);
-        });
-        it('returns magic bytes upon success', async () => {
-            const magicBytes = await chaiBridgeContract
-                .bridgeTransferFrom(randomAddress(), fromAddress, toAddress, amount, constants.NULL_BYTES)
-                .callAsync();
-            expect(magicBytes).to.eq(AssetProxyId.ERC20Bridge);
-        });
-        it('should increase the Dai balance of `toAddress` by `amount` if successful', async () => {
-            const initialBalance = await testDaiContract.balanceOf(toAddress).callAsync();
-            await chaiBridgeContract
-                .bridgeTransferFrom(randomAddress(), fromAddress, toAddress, amount, constants.NULL_BYTES)
-                .awaitTransactionSuccessAsync();
-            const endBalance = await testDaiContract.balanceOf(toAddress).callAsync();
-            expect(endBalance).to.bignumber.eq(initialBalance.plus(amount));
-        });
-        it('fails if the `chai.draw` call fails', async () => {
-            return expect(
-                chaiBridgeContract
-                    .bridgeTransferFrom(randomAddress(), alwaysRevertAddress, toAddress, amount, constants.NULL_BYTES)
-                    .awaitTransactionSuccessAsync(),
-            ).to.revertWith(RevertReason.ChaiBridgeDrawDaiFailed);
-        });
-    });
-});
--- a/contracts/asset-proxy/test/dydx_bridge.ts
+++ b/contracts/asset-proxy/test/dydx_bridge.ts
@@ -1,244 +0,0 @@
-import { blockchainTests, constants, expect, verifyEventsFromLogs } from '@0x/contracts-test-utils';
-import { AssetProxyId, RevertReason } from '@0x/types';
-import { AbiEncoder, BigNumber } from '@0x/utils';
-import * as _ from 'lodash';
-
-import { artifacts } from './artifacts';
-import { TestDydxBridgeContract, TestDydxBridgeEvents } from './wrappers';
-
-blockchainTests.resets('DydxBridge unit tests', env => {
-    const defaultAccountNumber = new BigNumber(1);
-    const marketId = new BigNumber(2);
-    const defaultAmount = new BigNumber(4);
-    const notAuthorized = '0x0000000000000000000000000000000000000001';
-    let testContract: TestDydxBridgeContract;
-    let authorized: string;
-    let accountOwner: string;
-    let receiver: string;
-
-    before(async () => {
-        // Get accounts
-        const accounts = await env.web3Wrapper.getAvailableAddressesAsync();
-        [, /* owner */ authorized, accountOwner, receiver] = accounts;
-
-        // Deploy dydx bridge
-        testContract = await TestDydxBridgeContract.deployFrom0xArtifactAsync(
-            artifacts.TestDydxBridge,
-            env.provider,
-            env.txDefaults,
-            artifacts,
-        );
-    });
-
-    describe('bridgeTransferFrom()', () => {
-        enum BridgeActionType {
-            Deposit,
-            Withdraw,
-        }
-        interface BrigeAction {
-            actionType: BridgeActionType;
-            accountId: BigNumber;
-            marketId: BigNumber;
-            conversionRateNumerator: BigNumber;
-            conversionRateDenominator: BigNumber;
-        }
-        interface BridgeData {
-            accountNumbers: BigNumber[];
-            actions: BrigeAction[];
-        }
-        const defaultDepositAction = {
-            actionType: BridgeActionType.Deposit as number,
-            accountId: constants.ZERO_AMOUNT,
-            marketId,
-            conversionRateNumerator: constants.ZERO_AMOUNT,
-            conversionRateDenominator: constants.ZERO_AMOUNT,
-        };
-        const defaultWithdrawAction = {
-            actionType: BridgeActionType.Withdraw as number,
-            accountId: constants.ZERO_AMOUNT,
-            marketId,
-            conversionRateNumerator: constants.ZERO_AMOUNT,
-            conversionRateDenominator: constants.ZERO_AMOUNT,
-        };
-        const bridgeDataEncoder = AbiEncoder.create([
-            {
-                name: 'bridgeData',
-                type: 'tuple',
-                components: [
-                    { name: 'accountNumbers', type: 'uint256[]' },
-                    {
-                        name: 'actions',
-                        type: 'tuple[]',
-                        components: [
-                            { name: 'actionType', type: 'uint8' },
-                            { name: 'accountId', type: 'uint256' },
-                            { name: 'marketId', type: 'uint256' },
-                            { name: 'conversionRateNumerator', type: 'uint256' },
-                            { name: 'conversionRateDenominator', type: 'uint256' },
-                        ],
-                    },
-                ],
-            },
-        ]);
-        const callBridgeTransferFrom = async (
-            from: string,
-            to: string,
-            amount: BigNumber,
-            bridgeData: BridgeData,
-            sender: string,
-        ): Promise<string> => {
-            const returnValue = await testContract
-                .bridgeTransferFrom(constants.NULL_ADDRESS, from, to, amount, bridgeDataEncoder.encode({ bridgeData }))
-                .callAsync({ from: sender });
-            return returnValue;
-        };
-        const callBridgeTransferFromAndVerifyEvents = async (
-            from: string,
-            to: string,
-            amount: BigNumber,
-            bridgeData: BridgeData,
-            sender: string,
-        ): Promise<void> => {
-            // Execute transaction.
-            const txReceipt = await testContract
-                .bridgeTransferFrom(constants.NULL_ADDRESS, from, to, amount, bridgeDataEncoder.encode({ bridgeData }))
-                .awaitTransactionSuccessAsync({ from: sender });
-
-            // Verify `OperateAccount` event.
-            const expectedOperateAccountEvents = [];
-            for (const accountNumber of bridgeData.accountNumbers) {
-                expectedOperateAccountEvents.push({
-                    owner: accountOwner,
-                    number: accountNumber,
-                });
-            }
-            verifyEventsFromLogs(txReceipt.logs, expectedOperateAccountEvents, TestDydxBridgeEvents.OperateAccount);
-
-            // Verify `OperateAction` event.
-            const weiDenomination = 0;
-            const deltaAmountRef = 0;
-            const expectedOperateActionEvents = [];
-            for (const action of bridgeData.actions) {
-                expectedOperateActionEvents.push({
-                    actionType: action.actionType as number,
-                    accountId: action.accountId,
-                    amountSign: action.actionType === BridgeActionType.Deposit ? true : false,
-                    amountDenomination: weiDenomination,
-                    amountRef: deltaAmountRef,
-                    amountValue: action.conversionRateDenominator.gt(0)
-                        ? amount.times(action.conversionRateNumerator).div(action.conversionRateDenominator)
-                        : amount,
-                    primaryMarketId: marketId,
-                    secondaryMarketId: constants.ZERO_AMOUNT,
-                    otherAddress: action.actionType === BridgeActionType.Deposit ? from : to,
-                    otherAccountId: constants.ZERO_AMOUNT,
-                    data: '0x',
-                });
-            }
-            verifyEventsFromLogs(txReceipt.logs, expectedOperateActionEvents, TestDydxBridgeEvents.OperateAction);
-        };
-        it('succeeds when calling `operate` with the `deposit` action and a single account', async () => {
-            const bridgeData = {
-                accountNumbers: [defaultAccountNumber],
-                actions: [defaultDepositAction],
-            };
-            await callBridgeTransferFromAndVerifyEvents(accountOwner, receiver, defaultAmount, bridgeData, authorized);
-        });
-        it('succeeds when calling `operate` with the `deposit` action and multiple accounts', async () => {
-            const bridgeData = {
-                accountNumbers: [defaultAccountNumber, defaultAccountNumber.plus(1)],
-                actions: [defaultDepositAction],
-            };
-            await callBridgeTransferFromAndVerifyEvents(accountOwner, receiver, defaultAmount, bridgeData, authorized);
-        });
-        it('succeeds when calling `operate` with the `withdraw` action and a single accuont', async () => {
-            const bridgeData = {
-                accountNumbers: [defaultAccountNumber],
-                actions: [defaultWithdrawAction],
-            };
-            await callBridgeTransferFromAndVerifyEvents(accountOwner, receiver, defaultAmount, bridgeData, authorized);
-        });
-        it('succeeds when calling `operate` with the `withdraw` action and multiple accounts', async () => {
-            const bridgeData = {
-                accountNumbers: [defaultAccountNumber, defaultAccountNumber.plus(1)],
-                actions: [defaultWithdrawAction],
-            };
-            await callBridgeTransferFromAndVerifyEvents(accountOwner, receiver, defaultAmount, bridgeData, authorized);
-        });
-        it('succeeds when calling `operate` with the `deposit` action and multiple accounts', async () => {
-            const bridgeData = {
-                accountNumbers: [defaultAccountNumber, defaultAccountNumber.plus(1)],
-                actions: [defaultWithdrawAction, defaultDepositAction],
-            };
-            await callBridgeTransferFromAndVerifyEvents(accountOwner, receiver, defaultAmount, bridgeData, authorized);
-        });
-        it('succeeds when calling `operate` with multiple actions under a single account', async () => {
-            const bridgeData = {
-                accountNumbers: [defaultAccountNumber],
-                actions: [defaultWithdrawAction, defaultDepositAction],
-            };
-            await callBridgeTransferFromAndVerifyEvents(accountOwner, receiver, defaultAmount, bridgeData, authorized);
-        });
-        it('succeeds when scaling the `amount` to deposit', async () => {
-            const conversionRateNumerator = new BigNumber(1);
-            const conversionRateDenominator = new BigNumber(2);
-            const bridgeData = {
-                accountNumbers: [defaultAccountNumber],
-                actions: [
-                    defaultWithdrawAction,
-                    {
-                        ...defaultDepositAction,
-                        conversionRateNumerator,
-                        conversionRateDenominator,
-                    },
-                ],
-            };
-            await callBridgeTransferFromAndVerifyEvents(accountOwner, receiver, defaultAmount, bridgeData, authorized);
-        });
-        it('succeeds when scaling the `amount` to withdraw', async () => {
-            const conversionRateNumerator = new BigNumber(1);
-            const conversionRateDenominator = new BigNumber(2);
-            const bridgeData = {
-                accountNumbers: [defaultAccountNumber],
-                actions: [
-                    defaultDepositAction,
-                    {
-                        ...defaultWithdrawAction,
-                        conversionRateNumerator,
-                        conversionRateDenominator,
-                    },
-                ],
-            };
-            await callBridgeTransferFromAndVerifyEvents(accountOwner, receiver, defaultAmount, bridgeData, authorized);
-        });
-        it('reverts if not called by the ERC20 Bridge Proxy', async () => {
-            const bridgeData = {
-                accountNumbers: [defaultAccountNumber],
-                actions: [defaultDepositAction],
-            };
-            const callBridgeTransferFromPromise = callBridgeTransferFrom(
-                accountOwner,
-                receiver,
-                defaultAmount,
-                bridgeData,
-                notAuthorized,
-            );
-            const expectedError = RevertReason.DydxBridgeOnlyCallableByErc20BridgeProxy;
-            return expect(callBridgeTransferFromPromise).to.revertWith(expectedError);
-        });
-        it('should return magic bytes if call succeeds', async () => {
-            const bridgeData = {
-                accountNumbers: [defaultAccountNumber],
-                actions: [defaultDepositAction],
-            };
-            const returnValue = await callBridgeTransferFrom(
-                accountOwner,
-                receiver,
-                defaultAmount,
-                bridgeData,
-                authorized,
-            );
-            expect(returnValue).to.equal(AssetProxyId.ERC20Bridge);
-        });
-    });
-});
--- a/contracts/asset-proxy/test/erc1155_proxy.ts
+++ b/contracts/asset-proxy/test/erc1155_proxy.ts
@@ -1,4 +1,3 @@
-import { DevUtilsContract } from '@0x/contracts-dev-utils';
 import {
    artifacts as erc1155Artifacts,
    DummyERC1155ReceiverBatchTokenReceivedEventArgs,
@@ -15,8 +14,8 @@ import {
    txDefaults,
    web3Wrapper,
 } from '@0x/contracts-test-utils';
-import { SafeMathRevertErrors } from '@0x/contracts-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';
@@ -24,10 +23,7 @@ import { LogWithDecodedArgs } from 'ethereum-types';
 import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';

-import { ERC1155ProxyWrapper } from '../src/erc1155_proxy_wrapper';
-import { ERC1155ProxyContract, IAssetDataContract } from '../src/wrappers';
-
-import { artifacts } from './artifacts';
+import { artifacts, ERC1155ProxyContract, ERC1155ProxyWrapper } from '../src';

 chaiSetup.configure();
 const expect = chai.expect;
@@ -63,8 +59,6 @@ describe('ERC1155Proxy', () => {
    // tokens
    let fungibleTokens: BigNumber[];
    let nonFungibleTokensOwnedBySpender: BigNumber[];
-    // devUtils for encoding and decoding assetData
-    let devUtils: DevUtilsContract;
    // tests
    before(async () => {
        await blockchainLifecycle.startAsync();
@@ -78,8 +72,16 @@ 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(authorized).awaitTransactionSuccessAsync({ from: owner });
-        await erc1155Proxy.addAuthorizedAddress(erc1155Proxy.address).awaitTransactionSuccessAsync({ from: owner });
+        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,
+        );
        // deploy & configure ERC1155 tokens and receiver
        [erc1155Wrapper] = await erc1155ProxyWrapper.deployDummyContractsAsync();
        erc1155Contract = erc1155Wrapper.getContract();
@@ -101,8 +103,6 @@ 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();
@@ -123,7 +123,7 @@ describe('ERC1155Proxy', () => {
            );
        });
        it('should have an id of 0xa7cb5fb7', async () => {
-            const proxyId = await erc1155Proxy.getProxyId().callAsync();
+            const proxyId = await erc1155Proxy.getProxyId.callAsync();
            const expectedProxyId = AssetProxyId.ERC1155;
            expect(proxyId).to.equal(expectedProxyId);
        });
@@ -638,14 +638,12 @@ describe('ERC1155Proxy', () => {
                return value.times(valueMultiplier);
            });
            const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = await devUtils
-                .encodeERC1155AssetData(
-                    erc1155ContractAddress,
-                    tokensToTransfer,
-                    valuesToTransfer,
-                    receiverCallbackData,
-                )
-                .callAsync();
+            const assetData = assetDataUtils.encodeERC1155AssetData(
+                erc1155ContractAddress,
+                tokensToTransfer,
+                valuesToTransfer,
+                receiverCallbackData,
+            );
            const extraData = '0102030405060708091001020304050607080910010203040506070809100102';
            const assetDataWithExtraData = `${assetData}${extraData}`;
            // check balances before transfer
@@ -698,20 +696,25 @@ describe('ERC1155Proxy', () => {
            const tokenUri = '';
            for (const tokenToCreate of tokensToCreate) {
                // create token
-                await erc1155Wrapper
-                    .getContract()
-                    .createWithType(tokenToCreate, tokenUri)
-                    .awaitTransactionSuccessAsync({
+                await erc1155Wrapper.getContract().createWithType.awaitTransactionSuccessAsync(
+                    tokenToCreate,
+                    tokenUri,
+                    {
                        from: owner,
-                    });
+                    },
+                    constants.AWAIT_TRANSACTION_MINED_MS,
+                );

                // mint balance for spender
-                await erc1155Wrapper
-                    .getContract()
-                    .mintFungible(tokenToCreate, [spender], [spenderInitialBalance])
-                    .awaitTransactionSuccessAsync({
+                await erc1155Wrapper.getContract().mintFungible.awaitTransactionSuccessAsync(
+                    tokenToCreate,
+                    [spender],
+                    [spenderInitialBalance],
+                    {
                        from: owner,
-                    });
+                    },
+                    constants.AWAIT_TRANSACTION_MINED_MS,
+                );
            }
            ///// Step 2/5 /////
            // Check balances before transfer
@@ -744,16 +747,18 @@ describe('ERC1155Proxy', () => {
            const tokensToTransfer = [new BigNumber(1), new BigNumber(2)];
            const valuesToTransfer = tokensToTransfer;
            const valueMultiplier = new BigNumber(2);
-
-            // 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.getSelector('ERC1155Assets');
-            const assetDataWithoutContractAddress =
+            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 =
                '0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000040102030400000000000000000000000000000000000000000000000000000000';
-            const assetData = `${selector}000000000000000000000000${erc1155ContractAddress.substr(
-                2,
-            )}${assetDataWithoutContractAddress}`;
-
+            expect(assetDataWithoutContractAddress).to.be.equal(expectedAssetDataWithoutContractAddress);
            ///// 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]
@@ -800,20 +805,25 @@ describe('ERC1155Proxy', () => {
            const tokenUri = '';
            for (const tokenToCreate of tokensToCreate) {
                // create token
-                await erc1155Wrapper
-                    .getContract()
-                    .createWithType(tokenToCreate, tokenUri)
-                    .awaitTransactionSuccessAsync({
+                await erc1155Wrapper.getContract().createWithType.awaitTransactionSuccessAsync(
+                    tokenToCreate,
+                    tokenUri,
+                    {
                        from: owner,
-                    });
+                    },
+                    constants.AWAIT_TRANSACTION_MINED_MS,
+                );

                // mint balance for spender
-                await erc1155Wrapper
-                    .getContract()
-                    .mintFungible(tokenToCreate, [spender], [spenderInitialBalance])
-                    .awaitTransactionSuccessAsync({
+                await erc1155Wrapper.getContract().mintFungible.awaitTransactionSuccessAsync(
+                    tokenToCreate,
+                    [spender],
+                    [spenderInitialBalance],
+                    {
                        from: owner,
-                    });
+                    },
+                    constants.AWAIT_TRANSACTION_MINED_MS,
+                );
            }
            ///// Step 2/5 /////
            // Check balances before transfer
@@ -857,14 +867,12 @@ 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 = await devUtils
-                .encodeERC1155AssetData(
-                    erc1155ContractAddress,
-                    tokensToTransfer,
-                    valuesToTransfer,
-                    receiverCallbackData,
-                )
-                .callAsync();
+            const generatedAssetData = 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 assetDataSelectorAndContractAddress = generatedAssetData.substr(0, offsetToTokenIds);
@@ -929,20 +937,25 @@ describe('ERC1155Proxy', () => {
            const tokenUri = '';
            for (const tokenToCreate of tokensToCreate) {
                // create token
-                await erc1155Wrapper
-                    .getContract()
-                    .createWithType(tokenToCreate, tokenUri)
-                    .awaitTransactionSuccessAsync({
+                await erc1155Wrapper.getContract().createWithType.awaitTransactionSuccessAsync(
+                    tokenToCreate,
+                    tokenUri,
+                    {
                        from: owner,
-                    });
+                    },
+                    constants.AWAIT_TRANSACTION_MINED_MS,
+                );

                // mint balance for spender
-                await erc1155Wrapper
-                    .getContract()
-                    .mintFungible(tokenToCreate, [spender], [spenderInitialBalance])
-                    .awaitTransactionSuccessAsync({
+                await erc1155Wrapper.getContract().mintFungible.awaitTransactionSuccessAsync(
+                    tokenToCreate,
+                    [spender],
+                    [spenderInitialBalance],
+                    {
                        from: owner,
-                    });
+                    },
+                    constants.AWAIT_TRANSACTION_MINED_MS,
+                );
            }
            ///// Step 2/5 /////
            // Check balances before transfer
@@ -983,14 +996,12 @@ 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 = await devUtils
-                .encodeERC1155AssetData(
-                    erc1155ContractAddress,
-                    tokensToTransfer,
-                    valuesToTransfer,
-                    receiverCallbackData,
-                )
-                .callAsync();
+            const generatedAssetData = 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 assetDataSelectorAndContractAddress = generatedAssetData.substr(0, offsetToTokenIds);
@@ -1048,14 +1059,12 @@ describe('ERC1155Proxy', () => {
            const valuesToTransfer = [fungibleValueToTransferLarge];
            const valueMultiplier = valueMultiplierSmall;
            const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = await devUtils
-                .encodeERC1155AssetData(
-                    erc1155ContractAddress,
-                    tokensToTransfer,
-                    valuesToTransfer,
-                    receiverCallbackData,
-                )
-                .callAsync();
+            const assetData = assetDataUtils.encodeERC1155AssetData(
+                erc1155ContractAddress,
+                tokensToTransfer,
+                valuesToTransfer,
+                receiverCallbackData,
+            );
            // The asset data we just generated will look like this:
            // a7cb5fb7
            // 0x         0000000000000000000000000b1ba0af832d7c05fd64161e0db78e85978e8082
@@ -1097,14 +1106,12 @@ describe('ERC1155Proxy', () => {
            const valuesToTransfer = [fungibleValueToTransferLarge];
            const valueMultiplier = valueMultiplierSmall;
            const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = await devUtils
-                .encodeERC1155AssetData(
-                    erc1155ContractAddress,
-                    tokensToTransfer,
-                    valuesToTransfer,
-                    receiverCallbackData,
-                )
-                .callAsync();
+            const assetData = assetDataUtils.encodeERC1155AssetData(
+                erc1155ContractAddress,
+                tokensToTransfer,
+                valuesToTransfer,
+                receiverCallbackData,
+            );
            // The asset data we just generated will look like this:
            // a7cb5fb7
            // 0x         0000000000000000000000000b1ba0af832d7c05fd64161e0db78e85978e8082
@@ -1150,14 +1157,12 @@ describe('ERC1155Proxy', () => {
            const valuesToTransfer = [fungibleValueToTransferLarge];
            const valueMultiplier = valueMultiplierSmall;
            const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = await devUtils
-                .encodeERC1155AssetData(
-                    erc1155ContractAddress,
-                    tokensToTransfer,
-                    valuesToTransfer,
-                    receiverCallbackData,
-                )
-                .callAsync();
+            const assetData = assetDataUtils.encodeERC1155AssetData(
+                erc1155ContractAddress,
+                tokensToTransfer,
+                valuesToTransfer,
+                receiverCallbackData,
+            );
            // The asset data we just generated will look like this:
            // a7cb5fb7
            // 0x         0000000000000000000000000b1ba0af832d7c05fd64161e0db78e85978e8082
@@ -1203,14 +1208,12 @@ describe('ERC1155Proxy', () => {
            const valuesToTransfer = [fungibleValueToTransferLarge];
            const valueMultiplier = valueMultiplierSmall;
            const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = await devUtils
-                .encodeERC1155AssetData(
-                    erc1155ContractAddress,
-                    tokensToTransfer,
-                    valuesToTransfer,
-                    receiverCallbackData,
-                )
-                .callAsync();
+            const assetData = assetDataUtils.encodeERC1155AssetData(
+                erc1155ContractAddress,
+                tokensToTransfer,
+                valuesToTransfer,
+                receiverCallbackData,
+            );
            // The asset data we just generated will look like this:
            // a7cb5fb7
            // 0x         0000000000000000000000000b1ba0af832d7c05fd64161e0db78e85978e8082
@@ -1256,14 +1259,12 @@ describe('ERC1155Proxy', () => {
            const valuesToTransfer = [fungibleValueToTransferLarge];
            const valueMultiplier = valueMultiplierSmall;
            const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = await devUtils
-                .encodeERC1155AssetData(
-                    erc1155ContractAddress,
-                    tokensToTransfer,
-                    valuesToTransfer,
-                    receiverCallbackData,
-                )
-                .callAsync();
+            const assetData = assetDataUtils.encodeERC1155AssetData(
+                erc1155ContractAddress,
+                tokensToTransfer,
+                valuesToTransfer,
+                receiverCallbackData,
+            );
            // The asset data we just generated will look like this:
            // a7cb5fb7
            // 0x         0000000000000000000000000b1ba0af832d7c05fd64161e0db78e85978e8082
@@ -1310,14 +1311,12 @@ describe('ERC1155Proxy', () => {
            const valuesToTransfer = [fungibleValueToTransferLarge];
            const valueMultiplier = valueMultiplierSmall;
            const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = await devUtils
-                .encodeERC1155AssetData(
-                    erc1155ContractAddress,
-                    tokensToTransfer,
-                    valuesToTransfer,
-                    receiverCallbackData,
-                )
-                .callAsync();
+            const assetData = assetDataUtils.encodeERC1155AssetData(
+                erc1155ContractAddress,
+                tokensToTransfer,
+                valuesToTransfer,
+                receiverCallbackData,
+            );
            // The asset data we just generated will look like this:
            // a7cb5fb7
            // 0x         0000000000000000000000000b1ba0af832d7c05fd64161e0db78e85978e8082
@@ -1359,14 +1358,12 @@ describe('ERC1155Proxy', () => {
            const valuesToTransfer = [fungibleValueToTransferLarge];
            const valueMultiplier = valueMultiplierSmall;
            const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = await devUtils
-                .encodeERC1155AssetData(
-                    erc1155ContractAddress,
-                    tokensToTransfer,
-                    valuesToTransfer,
-                    receiverCallbackData,
-                )
-                .callAsync();
+            const assetData = assetDataUtils.encodeERC1155AssetData(
+                erc1155ContractAddress,
+                tokensToTransfer,
+                valuesToTransfer,
+                receiverCallbackData,
+            );
            // The asset data we just generated will look like this:
            // a7cb5fb7
            // 0x         0000000000000000000000000b1ba0af832d7c05fd64161e0db78e85978e8082
@@ -1412,14 +1409,12 @@ describe('ERC1155Proxy', () => {
            const valuesToTransfer = [fungibleValueToTransferLarge];
            const valueMultiplier = valueMultiplierSmall;
            const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = await devUtils
-                .encodeERC1155AssetData(
-                    erc1155ContractAddress,
-                    tokensToTransfer,
-                    valuesToTransfer,
-                    receiverCallbackData,
-                )
-                .callAsync();
+            const assetData = assetDataUtils.encodeERC1155AssetData(
+                erc1155ContractAddress,
+                tokensToTransfer,
+                valuesToTransfer,
+                receiverCallbackData,
+            );
            // The asset data we just generated will look like this:
            // a7cb5fb7
            // 0x         0000000000000000000000000b1ba0af832d7c05fd64161e0db78e85978e8082
@@ -1461,14 +1456,12 @@ describe('ERC1155Proxy', () => {
            const valuesToTransfer = [fungibleValueToTransferLarge];
            const valueMultiplier = valueMultiplierSmall;
            const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = await devUtils
-                .encodeERC1155AssetData(
-                    erc1155ContractAddress,
-                    tokensToTransfer,
-                    valuesToTransfer,
-                    receiverCallbackData,
-                )
-                .callAsync();
+            const assetData = assetDataUtils.encodeERC1155AssetData(
+                erc1155ContractAddress,
+                tokensToTransfer,
+                valuesToTransfer,
+                receiverCallbackData,
+            );
            // The asset data we just generated will look like this:
            // a7cb5fb7
            // 0x         0000000000000000000000000b1ba0af832d7c05fd64161e0db78e85978e8082
@@ -1514,15 +1507,13 @@ describe('ERC1155Proxy', () => {
            const valuesToTransfer = [fungibleValueToTransferLarge];
            const valueMultiplier = valueMultiplierSmall;
            const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = await devUtils
-                .encodeERC1155AssetData(
-                    erc1155ContractAddress,
-                    tokensToTransfer,
-                    valuesToTransfer,
-                    receiverCallbackData,
-                )
-                .callAsync();
-            const txData = await erc1155ProxyWrapper.getTransferFromAbiEncodedTxDataAsync(
+            const assetData = assetDataUtils.encodeERC1155AssetData(
+                erc1155ContractAddress,
+                tokensToTransfer,
+                valuesToTransfer,
+                receiverCallbackData,
+            );
+            const txData = erc1155ProxyWrapper.getTransferFromAbiEncodedTxData(
                spender,
                receiverContract,
                erc1155Contract.address,
@@ -1547,15 +1538,13 @@ describe('ERC1155Proxy', () => {
            const valuesToTransfer = [fungibleValueToTransferLarge];
            const valueMultiplier = valueMultiplierSmall;
            const erc1155ContractAddress = erc1155Wrapper.getContract().address;
-            const assetData = await devUtils
-                .encodeERC1155AssetData(
-                    erc1155ContractAddress,
-                    tokensToTransfer,
-                    valuesToTransfer,
-                    receiverCallbackData,
-                )
-                .callAsync();
-            const txData = await erc1155ProxyWrapper.getTransferFromAbiEncodedTxDataAsync(
+            const assetData = assetDataUtils.encodeERC1155AssetData(
+                erc1155ContractAddress,
+                tokensToTransfer,
+                valuesToTransfer,
+                receiverCallbackData,
+            );
+            const txData = erc1155ProxyWrapper.getTransferFromAbiEncodedTxData(
                spender,
                receiverContract,
                erc1155Contract.address,
@@ -1678,9 +1667,13 @@ describe('ERC1155Proxy', () => {
        it('should propagate revert reason from erc1155 contract failure', async () => {
            // disable transfers
            const shouldRejectTransfer = true;
-            await erc1155Receiver.setRejectTransferFlag(shouldRejectTransfer).awaitTransactionSuccessAsync({
-                from: owner,
-            });
+            await erc1155Receiver.setRejectTransferFlag.awaitTransactionSuccessAsync(
+                shouldRejectTransfer,
+                {
+                    from: owner,
+                },
+                constants.AWAIT_TRANSACTION_MINED_MS,
+            );
            // setup test parameters
            const tokenHolders = [spender, receiverContract];
            const tokensToTransfer = fungibleTokens.slice(0, 1);
@@ -1755,14 +1748,9 @@ 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 expect(
+            await expectTransactionFailedAsync(
                erc1155ProxyWrapper.transferFromAsync(
                    spender,
                    receiver,
@@ -1773,7 +1761,8 @@ describe('ERC1155Proxy', () => {
                    receiverCallbackData,
                    authorized,
                ),
-            ).to.revertWith(expectedError);
+                RevertReason.Uint256Overflow,
+            );
        });
        it('should revert if transferring > 1 instances of a non-fungible token (valueMultiplier field >1)', async () => {
            // setup test parameters
@@ -1843,23 +1832,20 @@ describe('ERC1155Proxy', () => {
            // check balances before transfer
            const expectedInitialBalances = [spenderInitialFungibleBalance, receiverInitialFungibleBalance];
            await erc1155Wrapper.assertBalancesAsync(tokenHolders, tokensToTransfer, expectedInitialBalances);
-            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,
+            await expectTransactionFailedAsync(
+                erc1155ProxyWrapper.transferFromAsync(
+                    spender,
+                    receiver,
+                    erc1155Contract.address,
+                    tokensToTransfer,
+                    valuesToTransfer,
+                    valueMultiplier,
+                    receiverCallbackData,
+                    authorized,
+                ),
+                RevertReason.Uint256Underflow,
            );
-            return expect(tx).to.revertWith(expectedError);
        });
        it('should revert if sender allowance is insufficient', async () => {
            // dremove allowance for ERC1155 proxy
--- a/contracts/asset-proxy/test/erc20bridge_proxy.ts
+++ b/contracts/asset-proxy/test/erc20bridge_proxy.ts
@@ -1,287 +0,0 @@
-import {
-    blockchainTests,
-    constants,
-    expect,
-    getRandomInteger,
-    Numberish,
-    randomAddress,
-} from '@0x/contracts-test-utils';
-import { AuthorizableRevertErrors } from '@0x/contracts-utils';
-import { AssetProxyId } from '@0x/types';
-import { AbiEncoder, BigNumber, hexUtils, StringRevertError } from '@0x/utils';
-import { DecodedLogs } from 'ethereum-types';
-import * as _ from 'lodash';
-
-import { artifacts } from './artifacts';
-
-import { ERC20BridgeProxyContract, TestERC20BridgeContract } from './wrappers';
-
-blockchainTests.resets('ERC20BridgeProxy unit tests', env => {
-    const PROXY_ID = AssetProxyId.ERC20Bridge;
-    const BRIDGE_SUCCESS_RETURN_DATA = hexUtils.rightPad(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(owner).awaitTransactionSuccessAsync();
-    });
-
-    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(_owner, new BigNumber(balance)).awaitTransactionSuccessAsync();
-    }
-
-    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(encodeAssetData(_opts.assetData), _opts.from, _opts.to, new BigNumber(_opts.amount))
-                .awaitTransactionSuccessAsync({ 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;
-            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 = hexUtils.slice(encodeAssetData(opts.assetData), 0, -1);
-            const tx = assetProxy
-                .transferFrom(truncatedAssetData, opts.from, opts.to, new BigNumber(opts.amount))
-                .awaitTransactionSuccessAsync();
-            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: hexUtils.leftPad('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: hexUtils.rightPad('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(_owner, balance).awaitTransactionSuccessAsync();
-            const assetData = createAssetData({
-                tokenAddress: testTokenAddress,
-            });
-            const actualBalance = await assetProxy.balanceOf(encodeAssetData(assetData), _owner).callAsync();
-            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);
-        });
-    });
-});
--- a/contracts/asset-proxy/test/eth2dai_bridge.ts
+++ b/contracts/asset-proxy/test/eth2dai_bridge.ts
@@ -1,191 +0,0 @@
-import {
-    blockchainTests,
-    constants,
-    expect,
-    filterLogsToArguments,
-    getRandomInteger,
-    Numberish,
-    randomAddress,
-} from '@0x/contracts-test-utils';
-import { AssetProxyId } from '@0x/types';
-import { BigNumber, hexUtils, RawRevertError } from '@0x/utils';
-import { DecodedLogs } from 'ethereum-types';
-import * as _ from 'lodash';
-
-import { artifacts } from './artifacts';
-
-import {
-    TestEth2DaiBridgeContract,
-    TestEth2DaiBridgeEvents,
-    TestEth2DaiBridgeSellAllAmountEventArgs,
-    TestEth2DaiBridgeTokenApproveEventArgs,
-    TestEth2DaiBridgeTokenTransferEventArgs,
-} from './wrappers';
-
-blockchainTests.resets('Eth2DaiBridge unit tests', env => {
-    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(hexUtils.random(), hexUtils.random(_.random(0, 32)))
-                .callAsync();
-            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: hexUtils.leftPad(1),
-                ...opts,
-            };
-        }
-
-        async function withdrawToAsync(opts?: Partial<WithdrawToOpts>): Promise<WithdrawToResult> {
-            const _opts = createWithdrawToOpts(opts);
-            // Set the fill behavior.
-            await testContract
-                .setFillBehavior(_opts.revertReason, new BigNumber(_opts.fillAmount))
-                .awaitTransactionSuccessAsync();
-            // Create tokens and balances.
-            if (_opts.fromTokenAddress === undefined) {
-                const createTokenFn = testContract.createToken(new BigNumber(_opts.fromTokenBalance));
-                _opts.fromTokenAddress = await createTokenFn.callAsync();
-                await createTokenFn.awaitTransactionSuccessAsync();
-            }
-            if (_opts.toTokenAddress === undefined) {
-                const createTokenFn = testContract.createToken(constants.ZERO_AMOUNT);
-                _opts.toTokenAddress = await createTokenFn.callAsync();
-                await createTokenFn.awaitTransactionSuccessAsync();
-            }
-            // Set the transfer behavior of `toTokenAddress`.
-            await testContract
-                .setTransferBehavior(
-                    _opts.toTokenAddress,
-                    _opts.toTokentransferRevertReason,
-                    _opts.toTokenTransferReturnData,
-                )
-                .awaitTransactionSuccessAsync();
-            // Call bridgeTransferFrom().
-            const bridgeTransferFromFn = 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.
-                hexUtils.leftPad(_opts.fromTokenAddress as string),
-            );
-            const result = await bridgeTransferFromFn.callAsync();
-            const { logs } = await bridgeTransferFromFn.awaitTransactionSuccessAsync();
-            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: hexUtils.leftPad(0) });
-            const tx = withdrawToAsync(opts);
-            return expect(tx).to.revertWith(new RawRevertError(hexUtils.leftPad(0)));
-        });
-
-        it('succeeds if `toTokenAddress.transfer()` returns true', async () => {
-            await withdrawToAsync({ toTokenTransferReturnData: hexUtils.leftPad(1) });
-        });
-    });
-});
--- a/contracts/asset-proxy/test/kyber_bridge.ts
+++ b/contracts/asset-proxy/test/kyber_bridge.ts
@@ -1,272 +0,0 @@
-import {
-    blockchainTests,
-    constants,
-    expect,
-    getRandomInteger,
-    randomAddress,
-    verifyEventsFromLogs,
-} from '@0x/contracts-test-utils';
-import { AssetProxyId } from '@0x/types';
-import { BigNumber, hexUtils } from '@0x/utils';
-import { DecodedLogs } from 'ethereum-types';
-import * as _ from 'lodash';
-
-import { artifacts } from './artifacts';
-
-import { TestKyberBridgeContract, TestKyberBridgeEvents } from './wrappers';
-
-blockchainTests.resets('KyberBridge unit tests', env => {
-    const KYBER_ETH_ADDRESS = '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee';
-    let testContract: TestKyberBridgeContract;
-
-    before(async () => {
-        testContract = await TestKyberBridgeContract.deployFrom0xArtifactAsync(
-            artifacts.TestKyberBridge,
-            env.provider,
-            env.txDefaults,
-            artifacts,
-        );
-    });
-
-    describe('isValidSignature()', () => {
-        it('returns success bytes', async () => {
-            const LEGACY_WALLET_MAGIC_VALUE = '0xb0671381';
-            const result = await testContract
-                .isValidSignature(hexUtils.random(), hexUtils.random(_.random(0, 32)))
-                .callAsync();
-            expect(result).to.eq(LEGACY_WALLET_MAGIC_VALUE);
-        });
-    });
-
-    describe('bridgeTransferFrom()', () => {
-        let fromTokenAddress: string;
-        let toTokenAddress: string;
-        let wethAddress: string;
-
-        before(async () => {
-            wethAddress = await testContract.weth().callAsync();
-            fromTokenAddress = await testContract.createToken().callAsync();
-            await testContract.createToken().awaitTransactionSuccessAsync();
-            toTokenAddress = await testContract.createToken().callAsync();
-            await testContract.createToken().awaitTransactionSuccessAsync();
-        });
-
-        const STATIC_KYBER_TRADE_ARGS = {
-            maxBuyTokenAmount: constants.MAX_UINT256,
-            walletId: constants.NULL_ADDRESS,
-        };
-
-        interface TransferFromOpts {
-            toTokenAddress: string;
-            fromTokenAddress: string;
-            toAddress: string;
-            // Amount to pass into `bridgeTransferFrom()`
-            amount: BigNumber;
-            // Amount to convert in `trade()`.
-            fillAmount: BigNumber;
-            // Token balance of the bridge.
-            fromTokenBalance: BigNumber;
-        }
-
-        interface TransferFromResult {
-            opts: TransferFromOpts;
-            result: string;
-            logs: DecodedLogs;
-        }
-
-        function createTransferFromOpts(opts?: Partial<TransferFromOpts>): TransferFromOpts {
-            return {
-                fromTokenAddress,
-                toTokenAddress,
-                toAddress: randomAddress(),
-                amount: getRandomInteger(1, 10e18),
-                fillAmount: getRandomInteger(1, 10e18),
-                fromTokenBalance: getRandomInteger(1, 10e18),
-                ...opts,
-            };
-        }
-
-        async function withdrawToAsync(opts?: Partial<TransferFromOpts>): Promise<TransferFromResult> {
-            const _opts = createTransferFromOpts(opts);
-            // Fund the contract with input tokens.
-            await testContract
-                .grantTokensTo(_opts.fromTokenAddress, testContract.address, _opts.fromTokenBalance)
-                .awaitTransactionSuccessAsync({ value: _opts.fromTokenBalance });
-            // Fund the contract with output tokens.
-            await testContract.setNextFillAmount(_opts.fillAmount).awaitTransactionSuccessAsync({
-                value: _opts.toTokenAddress === wethAddress ? _opts.fillAmount : constants.ZERO_AMOUNT,
-            });
-            // Call bridgeTransferFrom().
-            const bridgeTransferFromFn = testContract.bridgeTransferFrom(
-                // Output token
-                _opts.toTokenAddress,
-                // Random maker address.
-                randomAddress(),
-                // Recipient address.
-                _opts.toAddress,
-                // Transfer amount.
-                _opts.amount,
-                // ABI-encode the input token address as the bridge data.
-                hexUtils.leftPad(_opts.fromTokenAddress),
-            );
-            const result = await bridgeTransferFromFn.callAsync();
-            const { logs } = await bridgeTransferFromFn.awaitTransactionSuccessAsync();
-            return {
-                opts: _opts,
-                result,
-                logs: (logs as any) as DecodedLogs,
-            };
-        }
-
-        function getMinimumConversionRate(opts: TransferFromOpts): BigNumber {
-            return opts.amount
-                .times(constants.ONE_ETHER)
-                .div(opts.fromTokenBalance)
-                .integerValue(BigNumber.ROUND_DOWN);
-        }
-
-        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('can trade token -> token', async () => {
-            const { opts, logs } = await withdrawToAsync();
-            verifyEventsFromLogs(
-                logs,
-                [
-                    {
-                        sellTokenAddress: opts.fromTokenAddress,
-                        buyTokenAddress: opts.toTokenAddress,
-                        sellAmount: opts.fromTokenBalance,
-                        recipientAddress: opts.toAddress,
-                        minConversionRate: getMinimumConversionRate(opts),
-                        msgValue: constants.ZERO_AMOUNT,
-                        ...STATIC_KYBER_TRADE_ARGS,
-                    },
-                ],
-                TestKyberBridgeEvents.KyberBridgeTrade,
-            );
-        });
-
-        it('can trade token -> ETH', async () => {
-            const { opts, logs } = await withdrawToAsync({
-                toTokenAddress: wethAddress,
-            });
-            verifyEventsFromLogs(
-                logs,
-                [
-                    {
-                        sellTokenAddress: opts.fromTokenAddress,
-                        buyTokenAddress: KYBER_ETH_ADDRESS,
-                        sellAmount: opts.fromTokenBalance,
-                        recipientAddress: testContract.address,
-                        minConversionRate: getMinimumConversionRate(opts),
-                        msgValue: constants.ZERO_AMOUNT,
-                        ...STATIC_KYBER_TRADE_ARGS,
-                    },
-                ],
-                TestKyberBridgeEvents.KyberBridgeTrade,
-            );
-        });
-
-        it('can trade ETH -> token', async () => {
-            const { opts, logs } = await withdrawToAsync({
-                fromTokenAddress: wethAddress,
-            });
-            verifyEventsFromLogs(
-                logs,
-                [
-                    {
-                        sellTokenAddress: KYBER_ETH_ADDRESS,
-                        buyTokenAddress: opts.toTokenAddress,
-                        sellAmount: opts.fromTokenBalance,
-                        recipientAddress: opts.toAddress,
-                        minConversionRate: getMinimumConversionRate(opts),
-                        msgValue: opts.fromTokenBalance,
-                        ...STATIC_KYBER_TRADE_ARGS,
-                    },
-                ],
-                TestKyberBridgeEvents.KyberBridgeTrade,
-            );
-        });
-
-        it('does nothing if bridge has no token balance', async () => {
-            const { logs } = await withdrawToAsync({
-                fromTokenBalance: constants.ZERO_AMOUNT,
-            });
-            expect(logs).to.be.length(0);
-        });
-
-        it('only transfers the token if trading the same token', async () => {
-            const { opts, logs } = await withdrawToAsync({
-                toTokenAddress: fromTokenAddress,
-            });
-            verifyEventsFromLogs(
-                logs,
-                [
-                    {
-                        tokenAddress: fromTokenAddress,
-                        ownerAddress: testContract.address,
-                        recipientAddress: opts.toAddress,
-                        amount: opts.fromTokenBalance,
-                    },
-                ],
-                TestKyberBridgeEvents.KyberBridgeTokenTransfer,
-            );
-        });
-
-        it('grants Kyber an allowance when selling non-WETH', async () => {
-            const { opts, logs } = await withdrawToAsync();
-            verifyEventsFromLogs(
-                logs,
-                [
-                    {
-                        tokenAddress: opts.fromTokenAddress,
-                        ownerAddress: testContract.address,
-                        spenderAddress: testContract.address,
-                        allowance: constants.MAX_UINT256,
-                    },
-                ],
-                TestKyberBridgeEvents.KyberBridgeTokenApprove,
-            );
-        });
-
-        it('does not grant Kyber an allowance when selling WETH', async () => {
-            const { logs } = await withdrawToAsync({
-                fromTokenAddress: wethAddress,
-            });
-            verifyEventsFromLogs(logs, [], TestKyberBridgeEvents.KyberBridgeTokenApprove);
-        });
-
-        it('withdraws WETH and passes it to Kyber when selling WETH', async () => {
-            const { opts, logs } = await withdrawToAsync({
-                fromTokenAddress: wethAddress,
-            });
-            expect(logs[0].event).to.eq(TestKyberBridgeEvents.KyberBridgeWethWithdraw);
-            expect(logs[0].args).to.deep.eq({
-                ownerAddress: testContract.address,
-                amount: opts.fromTokenBalance,
-            });
-            expect(logs[1].event).to.eq(TestKyberBridgeEvents.KyberBridgeTrade);
-            expect(logs[1].args.msgValue).to.bignumber.eq(opts.fromTokenBalance);
-        });
-
-        it('wraps WETH and transfers it to the recipient when buyng WETH', async () => {
-            const { opts, logs } = await withdrawToAsync({
-                toTokenAddress: wethAddress,
-            });
-            expect(logs[0].event).to.eq(TestKyberBridgeEvents.KyberBridgeTokenApprove);
-            expect(logs[0].args.tokenAddress).to.eq(opts.fromTokenAddress);
-            expect(logs[1].event).to.eq(TestKyberBridgeEvents.KyberBridgeTrade);
-            expect(logs[1].args.recipientAddress).to.eq(testContract.address);
-            expect(logs[2].event).to.eq(TestKyberBridgeEvents.KyberBridgeWethDeposit);
-            expect(logs[2].args).to.deep.eq({
-                msgValue: opts.fillAmount,
-                ownerAddress: testContract.address,
-                amount: opts.fillAmount,
-            });
-        });
-    });
-});
--- a/contracts/asset-proxy/test/proxies.ts
+++ b/contracts/asset-proxy/test/proxies.ts
--- a/contracts/asset-proxy/test/static_call_proxy.ts
+++ b/contracts/asset-proxy/test/static_call_proxy.ts
@@ -1,4 +1,3 @@
-import { DevUtilsContract } from '@0x/contracts-dev-utils';
 import {
    chaiSetup,
    constants,
@@ -9,14 +8,13 @@ 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';
 import * as ethUtil from 'ethereumjs-util';

-import { artifacts } from './artifacts';
-
-import { IAssetProxyContract, StaticCallProxyContract, TestStaticCallTargetContract } from './wrappers';
+import { artifacts, IAssetProxyContract, StaticCallProxyContract, TestStaticCallTargetContract } from '../src';

 chaiSetup.configure();
 const expect = chai.expect;
@@ -27,7 +25,6 @@ describe('StaticCallProxy', () => {
    let fromAddress: string;
    let toAddress: string;

-    let devUtils: DevUtilsContract;
    let staticCallProxy: IAssetProxyContract;
    let staticCallTarget: TestStaticCallTargetContract;

@@ -46,14 +43,7 @@ describe('StaticCallProxy', () => {
            txDefaults,
            artifacts,
        );
-        devUtils = new DevUtilsContract(constants.NULL_ADDRESS, provider);
-        staticCallProxy = new IAssetProxyContract(
-            staticCallProxyWithoutTransferFrom.address,
-            provider,
-            txDefaults,
-            {},
-            StaticCallProxyContract.deployedBytecode,
-        );
+        staticCallProxy = new IAssetProxyContract(staticCallProxyWithoutTransferFrom.address, provider, txDefaults);
        staticCallTarget = await TestStaticCallTargetContract.deployFrom0xArtifactAsync(
            artifacts.TestStaticCallTarget,
            provider,
@@ -81,21 +71,26 @@ describe('StaticCallProxy', () => {
            );
        });
        it('should have an id of 0xc339d10a', async () => {
-            const proxyId = await staticCallProxy.getProxyId().callAsync();
+            const proxyId = await staticCallProxy.getProxyId.callAsync();
            const expectedProxyId = AssetProxyId.StaticCall;
            expect(proxyId).to.equal(expectedProxyId);
        });
    });
    describe('transferFrom', () => {
        it('should revert if assetData lies outside the bounds of calldata', async () => {
-            const staticCallData = staticCallTarget.noInputFunction().getABIEncodedTransactionData();
+            const staticCallData = staticCallTarget.noInputFunction.getABIEncodedTransactionData();
            const expectedResultHash = constants.KECCAK256_NULL;
-            const assetData = await devUtils
-                .encodeStaticCallAssetData(staticCallTarget.address, staticCallData, expectedResultHash)
-                .callAsync();
-            const txData = staticCallProxy
-                .transferFrom(assetData, fromAddress, toAddress, amount)
-                .getABIEncodedTransactionData();
+            const assetData = assetDataUtils.encodeStaticCallAssetData(
+                staticCallTarget.address,
+                staticCallData,
+                expectedResultHash,
+            );
+            const txData = staticCallProxy.transferFrom.getABIEncodedTransactionData(
+                assetData,
+                fromAddress,
+                toAddress,
+                amount,
+            );
            const offsetToAssetData = '0000000000000000000000000000000000000000000000000000000000000080';
            const txDataEndBuffer = ethUtil.toBuffer((txData.length - 2) / 2 - 4);
            const paddedTxDataEndBuffer = ethUtil.setLengthLeft(txDataEndBuffer, 32);
@@ -113,21 +108,23 @@ 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 = (await devUtils
+            const assetData = assetDataUtils
                .encodeStaticCallAssetData(staticCallTarget.address, staticCallData, expectedResultHash)
-                .callAsync()).slice(0, -128);
+                .slice(0, -128);
            const assetDataByteLen = (assetData.length - 2) / 2;
            expect((assetDataByteLen - 4) % 32).to.equal(0);
            await expectTransactionFailedWithoutReasonAsync(
-                staticCallProxy.transferFrom(assetData, fromAddress, toAddress, amount).sendTransactionAsync(),
+                staticCallProxy.transferFrom.sendTransactionAsync(assetData, fromAddress, toAddress, amount),
            );
        });
        it('should revert if the offset to `staticCallData` points to outside of assetData', async () => {
-            const staticCallData = staticCallTarget.noInputFunction().getABIEncodedTransactionData();
+            const staticCallData = staticCallTarget.noInputFunction.getABIEncodedTransactionData();
            const expectedResultHash = constants.KECCAK256_NULL;
-            const assetData = await devUtils
-                .encodeStaticCallAssetData(staticCallTarget.address, staticCallData, expectedResultHash)
-                .callAsync();
+            const assetData = assetDataUtils.encodeStaticCallAssetData(
+                staticCallTarget.address,
+                staticCallData,
+                expectedResultHash,
+            );
            const offsetToStaticCallData = '0000000000000000000000000000000000000000000000000000000000000060';
            const assetDataEndBuffer = ethUtil.toBuffer((assetData.length - 2) / 2 - 4);
            const paddedAssetDataEndBuffer = ethUtil.setLengthLeft(assetDataEndBuffer, 32);
@@ -138,88 +135,90 @@ describe('StaticCallProxy', () => {
                invalidOffsetToStaticCallData,
            )}${newStaticCallData}`;
            await expectTransactionFailedWithoutReasonAsync(
-                staticCallProxy.transferFrom(badAssetData, fromAddress, toAddress, amount).sendTransactionAsync(),
+                staticCallProxy.transferFrom.sendTransactionAsync(badAssetData, fromAddress, toAddress, amount),
            );
        });
        it('should revert if the callTarget attempts to write to state', async () => {
-            const staticCallData = staticCallTarget.updateState().getABIEncodedTransactionData();
+            const staticCallData = staticCallTarget.updateState.getABIEncodedTransactionData();
            const expectedResultHash = constants.KECCAK256_NULL;
-            const assetData = await devUtils
-                .encodeStaticCallAssetData(staticCallTarget.address, staticCallData, expectedResultHash)
-                .callAsync();
+            const assetData = assetDataUtils.encodeStaticCallAssetData(
+                staticCallTarget.address,
+                staticCallData,
+                expectedResultHash,
+            );
            await expectTransactionFailedWithoutReasonAsync(
-                staticCallProxy.transferFrom(assetData, fromAddress, toAddress, amount).sendTransactionAsync(),
+                staticCallProxy.transferFrom.sendTransactionAsync(assetData, fromAddress, toAddress, amount),
            );
        });
        it('should revert with data provided by the callTarget if the staticcall reverts', async () => {
-            const staticCallData = staticCallTarget.assertEvenNumber(new BigNumber(1)).getABIEncodedTransactionData();
+            const staticCallData = staticCallTarget.assertEvenNumber.getABIEncodedTransactionData(new BigNumber(1));
            const expectedResultHash = constants.KECCAK256_NULL;
-            const assetData = await devUtils
-                .encodeStaticCallAssetData(staticCallTarget.address, staticCallData, expectedResultHash)
-                .callAsync();
+            const assetData = assetDataUtils.encodeStaticCallAssetData(
+                staticCallTarget.address,
+                staticCallData,
+                expectedResultHash,
+            );
            await expectTransactionFailedAsync(
-                staticCallProxy.transferFrom(assetData, fromAddress, toAddress, amount).sendTransactionAsync(),
+                staticCallProxy.transferFrom.sendTransactionAsync(assetData, fromAddress, toAddress, amount),
                RevertReason.TargetNotEven,
            );
        });
        it('should revert if the hash of the output is different than expected expected', async () => {
-            const staticCallData = staticCallTarget.isOddNumber(new BigNumber(0)).getABIEncodedTransactionData();
+            const staticCallData = staticCallTarget.isOddNumber.getABIEncodedTransactionData(new BigNumber(0));
            const trueAsBuffer = ethUtil.toBuffer('0x0000000000000000000000000000000000000000000000000000000000000001');
            const expectedResultHash = ethUtil.bufferToHex(ethUtil.sha3(trueAsBuffer));
-            const assetData = await devUtils
-                .encodeStaticCallAssetData(staticCallTarget.address, staticCallData, expectedResultHash)
-                .callAsync();
+            const assetData = assetDataUtils.encodeStaticCallAssetData(
+                staticCallTarget.address,
+                staticCallData,
+                expectedResultHash,
+            );
            await expectTransactionFailedAsync(
-                staticCallProxy.transferFrom(assetData, fromAddress, toAddress, amount).sendTransactionAsync(),
+                staticCallProxy.transferFrom.sendTransactionAsync(assetData, fromAddress, toAddress, amount),
                RevertReason.UnexpectedStaticCallResult,
            );
        });
        it('should be successful if a function call with no inputs and no outputs is successful', async () => {
-            const staticCallData = staticCallTarget.noInputFunction().getABIEncodedTransactionData();
+            const staticCallData = staticCallTarget.noInputFunction.getABIEncodedTransactionData();
            const expectedResultHash = constants.KECCAK256_NULL;
-            const assetData = await devUtils
-                .encodeStaticCallAssetData(staticCallTarget.address, staticCallData, expectedResultHash)
-                .callAsync();
-            await staticCallProxy
-                .transferFrom(assetData, fromAddress, toAddress, amount)
-                .awaitTransactionSuccessAsync();
+            const assetData = assetDataUtils.encodeStaticCallAssetData(
+                staticCallTarget.address,
+                staticCallData,
+                expectedResultHash,
+            );
+            await staticCallProxy.transferFrom.awaitTransactionSuccessAsync(assetData, fromAddress, toAddress, amount);
        });
        it('should be successful if the staticCallTarget is not a contract and no return value is expected', async () => {
            const staticCallData = '0x0102030405060708';
            const expectedResultHash = constants.KECCAK256_NULL;
-            const assetData = await devUtils
-                .encodeStaticCallAssetData(toAddress, staticCallData, expectedResultHash)
-                .callAsync();
-            await staticCallProxy
-                .transferFrom(assetData, fromAddress, toAddress, amount)
-                .awaitTransactionSuccessAsync();
+            const assetData = assetDataUtils.encodeStaticCallAssetData(toAddress, staticCallData, expectedResultHash);
+            await staticCallProxy.transferFrom.awaitTransactionSuccessAsync(assetData, fromAddress, toAddress, amount);
        });
        it('should be successful if a function call with one static input returns the correct value', async () => {
-            const staticCallData = staticCallTarget.isOddNumber(new BigNumber(1)).getABIEncodedTransactionData();
+            const staticCallData = staticCallTarget.isOddNumber.getABIEncodedTransactionData(new BigNumber(1));
            const trueAsBuffer = ethUtil.toBuffer('0x0000000000000000000000000000000000000000000000000000000000000001');
            const expectedResultHash = ethUtil.bufferToHex(ethUtil.sha3(trueAsBuffer));
-            const assetData = await devUtils
-                .encodeStaticCallAssetData(staticCallTarget.address, staticCallData, expectedResultHash)
-                .callAsync();
-            await staticCallProxy
-                .transferFrom(assetData, fromAddress, toAddress, amount)
-                .awaitTransactionSuccessAsync();
+            const assetData = assetDataUtils.encodeStaticCallAssetData(
+                staticCallTarget.address,
+                staticCallData,
+                expectedResultHash,
+            );
+            await staticCallProxy.transferFrom.awaitTransactionSuccessAsync(assetData, fromAddress, toAddress, amount);
        });
        it('should be successful if a function with one dynamic input is successful', async () => {
            const dynamicInput = '0x0102030405060708';
-            const staticCallData = staticCallTarget.dynamicInputFunction(dynamicInput).getABIEncodedTransactionData();
+            const staticCallData = staticCallTarget.dynamicInputFunction.getABIEncodedTransactionData(dynamicInput);
            const expectedResultHash = constants.KECCAK256_NULL;
-            const assetData = await devUtils
-                .encodeStaticCallAssetData(staticCallTarget.address, staticCallData, expectedResultHash)
-                .callAsync();
-            await staticCallProxy
-                .transferFrom(assetData, fromAddress, toAddress, amount)
-                .awaitTransactionSuccessAsync();
+            const assetData = assetDataUtils.encodeStaticCallAssetData(
+                staticCallTarget.address,
+                staticCallData,
+                expectedResultHash,
+            );
+            await staticCallProxy.transferFrom.awaitTransactionSuccessAsync(assetData, fromAddress, toAddress, amount);
        });
        it('should be successful if a function call returns a complex type', async () => {
            const a = new BigNumber(1);
            const b = new BigNumber(2);
-            const staticCallData = staticCallTarget.returnComplexType(a, b).getABIEncodedTransactionData();
+            const staticCallData = staticCallTarget.returnComplexType.getABIEncodedTransactionData(a, b);
            const abiEncoder = new AbiEncoder.DynamicBytes({
                name: '',
                type: 'bytes',
@@ -232,12 +231,12 @@ describe('StaticCallProxy', () => {
            const expectedResultHash = ethUtil.bufferToHex(
                ethUtil.sha3(ethUtil.toBuffer(encodedExpectedResultWithOffset)),
            );
-            const assetData = await devUtils
-                .encodeStaticCallAssetData(staticCallTarget.address, staticCallData, expectedResultHash)
-                .callAsync();
-            await staticCallProxy
-                .transferFrom(assetData, fromAddress, toAddress, amount)
-                .awaitTransactionSuccessAsync();
+            const assetData = assetDataUtils.encodeStaticCallAssetData(
+                staticCallTarget.address,
+                staticCallData,
+                expectedResultHash,
+            );
+            await staticCallProxy.transferFrom.awaitTransactionSuccessAsync(assetData, fromAddress, toAddress, amount);
        });
    });
 });
--- a/contracts/asset-proxy/test/uniswap_bridge.ts
+++ b/contracts/asset-proxy/test/uniswap_bridge.ts
@@ -1,370 +0,0 @@
-import {
-    blockchainTests,
-    constants,
-    expect,
-    filterLogs,
-    filterLogsToArguments,
-    getRandomInteger,
-    Numberish,
-    randomAddress,
-} from '@0x/contracts-test-utils';
-import { AssetProxyId } from '@0x/types';
-import { BigNumber, hexUtils } from '@0x/utils';
-import { DecodedLogs } from 'ethereum-types';
-import * as _ from 'lodash';
-
-import { artifacts } from './artifacts';
-
-import {
-    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 './wrappers';
-
-blockchainTests.resets('UniswapBridge unit tests', env => {
-    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(hexUtils.random(), hexUtils.random(_.random(0, 32)))
-                .callAsync();
-            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);
-            const callData = { value: new BigNumber(_opts.exchangeFillAmount) };
-            // Create the "from" token and exchange.
-            const createFromTokenFn = testContract.createTokenAndExchange(
-                _opts.fromTokenAddress,
-                _opts.exchangeRevertReason,
-            );
-            [_opts.fromTokenAddress] = await createFromTokenFn.callAsync(callData);
-            await createFromTokenFn.awaitTransactionSuccessAsync(callData);
-
-            // Create the "to" token and exchange.
-            const createToTokenFn = testContract.createTokenAndExchange(
-                _opts.toTokenAddress,
-                _opts.exchangeRevertReason,
-            );
-            [_opts.toTokenAddress] = await createToTokenFn.callAsync(callData);
-            await createToTokenFn.awaitTransactionSuccessAsync(callData);
-
-            await testContract
-                .setTokenRevertReason(_opts.toTokenAddress, _opts.toTokenRevertReason)
-                .awaitTransactionSuccessAsync();
-            await testContract
-                .setTokenRevertReason(_opts.fromTokenAddress, _opts.fromTokenRevertReason)
-                .awaitTransactionSuccessAsync();
-            // Set the token balance for the token we're converting from.
-            await testContract.setTokenBalance(_opts.fromTokenAddress).awaitTransactionSuccessAsync({
-                value: new BigNumber(_opts.fromTokenBalance),
-            });
-            // Call bridgeTransferFrom().
-            const bridgeTransferFromFn = 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.
-                hexUtils.leftPad(_opts.fromTokenAddress),
-            );
-            const result = await bridgeTransferFromFn.callAsync();
-            const receipt = await bridgeTransferFromFn.awaitTransactionSuccessAsync();
-            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(tokenAddress).callAsync();
-        }
-
-        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 createTokenFn = await testContract.createTokenAndExchange(constants.NULL_ADDRESS, '');
-            const [tokenAddress] = await createTokenFn.callAsync();
-            await createTokenFn.awaitTransactionSuccessAsync();
-            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(
-                        randomAddress(),
-                        randomAddress(),
-                        randomAddress(),
-                        getRandomInteger(1, 1e18),
-                        hexUtils.leftPad(randomAddress()),
-                    )
-                    .awaitTransactionSuccessAsync();
-                return expect(tx).to.eventually.be.rejectedWith('NO_UNISWAP_EXCHANGE_FOR_TOKEN');
-            });
-
-            it('fails if the exchange fails', async () => {
-                const revertReason = 'FOOBAR';
-                const tx = withdrawToAsync({
-                    exchangeRevertReason: revertReason,
-                });
-                return expect(tx).to.eventually.be.rejectedWith(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(
-                        randomAddress(),
-                        randomAddress(),
-                        randomAddress(),
-                        getRandomInteger(1, 1e18),
-                        hexUtils.leftPad(wethTokenAddress),
-                    )
-                    .awaitTransactionSuccessAsync();
-                return expect(tx).to.eventually.be.rejectedWith('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.eventually.be.rejectedWith(revertReason);
-            });
-
-            it('fails if the exchange fails', async () => {
-                const revertReason = 'FOOBAR';
-                const tx = withdrawToAsync({
-                    toTokenAddress: wethTokenAddress,
-                    exchangeRevertReason: revertReason,
-                });
-                return expect(tx).to.eventually.be.rejectedWith(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(
-                        wethTokenAddress,
-                        randomAddress(),
-                        randomAddress(),
-                        getRandomInteger(1, 1e18),
-                        hexUtils.leftPad(randomAddress()),
-                    )
-                    .awaitTransactionSuccessAsync();
-                return expect(tx).to.eventually.be.rejectedWith('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.eventually.be.rejectedWith(revertReason);
-            });
-
-            it('fails if the exchange fails', async () => {
-                const revertReason = 'FOOBAR';
-                const tx = withdrawToAsync({
-                    fromTokenAddress: wethTokenAddress,
-                    exchangeRevertReason: revertReason,
-                });
-                return expect(tx).to.eventually.be.rejectedWith(revertReason);
-            });
-        });
-    });
-});
--- a/contracts/asset-proxy/test/utils/erc1155_proxy_wrapper.ts
+++ b/contracts/asset-proxy/test/utils/erc1155_proxy_wrapper.ts
@@ -1,4 +1,3 @@
-import { DevUtilsContract } from '@0x/contracts-dev-utils';
 import { artifacts as erc1155Artifacts, ERC1155MintableContract, Erc1155Wrapper } from '@0x/contracts-erc1155';
 import {
    constants,
@@ -8,14 +7,13 @@ 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';
 import * as _ from 'lodash';

-import { artifacts } from './artifacts';
-
-import { ERC1155ProxyContract, IAssetProxyContract } from './wrappers';
+import { artifacts, ERC1155ProxyContract, IAssetProxyContract } from '../../src';

 export class ERC1155ProxyWrapper {
    private readonly _tokenOwnerAddresses: string[];
@@ -28,7 +26,6 @@ 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: {} };
@@ -40,7 +37,6 @@ 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 = [];
@@ -76,7 +72,7 @@ export class ERC1155ProxyWrapper {
            txDefaults,
            artifacts,
        );
-        this._proxyIdIfExists = await this._proxyContract.getProxyId().callAsync();
+        this._proxyIdIfExists = await this._proxyContract.getProxyId.callAsync();
        return this._proxyContract;
    }
    /**
@@ -99,7 +95,7 @@ export class ERC1155ProxyWrapper {
     * @param extraData extra data to append to `transferFrom` transaction. Optional.
     * @return abi encoded tx data.
     */
-    public async getTransferFromAbiEncodedTxDataAsync(
+    public getTransferFromAbiEncodedTxData(
        from: string,
        to: string,
        contractAddress: string,
@@ -109,17 +105,23 @@ export class ERC1155ProxyWrapper {
        receiverCallbackData: string,
        authorizedSender: string,
        assetData_?: string,
-    ): Promise<string> {
+    ): string {
        this._validateProxyContractExistsOrThrow();
        const assetData =
            assetData_ === undefined
-                ? await this._devUtils
-                      .encodeERC1155AssetData(contractAddress, tokensToTransfer, valuesToTransfer, receiverCallbackData)
-                      .callAsync()
+                ? assetDataUtils.encodeERC1155AssetData(
+                      contractAddress,
+                      tokensToTransfer,
+                      valuesToTransfer,
+                      receiverCallbackData,
+                  )
                : assetData_;
-        const data = this._assetProxyInterface
-            .transferFrom(assetData, from, to, valueMultiplier)
-            .getABIEncodedTransactionData();
+        const data = this._assetProxyInterface.transferFrom.getABIEncodedTransactionData(
+            assetData,
+            from,
+            to,
+            valueMultiplier,
+        );
        return data;
    }
    /**
@@ -167,13 +169,19 @@ export class ERC1155ProxyWrapper {
        this._validateProxyContractExistsOrThrow();
        const assetData =
            assetData_ === undefined
-                ? await this._devUtils
-                      .encodeERC1155AssetData(contractAddress, tokensToTransfer, valuesToTransfer, receiverCallbackData)
-                      .callAsync()
+                ? assetDataUtils.encodeERC1155AssetData(
+                      contractAddress,
+                      tokensToTransfer,
+                      valuesToTransfer,
+                      receiverCallbackData,
+                  )
                : assetData_;
-        const data = this._assetProxyInterface
-            .transferFrom(assetData, from, to, valueMultiplier)
-            .getABIEncodedTransactionData();
+        const data = this._assetProxyInterface.transferFrom.getABIEncodedTransactionData(
+            assetData,
+            from,
+            to,
+            valueMultiplier,
+        );
        const txHash = await this._web3Wrapper.sendTransactionAsync({
            to: (this._proxyContract as ERC1155ProxyContract).address,
            data,
@@ -328,22 +336,6 @@ 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.
@@ -354,7 +346,7 @@ export class ERC1155ProxyWrapper {
        this._validateProxyContractExistsOrThrow();
        const tokenContract = this._getContractFromAddress(contractAddress);
        const operator = (this._proxyContract as ERC1155ProxyContract).address;
-        const didApproveAll = await tokenContract.isApprovedForAll(userAddress, operator).callAsync();
+        const didApproveAll = await tokenContract.isApprovedForAll.callAsync(userAddress, operator);
        return didApproveAll;
    }
    public getFungibleTokenIds(): BigNumber[] {
--- a/contracts/asset-proxy/test/utils/erc20_wrapper.ts
+++ b/contracts/asset-proxy/test/utils/erc20_wrapper.ts
@@ -1,20 +1,17 @@
-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';

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

 export class ERC20Wrapper {
    private readonly _tokenOwnerAddresses: string[];
    private readonly _contractOwnerAddress: string;
    private readonly _provider: ZeroExProvider;
    private readonly _dummyTokenContracts: DummyERC20TokenContract[];
-    private readonly _devUtils: DevUtilsContract;
    private _proxyContract?: ERC20ProxyContract;
    private _proxyIdIfExists?: string;
    /**
@@ -29,7 +26,6 @@ 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,
@@ -58,7 +54,7 @@ export class ERC20Wrapper {
            txDefaults,
            artifacts,
        );
-        this._proxyIdIfExists = await this._proxyContract.getProxyId().callAsync();
+        this._proxyIdIfExists = await this._proxyContract.getProxyId.callAsync();
        return this._proxyContract;
    }
    public getProxyId(): string {
@@ -70,39 +66,50 @@ export class ERC20Wrapper {
        this._validateProxyContractExistsOrThrow();
        for (const dummyTokenContract of this._dummyTokenContracts) {
            for (const tokenOwnerAddress of this._tokenOwnerAddresses) {
-                await dummyTokenContract
-                    .setBalance(tokenOwnerAddress, constants.INITIAL_ERC20_BALANCE)
-                    .awaitTransactionSuccessAsync({ from: this._contractOwnerAddress });
-                await dummyTokenContract
-                    .approve((this._proxyContract as ERC20ProxyContract).address, constants.INITIAL_ERC20_ALLOWANCE)
-                    .awaitTransactionSuccessAsync({ from: tokenOwnerAddress });
+                await dummyTokenContract.setBalance.awaitTransactionSuccessAsync(
+                    tokenOwnerAddress,
+                    constants.INITIAL_ERC20_BALANCE,
+                    { from: this._contractOwnerAddress },
+                    constants.AWAIT_TRANSACTION_MINED_MS,
+                );
+                await dummyTokenContract.approve.awaitTransactionSuccessAsync(
+                    (this._proxyContract as ERC20ProxyContract).address,
+                    constants.INITIAL_ERC20_ALLOWANCE,
+                    { from: tokenOwnerAddress },
+                    constants.AWAIT_TRANSACTION_MINED_MS,
+                );
            }
        }
    }
    public async getBalanceAsync(userAddress: string, assetData: string): Promise<BigNumber> {
-        const tokenContract = await this._getTokenContractFromAssetDataAsync(assetData);
-        const balance = new BigNumber(await tokenContract.balanceOf(userAddress).callAsync());
+        const tokenContract = this._getTokenContractFromAssetData(assetData);
+        const balance = new BigNumber(await tokenContract.balanceOf.callAsync(userAddress));
        return balance;
    }
    public async setBalanceAsync(userAddress: string, assetData: string, amount: BigNumber): Promise<void> {
-        const tokenContract = await this._getTokenContractFromAssetDataAsync(assetData);
-        await tokenContract
-            .setBalance(userAddress, amount)
-            .awaitTransactionSuccessAsync(
-                { from: this._contractOwnerAddress },
-                { pollingIntervalMs: constants.AWAIT_TRANSACTION_MINED_MS },
-            );
+        const tokenContract = this._getTokenContractFromAssetData(assetData);
+        await tokenContract.setBalance.awaitTransactionSuccessAsync(
+            userAddress,
+            amount,
+            { from: this._contractOwnerAddress },
+            constants.AWAIT_TRANSACTION_MINED_MS,
+        );
    }
    public async getProxyAllowanceAsync(userAddress: string, assetData: string): Promise<BigNumber> {
-        const tokenContract = await this._getTokenContractFromAssetDataAsync(assetData);
+        const tokenContract = this._getTokenContractFromAssetData(assetData);
        const proxyAddress = (this._proxyContract as ERC20ProxyContract).address;
-        const allowance = new BigNumber(await tokenContract.allowance(userAddress, proxyAddress).callAsync());
+        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 = await this._getTokenContractFromAssetDataAsync(assetData);
+        const tokenContract = this._getTokenContractFromAssetData(assetData);
        const proxyAddress = (this._proxyContract as ERC20ProxyContract).address;
-        await tokenContract.approve(proxyAddress, amount).awaitTransactionSuccessAsync({ from: userAddress });
+        await tokenContract.approve.awaitTransactionSuccessAsync(
+            proxyAddress,
+            amount,
+            { from: userAddress },
+            constants.AWAIT_TRANSACTION_MINED_MS,
+        );
    }
    public async getBalancesAsync(): Promise<ERC20BalancesByOwner> {
        this._validateDummyTokenContractsExistOrThrow();
@@ -111,7 +118,7 @@ export class ERC20Wrapper {
        const balanceInfo: Array<{ tokenOwnerAddress: string; tokenAddress: string }> = [];
        for (const dummyTokenContract of this._dummyTokenContracts) {
            for (const tokenOwnerAddress of this._tokenOwnerAddresses) {
-                balances.push(await dummyTokenContract.balanceOf(tokenOwnerAddress).callAsync());
+                balances.push(await dummyTokenContract.balanceOf.callAsync(tokenOwnerAddress));
                balanceInfo.push({
                    tokenOwnerAddress,
                    tokenAddress: dummyTokenContract.address,
@@ -144,8 +151,9 @@ export class ERC20Wrapper {
        const tokenAddresses = _.map(this._dummyTokenContracts, dummyTokenContract => dummyTokenContract.address);
        return tokenAddresses;
    }
-    private async _getTokenContractFromAssetDataAsync(assetData: string): Promise<DummyERC20TokenContract> {
-        const [proxyId, tokenAddress] = await this._devUtils.decodeERC20AssetData(assetData).callAsync(); // tslint:disable-line:no-unused-variable
+    private _getTokenContractFromAssetData(assetData: string): DummyERC20TokenContract {
+        const erc20ProxyData = assetDataUtils.decodeERC20AssetData(assetData);
+        const tokenAddress = erc20ProxyData.tokenAddress;
        const tokenContractIfExists = _.find(this._dummyTokenContracts, c => c.address === tokenAddress);
        if (tokenContractIfExists === undefined) {
            throw new Error(`Token: ${tokenAddress} was not deployed through ERC20Wrapper`);
--- a/contracts/asset-proxy/test/utils/erc721_wrapper.ts
+++ b/contracts/asset-proxy/test/utils/erc721_wrapper.ts
@@ -5,9 +5,7 @@ import { BigNumber } from '@0x/utils';
 import { ZeroExProvider } from 'ethereum-types';
 import * as _ from 'lodash';

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

 export class ERC721Wrapper {
    private readonly _tokenOwnerAddresses: string[];
@@ -46,7 +44,7 @@ export class ERC721Wrapper {
            txDefaults,
            artifacts,
        );
-        this._proxyIdIfExists = await this._proxyContract.getProxyId().callAsync();
+        this._proxyIdIfExists = await this._proxyContract.getProxyId.callAsync();
        return this._proxyContract;
    }
    public getProxyId(): string {
@@ -73,14 +71,14 @@ export class ERC721Wrapper {
                    }
                    this._initialTokenIdsByOwner[tokenOwnerAddress][dummyTokenContract.address].push(tokenId);

-                    await this.approveProxyForAllAsync(dummyTokenContract.address, tokenOwnerAddress, true);
+                    await this.approveProxyAsync(dummyTokenContract.address, tokenId);
                }
            }
        }
    }
    public async doesTokenExistAsync(tokenAddress: string, tokenId: BigNumber): Promise<boolean> {
        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
-        const owner = await tokenContract.ownerOf(tokenId).callAsync();
+        const owner = await tokenContract.ownerOf.callAsync(tokenId);
        const doesExist = owner !== constants.NULL_ADDRESS;
        return doesExist;
    }
@@ -88,21 +86,26 @@ export class ERC721Wrapper {
        const proxyAddress = (this._proxyContract as ERC721ProxyContract).address;
        await this.approveAsync(proxyAddress, tokenAddress, tokenId);
    }
-    public async approveProxyForAllAsync(
-        tokenAddress: string,
-        ownerAddress: string,
-        isApproved: boolean,
-    ): Promise<void> {
+    public async approveProxyForAllAsync(tokenAddress: string, tokenId: BigNumber, isApproved: boolean): Promise<void> {
        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
+        const tokenOwner = await this.ownerOfAsync(tokenAddress, tokenId);
        const proxyAddress = (this._proxyContract as ERC721ProxyContract).address;
-        await tokenContract.setApprovalForAll(proxyAddress, isApproved).awaitTransactionSuccessAsync({
-            from: ownerAddress,
-        });
+        await tokenContract.setApprovalForAll.awaitTransactionSuccessAsync(
+            proxyAddress,
+            isApproved,
+            { from: tokenOwner },
+            constants.AWAIT_TRANSACTION_MINED_MS,
+        );
    }
    public async approveAsync(to: string, tokenAddress: string, tokenId: BigNumber): Promise<void> {
        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
        const tokenOwner = await this.ownerOfAsync(tokenAddress, tokenId);
-        await tokenContract.approve(to, tokenId).awaitTransactionSuccessAsync({ from: tokenOwner });
+        await tokenContract.approve.awaitTransactionSuccessAsync(
+            to,
+            tokenId,
+            { from: tokenOwner },
+            constants.AWAIT_TRANSACTION_MINED_MS,
+        );
    }
    public async transferFromAsync(
        tokenAddress: string,
@@ -111,28 +114,40 @@ export class ERC721Wrapper {
        userAddress: string,
    ): Promise<void> {
        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
-        await tokenContract.transferFrom(currentOwner, userAddress, tokenId).awaitTransactionSuccessAsync({
-            from: currentOwner,
-        });
+        await tokenContract.transferFrom.awaitTransactionSuccessAsync(
+            currentOwner,
+            userAddress,
+            tokenId,
+            { from: currentOwner },
+            constants.AWAIT_TRANSACTION_MINED_MS,
+        );
    }
    public async mintAsync(tokenAddress: string, tokenId: BigNumber, userAddress: string): Promise<void> {
        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
-        await tokenContract.mint(userAddress, tokenId).awaitTransactionSuccessAsync({
-            from: this._contractOwnerAddress,
-        });
+        await tokenContract.mint.awaitTransactionSuccessAsync(
+            userAddress,
+            tokenId,
+            { from: this._contractOwnerAddress },
+            constants.AWAIT_TRANSACTION_MINED_MS,
+        );
    }
    public async burnAsync(tokenAddress: string, tokenId: BigNumber, owner: string): Promise<void> {
        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
-        await tokenContract.burn(owner, tokenId).awaitTransactionSuccessAsync({ from: this._contractOwnerAddress });
+        await tokenContract.burn.awaitTransactionSuccessAsync(
+            owner,
+            tokenId,
+            { from: this._contractOwnerAddress },
+            constants.AWAIT_TRANSACTION_MINED_MS,
+        );
    }
    public async ownerOfAsync(tokenAddress: string, tokenId: BigNumber): Promise<string> {
        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
-        const owner = await tokenContract.ownerOf(tokenId).callAsync();
+        const owner = await tokenContract.ownerOf.callAsync(tokenId);
        return owner;
    }
    public async isOwnerAsync(userAddress: string, tokenAddress: string, tokenId: BigNumber): Promise<boolean> {
        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
-        const tokenOwner = await tokenContract.ownerOf(tokenId).callAsync();
+        const tokenOwner = await tokenContract.ownerOf.callAsync(tokenId);
        const isOwner = tokenOwner === userAddress;
        return isOwner;
    }
@@ -140,13 +155,13 @@ export class ERC721Wrapper {
        this._validateProxyContractExistsOrThrow();
        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
        const operator = (this._proxyContract as ERC721ProxyContract).address;
-        const didApproveAll = await tokenContract.isApprovedForAll(userAddress, operator).callAsync();
+        const didApproveAll = await tokenContract.isApprovedForAll.callAsync(userAddress, operator);
        return didApproveAll;
    }
    public async isProxyApprovedAsync(tokenAddress: string, tokenId: BigNumber): Promise<boolean> {
        this._validateProxyContractExistsOrThrow();
        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
-        const approvedAddress = await tokenContract.getApproved(tokenId).callAsync();
+        const approvedAddress = await tokenContract.getApproved.callAsync(tokenId);
        const proxyAddress = (this._proxyContract as ERC721ProxyContract).address;
        const isProxyAnApprovedOperator = approvedAddress === proxyAddress;
        return isProxyAnApprovedOperator;
@@ -163,7 +178,7 @@ export class ERC721Wrapper {
                    dummyTokenContract.address
                ];
                for (const tokenId of initialTokenOwnerIds) {
-                    tokenOwnerAddresses.push(await dummyTokenContract.ownerOf(tokenId).callAsync());
+                    tokenOwnerAddresses.push(await dummyTokenContract.ownerOf.callAsync(tokenId));
                    tokenInfo.push({
                        tokenId,
                        tokenAddress: dummyTokenContract.address,
--- a/contracts/asset-proxy/test/utils/index.ts
+++ b/contracts/asset-proxy/test/utils/index.ts
@@ -0,0 +1,3 @@
+export * from './erc20_wrapper';
+export * from './erc721_wrapper';
+export * from './erc1155_proxy_wrapper';
--- a/contracts/asset-proxy/test/wrappers.ts
+++ b/contracts/asset-proxy/test/wrappers.ts
@@ -1,38 +0,0 @@
-/*
- * -----------------------------------------------------------------------------
- * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
- * -----------------------------------------------------------------------------
- */
-export * from '../test/generated-wrappers/chai_bridge';
-export * from '../test/generated-wrappers/dydx_bridge';
-export * from '../test/generated-wrappers/erc1155_proxy';
-export * from '../test/generated-wrappers/erc20_bridge_proxy';
-export * from '../test/generated-wrappers/erc20_proxy';
-export * from '../test/generated-wrappers/erc721_proxy';
-export * from '../test/generated-wrappers/eth2_dai_bridge';
-export * from '../test/generated-wrappers/i_asset_data';
-export * from '../test/generated-wrappers/i_asset_proxy';
-export * from '../test/generated-wrappers/i_asset_proxy_dispatcher';
-export * from '../test/generated-wrappers/i_authorizable';
-export * from '../test/generated-wrappers/i_chai';
-export * from '../test/generated-wrappers/i_dydx';
-export * from '../test/generated-wrappers/i_dydx_bridge';
-export * from '../test/generated-wrappers/i_erc20_bridge';
-export * from '../test/generated-wrappers/i_eth2_dai';
-export * from '../test/generated-wrappers/i_kyber_network_proxy';
-export * from '../test/generated-wrappers/i_uniswap_exchange';
-export * from '../test/generated-wrappers/i_uniswap_exchange_factory';
-export * from '../test/generated-wrappers/kyber_bridge';
-export * from '../test/generated-wrappers/mixin_asset_proxy_dispatcher';
-export * from '../test/generated-wrappers/mixin_authorizable';
-export * from '../test/generated-wrappers/multi_asset_proxy';
-export * from '../test/generated-wrappers/ownable';
-export * from '../test/generated-wrappers/static_call_proxy';
-export * from '../test/generated-wrappers/test_chai_bridge';
-export * from '../test/generated-wrappers/test_dydx_bridge';
-export * from '../test/generated-wrappers/test_erc20_bridge';
-export * from '../test/generated-wrappers/test_eth2_dai_bridge';
-export * from '../test/generated-wrappers/test_kyber_bridge';
-export * from '../test/generated-wrappers/test_static_call_target';
-export * from '../test/generated-wrappers/test_uniswap_bridge';
-export * from '../test/generated-wrappers/uniswap_bridge';
--- a/contracts/asset-proxy/truffle-config.js
+++ b/contracts/asset-proxy/truffle-config.js
@@ -1,96 +0,0 @@
-/**
- * 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 },
-                },
-            },
-        },
-    },
-};
--- a/contracts/asset-proxy/tsconfig.json
+++ b/contracts/asset-proxy/tsconfig.json
@@ -3,72 +3,16 @@
    "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
    "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
    "files": [
-        "generated-artifacts/ChaiBridge.json",
-        "generated-artifacts/DydxBridge.json",
        "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/IChai.json",
-        "generated-artifacts/IDydx.json",
-        "generated-artifacts/IDydxBridge.json",
-        "generated-artifacts/IERC20Bridge.json",
-        "generated-artifacts/IEth2Dai.json",
-        "generated-artifacts/IKyberNetworkProxy.json",
-        "generated-artifacts/IUniswapExchange.json",
-        "generated-artifacts/IUniswapExchangeFactory.json",
-        "generated-artifacts/KyberBridge.json",
-        "generated-artifacts/MixinAssetProxyDispatcher.json",
        "generated-artifacts/MixinAuthorizable.json",
        "generated-artifacts/MultiAssetProxy.json",
-        "generated-artifacts/Ownable.json",
        "generated-artifacts/StaticCallProxy.json",
-        "generated-artifacts/TestChaiBridge.json",
-        "generated-artifacts/TestDydxBridge.json",
-        "generated-artifacts/TestERC20Bridge.json",
-        "generated-artifacts/TestEth2DaiBridge.json",
-        "generated-artifacts/TestKyberBridge.json",
-        "generated-artifacts/TestStaticCallTarget.json",
-        "generated-artifacts/TestUniswapBridge.json",
-        "generated-artifacts/UniswapBridge.json",
-        "test/generated-artifacts/ChaiBridge.json",
-        "test/generated-artifacts/DydxBridge.json",
-        "test/generated-artifacts/ERC1155Proxy.json",
-        "test/generated-artifacts/ERC20BridgeProxy.json",
-        "test/generated-artifacts/ERC20Proxy.json",
-        "test/generated-artifacts/ERC721Proxy.json",
-        "test/generated-artifacts/Eth2DaiBridge.json",
-        "test/generated-artifacts/IAssetData.json",
-        "test/generated-artifacts/IAssetProxy.json",
-        "test/generated-artifacts/IAssetProxyDispatcher.json",
-        "test/generated-artifacts/IAuthorizable.json",
-        "test/generated-artifacts/IChai.json",
-        "test/generated-artifacts/IDydx.json",
-        "test/generated-artifacts/IDydxBridge.json",
-        "test/generated-artifacts/IERC20Bridge.json",
-        "test/generated-artifacts/IEth2Dai.json",
-        "test/generated-artifacts/IKyberNetworkProxy.json",
-        "test/generated-artifacts/IUniswapExchange.json",
-        "test/generated-artifacts/IUniswapExchangeFactory.json",
-        "test/generated-artifacts/KyberBridge.json",
-        "test/generated-artifacts/MixinAssetProxyDispatcher.json",
-        "test/generated-artifacts/MixinAuthorizable.json",
-        "test/generated-artifacts/MultiAssetProxy.json",
-        "test/generated-artifacts/Ownable.json",
-        "test/generated-artifacts/StaticCallProxy.json",
-        "test/generated-artifacts/TestChaiBridge.json",
-        "test/generated-artifacts/TestDydxBridge.json",
-        "test/generated-artifacts/TestERC20Bridge.json",
-        "test/generated-artifacts/TestEth2DaiBridge.json",
-        "test/generated-artifacts/TestKyberBridge.json",
-        "test/generated-artifacts/TestStaticCallTarget.json",
-        "test/generated-artifacts/TestUniswapBridge.json",
-        "test/generated-artifacts/UniswapBridge.json"
+        "generated-artifacts/TestStaticCallTarget.json"
    ],
    "exclude": ["./deploy/solc/solc_bin"]
 }
--- a/contracts/coordinator/.npmignore
+++ b/contracts/coordinator/.npmignore
@@ -1,10 +0,0 @@
-# Blacklist all files
-.*
-*
-# Whitelist lib
-!lib/**/*
-# Whitelist Solidity contracts
-!contracts/src/**/*
-# Blacklist tests in lib
-/lib/test/*
-# Package specific ignore
--- a/contracts/coordinator/.solhintignore
+++ b/contracts/coordinator/.solhintignore
@@ -1,2 +0,0 @@
-# solhint can't parse `abi.decode` syntax.
-contracts/src/MixinCoordinatorApprovalVerifier.sol
--- a/contracts/coordinator/CHANGELOG.json
+++ b/contracts/coordinator/CHANGELOG.json
@@ -1,189 +1,4 @@
 [
-    {
-        "timestamp": 1576540892,
-        "version": "3.0.2",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1575931811,
-        "version": "3.0.1",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "version": "3.0.0",
-        "changes": [
-            {
-                "note": "Drastically reduced bundle size by adding .npmignore, only exporting specific artifacts/wrappers/utils",
-                "pr": 2330
-            },
-            {
-                "note": "Introduced new export CoordinatorRevertErrors",
-                "pr": 2321
-            },
-            {
-                "note": "Added dependency on @0x/contracts-utils",
-                "pr": 2321
-            },
-            {
-                "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": 1575296764
-    },
-    {
-        "version": "2.1.0-beta.4",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ],
-        "timestamp": 1575290197
-    },
-    {
-        "version": "2.1.0-beta.3",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ],
-        "timestamp": 1574238768
-    },
-    {
-        "version": "2.1.0-beta.2",
-        "changes": [
-            {
-                "note": "Drastically reduced bundle size by adding .npmignore, only exporting specific artifacts/wrappers/utils",
-                "pr": 2330
-            },
-            {
-                "note": "Introduced new export CoordinatorRevertErrors",
-                "pr": 2321
-            },
-            {
-                "note": "Added dependency on @0x/contracts-utils",
-                "pr": 2321
-            }
-        ],
-        "timestamp": 1574030254
-    },
-    {
-        "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",
--- a/contracts/coordinator/CHANGELOG.md
+++ b/contracts/coordinator/CHANGELOG.md
@@ -5,69 +5,6 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

-## v3.0.2 - _December 17, 2019_
-
-    * Dependencies updated
-
-## v3.0.1 - _December 9, 2019_
-
-    * Dependencies updated
-
-## v3.0.0 - _December 2, 2019_
-
-    * Drastically reduced bundle size by adding .npmignore, only exporting specific artifacts/wrappers/utils (#2330)
-    * Introduced new export CoordinatorRevertErrors (#2321)
-    * Added dependency on @0x/contracts-utils (#2321)
-    * 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.1.0-beta.4 - _December 2, 2019_
-
-    * Dependencies updated
-
-## v2.1.0-beta.3 - _November 20, 2019_
-
-    * Dependencies updated
-
-## v2.1.0-beta.2 - _November 17, 2019_
-
-    * Drastically reduced bundle size by adding .npmignore, only exporting specific artifacts/wrappers/utils (#2330)
-    * Introduced new export CoordinatorRevertErrors (#2321)
-    * Added dependency on @0x/contracts-utils (#2321)
-
-## 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
--- a/contracts/coordinator/README.md
+++ b/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 this 0x [guide](https://0x.org/docs/guides/0x-cheat-sheet) 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 the 0x [wiki](https://0xproject.com/wiki#Deployed-Addresses) 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://0x.org/docs/guides/bug-bounty-program).
+A bug bounty for the 2.0.0 contracts is ongoing! Instructions can be found [here](https://0xproject.com/wiki#Bug-Bounty).

 ## Contributing

--- a/contracts/coordinator/compiler.json
+++ b/contracts/coordinator/compiler.json
@@ -1,5 +1,5 @@
 {
-    "artifactsDir": "./test/generated-artifacts",
+    "artifactsDir": "./generated-artifacts",
    "contractsDir": "./contracts",
    "useDockerisedSolc": false,
    "compilerSettings": {
@@ -21,5 +21,6 @@
                ]
            }
        }
-    }
+    },
+    "contracts": ["src/Coordinator.sol", "src/registry/CoordinatorRegistry.sol"]
 }
--- a/contracts/coordinator/contracts/src/Coordinator.sol
+++ b/contracts/coordinator/contracts/src/Coordinator.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,12 +16,10 @@

 */

-pragma solidity ^0.5.9;
-pragma experimental ABIEncoderV2;
+pragma solidity ^0.5.5;
+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";
@@ -34,12 +32,8 @@ contract Coordinator is
    MixinCoordinatorApprovalVerifier,
    MixinCoordinatorCore
 {
-    /// @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)
+    constructor (address _exchange)
        public
-        LibConstants(exchange)
-        LibEIP712CoordinatorDomain(chainId, address(0))
-        LibEIP712ExchangeDomain(chainId, exchange)
+        LibConstants(_exchange)
    {}
 }
--- a/contracts/coordinator/contracts/src/MixinCoordinatorApprovalVerifier.sol
+++ b/contracts/coordinator/contracts/src/MixinCoordinatorApprovalVerifier.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,28 +16,26 @@

 */

-pragma solidity ^0.5.9;
-pragma experimental ABIEncoderV2;
+pragma solidity ^0.5.5;
+pragma experimental "ABIEncoderV2";

-import "@0x/contracts-exchange-libs/contracts/src/LibEIP712ExchangeDomain.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibExchangeSelectors.sol";
 import "@0x/contracts-exchange-libs/contracts/src/LibOrder.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 "@0x/contracts-utils/contracts/src/LibAddressArray.sol";
 import "./libs/LibCoordinatorApproval.sol";
-import "./libs/LibCoordinatorRichErrors.sol";
-import "./interfaces/ICoordinatorSignatureValidator.sol";
-import "./interfaces/ICoordinatorApprovalVerifier.sol";
+import "./libs/LibZeroExTransaction.sol";
+import "./mixins/MSignatureValidator.sol";
+import "./mixins/MCoordinatorApprovalVerifier.sol";


 // solhint-disable avoid-tx-origin
 contract MixinCoordinatorApprovalVerifier is
+    LibExchangeSelectors,
    LibCoordinatorApproval,
-    LibEIP712ExchangeDomain,
-    ICoordinatorSignatureValidator,
-    ICoordinatorApprovalVerifier
+    LibZeroExTransaction,
+    MSignatureValidator,
+    MCoordinatorApprovalVerifier
 {
    using LibBytes for bytes;
    using LibAddressArray for address[];
@@ -47,12 +45,13 @@ 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 approvalSignatures Array of signatures that correspond to the feeRecipients of each
-    ///        order in the transaction's Exchange calldata.
+    /// @param approvalExpirationTimeSeconds Array of expiration times in seconds for which each corresponding approval signature expires.
+    /// @param approvalSignatures Array of signatures that correspond to the feeRecipients of each order in the transaction's Exchange calldata.
    function assertValidCoordinatorApprovals(
        LibZeroExTransaction.ZeroExTransaction memory transaction,
        address txOrigin,
        bytes memory transactionSignature,
+        uint256[] memory approvalExpirationTimeSeconds,
        bytes[] memory approvalSignatures
    )
        public
@@ -64,11 +63,12 @@ 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 orders The orders from the Exchange calldata.
+    /// @return The orders from the Exchange calldata.
    function decodeOrdersFromFillData(bytes memory data)
        public
        pure
@@ -84,8 +84,9 @@ contract MixinCoordinatorApprovalVerifier is
    {
        bytes4 selector = data.readBytes4(0);
        if (
-            selector == IExchange(address(0)).fillOrder.selector ||
-            selector == IExchange(address(0)).fillOrKillOrder.selector
+            selector == FILL_ORDER_SELECTOR ||
+            selector == FILL_ORDER_NO_THROW_SELECTOR ||
+            selector == FILL_OR_KILL_ORDER_SELECTOR
        ) {
            // Decode single order
            (LibOrder.Order memory order) = abi.decode(
@@ -95,13 +96,13 @@ contract MixinCoordinatorApprovalVerifier is
            orders = new LibOrder.Order[](1);
            orders[0] = order;
        } else if (
-            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
+            selector == BATCH_FILL_ORDERS_SELECTOR ||
+            selector == BATCH_FILL_ORDERS_NO_THROW_SELECTOR ||
+            selector == BATCH_FILL_OR_KILL_ORDERS_SELECTOR ||
+            selector == MARKET_BUY_ORDERS_SELECTOR ||
+            selector == MARKET_BUY_ORDERS_NO_THROW_SELECTOR ||
+            selector == MARKET_SELL_ORDERS_SELECTOR ||
+            selector == MARKET_SELL_ORDERS_NO_THROW_SELECTOR
        ) {
            // Decode all orders
            // solhint-disable indent
@@ -109,10 +110,7 @@ contract MixinCoordinatorApprovalVerifier is
                data.slice(4, data.length),
                (LibOrder.Order[])
            );
-        } else if (
-            selector == IExchange(address(0)).matchOrders.selector ||
-            selector == IExchange(address(0)).matchOrdersWithMaximalFill.selector
-        ) {
+        } else if (selector == MATCH_ORDERS_SELECTOR) {
            // Decode left and right orders
            (LibOrder.Order memory leftOrder, LibOrder.Order memory rightOrder) = abi.decode(
                data.slice(4, data.length),
@@ -132,24 +130,27 @@ 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
-        if (tx.origin != txOrigin) {
-            LibRichErrors.rrevert(LibCoordinatorRichErrors.InvalidOriginError(txOrigin));
-        }
+        require(
+            tx.origin == txOrigin,
+            "INVALID_ORIGIN"
+        );

        // Hash 0x transaction
-        bytes32 transactionHash = LibZeroExTransaction.getTypedDataHash(transaction, EIP712_EXCHANGE_DOMAIN_HASH);
+        bytes32 transactionHash = getTransactionHash(transaction);

        // Create empty list of approval signers
        address[] memory approvalSignerAddresses = new address[](0);
@@ -157,12 +158,21 @@ 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
+                transactionSignature: transactionSignature,
+                approvalExpirationTimeSeconds: currentApprovalExpirationTimeSeconds
            });

+            // Ensure approval has not expired
+            require(
+                // solhint-disable-next-line not-rely-on-time
+                currentApprovalExpirationTimeSeconds > block.timestamp,
+                "APPROVAL_EXPIRED"
+            );
+
            // Hash approval message and recover signer address
            bytes32 approvalHash = getCoordinatorApprovalHash(approval);
            address approvalSignerAddress = getSignerAddress(approvalHash, approvalSignatures[i]);
@@ -184,12 +194,10 @@ contract MixinCoordinatorApprovalVerifier is
            // Ensure feeRecipient of order has approved this 0x transaction
            address approverAddress = orders[i].feeRecipientAddress;
            bool isOrderApproved = approvalSignerAddresses.contains(approverAddress);
-            if (!isOrderApproved) {
-                LibRichErrors.rrevert(LibCoordinatorRichErrors.InvalidApprovalSignatureError(
-                    transactionHash,
-                    approverAddress
-                ));
-            }
+            require(
+                isOrderApproved,
+                "INVALID_APPROVAL_SIGNATURE"
+            );
        }
    }
 }
--- a/contracts/coordinator/contracts/src/MixinCoordinatorCore.sol
+++ b/contracts/coordinator/contracts/src/MixinCoordinatorCore.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,57 +16,50 @@

 */

-pragma solidity ^0.5.9;
-pragma experimental ABIEncoderV2;
+pragma solidity ^0.5.5;
+pragma experimental "ABIEncoderV2";

-import "@0x/contracts-exchange-libs/contracts/src/LibZeroExTransaction.sol";
-import "@0x/contracts-utils/contracts/src/Refundable.sol";
+import "./libs/LibZeroExTransaction.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,
-    ICoordinatorApprovalVerifier,
+    MCoordinatorApprovalVerifier,
    ICoordinatorCore
 {
-
-    /// @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.
+    /// @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 approvalSignatures Array of signatures that correspond to the feeRecipients of each
-    ///        order in the transaction's Exchange calldata.
+    /// @param approvalExpirationTimeSeconds Array of expiration times in seconds for which each corresponding approval signature expires.
+    /// @param approvalSignatures Array of signatures that correspond to the feeRecipients of each order in the transaction's Exchange calldata.
    function executeTransaction(
        LibZeroExTransaction.ZeroExTransaction memory transaction,
        address txOrigin,
        bytes memory transactionSignature,
+        uint256[] memory approvalExpirationTimeSeconds,
        bytes[] memory approvalSignatures
    )
        public
-        payable
-        refundFinalBalance
    {
        // Validate that the 0x transaction has been approves by each feeRecipient
        assertValidCoordinatorApprovals(
            transaction,
            txOrigin,
            transactionSignature,
+            approvalExpirationTimeSeconds,
            approvalSignatures
        );

        // Execute the transaction
-        EXCHANGE.executeTransaction.value(msg.value)(transaction, transactionSignature);
+        EXCHANGE.executeTransaction(
+            transaction.salt,
+            transaction.signerAddress,
+            transaction.data,
+            transactionSignature
+        );
    }
 }
--- a/contracts/coordinator/contracts/src/MixinSignatureValidator.sol
+++ b/contracts/coordinator/contracts/src/MixinSignatureValidator.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,48 +16,38 @@

 */

-pragma solidity ^0.5.9;
+pragma solidity ^0.5.5;

 import "@0x/contracts-utils/contracts/src/LibBytes.sol";
-import "@0x/contracts-utils/contracts/src/LibRichErrors.sol";
-import "./interfaces/ICoordinatorSignatureValidator.sol";
-import "./libs/LibCoordinatorRichErrors.sol";
+import "./mixins/MSignatureValidator.sol";


 contract MixinSignatureValidator is
-    ICoordinatorSignatureValidator
+    MSignatureValidator
 {
    using LibBytes for bytes;

    /// @dev Recovers the address of a signer given a hash and signature.
    /// @param hash Any 32 byte hash.
    /// @param signature Proof that the hash has been signed by signer.
-    /// @return signerAddress Address of the signer.
    function getSignerAddress(bytes32 hash, bytes memory signature)
        public
        pure
        returns (address signerAddress)
    {
-        uint256 signatureLength = signature.length;
-        if (signatureLength == 0) {
-            LibRichErrors.rrevert(LibCoordinatorRichErrors.SignatureError(
-                LibCoordinatorRichErrors.SignatureErrorCodes.INVALID_LENGTH,
-                hash,
-                signature
-            ));
-        }
+        require(
+            signature.length > 0,
+            "LENGTH_GREATER_THAN_0_REQUIRED"
+        );

        // Pop last byte off of signature byte array.
-        uint8 signatureTypeRaw = uint8(signature[signature.length - 1]);
+        uint8 signatureTypeRaw = uint8(signature.popLastByte());

        // Ensure signature is supported
-        if (signatureTypeRaw >= uint8(SignatureType.NSignatureTypes)) {
-            LibRichErrors.rrevert(LibCoordinatorRichErrors.SignatureError(
-                LibCoordinatorRichErrors.SignatureErrorCodes.UNSUPPORTED,
-                hash,
-                signature
-            ));
-        }
+        require(
+            signatureTypeRaw < uint8(SignatureType.NSignatureTypes),
+            "SIGNATURE_UNSUPPORTED"
+        );

        SignatureType signatureType = SignatureType(signatureTypeRaw);

@@ -67,32 +57,25 @@ 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) {
-            LibRichErrors.rrevert(LibCoordinatorRichErrors.SignatureError(
-                LibCoordinatorRichErrors.SignatureErrorCodes.ILLEGAL,
-                hash,
-                signature
-            ));
+            revert("SIGNATURE_ILLEGAL");

        // Always invalid signature.
        // Like Illegal, this is always implicitly available and therefore
        // offered explicitly. It can be implicitly created by providing
        // a correctly formatted but incorrect signature.
        } else if (signatureType == SignatureType.Invalid) {
-            LibRichErrors.rrevert(LibCoordinatorRichErrors.SignatureError(
-                LibCoordinatorRichErrors.SignatureErrorCodes.INVALID,
-                hash,
-                signature
-            ));
+            require(
+                signature.length == 0,
+                "LENGTH_0_REQUIRED"
+            );
+            revert("SIGNATURE_INVALID");

        // Signature using EIP712
        } else if (signatureType == SignatureType.EIP712) {
-            if (signatureLength != 66) {
-                LibRichErrors.rrevert(LibCoordinatorRichErrors.SignatureError(
-                    LibCoordinatorRichErrors.SignatureErrorCodes.INVALID_LENGTH,
-                    hash,
-                    signature
-                ));
-            }
+            require(
+                signature.length == 65,
+                "LENGTH_65_REQUIRED"
+            );
            uint8 v = uint8(signature[0]);
            bytes32 r = signature.readBytes32(1);
            bytes32 s = signature.readBytes32(33);
@@ -106,13 +89,10 @@ contract MixinSignatureValidator is

        // Signed using web3.eth_sign
        } else if (signatureType == SignatureType.EthSign) {
-            if (signatureLength != 66) {
-                LibRichErrors.rrevert(LibCoordinatorRichErrors.SignatureError(
-                    LibCoordinatorRichErrors.SignatureErrorCodes.INVALID_LENGTH,
-                    hash,
-                    signature
-                ));
-            }
+            require(
+                signature.length == 65,
+                "LENGTH_65_REQUIRED"
+            );
            uint8 v = uint8(signature[0]);
            bytes32 r = signature.readBytes32(1);
            bytes32 s = signature.readBytes32(33);
@@ -133,10 +113,6 @@ contract MixinSignatureValidator is
        // that we currently support. In this case returning false
        // may lead the caller to incorrectly believe that the
        // signature was invalid.)
-        LibRichErrors.rrevert(LibCoordinatorRichErrors.SignatureError(
-            LibCoordinatorRichErrors.SignatureErrorCodes.UNSUPPORTED,
-            hash,
-            signature
-        ));
+        revert("SIGNATURE_UNSUPPORTED");
    }
 }
--- a/contracts/coordinator/contracts/src/interfaces/ICoordinatorApprovalVerifier.sol
+++ b/contracts/coordinator/contracts/src/interfaces/ICoordinatorApprovalVerifier.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,11 +16,11 @@

 */

-pragma solidity ^0.5.9;
-pragma experimental ABIEncoderV2;
+pragma solidity ^0.5.5;
+pragma experimental "ABIEncoderV2";

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


 contract ICoordinatorApprovalVerifier {
@@ -30,12 +30,13 @@ 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 approvalSignatures Array of signatures that correspond to the feeRecipients of each
-    ///        order in the transaction's Exchange calldata.
+    /// @param approvalExpirationTimeSeconds Array of expiration times in seconds for which each corresponding approval signature expires.
+    /// @param approvalSignatures Array of signatures that correspond to the feeRecipients of each order in the transaction's Exchange calldata.
    function assertValidCoordinatorApprovals(
        LibZeroExTransaction.ZeroExTransaction memory transaction,
        address txOrigin,
        bytes memory transactionSignature,
+        uint256[] memory approvalExpirationTimeSeconds,
        bytes[] memory approvalSignatures
    )
        public
@@ -43,7 +44,7 @@ contract ICoordinatorApprovalVerifier {

    /// @dev Decodes the orders from Exchange calldata representing any fill method.
    /// @param data Exchange calldata representing a fill method.
-    /// @return orders The orders from the Exchange calldata.
+    /// @return The orders from the Exchange calldata.
    function decodeOrdersFromFillData(bytes memory data)
        public
        pure
--- a/contracts/coordinator/contracts/src/interfaces/ICoordinatorCore.sol
+++ b/contracts/coordinator/contracts/src/interfaces/ICoordinatorCore.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,27 +16,26 @@

 */

-pragma solidity ^0.5.9;
-pragma experimental ABIEncoderV2;
+pragma solidity ^0.5.5;
+pragma experimental "ABIEncoderV2";

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


 contract ICoordinatorCore {

-    /// @dev Executes a 0x transaction that has been signed by the feeRecipients that correspond to
-    ///      each order in the transaction's Exchange calldata.
+    /// @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 approvalSignatures Array of signatures that correspond to the feeRecipients of each
-    ///        order in the transaction's Exchange calldata.
+    /// @param approvalExpirationTimeSeconds Array of expiration times in seconds for which each corresponding approval signature expires.
+    /// @param approvalSignatures Array of signatures that correspond to the feeRecipients of each order in the transaction's Exchange calldata.
    function executeTransaction(
        LibZeroExTransaction.ZeroExTransaction memory transaction,
        address txOrigin,
        bytes memory transactionSignature,
+        uint256[] memory approvalExpirationTimeSeconds,
        bytes[] memory approvalSignatures
    )
-        public
-        payable;
+        public;
 }
--- a/contracts/coordinator/contracts/src/interfaces/ICoordinatorSignatureValidator.sol
+++ b/contracts/coordinator/contracts/src/interfaces/ICoordinatorSignatureValidator.sol
@@ -1,45 +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.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);
-}
--- a/contracts/coordinator/contracts/src/interfaces/ISignatureValidator.sol
+++ b/contracts/coordinator/contracts/src/interfaces/ISignatureValidator.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -18,10 +18,14 @@

 pragma solidity ^0.5.5;

-import "../src/libs/LibExchangeRichErrorDecoder.sol";

+contract ISignatureValidator {

-// solhint-disable no-empty-blocks
-contract TestLibExchangeRichErrorDecoder is
-    LibExchangeRichErrorDecoder
-{}
+    /// @dev Recovers the address of a signer given a hash and signature.
+    /// @param hash Any 32 byte hash.
+    /// @param signature Proof that the hash has been signed by signer.
+    function getSignerAddress(bytes32 hash, bytes memory signature)
+        public
+        pure
+        returns (address signerAddress);
+}
--- a/contracts/coordinator/contracts/src/interfaces/ITransactions.sol
+++ b/contracts/coordinator/contracts/src/interfaces/ITransactions.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -15,24 +15,21 @@
  limitations under the License.

 */
-
-pragma solidity ^0.5.9;
-
-import "@0x/contracts-utils/contracts/src/LibEIP1271.sol";
+pragma solidity ^0.5.5;


-contract IEIP1271Wallet is
-    LibEIP1271
-{
-    /// @dev Verifies that a signature is valid.
-    /// @param data Arbitrary signed data.
-    /// @param signature Proof that data has been signed.
-    /// @return magicValue bytes4(0x20c13b0b) if the signature check succeeds.
-    function isValidSignature(
+contract ITransactions {
+
+    /// @dev Executes an exchange method call in the context of signer.
+    /// @param salt Arbitrary number to ensure uniqueness of transaction hash.
+    /// @param signerAddress Address of transaction signer.
+    /// @param data AbiV2 encoded calldata.
+    /// @param signature Proof of signer transaction by signer.
+    function executeTransaction(
+        uint256 salt,
+        address signerAddress,
        bytes calldata data,
        bytes calldata signature
    )
-        external
-        view
-        returns (bytes4 magicValue);
+        external;
 }
--- a/contracts/coordinator/contracts/src/libs/LibConstants.sol
+++ b/contracts/coordinator/contracts/src/libs/LibConstants.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,21 +16,19 @@

 */

-pragma solidity ^0.5.9;
+pragma solidity ^0.5.5;

-import "@0x/contracts-exchange/contracts/src/interfaces/ITransactions.sol";
+import "../interfaces/ITransactions.sol";


-// solhint-disable var-name-mixedcase
 contract LibConstants {

-    // The 0x Exchange contract.
+     // solhint-disable-next-line var-name-mixedcase
    ITransactions internal EXCHANGE;

-    /// @param exchange Address of the 0x Exchange contract.
-    constructor (address exchange)
+    constructor (address _exchange)
        public
    {
-        EXCHANGE = ITransactions(exchange);
+        EXCHANGE = ITransactions(_exchange);
    }
 }
--- a/contracts/coordinator/contracts/src/libs/LibCoordinatorApproval.sol
+++ b/contracts/coordinator/contracts/src/libs/LibCoordinatorApproval.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,52 +16,49 @@

 */

-pragma solidity ^0.5.9;
-pragma experimental ABIEncoderV2;
+pragma solidity ^0.5.5;
+pragma experimental "ABIEncoderV2";

-import "./LibEIP712CoordinatorDomain.sol";
+import "./LibEIP712Domain.sol";


 contract LibCoordinatorApproval is
-    LibEIP712CoordinatorDomain
+    LibEIP712Domain
 {
    // Hash for the EIP712 Coordinator approval message
    // keccak256(abi.encodePacked(
    //     "CoordinatorApproval(",
    //     "address txOrigin,",
    //     "bytes32 transactionHash,",
-    //     "bytes transactionSignature",
+    //     "bytes transactionSignature,",
+    //     "uint256 approvalExpirationTimeSeconds",
    //     ")"
    // ));
-    bytes32 constant public EIP712_COORDINATOR_APPROVAL_SCHEMA_HASH =
-        0xa6511c04ca44625d50986f8c36bedc09366207a17b96e347094053a9f8507168;
+    bytes32 constant internal EIP712_COORDINATOR_APPROVAL_SCHEMA_HASH = 0x2fbcdbaa76bc7589916958ae919dfbef04d23f6bbf26de6ff317b32c6cc01e05;

    struct CoordinatorApproval {
        address txOrigin;                       // Required signer of Ethereum transaction that is submitting approval.
        bytes32 transactionHash;                // EIP712 hash of the transaction.
        bytes transactionSignature;             // Signature of the 0x transaction.
+        uint256 approvalExpirationTimeSeconds;  // Timestamp in seconds for which the approval expires.
    }

-    /// @dev 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.
+    /// @dev Calculated the EIP712 hash of the Coordinator approval mesasage using the domain separator of this contract.
+    /// @param approval Coordinator approval message containing the transaction hash, transaction signature, and expiration of the approval.
+    /// @return EIP712 hash of the Coordinator approval message with the domain separator of this contract.
    function getCoordinatorApprovalHash(CoordinatorApproval memory approval)
        public
        view
        returns (bytes32 approvalHash)
    {
-        approvalHash = _hashEIP712CoordinatorMessage(_hashCoordinatorApproval(approval));
+        approvalHash = hashEIP712CoordinatorMessage(hashCoordinatorApproval(approval));
        return approvalHash;
    }

-    /// @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)
+    /// @dev Calculated the EIP712 hash of the Coordinator approval mesasage with no domain separator.
+    /// @param approval Coordinator approval message containing the transaction hash, transaction signature, and expiration of the approval.
+    /// @return EIP712 hash of the Coordinator approval message with no domain separator.
+    function hashCoordinatorApproval(CoordinatorApproval memory approval)
        internal
        pure
        returns (bytes32 result)
@@ -70,6 +67,7 @@ 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(
@@ -77,6 +75,7 @@ contract LibCoordinatorApproval is
        //     approval.txOrigin,
        //     approval.transactionHash,
        //     keccak256(approval.transactionSignature)
+        //     approval.approvalExpirationTimeSeconds,
        // ));

        assembly {
@@ -90,8 +89,9 @@ 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, 128)
+            result := keccak256(memPtr, 160)
        }
        return result;
    }
--- a/contracts/coordinator/contracts/src/libs/LibCoordinatorRichErrors.sol
+++ b/contracts/coordinator/contracts/src/libs/LibCoordinatorRichErrors.sol
@@ -1,87 +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.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
-        );
-    }
-}
--- a/contracts/coordinator/contracts/src/libs/LibEIP712CoordinatorDomain.sol
+++ b/contracts/coordinator/contracts/src/libs/LibEIP712CoordinatorDomain.sol
@@ -1,66 +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.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);
-    }
-}
--- a/contracts/coordinator/contracts/src/libs/LibEIP712Domain.sol
+++ b/contracts/coordinator/contracts/src/libs/LibEIP712Domain.sol
@@ -0,0 +1,131 @@
+/*
+
+  Copyright 2018 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.5.5;
+
+import "./LibConstants.sol";
+
+
+contract LibEIP712Domain is
+    LibConstants
+{
+
+    // EIP191 header for EIP712 prefix
+    string constant internal EIP191_HEADER = "\x19\x01";
+
+    // EIP712 Domain Name value for the Coordinator
+    string constant internal EIP712_COORDINATOR_DOMAIN_NAME = "0x Protocol Coordinator";
+
+    // EIP712 Domain Version value for the Coordinator
+    string constant internal EIP712_COORDINATOR_DOMAIN_VERSION = "1.0.0";
+
+    // EIP712 Domain Name value for the Exchange
+    string constant internal EIP712_EXCHANGE_DOMAIN_NAME = "0x Protocol";
+
+    // EIP712 Domain Version value for the Exchange
+    string constant internal EIP712_EXCHANGE_DOMAIN_VERSION = "2";
+
+    // Hash of the EIP712 Domain Separator Schema
+    bytes32 constant internal EIP712_DOMAIN_SEPARATOR_SCHEMA_HASH = keccak256(abi.encodePacked(
+        "EIP712Domain(",
+        "string name,",
+        "string version,",
+        "address verifyingContract",
+        ")"
+    ));
+
+    // Hash of the EIP712 Domain Separator data for the Coordinator
+    // solhint-disable-next-line var-name-mixedcase
+    bytes32 public EIP712_COORDINATOR_DOMAIN_HASH;
+
+    // Hash of the EIP712 Domain Separator data for the Exchange
+    // solhint-disable-next-line var-name-mixedcase
+    bytes32 public EIP712_EXCHANGE_DOMAIN_HASH;
+
+    constructor ()
+        public
+    {
+        EIP712_COORDINATOR_DOMAIN_HASH = keccak256(abi.encodePacked(
+            EIP712_DOMAIN_SEPARATOR_SCHEMA_HASH,
+            keccak256(bytes(EIP712_COORDINATOR_DOMAIN_NAME)),
+            keccak256(bytes(EIP712_COORDINATOR_DOMAIN_VERSION)),
+            uint256(address(this))
+        ));
+
+        EIP712_EXCHANGE_DOMAIN_HASH = keccak256(abi.encodePacked(
+            EIP712_DOMAIN_SEPARATOR_SCHEMA_HASH,
+            keccak256(bytes(EIP712_EXCHANGE_DOMAIN_NAME)),
+            keccak256(bytes(EIP712_EXCHANGE_DOMAIN_VERSION)),
+            uint256(address(EXCHANGE))
+        ));
+    }
+
+    /// @dev Calculates EIP712 encoding for a hash struct in the EIP712 domain
+    ///      of this contract.
+    /// @param hashStruct The EIP712 hash struct.
+    /// @return EIP712 hash applied to this EIP712 Domain.
+    function hashEIP712CoordinatorMessage(bytes32 hashStruct)
+        internal
+        view
+        returns (bytes32 result)
+    {
+        return hashEIP712Message(EIP712_COORDINATOR_DOMAIN_HASH, hashStruct);
+    }
+
+    /// @dev Calculates EIP712 encoding for a hash struct in the EIP712 domain
+    ///      of the Exchange contract.
+    /// @param hashStruct The EIP712 hash struct.
+    /// @return EIP712 hash applied to the Exchange EIP712 Domain.
+    function hashEIP712ExchangeMessage(bytes32 hashStruct)
+        internal
+        view
+        returns (bytes32 result)
+    {
+        return hashEIP712Message(EIP712_EXCHANGE_DOMAIN_HASH, hashStruct);
+    }
+
+    /// @dev Calculates EIP712 encoding for a hash struct with a given domain hash.
+    /// @param eip712DomainHash Hash of the domain domain separator data.
+    /// @param hashStruct The EIP712 hash struct.
+    /// @return EIP712 hash applied to the Exchange EIP712 Domain.
+    function hashEIP712Message(bytes32 eip712DomainHash, bytes32 hashStruct)
+        internal
+        pure
+        returns (bytes32 result)
+    {
+        // Assembly for more efficient computing:
+        // keccak256(abi.encodePacked(
+        //     EIP191_HEADER,
+        //     EIP712_DOMAIN_HASH,
+        //     hashStruct
+        // ));
+
+        assembly {
+            // Load free memory pointer
+            let memPtr := mload(64)
+
+            mstore(memPtr, 0x1901000000000000000000000000000000000000000000000000000000000000)  // EIP191 header
+            mstore(add(memPtr, 2), eip712DomainHash)                                            // EIP712 domain hash
+            mstore(add(memPtr, 34), hashStruct)                                                 // Hash of struct
+
+            // Compute hash
+            result := keccak256(memPtr, 66)
+        }
+        return result;
+    }
+}
--- a/contracts/coordinator/contracts/src/libs/LibZeroExTransaction.sol
+++ b/contracts/coordinator/contracts/src/libs/LibZeroExTransaction.sol
@@ -0,0 +1,95 @@
+/*
+
+  Copyright 2018 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.5.5;
+pragma experimental "ABIEncoderV2";
+
+import "./LibEIP712Domain.sol";
+
+
+contract LibZeroExTransaction is
+    LibEIP712Domain
+{
+    // Hash for the EIP712 0x transaction schema
+    // keccak256(abi.encodePacked(
+    //    "ZeroExTransaction(",
+    //    "uint256 salt,",
+    //    "address signerAddress,",
+    //    "bytes data",
+    //    ")"
+    // ));
+    bytes32 constant internal EIP712_ZEROEX_TRANSACTION_SCHEMA_HASH = 0x213c6f636f3ea94e701c0adf9b2624aa45a6c694f9a292c094f9a81c24b5df4c;
+
+    struct ZeroExTransaction {
+        uint256 salt;           // Arbitrary number to ensure uniqueness of transaction hash.
+        address signerAddress;  // Address of transaction signer.
+        bytes data;             // AbiV2 encoded calldata.
+    }
+
+    /// @dev Calculates the EIP712 hash of a 0x transaction using the domain separator of the Exchange contract.
+    /// @param transaction 0x transaction containing salt, signerAddress, and data.
+    /// @return EIP712 hash of the transaction with the domain separator of this contract.
+    function getTransactionHash(ZeroExTransaction memory transaction)
+        public
+        view
+        returns (bytes32 transactionHash)
+    {
+        // Hash the transaction with the domain separator of the Exchange contract.
+        transactionHash = hashEIP712ExchangeMessage(hashZeroExTransaction(transaction));
+        return transactionHash;
+    }
+
+    /// @dev Calculates EIP712 hash of the 0x transaction with no domain separator.
+    /// @param transaction 0x transaction containing salt, signerAddress, and data.
+    /// @return EIP712 hash of the transaction with no domain separator.
+    function hashZeroExTransaction(ZeroExTransaction memory transaction)
+        internal
+        pure
+        returns (bytes32 result)
+    {
+        bytes32 schemaHash = EIP712_ZEROEX_TRANSACTION_SCHEMA_HASH;
+        bytes memory data = transaction.data;
+        uint256 salt = transaction.salt;
+        address signerAddress = transaction.signerAddress;
+
+        // Assembly for more efficiently computing:
+        // keccak256(abi.encodePacked(
+        //     EIP712_ZEROEX_TRANSACTION_SCHEMA_HASH,
+        //     transaction.salt,
+        //     uint256(transaction.signerAddress),
+        //     keccak256(transaction.data)
+        // ));
+
+        assembly {
+            // Compute hash of data
+            let dataHash := keccak256(add(data, 32), mload(data))
+
+            // Load free memory pointer
+            let memPtr := mload(64)
+
+            mstore(memPtr, schemaHash)                                                               // hash of schema
+            mstore(add(memPtr, 32), salt)                                                            // salt
+            mstore(add(memPtr, 64), and(signerAddress, 0xffffffffffffffffffffffffffffffffffffffff))  // signerAddress
+            mstore(add(memPtr, 96), dataHash)                                                        // hash of data
+
+            // Compute hash
+            result := keccak256(memPtr, 128)
+        }
+        return result;
+    }
+}
--- a/contracts/coordinator/contracts/src/mixins/MCoordinatorApprovalVerifier.sol
+++ b/contracts/coordinator/contracts/src/mixins/MCoordinatorApprovalVerifier.sol
@@ -0,0 +1,46 @@
+/*
+
+  Copyright 2018 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.5.5;
+pragma experimental "ABIEncoderV2";
+
+import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
+import "../interfaces/ICoordinatorApprovalVerifier.sol";
+
+
+contract MCoordinatorApprovalVerifier is
+    ICoordinatorApprovalVerifier
+{
+    /// @dev Validates that the feeRecipients of a batch of order have approved a 0x transaction.
+    /// @param transaction 0x transaction containing salt, signerAddress, and data.
+    /// @param orders Array of order structs containing order specifications.
+    /// @param txOrigin Required signer of Ethereum transaction calling this function.
+    /// @param transactionSignature Proof that the transaction has been signed by the signer.
+    /// @param approvalExpirationTimeSeconds Array of expiration times in seconds for which each corresponding approval signature expires.
+    /// @param approvalSignatures Array of signatures that correspond to the feeRecipients of each order.
+    function assertValidTransactionOrdersApproval(
+        LibZeroExTransaction.ZeroExTransaction memory transaction,
+        LibOrder.Order[] memory orders,
+        address txOrigin,
+        bytes memory transactionSignature,
+        uint256[] memory approvalExpirationTimeSeconds,
+        bytes[] memory approvalSignatures
+    )
+        internal
+        view;
+}
--- a/contracts/coordinator/contracts/src/mixins/MSignatureValidator.sol
+++ b/contracts/coordinator/contracts/src/mixins/MSignatureValidator.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,27 +16,20 @@

 */

-pragma solidity ^0.5.9;
-pragma experimental ABIEncoderV2;
+pragma solidity ^0.5.5;

-import "../src/Staking.sol";
+import "../interfaces/ISignatureValidator.sol";


-contract TestExchangeManager is
-    Staking
+contract MSignatureValidator is
+    ISignatureValidator
 {
-    function setValidExchange(address exchange)
-        external
-    {
-        validExchanges[exchange] = true;
-    }
-
-    function onlyExchangeFunction()
-        external
-        view
-        onlyExchange
-        returns (bool)
-    {
-        return true;
+    // Allowed signature types.
+    enum SignatureType {
+        Illegal,         // 0x00, default value
+        Invalid,         // 0x01
+        EIP712,          // 0x02
+        EthSign,         // 0x03
+        NSignatureTypes  // 0x04, number of signature types. Always leave at end.
    }
 }
--- a/contracts/coordinator/contracts/src/registry/CoordinatorRegistry.sol
+++ b/contracts/coordinator/contracts/src/registry/CoordinatorRegistry.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,7 +16,7 @@

 */

-pragma solidity ^0.5.9;
+pragma solidity ^0.5.5;

 import "./MixinCoordinatorRegistryCore.sol";

--- a/contracts/coordinator/contracts/src/registry/MixinCoordinatorRegistryCore.sol
+++ b/contracts/coordinator/contracts/src/registry/MixinCoordinatorRegistryCore.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,7 +16,7 @@

 */

-pragma solidity ^0.5.9;
+pragma solidity ^0.5.5;

 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 as a string.
+    /// @param coordinatorEndpoint endpoint of the Coordinator.
    function setCoordinatorEndpoint(string calldata coordinatorEndpoint) external {
        address coordinatorOperator = msg.sender;
        coordinatorEndpoints[coordinatorOperator] = coordinatorEndpoint;
@@ -37,8 +37,7 @@ contract MixinCoordinatorRegistryCore is
    }

    /// @dev Gets the endpoint for a Coordinator.
-    /// @param coordinatorOperator Operator of the Coordinator endpoint.
-    /// @return coordinatorEndpoint Endpoint of the Coordinator as a string.
+    /// @param coordinatorOperator operator of the Coordinator endpoint.
    function getCoordinatorEndpoint(address coordinatorOperator)
        external
        view
--- a/contracts/coordinator/contracts/src/registry/interfaces/ICoordinatorRegistryCore.sol
+++ b/contracts/coordinator/contracts/src/registry/interfaces/ICoordinatorRegistryCore.sol
@@ -1,6 +1,6 @@
 /*

-  Copyright 2019 ZeroEx Intl.
+  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.
@@ -16,7 +16,7 @@

 */

-pragma solidity ^0.5.9;
+pragma solidity ^0.5.5;


 // solhint-disable no-empty-blocks
@@ -29,12 +29,11 @@ contract ICoordinatorRegistryCore
    );

    /// @dev Called by a Coordinator operator to set the endpoint of their Coordinator.
-    /// @param coordinatorEndpoint Endpoint of the Coordinator as a string.
+    /// @param coordinatorEndpoint endpoint of the Coordinator.
    function setCoordinatorEndpoint(string calldata coordinatorEndpoint) external;

    /// @dev Gets the endpoint for a Coordinator.
-    /// @param coordinatorOperator Operator of the Coordinator endpoint.
-    /// @return coordinatorEndpoint Endpoint of the Coordinator as a string.
+    /// @param coordinatorOperator operator of the Coordinator endpoint.
    function getCoordinatorEndpoint(address coordinatorOperator)
        external
        view
--- a/contracts/coordinator/package.json
+++ b/contracts/coordinator/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-coordinator",
-    "version": "3.0.2",
+    "version": "2.0.11",
    "engines": {
        "node": ">=6.12"
    },
@@ -12,7 +12,7 @@
    "scripts": {
        "build": "yarn pre_build && tsc -b",
        "build:ci": "yarn build",
-        "pre_build": "run-s compile contracts:gen generate_contract_wrappers contracts:copy",
+        "pre_build": "run-s compile generate_contract_wrappers",
        "test": "yarn run_mocha",
        "rebuild_and_test": "run-s build test",
        "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
@@ -21,25 +21,20 @@
        "run_mocha": "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*.js' --timeout 100000 --bail --exit",
        "compile": "sol-compiler",
        "watch": "sol-compiler -w",
-        "clean": "shx rm -rf lib test/generated-artifacts test/generated-wrappers generated-artifacts generated-wrappers",
-        "generate_contract_wrappers": "abi-gen --debug --abis  ${npm_package_config_abis} --output test/generated-wrappers --backend ethers",
-        "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./test/generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude ./test/generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
-        "fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./test/generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude ./test/generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
+        "clean": "shx rm -rf lib generated-artifacts generated-wrappers",
+        "generate_contract_wrappers": "abi-gen --abis  ${npm_package_config_abis} --template ../../node_modules/@0x/abi-gen-templates/contract.handlebars --partials '../../node_modules/@0x/abi-gen-templates/partials/**/*.handlebars' --output generated-wrappers --backend ethers",
+        "lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
+        "fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
        "coverage:report:text": "istanbul report text",
        "coverage:report:html": "istanbul report html && open coverage/index.html",
        "profiler:report:html": "istanbul report html && open coverage/index.html",
        "coverage:report:lcov": "istanbul report lcov",
        "test:circleci": "yarn test",
-        "contracts:gen": "contracts-gen generate",
-        "contracts:copy": "contracts-gen copy",
-        "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol",
-        "compile:truffle": "truffle compile",
-        "docs:md": "ts-doc-gen --sourceDir='$PROJECT_FILES' --output=$MD_FILE_DIR --fileExtension=mdx --tsconfig=./typedoc-tsconfig.json",
-        "docs:json": "typedoc --excludePrivate --excludeExternals --excludeProtected --ignoreCompilerErrors --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES"
+        "contracts:gen": "contracts-gen",
+        "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
    },
    "config": {
-        "publicInterfaceContracts": "Coordinator,CoordinatorRegistry,LibCoordinatorApproval,LibCoordinatorRichErrors,LibEIP712CoordinatorDomain,LibConstants",
-        "abis": "./test/generated-artifacts/@(Coordinator|CoordinatorRegistry|ICoordinatorApprovalVerifier|ICoordinatorCore|ICoordinatorRegistryCore|ICoordinatorSignatureValidator|LibConstants|LibCoordinatorApproval|LibCoordinatorRichErrors|LibEIP712CoordinatorDomain|MixinCoordinatorApprovalVerifier|MixinCoordinatorCore|MixinCoordinatorRegistryCore|MixinSignatureValidator).json",
+        "abis": "./generated-artifacts/@(Coordinator|CoordinatorRegistry).json",
        "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
    },
    "repository": {
@@ -52,19 +47,12 @@
    },
    "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
    "devDependencies": {
-        "@0x/abi-gen": "^5.0.2",
-        "@0x/contracts-asset-proxy": "^3.0.2",
-        "@0x/contracts-dev-utils": "^1.0.2",
-        "@0x/contracts-erc20": "^3.0.2",
-        "@0x/contracts-exchange": "^3.0.2",
-        "@0x/contracts-gen": "^2.0.2",
-        "@0x/contracts-test-utils": "^5.0.1",
-        "@0x/dev-utils": "^3.0.2",
-        "@0x/order-utils": "^10.0.1",
-        "@0x/sol-compiler": "^4.0.2",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.0.0",
-        "@0x/web3-wrapper": "^7.0.2",
+        "@0x/abi-gen": "^4.1.1",
+        "@0x/contracts-gen": "^1.0.13",
+        "@0x/contracts-test-utils": "^3.1.14",
+        "@0x/dev-utils": "^2.3.1",
+        "@0x/sol-compiler": "^3.1.13",
+        "@0x/tslint-config": "^3.0.1",
        "@types/lodash": "4.14.104",
        "@types/mocha": "^5.2.7",
        "@types/node": "*",
@@ -72,28 +60,29 @@
        "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",
-        "typedoc": "^0.15.0",
        "typescript": "3.0.1"
    },
    "dependencies": {
-        "@0x/assert": "^3.0.2",
-        "@0x/base-contract": "^6.0.2",
-        "@0x/contract-addresses": "^4.1.0",
-        "@0x/contracts-utils": "^4.0.2",
-        "@0x/json-schemas": "^5.0.2",
-        "@0x/types": "^3.1.1",
-        "@0x/typescript-typings": "^5.0.1",
-        "@0x/utils": "^5.1.1",
-        "ethereum-types": "^3.0.0",
-        "http-status-codes": "^1.3.2"
+        "@0x/base-contract": "^5.3.2",
+        "@0x/contracts-asset-proxy": "^2.2.6",
+        "@0x/contracts-erc20": "^2.2.12",
+        "@0x/contracts-exchange": "^2.1.12",
+        "@0x/contracts-exchange-libs": "^3.0.6",
+        "@0x/contracts-utils": "^3.2.2",
+        "@0x/order-utils": "^8.3.0",
+        "@0x/types": "^2.4.1",
+        "@0x/typescript-typings": "^4.2.4",
+        "@0x/utils": "^4.5.0",
+        "@0x/web3-wrapper": "^6.0.11",
+        "ethereum-types": "^2.1.4",
+        "ethereumjs-util": "^5.1.1",
+        "lodash": "^4.17.11"
    },
    "publishConfig": {
        "access": "public"
--- a/contracts/coordinator/src/artifacts.ts
+++ b/contracts/coordinator/src/artifacts.ts
@@ -7,15 +7,7 @@ import { ContractArtifact } from 'ethereum-types';

 import * as Coordinator from '../generated-artifacts/Coordinator.json';
 import * as CoordinatorRegistry from '../generated-artifacts/CoordinatorRegistry.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';
 export const artifacts = {
    Coordinator: Coordinator as ContractArtifact,
    CoordinatorRegistry: CoordinatorRegistry as ContractArtifact,
-    LibCoordinatorApproval: LibCoordinatorApproval as ContractArtifact,
-    LibCoordinatorRichErrors: LibCoordinatorRichErrors as ContractArtifact,
-    LibEIP712CoordinatorDomain: LibEIP712CoordinatorDomain as ContractArtifact,
-    LibConstants: LibConstants as ContractArtifact,
 };
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jacob Evans	bbd3c03969	Publish - @0x/contracts-asset-proxy@2.2.6 - @0x/contracts-coordinator@2.0.11 - @0x/contracts-dev-utils@0.0.8 - @0x/contracts-erc1155@1.1.13 - @0x/contracts-erc20@2.2.12 - @0x/contracts-erc721@2.1.13 - @0x/contracts-exchange-forwarder@3.0.10 - @0x/contracts-exchange-libs@3.0.6 - @0x/contracts-exchange@2.1.12 - @0x/contracts-extensions@4.0.6 - @0x/contracts-multisig@3.1.12 - @0x/contracts-test-utils@3.1.14 - @0x/contracts-utils@3.2.2 - 0x.js@7.0.0 - @0x/abi-gen-templates@2.4.2 - @0x/abi-gen-wrappers@5.3.0 - @0x/abi-gen@4.1.1 - @0x/assert@2.1.4 - @0x/asset-buyer@6.1.12 - @0x/asset-swapper@1.0.2 - @0x/base-contract@5.3.2 - @0x/connect@5.0.17 - @0x/contract-addresses@3.1.0 - @0x/contract-artifacts@2.2.0 - @0x/contract-wrappers@11.1.0 - @0x/dev-utils@2.3.1 - @0x/fill-scenarios@3.0.17 - @0x/instant@1.0.29 - @0x/json-schemas@4.0.0 - @0x/migrations@4.3.0 - @0x/monorepo-scripts@1.0.35 - @0x/order-utils@8.3.0 - @0x/python-contract-wrappers@1.0.4 - @0x/sol-compiler@3.1.13 - @0x/sol-coverage@3.0.10 - @0x/sol-doc@2.0.17 - @0x/sol-profiler@3.1.12 - @0x/sol-trace@2.0.18 - @0x/sol-tracing-utils@6.0.17 - @0x/sra-spec@2.0.15 - @0x/subproviders@5.0.2 - @0x/testnet-faucets@1.0.85 - @0x/web3-wrapper@6.0.11 - @0x/website@0.0.88	2019-08-22 14:13:00 +10:00
Jacob Evans	a4405c3d39	Updated CHANGELOGS	2019-08-22 14:12:40 +10:00
Xianny	0fe4f587d8	update ethereumjs-blockstream 6.0.0 -> ^7.0.0 (#2089 )	2019-08-21 18:39:07 -07:00
Francesco Agosti	d3c714bd17	Merge pull request #2085 from 0xProject/feature/cfl-page-fix Fix small issue on mobile nav	2019-08-21 14:54:17 -07:00
fragosti	c399b7a7d5	Add Asset Swapper to footer	2019-08-21 14:30:55 -07:00
fragosti	b9234e94fb	Fix small issue on mobile nav	2019-08-21 14:30:55 -07:00
Francesco Agosti	417bb87785	Merge pull request #2081 from 0xProject/feature/cfl-page CFL page	2019-08-20 18:24:40 -07:00
fragosti	0233ae3134	Use Asset Swapper on CFL page	2019-08-20 17:48:57 -07:00
fragosti	eed0c5dd59	Distinguish between asset swapper page and docs	2019-08-20 17:39:15 -07:00
fragosti	2b3b167095	Fix path of asset swapper link in product dropdown	2019-08-20 17:30:15 -07:00
fragosti	5d91d19808	Disable jsx-curly-spacing on cfl page	2019-08-20 17:24:49 -07:00
fragosti	0f374ddee9	Change AssetBuyer to AssetSwapper on instant page	2019-08-20 17:08:03 -07:00
Chris Kalani	a65a9913cd	Fixed up some design nits and updated copy	2019-08-20 16:51:06 -07:00
fragosti	1ead32c666	Asset-Swapper -> asset-swapper	2019-08-20 15:35:39 -07:00
fragosti	d1af9fc780	use asset-swapper instead of Asset-Swapper	2019-08-20 15:31:50 -07:00
fragosti	0f06737fb6	Fix install prompt on mobile layout	2019-08-20 15:01:59 -07:00
fragosti	1676231532	Rename variables to be compatible with new backend	2019-08-20 14:36:57 -07:00
fragosti	b1caf697c8	Update titles and descriptions	2019-08-20 13:52:50 -07:00
fragosti	51481065fe	Fix jumping around of editor	2019-08-20 11:56:09 -07:00
fragosti	e367da710c	Fix massive i	2019-08-20 11:47:05 -07:00
fragosti	f493d6524d	Change to crypto algo-traders	2019-08-20 11:22:21 -07:00
fragosti	e1b85da2a7	Make terminal text selectable	2019-08-20 11:16:28 -07:00
F. Eugene Aumson	22c6548ed1	abi-gen/test-cli: rm expected-output; use git diff (#2079 ) * abi-gen/test-cli: rm expected-output; use git diff * abi-gen/test-cli: Simplify git diff test script * Remove abi-gen/test-cli/output from .gitignore	2019-08-20 14:08:54 -04:00
Fabio B	afb32c087d	Merge pull request #2017 from jangerritharms/fix/broken-validator-signatures Fix broken validator signatures	2019-08-20 18:44:50 +02:00
Jan-Gerrit Harms	bbc1ed1c64	Update test to adhere to v2.1 Validator revert	2019-08-20 14:53:10 +02:00
Jan-Gerrit Harms	3a46f1a27a	Merge branch 'development' into fix/broken-validator-signatures	2019-08-20 09:30:21 +02:00
Jacob Evans	90cd364780	Merge pull request #2078 from 0xProject/fix/isValidSignature-2.1 Update development to 2.1 isValidSignature with magic salt	2019-08-20 16:34:48 +10:00
Jacob Evans	6795e6f078	Update comments with bytes4 values	2019-08-20 16:15:44 +10:00
fragosti	cfb3404349	Fix dogfood link	2019-08-19 20:49:35 -07:00
fragosti	0212f3ee78	Run linter	2019-08-19 19:28:42 -07:00
fragosti	6b2995a4ee	Remove didError state from CFLmetrics component	2019-08-19 19:24:37 -07:00
fragosti	09e7ac54d4	Replace hummingbot link	2019-08-19 19:18:58 -07:00
fragosti	f69009d4a8	Add CFL to mobile dropdown and remove extensions for desktop	2019-08-19 19:16:26 -07:00
fragosti	206802ae33	Make layout more responsive	2019-08-19 19:08:48 -07:00
fragosti	91d4138fb8	Fix react key error	2019-08-19 18:22:17 -07:00
fragosti	cb455f951a	Add loading state to CFL metrics	2019-08-19 18:19:01 -07:00
fragosti	5f25d20cd0	Improve tooltip and copy	2019-08-19 17:54:10 -07:00
fragosti	1f0e2cd910	Add info tooltip	2019-08-19 17:46:11 -07:00
Jacob Evans	1749d02701	Add python linter exception	2019-08-20 10:30:09 +10:00
fragosti	55ace3179c	Add disclaimer component	2019-08-19 17:00:41 -07:00
fragosti	7866d9ccb4	Implement CFL metrics MVP	2019-08-19 16:52:40 -07:00
Brandon Millman	51f73d07fa	Merge pull request #2080 from 0xProject/feature/website/adding-michael Adding Michael Zhu to the team page	2019-08-19 13:02:18 -07:00
Francesco Agosti	63d84674ab	Merge pull request #2074 from 0xProject/feature/website/remove-faq Removing the old FAQ page and all references	2019-08-19 12:36:59 -07:00
Chris Kalani	14066997b2	Adding Michael Zhu to the team page	2019-08-19 12:34:19 -07:00
F. Eugene Aumson	28561e765a	Update README.md (#2077 ) * Update README.md * top-level README.md: explain Python dependency * top-level README.md: suggest node v6 OR v8	2019-08-19 13:55:06 -04:00
Jacob Evans	453fbbdc5d	Update python doc strings	2019-08-19 15:55:28 +10:00
Jacob Evans	1e1e5ec10d	Catch revert in IWallet/IValidator and return false	2019-08-19 15:45:32 +10:00
Jacob Evans	2088b0e459	Update python doc string	2019-08-19 15:13:09 +10:00
Jacob Evans	58400d9e01	Update python docs string	2019-08-19 14:40:46 +10:00
Jacob Evans	ac9375f1d2	Updated generated-wrappers?	2019-08-19 14:10:50 +10:00
Jacob Evans	db061c9355	Update Whitelist.sol	2019-08-19 12:15:46 +10:00
Jacob Evans	d5ce6c464b	Update Wallet signature test	2019-08-19 11:55:48 +10:00
Jacob Evans	b06205bb7f	Fix lint errors	2019-08-19 11:36:35 +10:00
Jacob Evans	f528a3e1de	Update Order-utils to check magic values	2019-08-19 11:14:35 +10:00
Jacob Evans	bddfdacfad	Update Interfaces for IValidator and IWallet	2019-08-19 11:08:06 +10:00
Jacob Evans	d3cdd3f235	Update development to 2.1 isValidSignature with magic salt	2019-08-19 10:35:26 +10:00
Chris Kalani	41ae45ea40	Fixed build error	2019-08-16 14:17:12 -07:00
Chris Kalani	657e0895ea	Removing the olf FAW page and all references	2019-08-16 13:56:03 -07:00
Jan-Gerrit Harms	b2592d1cc2	Removed the order-watcher files that were accidentally added	2019-08-16 14:02:32 +02:00
Jan-Gerrit Harms	aa3524c3b2	Merge branch 'development' into fix/broken-validator-signatures	2019-08-16 13:04:27 +02:00
fragosti	39deb1a05f	Make it possible to show figure in hero on the bottom on mobile	2019-08-15 17:23:20 -07:00
fragosti	302d08e290	Make website mobile friendly	2019-08-15 17:01:50 -07:00
fragosti	05489dd7f1	Implement basic CFL landing page	2019-08-15 16:33:52 -07:00
Jan-Gerrit Harms	55bd076602	Merge branch 'development' into fix/broken-validator-signatures	2019-08-14 09:37:20 +02:00
Jan-Gerrit Harms	7a224fe08f	Merge branch 'development' into fix/broken-validator-signatures	2019-08-13 19:49:24 +02:00
Jan-Gerrit Harms	3bdeb82097	Updated CHANGELOG of 0x.js and @0x/order-watcher	2019-08-09 09:58:29 +02:00
Jan-Gerrit Harms	f49ab3f919	Merge branch 'development' into fix/broken-validator-signatures	2019-08-09 09:47:42 +02:00
Jan-Gerrit Harms	42d5bdd3ab	Explicitly check exchangeAddress definedness	2019-08-09 09:39:49 +02:00
Jan-Gerrit Harms	7228cbfe92	Pass exchangeAddress instead of SignatureOpts	2019-08-09 09:36:32 +02:00
Jan-Gerrit Harms	11e2fc5bc4	Added documentation for additional parameters	2019-07-30 15:18:08 +02:00
Jan-Gerrit Harms	3e88f820b8	Prettified changelog	2019-07-30 15:11:24 +02:00
Jan-Gerrit Harms	163750f8c2	Updated internal usages of isValidSignatureAsync	2019-07-30 14:52:35 +02:00
Jan-Gerrit Harms	4aabc5d791	Fixed merge conflict in changelog	2019-07-30 14:43:24 +02:00
Jan-Gerrit Harms	c9a7b9dcc1	Appended to changelog in the order-utils package	2019-07-30 14:35:11 +02:00
Jan-Gerrit Harms	98075b5653	Revert "Updated changelog" This reverts commit `57ae5be916`.	2019-07-30 14:32:27 +02:00
Jan-Gerrit Harms	57ae5be916	Updated changelog	2019-07-30 14:26:46 +02:00
Jan-Gerrit Harms	8caf62997f	Forgot formatting again	2019-07-30 13:26:27 +02:00
Jan-Gerrit Harms	f8656ad376	Added integration tests and fixed another bug	2019-07-30 13:25:36 +02:00
Jan-Gerrit Harms	29c6c2a2ad	Add exports to 0x.js	2019-07-30 10:15:41 +02:00
Jan-Gerrit Harms	f2db67ef02	Fixed prettier errors	2019-07-30 09:50:54 +02:00
Jan-Gerrit Harms	72b8ef33d9	Fixes #1998 , still needs Integration testing	2019-07-29 21:39:21 +02:00