Publish

- @0x/contracts-asset-proxy@3.5.0
 - @0x/contracts-broker@1.1.7
 - @0x/contracts-coordinator@3.1.8
 - @0x/contracts-dev-utils@1.3.6
 - @0x/contracts-erc1155@2.1.8
 - @0x/contracts-erc20@3.2.2
 - @0x/contracts-erc721@3.1.8
 - @0x/contracts-exchange-forwarder@4.2.8
 - @0x/contracts-exchange-libs@4.3.8
 - @0x/contracts-exchange@3.2.8
 - @0x/contracts-extensions@6.2.2
 - @0x/contracts-integrations@2.7.0
 - @0x/contracts-multisig@4.1.8
 - @0x/contracts-staking@2.0.15
 - @0x/contracts-test-utils@5.3.5
 - @0x/contracts-utils@4.5.2
 - @0x/contracts-zero-ex@0.3.0
 - @0x/asset-swapper@4.7.0
 - @0x/contract-addresses@4.12.0
 - @0x/contract-artifacts@3.8.0
 - @0x/contract-wrappers-test@12.2.17
 - @0x/contract-wrappers@13.9.0
 - @0x/migrations@6.4.1
 - @0x/order-utils@10.4.0

.circleci/config.yml

@@ -4,23 +4,13 @@ jobs:
     build:
         resource_class: medium+
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs8
+            - image: nikolaik/python-nodejs:python3.7-nodejs10
         environment:
             CONTRACTS_COMMIT_HASH: '9ed05f5'
         working_directory: ~/repo
         steps:
             - checkout
             - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV
-            # HACK(feuGeneA): commented out this hack as we're changing
-            # from a circleci-maintained container to a different
-            # container, and this hack may not apply anymore, as
-            # suggested by the non-existance of `/home/circleci/.bashrc`
-            # when running the command below.
-            # - run:
-            #       # HACK(albrow): Without this, yarn commands will sometimes
-            #       # fail with a "permission denied" error.
-            #       name: Set npm path
-            #       command: npm set prefix=/home/circleci/npm && echo 'export PATH=$HOME/circleci/npm/bin:$PATH' >> /home/circleci/.bashrc
             - run:
                   name: install-yarn
                   command: npm install --force --global yarn@1.17.0
@@ -38,54 +28,60 @@ jobs:
                   path: ~/repo/packages/abi-gen/test-cli/output
             - store_artifacts:
                   path: ~/repo/packages/contract-wrappers/generated_docs
-    test-contracts-ganache:
+    test-exchange-ganache:
         resource_class: medium+
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs8
-        working_directory: ~/repo
-        steps:
-            - restore_cache:
-                  keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run: yarn wsrun test:circleci @0x/contracts-multisig @0x/contracts-utils @0x/contracts-exchange-libs @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-extensions @0x/contracts-asset-proxy @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-coordinator @0x/contracts-staking
-    test-exchange-ganache-3.0:
-        resource_class: medium+
-        docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs8
+            - image: nikolaik/python-nodejs:python3.7-nodejs10
         working_directory: ~/repo
         steps:
             - restore_cache:
                   keys:
                       - repo-{{ .Environment.CIRCLE_SHA1 }}
             - run: yarn wsrun test:circleci @0x/contracts-exchange
-    test-integrations-ganache-3.0:
+    test-integrations-ganache:
         resource_class: medium+
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs8
+            - image: nikolaik/python-nodejs:python3.7-nodejs10
         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:
+    test-contracts-staking-ganache:
         resource_class: medium+
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs8
+            - image: nikolaik/python-nodejs:python3.7-nodejs10
         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-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
+            - run: yarn wsrun test:circleci @0x/contracts-staking
+    test-contracts-extra-ganache:
+        resource_class: medium+
+        docker:
+            - image: nikolaik/python-nodejs:python3.7-nodejs10
+        working_directory: ~/repo
+        steps:
+            - restore_cache:
+                  keys:
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+            - run: yarn wsrun test:circleci @0x/contracts-exchange-forwarder @0x/contracts-coordinator
+    test-contracts-rest-ganache:
+        resource_class: medium+
+        docker:
+            - image: nikolaik/python-nodejs:python3.7-nodejs10
+        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-broker @0x/contracts-zero-ex
     test-publish:
         resource_class: medium+
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs8
+            - image: nikolaik/python-nodejs:python3.7-nodejs10
             - image: 0xorg/verdaccio
         working_directory: ~/repo
         steps:
@@ -95,9 +91,11 @@ jobs:
             - run:
                   command: yarn test:publish:circleci
                   no_output_timeout: 1800
+            - store_artifacts:
+                  path: ~/.npm/_logs
     test-doc-generation:
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs8
+            - image: nikolaik/python-nodejs:python3.7-nodejs10
         working_directory: ~/repo
         steps:
             - restore_cache:
@@ -108,228 +106,35 @@ jobs:
                   no_output_timeout: 1200
     test-rest:
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs8
+            - image: nikolaik/python-nodejs:python3.7-nodejs10
         working_directory: ~/repo
         steps:
             - restore_cache:
                   keys:
                       - repo-{{ .Environment.CIRCLE_SHA1 }}
             - run: yarn wsrun test:circleci @0x/contracts-test-utils
-            - run: yarn wsrun test:circleci @0x/abi-gen
-            - run: yarn wsrun test:circleci @0x/asset-swapper
             - run: yarn wsrun test:circleci @0x/contract-artifacts
-            - run: yarn wsrun test:circleci @0x/assert
-            - run: yarn wsrun test:circleci @0x/base-contract
-            - run: yarn wsrun test:circleci @0x/connect
             - run: yarn wsrun test:circleci @0x/contract-wrappers-test
-            - run: yarn wsrun test:circleci @0x/dev-utils
-            - run: yarn wsrun test:circleci @0x/json-schemas
+            - run: yarn wsrun test:circleci @0x/migrations
             - 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
-            - run: yarn wsrun test:circleci @0x/subproviders
-            - run: yarn wsrun test:circleci @0x/web3-wrapper
-            - run: yarn wsrun test:circleci @0x/utils
-            - run: yarn wsrun test:circleci @0x/instant
-            - save_cache:
-                  key: coverage-abi-gen-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/packages/abi-gen/coverage/lcov.info
-            - save_cache:
-                  key: coverage-assert-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/packages/assert/coverage/lcov.info
-            - save_cache:
-                  key: coverage-asset-swapper-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/packages/asset-swapper/coverage/lcov.info
-            - save_cache:
-                  key: coverage-base-contract-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/packages/base-contract/coverage/lcov.info
-            - save_cache:
-                  key: coverage-connect-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/packages/connect/coverage/lcov.info
+            - run: yarn wsrun test:circleci @0x/asset-swapper
             - save_cache:
                   key: coverage-contract-wrappers-test-{{ .Environment.CIRCLE_SHA1 }}
                   paths:
                       - ~/repo/packages/contract-wrappers-test/coverage/lcov.info
-            - save_cache:
-                  key: coverage-dev-utils-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/packages/dev-utils/coverage/lcov.info
-            - save_cache:
-                  key: coverage-json-schemas-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/packages/json-schemas/coverage/lcov.info
             - save_cache:
                   key: coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }}
                   paths:
                       - ~/repo/packages/order-utils/coverage/lcov.info
-            - save_cache:
-                  key: coverage-sol-compiler-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/packages/sol-compiler/coverage/lcov.info
-            - save_cache:
-                  key: coverage-sol-tracing-utils-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/packages/sol-tracing-utils/coverage/lcov.info
-            - save_cache:
-                  key: coverage-sol-doc-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/packages/sol-doc/coverage/lcov.info
-            - save_cache:
-                  key: coverage-subproviders-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/packages/subproviders/coverage/lcov.info
             - save_cache:
                   key: coverage-web3-wrapper-{{ .Environment.CIRCLE_SHA1 }}
                   paths:
                       - ~/repo/packages/web3-wrapper/coverage/lcov.info
-    test-python:
-        working_directory: ~/repo
-        docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs8
-            - image: 0xorg/ganache-cli:6.0.0
-            - image: 0xorg/mesh:0xV3
-              environment:
-                  ETHEREUM_RPC_URL: 'http://localhost:8545'
-                  ETHEREUM_CHAIN_ID: '1337'
-                  VERBOSITY: 5
-                  BLOCK_POLLING_INTERVAL: '50ms'
-                  ETHEREUM_RPC_MAX_REQUESTS_PER_24_HR_UTC: '1778000'
-              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
-                  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"
-        steps:
-            - checkout
-            - restore_cache:
-                  key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run:
-                  command: |
-                      cd python-packages
-                      python -m ensurepip
-                      ./pre_install
-                      ./install
-            - save_cache:
-                  key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - '/usr/local/bin'
-                      - '/usr/local/lib/python3.7/site-packages'
-            - run:
-                  command: |
-                      cd python-packages
-                      ./parallel 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:
-                      - ~/repo/python-packages/contract_addresses/.coverage
-            - save_cache:
-                  key: coverage-python-contract-artifacts-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/python-packages/contract_artifacts/.coverage
-            - save_cache:
-                  key: coverage-python-contract-demo-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/python-packages/contract_demo/.coverage
-            - save_cache:
-                  key: coverage-python-json-schemas-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/python-packages/json_schemas/.coverage
-            - save_cache:
-                  key: coverage-python-order-utils-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/python-packages/order_utils/.coverage
-            - save_cache:
-                  key: coverage-python-sra-client-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/python-packages/sra_client/.coverage
-            - store_artifacts:
-                  path: ~/repo/python-packages/contract_addresses/build
-            - store_artifacts:
-                  path: ~/repo/python-packages/contract_artifacts/build
-            - store_artifacts:
-                  path: ~/repo/python-packages/contract_wrappers/build
-            - store_artifacts:
-                  path: ~/repo/python-packages/json_schemas/build
-            - store_artifacts:
-                  path: ~/repo/python-packages/middlewares/build
-            - store_artifacts:
-                  path: ~/repo/python-packages/order_utils/build
-            - store_artifacts:
-                  path: ~/repo/python-packages/sra_client/build
-    test-rest-python:
-        working_directory: ~/repo
-        docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs8
-        steps:
-            - checkout
-            - restore_cache:
-                  key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
-            - run:
-                  command: |
-                      cd python-packages/order_utils
-                      python -m ensurepip
-                      python -m pip install .
-            - save_cache:
-                  key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - '/usr/local/bin'
-                      - '/usr/local/lib/python3.7/site-packages'
-                      - '.eggs'
-                      - '.mypy_cache'
-                      - '.pytest_cache'
-                      - '.tox'
-            - run:
-                  command: |
-                      cd python-packages/order_utils
-                      tox
-    static-tests-python:
-        working_directory: ~/repo
-        docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs8
-        steps:
-            - checkout
-            - restore_cache:
-                  key: installed-py-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run:
-                  command: |
-                      python -m ensurepip
-                      cd python-packages
-                      ./pre_install
-                      ./install
-                      ./lint
     static-tests:
         resource_class: large
         working_directory: ~/repo
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs8
+            - image: nikolaik/python-nodejs:python3.7-nodejs10
         steps:
             - restore_cache:
                   keys:
@@ -338,92 +143,43 @@ jobs:
             - run: yarn prettier:ci
             - run: yarn deps_versions:ci
             - run: yarn diff_md_docs:ci
-            - run: cd packages/0x.js && yarn build:umd:prod
-            - run: yarn bundlewatch
     submit-coverage:
         docker:
-            - image: nikolaik/python-nodejs:python3.7-nodejs8
+            - image: nikolaik/python-nodejs:python3.7-nodejs10
         working_directory: ~/repo
         steps:
             - restore_cache:
                   keys:
                       - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-abi-gen-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-assert-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-asset-swapper-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-base-contract-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-connect-{{ .Environment.CIRCLE_SHA1 }}
             - restore_cache:
                   keys:
                       - coverage-contract-wrappers-test-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-dev-utils-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-json-schemas-{{ .Environment.CIRCLE_SHA1 }}
             - restore_cache:
                   keys:
                       - coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-sol-compiler-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-sol-tracing-utils-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-sol-doc-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-subproviders-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-web3-wrapper-{{ .Environment.CIRCLE_SHA1 }}
             - restore_cache:
                   keys:
                       - coverage-contracts-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-python-json-schemas-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-python-contract-addresses-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-python-contract-artifacts-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-python-contract-demo-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-python-sra-client-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-python-order-utils-{{ .Environment.CIRCLE_SHA1 }}
             - run: yarn report_coverage
 workflows:
     version: 2
     main:
         jobs:
             - build
-            - test-exchange-ganache-3.0:
-                  requires:
-                      - build
-            - test-integrations-ganache-3.0:
-                  requires:
-                      - build
-            - test-contracts-rest-ganache-3.0:
+            # Disabled until we begin actively developing on these packages again.
+            # - test-exchange-ganache:
+            #       requires:
+            #           - build
+            # - test-integrations-ganache:
+            #       requires:
+            #           - build
+            # - test-contracts-staking-ganache:
+            #       requires:
+            #           - build
+            # - test-contracts-extra-ganache:
+            #       requires:
+            #           - build
+            - test-contracts-rest-ganache:
                   requires:
                       - build
             - test-rest:
@@ -438,17 +194,14 @@ workflows:
             - test-doc-generation:
                   requires:
                       - build
-            - submit-coverage:
-                  requires:
-                      - test-contracts-rest-ganache-3.0
-                      - test-exchange-ganache-3.0
-                      - test-rest
-                      - static-tests
-            - test-python:
-                  requires:
-                      - build
-            - static-tests-python:
-                  requires:
-                      - build
-            # skip python tox run for now, as we don't yet have multiple test environments to support.
-            # - test-rest-python
+            # Disabled until this repo has a coveralls API key
+            # - submit-coverage:
+            #       requires:
+            #           # Disabled until we begin actively developing on these packages again.
+            #           # - test-exchange-ganache
+            #           # - test-integrations-ganache
+            #           # - test-contracts-staking-ganache
+            #           # - test-contracts-extra-ganache
+            #           - test-contracts-rest-ganache
+            #           - test-rest
+            #           - static-tests

.gitattributes

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

.github/autolabeler.yml

@@ -1,33 +1,7 @@
 python: ['python-packages']
 contracts: ['contracts']
-@0x/sol-doc: ['packages/sol-doc']
-@0x/sol-resolver: ['packages/sol-resolver']
-@0x/contracts-gen: ['packages/contracts-gen']
-@0x/sra-spec: ['packages/sra-spec']
-@0x/subproviders: ['packages/subproviders']
 @0x/contract-addresses: ['packages/contract-addresses']
 @0x/migrations: ['packages/migrations']
-@0x/web3-wrapper: ['packages/web3-wrapper']
-@0x/sol-compiler: ['packages/sol-compiler']
-@0x/types: ['packages/types']
-@0x/instant: ['packages/instant']
-@0x/abi-gen-templates: ['packages/abi-gen-templates']
-@0x/abi-gen: ['packages/abi-gen']
-@0x/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/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/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']

.gitignore

@@ -111,8 +111,8 @@ 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/
+contracts/zero-ex/generated-artifacts/
+contracts/zero-ex/test/generated-artifacts/
 
 # generated truffle contract artifacts/
 contracts/broker/build/
@@ -165,24 +165,8 @@ 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/*/__init__.py
-
-# solc-bin in sol-compiler
-packages/sol-compiler/solc_bin/
-
-# python stuff
-.eggs
-.mypy_cache
-.tox
-python-packages/*/build
-python-packages/*/dist
-__pycache__
-python-packages/*/src/*.egg-info
-python-packages/*/.coverage
-
-# python keeps package-local copies of json schemas and contract addresses
-python-packages/json_schemas/src/zero_ex/json_schemas/schemas
-python-packages/contract_addresses/src/zero_ex/contract_addresses/addresses.json
+contracts/zero-ex/generated-wrappers/
+contracts/zero-ex/test/generated-wrappers/
 
 # Doc README copy
 packages/*/docs/README.md

.prettierignore

@@ -40,10 +40,6 @@ lib
 /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
@@ -64,6 +60,10 @@ lib
 /contracts/dev-utils/test/generated-wrappers
 /contracts/dev-utils/generated-artifacts
 /contracts/dev-utils/test/generated-artifacts
+/contracts/zero-ex/generated-wrappers
+/contracts/zero-ex/test/generated-wrappers
+/contracts/zero-ex/generated-artifacts
+/contracts/zero-ex/test/generated-artifacts
 /contracts/staking/build/
 /contracts/coordinator/build/
 /contracts/exchange/build/
@@ -76,18 +76,10 @@ lib
 /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/asset-swapper/generated-artifacts
+/packages/asset-swapper/generated-wrappers
+/packages/asset-swapper/test/generated-artifacts
+/packages/asset-swapper/test/generated-wrappers
 package.json
-scripts/postpublish_utils.js
-packages/sol-coverage/test/fixtures/artifacts
-.pytest_cache
-.mypy_cache
-.tox
-packages/abi-gen/test-cli/fixtures/artifacts/AbiGenDummy.json
-packages/abi-gen/test-cli/fixtures/artifacts/LibDummy.json
-packages/abi-gen/test-cli/fixtures/artifacts/TestLibDummy.json
 packages/*/docs
+*.sol

.prettierrc

@@ -2,5 +2,6 @@
     "printWidth": 120,
     "tabWidth": 4,
     "singleQuote": true,
-    "trailingComma": "all"
+    "trailingComma": "all",
+    "bracketSpacing": true
 }

CODEOWNERS

@@ -9,30 +9,10 @@ packages/asset-swapper/  @BMillman19 @fragosti @dave4506
 packages/instant/  @BMillman19 @fragosti @dave4506
 
 # Dev tools & setup
-.circleci/ @LogvinovLeon
-packages/abi-gen/ @feuGeneA
-packages/base-contract/ @xianny
-packages/connect/ @fragosti 
-packages/abi-gen-templates/ @feuGeneA @xianny
+.circleci/ @dorothy-zbornak
 packages/contract-addresses/ @abandeali1
 packages/contract-artifacts/ @abandeali1
-packages/dev-utils/ @LogvinovLeon @fabioberger
-packages/devnet/ @albrow
-packages/ethereum-types/ @LogvinovLeon
-packages/monorepo-scripts/ @fabioberger
-packages/order-utils/ @fabioberger @LogvinovLeon 
-packages/python-contract-wrappers/ @feuGeneA
-packages/sol-compiler/ @LogvinovLeon
-packages/sol-coverage/ @LogvinovLeon
-packages/sol-profiler/ @LogvinovLeon
-packages/sol-trace/ @LogvinovLeon
-packages/sol-tracing-utils/ @LogvinovLeon
-packages/sol-resolver/ @LogvinovLeon
-packages/subproviders/ @fabioberger @dekz
-packages/verdaccio/ @albrow
-packages/web3-wrapper/ @LogvinovLeon @fabioberger
-python-packages/ @feuGeneA
-packages/utils/ @hysz
+packages/order-utils/ @dorothy-zbornak 
 
 # Protocol/smart contracts
-contracts/ @abandeali1 @hysz
+contracts/ @abandeali1 @hysz @dorothy-zbornak @mzhu25

CONTRIBUTING.md

@@ -4,9 +4,9 @@ We welcome contributions from anyone on the internet and are grateful for even t
 
 ### Getting started
 
-1.  Fork `0xproject/0x-monorepo`
+1.  Fork `0xproject/0x-tools`
 2.  Clone your fork
-3.  Follow the [installation & build steps](https://github.com/0xProject/0x-monorepo#install-dependencies) in the repo's top-level README.
+3.  Follow the [installation & build steps](https://github.com/0xProject/0x-tools#install-dependencies) in the repo's top-level README.
 4.  Setup the recommended [Development Tooling](#development-tooling).
 5.  Open a PR with the `[WIP]` flag against the `development` branch and describe the change you are intending to undertake in the PR description. (see [our branch naming conventions](#branch-structure))
 
@@ -59,11 +59,11 @@ We strongly recommend you use the [VSCode](https://code.visualstudio.com/) text
 
 #### Linter
 
-We use [TSLint](https://palantir.github.io/tslint/) with [custom configs](https://github.com/0xProject/0x-monorepo/tree/development/packages/tslint-config) to keep our code-style consistent.
+We use [TSLint](https://palantir.github.io/tslint/) with [custom configs](https://github.com/0xProject/0x-tools/tree/development/packages/tslint-config) to keep our code-style consistent.
 
 Use `yarn:lint` to lint the entire monorepo, and `PKG={PACKAGE_NAME} yarn lint` to lint a specific package.
 
-If you want to change a rule, or add a custom rule, please make these changes to our [tslint-config](https://github.com/0xProject/0x-monorepo/tree/development/packages/tslint-config) package. All other packages have it as a dependency.
+If you want to change a rule, or add a custom rule, please make these changes to our [tslint-config](https://github.com/0xProject/0x-tools/tree/development/packages/tslint-config) package. All other packages have it as a dependency.
 
 Integrate it into your text editor:
 
@@ -94,12 +94,12 @@ A few of our coding conventions are not yet enforced by the linter/auto-formatte
 
 ### Fix `submit-coverage` CI failure
 
-If you simply fork the repo and then create a PR from it, your PR will fail the `submit-coverage` check on CI. This is because the 0x CircleCI configuration sets the `COVERALLS_REPO_TOKEN` environment variable to the token for `0xProject/0x-monorepo`, but when running the check against your fork the token needs to match your repo's name `your-username/0x-monorepo`.
+If you simply fork the repo and then create a PR from it, your PR will fail the `submit-coverage` check on CI. This is because the 0x CircleCI configuration sets the `COVERALLS_REPO_TOKEN` environment variable to the token for `0xProject/0x-tools`, but when running the check against your fork the token needs to match your repo's name `your-username/0x-tools`.
 
 To facilitate this check, after creating your fork, but before creating the branch for your PR, do the following:
 
 1.  Log in to [coveralls.io](https://coveralls.io/), go to `Add Repos`, and enable your fork. Then go to the settings for that repo, and copy the `Repo Token` identifier.
-2.  Log in to [CircleCI](https://circleci.com/login), go to `Add Projects`, click the `Set Up Project` button corresponding to your fork, and then click `Start Building`. (Aside from step 3 below, no actual set up is needed, since it will use the `.circleci/config.yml` file in 0x-monorepo, so you can ignore all of the instruction/explanation given on the page with the `Start Building` button.)
+2.  Log in to [CircleCI](https://circleci.com/login), go to `Add Projects`, click the `Set Up Project` button corresponding to your fork, and then click `Start Building`. (Aside from step 3 below, no actual set up is needed, since it will use the `.circleci/config.yml` file in 0x-tools, so you can ignore all of the instruction/explanation given on the page with the `Start Building` button.)
 3.  In CircleCI, configure your project to add an environment variable, with name `COVERALLS_REPO_TOKEN`, and for the value paste in the `Repo Token` you copied in step 1.
 
 Now, when you push to your branch, CircleCI will automatically run all of the checks in your own instance, and the coverage check will work since it has the proper `Repo Token`, and the PR will magically refer to your own checks rather than running them in the 0x CircleCI instance.

LICENSE

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

README.md

@@ -17,17 +17,6 @@ This repository is a monorepo including the 0x protocol smart contracts and nume
 
 Visit our [developer portal](https://0x.org/docs/tools/order-utils) for a comprehensive list of core & community maintained packages. All packages maintained with this monorepo are listed below.
 
-### Python Packages
-
-| Package                                                        | Version                                                                                                             | Description                                                                                       |
-| -------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
-| [`0x-contract-addresses`](/python-packages/contract_addresses) | [![PyPI](https://img.shields.io/pypi/v/0x-contract-addresses.svg)](https://pypi.org/project/0x-contract-addresses/) | A tiny utility library for getting known deployed contract addresses for a particular network     |
-| [`0x-contract-artifacts`](/python-packages/contract_artifacts) | [![PyPI](https://img.shields.io/pypi/v/0x-contract-artifacts.svg)](https://pypi.org/project/0x-contract-artifacts/) | 0x smart contract compilation artifacts                                                           |
-| [`0x-contract-wrappers`](/python-packages/contract_wrappers)   | [![PyPI](https://img.shields.io/pypi/v/0x-contract-wrappers.svg)](https://pypi.org/project/0x-contract-wrappers/)   | 0x smart contract wrappers                                                                        |
-| [`0x-json-schemas`](/python-packages/json_schemas)             | [![PyPI](https://img.shields.io/pypi/v/0x-json-schemas.svg)](https://pypi.org/project/0x-json-schemas/)             | 0x-related JSON schemas                                                                           |
-| [`0x-order-utils`](/python-packages/order_utils)               | [![PyPI](https://img.shields.io/pypi/v/0x-order-utils.svg)](https://pypi.org/project/0x-order-utils/)               | A set of utilities for generating, parsing, signing and validating 0x orders                      |
-| [`0x-sra-client`](/python-packages/sra_client)                 | [![PyPI](https://img.shields.io/pypi/v/0x-sra-client.svg)](https://pypi.org/project/0x-sra-client/)                 | A Python client for interacting with servers conforming to the Standard Relayer API specification |
-
 ### Solidity Packages
 
 These packages are all under development. See [/contracts/README.md](/contracts/README.md) for a list of deployed packages.
@@ -53,50 +42,13 @@ These packages are all under development. See [/contracts/README.md](/contracts/
 
 #### 0x-specific packages
 
-| Package                                                  | Version                                                                                                                 | Description                                                                                       |
-| -------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
-| [`0x.js`](/packages/0x.js)                               | [![npm](https://img.shields.io/npm/v/0x.js.svg)](https://www.npmjs.com/package/0x.js)                                   | An aggregate package combining many smaller utility packages for interacting with the 0x protocol |
-| [`@0x/contract-addresses`](/packages/contract-addresses) | [![npm](https://img.shields.io/npm/v/@0x/contract-addresses.svg)](https://www.npmjs.com/package/@0x/contract-addresses) | A tiny utility library for getting known deployed contract addresses for a particular network.    |
-| [`@0x/contract-wrappers`](/packages/contract-wrappers)   | [![npm](https://img.shields.io/npm/v/@0x/contract-wrappers.svg)](https://www.npmjs.com/package/@0x/contract-wrappers)   | JS/TS wrappers for interacting with the 0x smart contracts                                        |
-| [`@0x/order-utils`](/packages/order-utils)               | [![npm](https://img.shields.io/npm/v/@0x/order-utils.svg)](https://www.npmjs.com/package/@0x/order-utils)               | A set of utilities for generating, parsing, signing and validating 0x orders                      |
-| [`@0x/json-schemas`](/packages/json-schemas)             | [![npm](https://img.shields.io/npm/v/@0x/json-schemas.svg)](https://www.npmjs.com/package/@0x/json-schemas)             | 0x-related JSON schemas                                                                           |  |
-| [`@0x/migrations`](/packages/migrations)                 | [![npm](https://img.shields.io/npm/v/@0x/migrations.svg)](https://www.npmjs.com/package/@0x/migrations)                 | Migration tool for deploying 0x smart contracts on private testnets                               |
-| [`@0x/contract-artifacts`](/packages/contract-artifacts) | [![npm](https://img.shields.io/npm/v/@0x/contract-artifacts.svg)](https://www.npmjs.com/package/@0x/contract-artifacts) | 0x smart contract compilation artifacts                                                           |  |
-| [`@0x/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-swapper`](/packages/asset-swapper)           | [![npm](https://img.shields.io/npm/v/@0x/asset-swapper.svg)](https://www.npmjs.com/package/@0x/asset-swapper)           | Convenience package for discovering and performing swaps for any ERC20 Assets                     |
-
-#### Ethereum tooling
-
-| Package                                      | Version                                                                                                     | Description                                                                                                                                                                             |
-| -------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [`@0x/web3-wrapper`](/packages/web3-wrapper) | [![npm](https://img.shields.io/npm/v/@0x/web3-wrapper.svg)](https://www.npmjs.com/package/@0x/web3-wrapper) | An Ethereum JSON RPC client                                                                                                                                                             |
-| [`@0x/sol-compiler`](/packages/sol-compiler) | [![npm](https://img.shields.io/npm/v/@0x/sol-compiler.svg)](https://www.npmjs.com/package/@0x/sol-compiler) | A wrapper around solc-js that adds smart re-compilation, ability to compile an entire project, Solidity version specific compilation, standard input description support and much more. |
-| [`@0x/sol-coverage`](/packages/sol-coverage) | [![npm](https://img.shields.io/npm/v/@0x/sol-coverage.svg)](https://www.npmjs.com/package/@0x/sol-coverage) | A solidity test coverage tool                                                                                                                                                           |
-| [`@0x/sol-profiler`](/packages/sol-profiler) | [![npm](https://img.shields.io/npm/v/@0x/sol-profiler.svg)](https://www.npmjs.com/package/@0x/sol-profiler) | A solidity gas cost profiler                                                                                                                                                            |
-| [`@0x/sol-trace`](/packages/sol-trace)       | [![npm](https://img.shields.io/npm/v/@0x/sol-trace.svg)](https://www.npmjs.com/package/@0x/sol-trace)       | A solidity stack trace tool                                                                                                                                                             |
-| [`@0x/sol-resolver`](/packages/sol-resolver) | [![npm](https://img.shields.io/npm/v/@0x/sol-resolver.svg)](https://www.npmjs.com/package/@0x/sol-resolver) | Import resolver for smart contracts dependencies                                                                                                                                        |
-| [`@0x/subproviders`](/packages/subproviders) | [![npm](https://img.shields.io/npm/v/@0x/subproviders.svg)](https://www.npmjs.com/package/@0x/subproviders) | Web3 provider middlewares (e.g. LedgerSubprovider)                                                                                                                                      |
-| [`@0x/sol-doc`](/packages/sol-doc)           | [![npm](https://img.shields.io/npm/v/@0x/sol-doc.svg)](https://www.npmjs.com/package/@0x/sol-doc)           | Solidity documentation generator                                                                                                                                                        |
-
-#### Utilities
-
-| Package                                                  | Version                                                                                                                 | Description                                                     |
-| -------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------- |
-| [`@0x/abi-gen`](/packages/abi-gen)                       | [![npm](https://img.shields.io/npm/v/@0x/abi-gen.svg)](https://www.npmjs.com/package/@0x/abi-gen)                       | Tool to generate TS wrappers from smart contract ABIs           |
-| [`@0x/tslint-config`](/packages/tslint-config)           | [![npm](https://img.shields.io/npm/v/@0x/tslint-config.svg)](https://www.npmjs.com/package/@0x/tslint-config)           | Custom TSLint rules used by the 0x core team                    |
-| [`@0x/types`](/packages/types)                           | [![npm](https://img.shields.io/npm/v/@0x/types.svg)](https://www.npmjs.com/package/@0x/types)                           | Shared type declarations                                        |
-| [`@0x/typescript-typings`](/packages/typescript-typings) | [![npm](https://img.shields.io/npm/v/@0x/typescript-typings.svg)](https://www.npmjs.com/package/@0x/typescript-typings) | Repository of types for external packages                       |
-| [`@0x/utils`](/packages/utils)                           | [![npm](https://img.shields.io/npm/v/@0x/utils.svg)](https://www.npmjs.com/package/@0x/utils)                           | Shared utilities                                                |
-| [`@0x/assert`](/packages/assert)                         | [![npm](https://img.shields.io/npm/v/@0x/assert.svg)](https://www.npmjs.com/package/@0x/assert)                         | Type and schema assertions used by our packages                 |
-| [`@0x/base-contract`](/packages/base-contract)           | [![npm](https://img.shields.io/npm/v/@0x/base-contract.svg)](https://www.npmjs.com/package/@0x/base-contract)           | BaseContract used by auto-generated `abi-gen` wrapper contracts |
-| [`@0x/dev-utils`](/packages/dev-utils)                   | [![npm](https://img.shields.io/npm/v/@0x/dev-utils.svg)](https://www.npmjs.com/package/@0x/dev-utils)                   | Dev utils to be shared across 0x packages                       |
-
-#### Private Packages
-
-| Package                            | Description                                                                      |
-| ---------------------------------- | -------------------------------------------------------------------------------- |
-| [`@0x/instant`](/packages/instant) | A free and flexible way to offer simple crypto purchasing in any app or website. |
+| Package                                                  | Version                                                                                                                 | Description                                                                                    |
+| -------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------- |
+| [`@0x/contract-addresses`](/packages/contract-addresses) | [![npm](https://img.shields.io/npm/v/@0x/contract-addresses.svg)](https://www.npmjs.com/package/@0x/contract-addresses) | A tiny utility library for getting known deployed contract addresses for a particular network. |
+| [`@0x/contract-wrappers`](/packages/contract-wrappers)   | [![npm](https://img.shields.io/npm/v/@0x/contract-wrappers.svg)](https://www.npmjs.com/package/@0x/contract-wrappers)   | JS/TS wrappers for interacting with the 0x smart contracts                                     |
+| [`@0x/order-utils`](/packages/order-utils)               | [![npm](https://img.shields.io/npm/v/@0x/order-utils.svg)](https://www.npmjs.com/package/@0x/order-utils)               | A set of utilities for generating, parsing, signing and validating 0x orders                   |
+| [`@0x/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                                                        |  |
 
 ## Usage
 
@@ -129,8 +81,6 @@ Then install dependencies
 yarn install
 ```
 
-You will also need to have Python 3 installed, in order to build and run the tests of `abi-gen`'s command-line interface, which is integrated with the yarn build, yarn test, and yarn lint commands described below. More specifically, your local pip should resolve to the Python 3 version of pip, not a Python 2.x version.
-
 ### Build
 
 To build all packages:

contracts/asset-proxy/CHANGELOG.json

@@ -1,7 +1,150 @@
 [
+    {
+        "version": "3.5.0",
+        "changes": [
+            {
+                "note": "Update `CurveBridge` to support more varied curves",
+                "pr": 2633
+            },
+            {
+                "note": "Export DexForwarderBridgeContract",
+                "pr": 2656
+            },
+            {
+                "note": "Add BancorBridge and IBancorNetwork, ",
+                "pr": 2650
+            },
+            {
+                "note": "Added `MStableBridge`",
+                "pr": 2662
+            },
+            {
+                "note": "Added `MooniswapBridge`",
+                "pr": 2675
+            },
+            {
+                "note": "Reworked `KyberBridge`",
+                "pr": 2683
+            },
+            {
+                "note": "Added `CreamBridge`",
+                "pr": 2715
+            },
+            {
+                "note": "Added `ShellBridge`",
+                "pr": 2722
+            },
+            {
+                "note": "Added `DODOBridge`",
+                "pr": 2701
+            }
+        ],
+        "timestamp": 1603265572
+    },
+    {
+        "version": "3.4.0",
+        "changes": [
+            {
+                "note": "Fix instability with DFB.",
+                "pr": 2616
+            },
+            {
+                "note": "Add `BalancerBridge`",
+                "pr": 2613
+            }
+        ],
+        "timestamp": 1594788383
+    },
+    {
+        "version": "3.3.0",
+        "changes": [
+            {
+                "note": "Use `LibERC20Token.approveIfBelow()` in DEX bridges for for approvals.",
+                "pr": 2512
+            },
+            {
+                "note": "Emit `ERC20BridgeTransfer` events in bridges.",
+                "pr": 2512
+            },
+            {
+                "note": "Change names of `ERC20BridgeTransfer` args to be less ambiguous.",
+                "pr": 2524
+            },
+            {
+                "note": "Added `MixinGasToken` allowing Gas Tokens to be freed",
+                "pr": 2523
+            },
+            {
+                "note": "Add `DexForwaderBridge` bridge contract.",
+                "pr": 2525
+            },
+            {
+                "note": "Add `UniswapV2Bridge` bridge contract.",
+                "pr": 2590
+            },
+            {
+                "note": "Add Gas Token freeing to `DexForwarderBridge` contract.",
+                "pr": 2536
+            }
+        ],
+        "timestamp": 1592969527
+    },
+    {
+        "timestamp": 1583220306,
+        "version": "3.2.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1582837861,
+        "version": "3.2.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1582677073,
+        "version": "3.2.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1582623685,
+        "version": "3.2.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1581748629,
+        "version": "3.2.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "3.2.0",
         "changes": [
+            {
+                "note": "Add more types and functions to `IDydx`",
+                "pr": 2466
+            },
+            {
+                "note": "Rename `DydxBrigeAction.accountId` to `DydxBridgeAction.accountIdx`",
+                "pr": 2466
+            },
             {
                 "note": "Fix broken tests.",
                 "pr": 2462
@@ -13,6 +156,10 @@
             {
                 "note": "Add asset data decoding functions",
                 "pr": 2462
+            },
+            {
+                "note": "Add `setOperators()` to `IDydx`",
+                "pr": 2462
             }
         ],
         "timestamp": 1581204851

contracts/asset-proxy/CHANGELOG.md

@@ -5,11 +5,61 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.5.0 - _October 21, 2020_
+
+    * Update `CurveBridge` to support more varied curves (#2633)
+    * Export DexForwarderBridgeContract (#2656)
+    * Add BancorBridge and IBancorNetwork,  (#2650)
+    * Added `MStableBridge` (#2662)
+    * Added `MooniswapBridge` (#2675)
+    * Reworked `KyberBridge` (#2683)
+    * Added `CreamBridge` (#2715)
+    * Added `ShellBridge` (#2722)
+    * Added `DODOBridge` (#2701)
+
+## v3.4.0 - _July 15, 2020_
+
+    * Fix instability with DFB. (#2616)
+    * Add `BalancerBridge` (#2613)
+
+## v3.3.0 - _June 24, 2020_
+
+    * Use `LibERC20Token.approveIfBelow()` in DEX bridges for for approvals. (#2512)
+    * Emit `ERC20BridgeTransfer` events in bridges. (#2512)
+    * Change names of `ERC20BridgeTransfer` args to be less ambiguous. (#2524)
+    * Added `MixinGasToken` allowing Gas Tokens to be freed (#2523)
+    * Add `DexForwaderBridge` bridge contract. (#2525)
+    * Add `UniswapV2Bridge` bridge contract. (#2590)
+    * Add Gas Token freeing to `DexForwarderBridge` contract. (#2536)
+
+## v3.2.5 - _March 3, 2020_
+
+    * Dependencies updated
+
+## v3.2.4 - _February 27, 2020_
+
+    * Dependencies updated
+
+## v3.2.3 - _February 26, 2020_
+
+    * Dependencies updated
+
+## v3.2.2 - _February 25, 2020_
+
+    * Dependencies updated
+
+## v3.2.1 - _February 15, 2020_
+
+    * Dependencies updated
+
 ## v3.2.0 - _February 8, 2020_
 
+    * Add more types and functions to `IDydx` (#2466)
+    * Rename `DydxBrigeAction.accountId` to `DydxBridgeAction.accountIdx` (#2466)
     * Fix broken tests. (#2462)
     * Remove dependency on `@0x/contracts-dev-utils` (#2462)
     * Add asset data decoding functions (#2462)
+    * Add `setOperators()` to `IDydx` (#2462)
 
 ## v3.1.3 - _February 6, 2020_
 

contracts/asset-proxy/compiler.json

@@ -3,6 +3,7 @@
     "contractsDir": "./contracts",
     "useDockerisedSolc": false,
     "isOfflineMode": false,
+    "shouldSaveStandardInput": true,
     "compilerSettings": {
         "evmVersion": "istanbul",
         "optimizer": {

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

@@ -0,0 +1,103 @@
+
+/*
+
+  Copyright 2020 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/IBalancerPool.sol";
+
+
+contract BalancerBridge is
+    IERC20Bridge,
+    IWallet,
+    DeploymentConstants
+{
+    /// @dev Callback for `IERC20Bridge`. Tries to buy `amount` of
+    ///      `toTokenAddress` tokens by selling the entirety of the `fromTokenAddress`
+    ///      token encoded in the bridge data, then transfers the bought
+    ///      tokens to `to`.
+    /// @param toTokenAddress The token to buy and transfer to `to`.
+    /// @param from The maker (this contract).
+    /// @param to The recipient of the bought tokens.
+    /// @param amount Minimum amount of `toTokenAddress` tokens to buy.
+    /// @param bridgeData The abi-encoded addresses of the "from" token and Balancer pool.
+    /// @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.
+        (address fromTokenAddress, address poolAddress) = abi.decode(
+            bridgeData,
+            (address, address)
+        );
+        require(toTokenAddress != fromTokenAddress, "BalancerBridge/INVALID_PAIR");
+
+        uint256 fromTokenBalance = IERC20Token(fromTokenAddress).balanceOf(address(this));
+        // Grant an allowance to the exchange to spend `fromTokenAddress` token.
+        LibERC20Token.approveIfBelow(fromTokenAddress, poolAddress, fromTokenBalance);
+
+        // Sell all of this contract's `fromTokenAddress` token balance.
+        (uint256 boughtAmount,) = IBalancerPool(poolAddress).swapExactAmountIn(
+            fromTokenAddress, // tokenIn
+            fromTokenBalance, // tokenAmountIn
+            toTokenAddress,   // tokenOut
+            amount,           // minAmountOut
+            uint256(-1)       // maxPrice
+        );
+
+        // Transfer the converted `toToken`s to `to`.
+        LibERC20Token.transfer(toTokenAddress, to, boughtAmount);
+
+        emit ERC20BridgeTransfer(
+            fromTokenAddress,
+            toTokenAddress,
+            fromTokenBalance,
+            boughtAmount,
+            from,
+            to
+        );
+        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;
+    }
+}

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

@@ -0,0 +1,122 @@
+
+/*
+
+  Copyright 2020 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/IBancorNetwork.sol";
+
+
+contract BancorBridge is
+    IERC20Bridge,
+    IWallet,
+    DeploymentConstants
+{
+    struct TransferState {
+        address bancorNetworkAddress;
+        address[] path;
+    }
+
+    /// @dev Callback for `IERC20Bridge`. Tries to buy `amount` of
+    ///      `toTokenAddress` tokens by selling the entirety of the `fromTokenAddress`
+    ///      token encoded in the bridge data, then transfers the bought
+    ///      tokens to `to`.
+    /// @param toTokenAddress The token to buy and transfer to `to`.
+    /// @param from The maker (this contract).
+    /// @param to The recipient of the bought tokens.
+    /// @param amount Minimum amount of `toTokenAddress` tokens to buy.
+    /// @param bridgeData The abi-encoded conversion path addresses and Bancor network 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)
+    {
+        // hold variables to get around stack depth limitations
+        TransferState memory state;
+
+        // Decode the bridge data.
+        (
+            state.path,
+            state.bancorNetworkAddress
+        // solhint-disable indent
+        ) = abi.decode(bridgeData, (address[], address));
+        // solhint-enable indent
+
+        require(state.path.length > 0, "BancorBridge/PATH_MUST_EXIST");
+        // Just transfer the tokens if they're the same.
+        if (state.path[0] == toTokenAddress) {
+            LibERC20Token.transfer(state.path[0], to, amount);
+            return BRIDGE_SUCCESS;
+        }
+
+        // Otherwise use Bancor to convert
+        require(state.path.length > 2, "BancorBridge/PATH_LENGTH_MUST_BE_GREATER_THAN_TWO");
+        require(state.path[state.path.length - 1] == toTokenAddress, "BancorBridge/LAST_ELEMENT_OF_PATH_MUST_MATCH_OUTPUT_TOKEN");
+        
+        // // Grant an allowance to the Bancor Network to spend `fromTokenAddress` token.
+        uint256 fromTokenBalance = IERC20Token(state.path[0]).balanceOf(address(this));
+        LibERC20Token.approveIfBelow(state.path[0], state.bancorNetworkAddress, fromTokenBalance);
+
+        // Convert the tokens
+        uint256 boughtAmount = IBancorNetwork(state.bancorNetworkAddress).convertByPath(
+            state.path, // path originating with source token and terminating in destination token
+            fromTokenBalance, // amount of source token to trade
+            amount, // minimum amount of destination token expected to receive
+            to, // beneficiary
+            address(0), // affiliateAccount; no fee paid
+            0 // affiliateFee; no fee paid
+        );
+
+        emit ERC20BridgeTransfer(
+            state.path[0], // fromTokenAddress
+            toTokenAddress,
+            fromTokenBalance,
+            boughtAmount,
+            from,
+            to
+        );
+        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;
+    }
+    
+}

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

@@ -35,7 +35,7 @@ contract ChaiBridge is
     /// @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.
+    /// @return success The magic bytes `0xdc1600f3` if successful.
     function bridgeTransferFrom(
         address /* tokenAddress */,
         address from,

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

@@ -0,0 +1,103 @@
+
+/*
+
+  Copyright 2020 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/IBalancerPool.sol";
+
+
+contract CreamBridge is
+    IERC20Bridge,
+    IWallet,
+    DeploymentConstants
+{
+    /// @dev Callback for `IERC20Bridge`. Tries to buy `amount` of
+    ///      `toTokenAddress` tokens by selling the entirety of the `fromTokenAddress`
+    ///      token encoded in the bridge data, then transfers the bought
+    ///      tokens to `to`.
+    /// @param toTokenAddress The token to buy and transfer to `to`.
+    /// @param from The maker (this contract).
+    /// @param to The recipient of the bought tokens.
+    /// @param amount Minimum amount of `toTokenAddress` tokens to buy.
+    /// @param bridgeData The abi-encoded addresses of the "from" token and Balancer pool.
+    /// @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.
+        (address fromTokenAddress, address poolAddress) = abi.decode(
+            bridgeData,
+            (address, address)
+        );
+        require(toTokenAddress != fromTokenAddress, "CreamBridge/INVALID_PAIR");
+
+        uint256 fromTokenBalance = IERC20Token(fromTokenAddress).balanceOf(address(this));
+        // Grant an allowance to the exchange to spend `fromTokenAddress` token.
+        LibERC20Token.approveIfBelow(fromTokenAddress, poolAddress, fromTokenBalance);
+
+        // Sell all of this contract's `fromTokenAddress` token balance.
+        (uint256 boughtAmount,) = IBalancerPool(poolAddress).swapExactAmountIn(
+            fromTokenAddress, // tokenIn
+            fromTokenBalance, // tokenAmountIn
+            toTokenAddress,   // tokenOut
+            amount,           // minAmountOut
+            uint256(-1)       // maxPrice
+        );
+
+        // Transfer the converted `toToken`s to `to`.
+        LibERC20Token.transfer(toTokenAddress, to, boughtAmount);
+
+        emit ERC20BridgeTransfer(
+            fromTokenAddress,
+            toTokenAddress,
+            fromTokenBalance,
+            boughtAmount,
+            from,
+            to
+        );
+        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;
+    }
+}

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

@@ -0,0 +1,119 @@
+
+/*
+
+  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/ICurve.sol";
+
+
+// solhint-disable not-rely-on-time
+// solhint-disable space-after-comma
+contract CurveBridge is
+    IERC20Bridge,
+    IWallet,
+    DeploymentConstants
+{
+    struct CurveBridgeData {
+        address curveAddress;
+        bytes4 exchangeFunctionSelector;
+        address fromTokenAddress;
+        int128 fromCoinIdx;
+        int128 toCoinIdx;
+    }
+
+    /// @dev Callback for `ICurve`. Tries to buy `amount` of
+    ///      `toTokenAddress` tokens by selling the entirety of the opposing asset
+    ///      (DAI, USDC) to the Curve contract, then transfers the bought
+    ///      tokens to `to`.
+    /// @param toTokenAddress The token to give to `to` (i.e DAI, USDC, USDT).
+    /// @param from The maker (this contract).
+    /// @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 Curve metadata.
+        CurveBridgeData memory data = abi.decode(bridgeData, (CurveBridgeData));
+
+        require(toTokenAddress != data.fromTokenAddress, "CurveBridge/INVALID_PAIR");
+        uint256 fromTokenBalance = IERC20Token(data.fromTokenAddress).balanceOf(address(this));
+        // Grant an allowance to the exchange to spend `fromTokenAddress` token.
+        LibERC20Token.approveIfBelow(data.fromTokenAddress, data.curveAddress, fromTokenBalance);
+
+        // Try to sell all of this contract's `fromTokenAddress` token balance.
+        {
+            (bool didSucceed, bytes memory resultData) =
+                data.curveAddress.call(abi.encodeWithSelector(
+                    data.exchangeFunctionSelector,
+                    data.fromCoinIdx,
+                    data.toCoinIdx,
+                    // dx
+                    fromTokenBalance,
+                    // min dy
+                    amount
+                ));
+            if (!didSucceed) {
+                assembly { revert(add(resultData, 32), mload(resultData)) }
+            }
+        }
+
+        uint256 toTokenBalance = IERC20Token(toTokenAddress).balanceOf(address(this));
+        // Transfer the converted `toToken`s to `to`.
+        LibERC20Token.transfer(toTokenAddress, to, toTokenBalance);
+
+        emit ERC20BridgeTransfer(
+            data.fromTokenAddress,
+            toTokenAddress,
+            fromTokenBalance,
+            toTokenBalance,
+            from,
+            to
+        );
+        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;
+    }
+}

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

@@ -0,0 +1,147 @@
+/*
+
+  Copyright 2020 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";
+
+
+interface IDODOHelper {
+
+    function querySellQuoteToken(address dodo, uint256 amount) external view returns (uint256);
+}
+
+
+interface IDODO {
+
+    function sellBaseToken(uint256 amount, uint256 minReceiveQuote, bytes calldata data) external returns (uint256);
+
+    function buyBaseToken(uint256 amount, uint256 maxPayQuote, bytes calldata data) external returns (uint256);
+
+}
+
+
+contract DODOBridge is
+    IERC20Bridge,
+    IWallet,
+    DeploymentConstants
+{
+
+    struct TransferState {
+        address fromTokenAddress;
+        uint256 fromTokenBalance;
+        address pool;
+        bool isSellBase;
+    }
+
+    /// @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 from The maker (this contract).
+    /// @param to The recipient of the bought tokens.
+    /// @param amount Minimum amount of `toTokenAddress` tokens to buy.
+    /// @param bridgeData The abi-encoded path of token addresses. Last element must be toTokenAddress
+    /// @return success The magic bytes if successful.
+    function bridgeTransferFrom(
+        address toTokenAddress,
+        address from,
+        address to,
+        uint256 amount,
+        bytes calldata bridgeData
+    )
+        external
+        returns (bytes4 success)
+    {
+        TransferState memory state;
+        // Decode the bridge data to get the `fromTokenAddress`.
+        (state.fromTokenAddress, state.pool, state.isSellBase) = abi.decode(bridgeData, (address, address, bool));
+        require(state.pool != address(0), "DODOBridge/InvalidPool");
+        IDODO exchange = IDODO(state.pool);
+        // Get our balance of `fromTokenAddress` token.
+        state.fromTokenBalance = IERC20Token(state.fromTokenAddress).balanceOf(address(this));
+
+        // Grant the pool an allowance.
+        LibERC20Token.approveIfBelow(
+            state.fromTokenAddress,
+            address(exchange),
+            state.fromTokenBalance
+        );
+
+        uint256 boughtAmount;
+        if (state.isSellBase) {
+            boughtAmount = exchange.sellBaseToken(
+                // amount to sell
+                state.fromTokenBalance,
+                // min receive amount
+                1,
+                new bytes(0)
+            );
+        } else {
+            // Need to re-calculate the sell quote amount into buyBase
+            boughtAmount = IDODOHelper(_getDODOHelperAddress()).querySellQuoteToken(
+                address(exchange),
+                state.fromTokenBalance
+            );
+            exchange.buyBaseToken(
+                // amount to buy
+                boughtAmount,
+                // max pay amount
+                state.fromTokenBalance,
+                new bytes(0)
+            );
+        }
+        // Transfer funds to `to`
+        IERC20Token(toTokenAddress).transfer(to, boughtAmount);
+
+
+        emit ERC20BridgeTransfer(
+            // input token
+            state.fromTokenAddress,
+            // output token
+            toTokenAddress,
+            // input token amount
+            state.fromTokenBalance,
+            // output token amount
+            boughtAmount,
+            from,
+            to
+        );
+
+        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;
+    }
+}

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

@@ -0,0 +1,200 @@
+/*
+
+  Copyright 2020 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-exchange-libs/contracts/src/LibMath.sol";
+import "@0x/contracts-utils/contracts/src/DeploymentConstants.sol";
+import "@0x/contracts-utils/contracts/src/LibBytes.sol";
+import "@0x/contracts-utils/contracts/src/LibSafeMath.sol";
+import "../interfaces/IERC20Bridge.sol";
+import "./MixinGasToken.sol";
+
+
+// solhint-disable space-after-comma, indent
+contract DexForwarderBridge is
+    IERC20Bridge,
+    IWallet,
+    DeploymentConstants,
+    MixinGasToken
+{
+    using LibSafeMath for uint256;
+
+    /// @dev Data needed to reconstruct a bridge call.
+    struct BridgeCall {
+        address target;
+        uint256 inputTokenAmount;
+        uint256 outputTokenAmount;
+        bytes bridgeData;
+    }
+
+    /// @dev Intermediate state variables used by `bridgeTransferFrom()`, in
+    ///      struct form to get around stack limits.
+    struct TransferFromState {
+        address inputToken;
+        uint256 initialInputTokenBalance;
+        uint256 callInputTokenAmount;
+        uint256 callOutputTokenAmount;
+        uint256 totalInputTokenSold;
+        BridgeCall[] calls;
+    }
+
+    /// @dev Spends this contract's entire balance of input tokens by forwarding
+    /// them to other bridges. Reverts if the entire balance is not spent.
+    /// @param outputToken The token being bought.
+    /// @param to The recipient of the bought tokens.
+    /// @param bridgeData The abi-encoded input token address.
+    /// @return success The magic bytes if successful.
+    function bridgeTransferFrom(
+        address outputToken,
+        address /* from */,
+        address to,
+        uint256 /* amount */,
+        bytes calldata bridgeData
+    )
+        external
+        freesGasTokensFromCollector
+        returns (bytes4 success)
+    {
+        require(
+            msg.sender == _getERC20BridgeProxyAddress(),
+            "DexForwarderBridge/SENDER_NOT_AUTHORIZED"
+        );
+        TransferFromState memory state;
+        (
+            state.inputToken,
+            state.calls
+        ) = abi.decode(bridgeData, (address, BridgeCall[]));
+
+        state.initialInputTokenBalance =
+            IERC20Token(state.inputToken).balanceOf(address(this));
+
+        for (uint256 i = 0; i < state.calls.length; ++i) {
+            // Stop if the we've sold all our input tokens.
+            if (state.totalInputTokenSold >= state.initialInputTokenBalance) {
+                break;
+            }
+
+            // Compute token amounts.
+            state.callInputTokenAmount = LibSafeMath.min256(
+                state.calls[i].inputTokenAmount,
+                state.initialInputTokenBalance.safeSub(state.totalInputTokenSold)
+            );
+            state.callOutputTokenAmount = LibMath.getPartialAmountFloor(
+                state.callInputTokenAmount,
+                state.calls[i].inputTokenAmount,
+                state.calls[i].outputTokenAmount
+            );
+
+            // Execute the call in a new context so we can recoup transferred
+            // funds by reverting.
+            (bool didSucceed, ) = address(this)
+                .call(abi.encodeWithSelector(
+                    this.executeBridgeCall.selector,
+                    state.calls[i].target,
+                    to,
+                    state.inputToken,
+                    outputToken,
+                    state.callInputTokenAmount,
+                    state.callOutputTokenAmount,
+                    state.calls[i].bridgeData
+                ));
+
+            if (didSucceed) {
+                // Increase the amount of tokens sold.
+                state.totalInputTokenSold = state.totalInputTokenSold.safeAdd(
+                    state.callInputTokenAmount
+                );
+            }
+        }
+        // Always succeed.
+        return BRIDGE_SUCCESS;
+    }
+
+    /// @dev Transfers `inputToken` token to a bridge contract then calls
+    ///      its `bridgeTransferFrom()`. This is executed in separate context
+    ///      so we can revert the transfer on error. This can only be called
+    //       by this contract itself.
+    /// @param bridge The bridge contract.
+    /// @param to The recipient of `outputToken` tokens.
+    /// @param inputToken The input token.
+    /// @param outputToken The output token.
+    /// @param inputTokenAmount The amount of input tokens to transfer to `bridge`.
+    /// @param outputTokenAmount The amount of expected output tokens to be sent
+    ///        to `to` by `bridge`.
+    function executeBridgeCall(
+        address bridge,
+        address to,
+        address inputToken,
+        address outputToken,
+        uint256 inputTokenAmount,
+        uint256 outputTokenAmount,
+        bytes calldata bridgeData
+    )
+        external
+    {
+        // Must be called through `bridgeTransferFrom()`.
+        require(msg.sender == address(this), "DexForwarderBridge/ONLY_SELF");
+        // `bridge` must not be this contract.
+        require(bridge != address(this));
+
+        // Get the starting balance of output tokens for `to`.
+        uint256 initialRecipientBalance = IERC20Token(outputToken).balanceOf(to);
+
+        // Transfer input tokens to the bridge.
+        LibERC20Token.transfer(inputToken, bridge, inputTokenAmount);
+
+        // Call the bridge.
+        (bool didSucceed, bytes memory resultData) =
+            bridge.call(abi.encodeWithSelector(
+                IERC20Bridge(0).bridgeTransferFrom.selector,
+                outputToken,
+                bridge,
+                to,
+                outputTokenAmount,
+                bridgeData
+            ));
+
+        // Revert if the call failed or not enough tokens were bought.
+        // This will also undo the token transfer.
+        require(
+            didSucceed
+            && resultData.length == 32
+            && LibBytes.readBytes32(resultData, 0) == bytes32(BRIDGE_SUCCESS)
+            && IERC20Token(outputToken).balanceOf(to).safeSub(initialRecipientBalance) >= outputTokenAmount
+        );
+    }
+
+    /// @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;
+    }
+}

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

@@ -50,7 +50,7 @@ contract DydxBridge is
     /// @param encodedBridgeData An abi-encoded `BridgeData` struct.
     /// @return success The magic bytes if successful.
     function bridgeTransferFrom(
-        address,
+        address, /* toTokenAddress */
         address from,
         address to,
         uint256 amount,
@@ -81,6 +81,7 @@ contract DydxBridge is
 
         // Run operation. This will revert on failure.
         IDydx(_getDydxAddress()).operate(accounts, actions);
+
         return BRIDGE_SUCCESS;
     }
 
@@ -191,12 +192,12 @@ contract DydxBridge is
         depositAction = IDydx.ActionArgs({
             actionType: IDydx.ActionType.Deposit,           // deposit tokens.
             amount: dydxAmount,                             // amount to deposit.
-            accountId: bridgeAction.accountId,              // index in the `accounts` when calling `operate`.
+            accountIdx: bridgeAction.accountIdx,             // 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,
+            otherAccountIdx: 0,
             data: hex''
         });
     }
@@ -229,12 +230,12 @@ contract DydxBridge is
         withdrawAction = IDydx.ActionArgs({
             actionType: IDydx.ActionType.Withdraw,          // withdraw tokens.
             amount: amountToWithdraw,                       // amount to withdraw.
-            accountId: bridgeAction.accountId,              // index in the `accounts` when calling `operate`.
+            accountIdx: bridgeAction.accountIdx,            // 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,
+            otherAccountIdx: 0,
             data: hex''
         });
     }

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

@@ -38,13 +38,14 @@ contract Eth2DaiBridge is
     ///      (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 from The maker (this contract).
     /// @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 from,
         address to,
         uint256 amount,
         bytes calldata bridgeData
@@ -56,18 +57,28 @@ contract Eth2DaiBridge is
         (address fromTokenAddress) = abi.decode(bridgeData, (address));
 
         IEth2Dai exchange = IEth2Dai(_getEth2DaiAddress());
+        uint256 fromTokenBalance = IERC20Token(fromTokenAddress).balanceOf(address(this));
         // Grant an allowance to the exchange to spend `fromTokenAddress` token.
-        LibERC20Token.approve(fromTokenAddress, address(exchange), uint256(-1));
+        LibERC20Token.approveIfBelow(fromTokenAddress, address(exchange), fromTokenBalance);
 
         // Try to sell all of this contract's `fromTokenAddress` token balance.
         uint256 boughtAmount = exchange.sellAllAmount(
             fromTokenAddress,
-            IERC20Token(fromTokenAddress).balanceOf(address(this)),
+            fromTokenBalance,
             toTokenAddress,
             amount
         );
         // Transfer the converted `toToken`s to `to`.
         LibERC20Token.transfer(toTokenAddress, to, boughtAmount);
+
+        emit ERC20BridgeTransfer(
+            fromTokenAddress,
+            toTokenAddress,
+            fromTokenBalance,
+            boughtAmount,
+            from,
+            to
+        );
         return BRIDGE_SUCCESS;
     }
 

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

@@ -1,6 +1,6 @@
 /*
 
-  Copyright 2019 ZeroEx Intl.
+  Copyright 2020 ZeroEx Intl.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -45,6 +45,7 @@ contract KyberBridge is
         uint256 fromTokenBalance;
         uint256 payableAmount;
         uint256 conversionRate;
+        bytes hint;
     }
 
     /// @dev Kyber ETH pseudo-address.
@@ -66,13 +67,14 @@ contract KyberBridge is
     ///      to the `KyberNetworkProxy` contract, then transfers the bought
     ///      tokens to `to`.
     /// @param toTokenAddress The token to give to `to`.
+    /// @param from The maker (this contract).
     /// @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 from,
         address to,
         uint256 amount,
         bytes calldata bridgeData
@@ -84,43 +86,35 @@ contract KyberBridge is
         state.kyber = IKyberNetworkProxy(_getKyberNetworkProxyAddress());
         state.weth = IEtherToken(_getWethAddress());
         // Decode the bridge data to get the `fromTokenAddress`.
-        (state.fromTokenAddress) = abi.decode(bridgeData, (address));
+        (state.fromTokenAddress, state.hint) = abi.decode(bridgeData, (address, bytes));
         // Query the balance of "from" tokens.
         state.fromTokenBalance = IERC20Token(state.fromTokenAddress).balanceOf(address(this));
         if (state.fromTokenBalance == 0) {
             // Return failure if no input tokens.
             return BRIDGE_FAILED;
         }
-        // Compute the conversion rate, expressed in 18 decimals.
-        // The sequential notation is to get around stack limits.
-        state.conversionRate = KYBER_RATE_BASE;
-        state.conversionRate = state.conversionRate.safeMul(amount);
-        state.conversionRate = state.conversionRate.safeMul(
-            10 ** uint256(LibERC20Token.decimals(state.fromTokenAddress))
-        );
-        state.conversionRate = state.conversionRate.safeDiv(state.fromTokenBalance);
-        state.conversionRate = state.conversionRate.safeDiv(
-            10 ** uint256(LibERC20Token.decimals(toTokenAddress))
-        );
         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.
+        }
+        if (state.fromTokenAddress == address(state.weth)) {
+            // From WETH
             state.fromTokenAddress = KYBER_ETH_ADDRESS;
             state.payableAmount = state.fromTokenBalance;
             state.weth.withdraw(state.fromTokenBalance);
+        } else {
+            LibERC20Token.approveIfBelow(
+                state.fromTokenAddress,
+                address(state.kyber),
+                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)(
+        uint256 boughtAmount = state.kyber.tradeWithHint.value(state.payableAmount)(
             // Input token.
             state.fromTokenAddress,
             // Sell amount.
@@ -132,17 +126,26 @@ contract KyberBridge is
             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.
-            state.conversionRate,
+            // The minimum conversion rate
+            1,
             // No affiliate address.
-            address(0)
+            address(0),
+            state.hint
         );
         // Wrap ETH output and transfer to recipient.
         if (isToTokenWeth) {
             state.weth.deposit.value(boughtAmount)();
             state.weth.transfer(to, boughtAmount);
         }
+
+        emit ERC20BridgeTransfer(
+            state.fromTokenAddress == KYBER_ETH_ADDRESS ? address(state.weth) : state.fromTokenAddress,
+            toTokenAddress,
+            state.fromTokenBalance,
+            boughtAmount,
+            from,
+            to
+        );
         return BRIDGE_SUCCESS;
     }
 
@@ -159,4 +162,5 @@ contract KyberBridge is
     {
         return LEGACY_WALLET_MAGIC_VALUE;
     }
+
 }

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

@@ -0,0 +1,94 @@
+/*
+
+  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/IMStable.sol";
+
+
+contract MStableBridge is
+    IERC20Bridge,
+    IWallet,
+    DeploymentConstants
+{
+
+    /// @dev Swaps specified tokens against the mStable mUSD contract
+    /// @param toTokenAddress The token to give to `to` (i.e DAI, USDC, USDT).
+    /// @param from The maker (this contract).
+    /// @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.
+    // solhint-disable no-unused-vars
+    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));
+
+        IMStable exchange = IMStable(_getMUsdAddress());
+        uint256 fromTokenBalance = IERC20Token(fromTokenAddress).balanceOf(address(this));
+        // Grant an allowance to the exchange to spend `fromTokenAddress` token.
+        LibERC20Token.approveIfBelow(fromTokenAddress, address(exchange), fromTokenBalance);
+
+        // Try to sell all of this contract's `fromTokenAddress` token balance.
+        uint256 boughtAmount = exchange.swap(
+            fromTokenAddress,
+            toTokenAddress,
+            fromTokenBalance,
+            to
+        );
+
+        emit ERC20BridgeTransfer(
+            fromTokenAddress,
+            toTokenAddress,
+            fromTokenBalance,
+            boughtAmount,
+            from,
+            to
+        );
+        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;
+    }
+}

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

@@ -0,0 +1,55 @@
+/*
+
+  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.16;
+
+import "@0x/contracts-utils/contracts/src/DeploymentConstants.sol";
+import "../interfaces/IGasToken.sol";
+
+
+contract MixinGasToken is
+    DeploymentConstants
+{
+
+    /// @dev Frees gas tokens based on the amount of gas consumed in the function
+    modifier freesGasTokens {
+        uint256 gasBefore = gasleft();
+        _;
+        IGasToken gst = IGasToken(_getGstAddress());
+        if (address(gst) != address(0)) {
+            // (gasUsed + FREE_BASE) / (2 * REIMBURSE - FREE_TOKEN)
+            //            14154             24000        6870
+            uint256 value = (gasBefore - gasleft() + 14154) / 41130;
+            gst.freeUpTo(value);
+        }
+    }
+
+    /// @dev Frees gas tokens using the balance of `from`. Amount freed is based
+    ///     on the gas consumed in the function
+    modifier freesGasTokensFromCollector() {
+        uint256 gasBefore = gasleft();
+        _;
+        IGasToken gst = IGasToken(_getGstAddress());
+        if (address(gst) != address(0)) {
+            // (gasUsed + FREE_BASE) / (2 * REIMBURSE - FREE_TOKEN)
+            //            14154             24000        6870
+            uint256 value = (gasBefore - gasleft() + 14154) / 41130;
+            gst.freeFromUpTo(_getGstCollectorAddress(), value);
+        }
+    }
+}

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

@@ -0,0 +1,148 @@
+/*
+
+  Copyright 2020 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/IMooniswap.sol";
+
+
+// solhint-disable space-after-comma
+// solhint-disable not-rely-on-time
+contract MooniswapBridge is
+    IERC20Bridge,
+    IWallet,
+    DeploymentConstants
+{
+
+    struct TransferState {
+        IMooniswap pool;
+        uint256 fromTokenBalance;
+        IEtherToken weth;
+        uint256 boughtAmount;
+        address fromTokenAddress;
+        address toTokenAddress;
+    }
+
+    // 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 from The maker (this contract).
+    /// @param to The recipient of the bought tokens.
+    /// @param amount Minimum amount of `toTokenAddress` tokens to buy.
+    /// @param bridgeData The abi-encoded path of token addresses. Last element must be toTokenAddress
+    /// @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.
+        TransferState memory state;
+        // Decode the bridge data to get the `fromTokenAddress`.
+        address fromTokenAddress = abi.decode(bridgeData, (address));
+        // Get the weth contract.
+        state.weth = IEtherToken(_getWethAddress());
+        // Get our balance of `fromTokenAddress` token.
+        state.fromTokenBalance = IERC20Token(fromTokenAddress).balanceOf(address(this));
+
+        state.fromTokenAddress = fromTokenAddress == address(state.weth) ? address(0) : fromTokenAddress;
+        state.toTokenAddress = toTokenAddress == address(state.weth) ? address(0) : toTokenAddress;
+        state.pool = IMooniswap(
+            IMooniswapRegistry(_getMooniswapAddress()).pools(
+                state.fromTokenAddress,
+                state.toTokenAddress
+            )
+        );
+
+        // withdraw WETH to ETH
+        if (state.fromTokenAddress == address(0)) {
+            state.weth.withdraw(state.fromTokenBalance);
+        } else {
+            // Grant the pool an allowance.
+            LibERC20Token.approveIfBelow(
+                state.fromTokenAddress,
+                address(state.pool),
+                state.fromTokenBalance
+            );
+        }
+        uint256 ethValue = state.fromTokenAddress == address(0) ? state.fromTokenBalance : 0;
+        state.boughtAmount = state.pool.swap.value(ethValue)(
+            state.fromTokenAddress,
+            state.toTokenAddress,
+            state.fromTokenBalance,
+            amount,
+            address(0)
+        );
+        // Deposit to WETH
+        if (state.toTokenAddress == address(0)) {
+            state.weth.deposit.value(state.boughtAmount)();
+        }
+
+        // Transfer funds to `to`
+        LibERC20Token.transfer(toTokenAddress, to, state.boughtAmount);
+
+        emit ERC20BridgeTransfer(
+            // input token
+            fromTokenAddress,
+            // output token
+            toTokenAddress,
+            // input token amount
+            state.fromTokenBalance,
+            // output token amount
+            state.boughtAmount,
+            from,
+            to
+        );
+
+        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;
+    }
+}

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

@@ -0,0 +1,96 @@
+/*
+
+  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/IShell.sol";
+
+
+contract ShellBridge is
+    IERC20Bridge,
+    IWallet,
+    DeploymentConstants
+{
+
+    /// @dev Swaps specified tokens against the Shell contract
+    /// @param toTokenAddress The token to give to `to`.
+    /// @param from The maker (this contract).
+    /// @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.
+    // solhint-disable no-unused-vars
+    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));
+
+        uint256 fromTokenBalance = IERC20Token(fromTokenAddress).balanceOf(address(this));
+        IShell exchange = IShell(_getShellAddress());
+        // Grant an allowance to the exchange to spend `fromTokenAddress` token.
+        LibERC20Token.approveIfBelow(fromTokenAddress, address(exchange), fromTokenBalance);
+
+        // Try to sell all of this contract's `fromTokenAddress` token balance.
+        uint256 boughtAmount = exchange.originSwap(
+            fromTokenAddress,
+            toTokenAddress,
+            fromTokenBalance,
+            amount, // min amount
+            block.timestamp + 1
+        );
+        LibERC20Token.transfer(toTokenAddress, to, boughtAmount);
+
+        emit ERC20BridgeTransfer(
+            fromTokenAddress,
+            toTokenAddress,
+            fromTokenBalance,
+            boughtAmount,
+            from,
+            to
+        );
+        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;
+    }
+}

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

@@ -0,0 +1,136 @@
+/*
+
+  Copyright 2020 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/LibAddressArray.sol";
+import "@0x/contracts-utils/contracts/src/DeploymentConstants.sol";
+import "../interfaces/IUniswapV2Router01.sol";
+import "../interfaces/IERC20Bridge.sol";
+
+
+// solhint-disable space-after-comma
+// solhint-disable not-rely-on-time
+contract SushiSwapBridge is
+    IERC20Bridge,
+    IWallet,
+    DeploymentConstants
+{
+    struct TransferState {
+        address[] path;
+        address router;
+        uint256 fromTokenBalance;
+    }
+
+    /// @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 from The maker (this contract).
+    /// @param to The recipient of the bought tokens.
+    /// @param amount Minimum amount of `toTokenAddress` tokens to buy.
+    /// @param bridgeData The abi-encoded path of token addresses. Last element must be toTokenAddress
+    /// @return success The magic bytes if successful.
+    function bridgeTransferFrom(
+        address toTokenAddress,
+        address from,
+        address to,
+        uint256 amount,
+        bytes calldata bridgeData
+    )
+        external
+        returns (bytes4 success)
+    {
+        // hold variables to get around stack depth limitations
+        TransferState memory state;
+
+        // Decode the bridge data to get the `fromTokenAddress`.
+        // solhint-disable indent
+        (state.path, state.router) = abi.decode(bridgeData, (address[], address));
+        // solhint-enable indent
+
+        require(state.path.length >= 2, "SushiSwapBridge/PATH_LENGTH_MUST_BE_AT_LEAST_TWO");
+        require(state.path[state.path.length - 1] == toTokenAddress, "SushiSwapBridge/LAST_ELEMENT_OF_PATH_MUST_MATCH_OUTPUT_TOKEN");
+
+        // Just transfer the tokens if they're the same.
+        if (state.path[0] == toTokenAddress) {
+            LibERC20Token.transfer(state.path[0], to, amount);
+            return BRIDGE_SUCCESS;
+        }
+
+        // Get our balance of `fromTokenAddress` token.
+        state.fromTokenBalance = IERC20Token(state.path[0]).balanceOf(address(this));
+
+        // Grant the SushiSwap router an allowance.
+        LibERC20Token.approveIfBelow(
+            state.path[0],
+            state.router,
+            state.fromTokenBalance
+        );
+
+        // Buy as much `toTokenAddress` token with `fromTokenAddress` token
+        // and transfer it to `to`.
+        IUniswapV2Router01 router = IUniswapV2Router01(state.router);
+        uint[] memory amounts = router.swapExactTokensForTokens(
+             // Sell all tokens we hold.
+            state.fromTokenBalance,
+             // Minimum buy amount.
+            amount,
+            // Convert `fromTokenAddress` to `toTokenAddress`.
+            state.path,
+            // Recipient is `to`.
+            to,
+            // Expires after this block.
+            block.timestamp
+        );
+
+        emit ERC20BridgeTransfer(
+            // input token
+            state.path[0],
+            // output token
+            toTokenAddress,
+            // input token amount
+            state.fromTokenBalance,
+            // output token amount
+            amounts[amounts.length - 1],
+            from,
+            to
+        );
+
+        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;
+    }
+}

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

@@ -38,10 +38,11 @@ contract UniswapBridge is
 {
     // Struct to hold `bridgeTransferFrom()` local variables in memory and to avoid
     // stack overflows.
-    struct WithdrawToState {
+    struct TransferState {
         IUniswapExchange exchange;
         uint256 fromTokenBalance;
         IEtherToken weth;
+        uint256 boughtAmount;
     }
 
     // solhint-disable no-empty-blocks
@@ -55,13 +56,14 @@ contract UniswapBridge is
     ///      `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 from The maker (this contract).
     /// @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 from,
         address to,
         uint256 amount,
         bytes calldata bridgeData
@@ -70,7 +72,7 @@ contract UniswapBridge is
         returns (bytes4 success)
     {
         // State memory object to avoid stack overflows.
-        WithdrawToState memory state;
+        TransferState memory state;
         // Decode the bridge data to get the `fromTokenAddress`.
         (address fromTokenAddress) = abi.decode(bridgeData, (address));
 
@@ -96,7 +98,7 @@ contract UniswapBridge is
             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)(
+            state.boughtAmount = state.exchange.ethToTokenTransferInput.value(state.fromTokenBalance)(
                 // Minimum buy amount.
                 amount,
                 // Expires after this block.
@@ -108,9 +110,9 @@ contract UniswapBridge is
         // Convert from a token to WETH.
         } else if (toTokenAddress == address(state.weth)) {
             // Grant the exchange an allowance.
-            _grantExchangeAllowance(state.exchange, fromTokenAddress);
+            _grantExchangeAllowance(state.exchange, fromTokenAddress, state.fromTokenBalance);
             // Buy as much ETH with `fromTokenAddress` token as possible.
-            uint256 ethBought = state.exchange.tokenToEthSwapInput(
+            state.boughtAmount = state.exchange.tokenToEthSwapInput(
                 // Sell all tokens we hold.
                 state.fromTokenBalance,
                 // Minimum buy amount.
@@ -119,17 +121,17 @@ contract UniswapBridge is
                 block.timestamp
             );
             // Wrap the ETH.
-            state.weth.deposit.value(ethBought)();
+            state.weth.deposit.value(state.boughtAmount)();
             // Transfer the WETH to `to`.
-            IEtherToken(toTokenAddress).transfer(to, ethBought);
+            IEtherToken(toTokenAddress).transfer(to, state.boughtAmount);
 
         // Convert from one token to another.
         } else {
             // Grant the exchange an allowance.
-            _grantExchangeAllowance(state.exchange, fromTokenAddress);
+            _grantExchangeAllowance(state.exchange, fromTokenAddress, state.fromTokenBalance);
             // Buy as much `toTokenAddress` token with `fromTokenAddress` token
             // and transfer it to `to`.
-            state.exchange.tokenToTokenTransferInput(
+            state.boughtAmount = state.exchange.tokenToTokenTransferInput(
                 // Sell all tokens we hold.
                 state.fromTokenBalance,
                 // Minimum buy amount.
@@ -144,6 +146,15 @@ contract UniswapBridge is
                 toTokenAddress
             );
         }
+
+        emit ERC20BridgeTransfer(
+            fromTokenAddress,
+            toTokenAddress,
+            state.fromTokenBalance,
+            state.boughtAmount,
+            from,
+            to
+        );
         return BRIDGE_SUCCESS;
     }
 
@@ -165,10 +176,19 @@ contract UniswapBridge is
     ///      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)
+    /// @param minimumAllowance The minimum necessary allowance.
+    function _grantExchangeAllowance(
+        IUniswapExchange exchange,
+        address tokenAddress,
+        uint256 minimumAllowance
+    )
         private
     {
-        LibERC20Token.approve(tokenAddress, address(exchange), uint256(-1));
+        LibERC20Token.approveIfBelow(
+            tokenAddress,
+            address(exchange),
+            minimumAllowance
+        );
     }
 
     /// @dev Retrieves the uniswap exchange for a given token pair.

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

@@ -0,0 +1,135 @@
+/*
+
+  Copyright 2020 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/LibAddressArray.sol";
+import "@0x/contracts-utils/contracts/src/DeploymentConstants.sol";
+import "../interfaces/IUniswapV2Router01.sol";
+import "../interfaces/IERC20Bridge.sol";
+
+
+// solhint-disable space-after-comma
+// solhint-disable not-rely-on-time
+contract UniswapV2Bridge is
+    IERC20Bridge,
+    IWallet,
+    DeploymentConstants
+{
+    struct TransferState {
+        address[] path;
+        uint256 fromTokenBalance;
+    }
+
+    /// @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 from The maker (this contract).
+    /// @param to The recipient of the bought tokens.
+    /// @param amount Minimum amount of `toTokenAddress` tokens to buy.
+    /// @param bridgeData The abi-encoded path of token addresses. Last element must be toTokenAddress
+    /// @return success The magic bytes if successful.
+    function bridgeTransferFrom(
+        address toTokenAddress,
+        address from,
+        address to,
+        uint256 amount,
+        bytes calldata bridgeData
+    )
+        external
+        returns (bytes4 success)
+    {
+        // hold variables to get around stack depth limitations
+        TransferState memory state;
+
+        // Decode the bridge data to get the `fromTokenAddress`.
+        // solhint-disable indent
+        state.path = abi.decode(bridgeData, (address[]));
+        // solhint-enable indent
+
+        require(state.path.length >= 2, "UniswapV2Bridge/PATH_LENGTH_MUST_BE_AT_LEAST_TWO");
+        require(state.path[state.path.length - 1] == toTokenAddress, "UniswapV2Bridge/LAST_ELEMENT_OF_PATH_MUST_MATCH_OUTPUT_TOKEN");
+
+        // Just transfer the tokens if they're the same.
+        if (state.path[0] == toTokenAddress) {
+            LibERC20Token.transfer(state.path[0], to, amount);
+            return BRIDGE_SUCCESS;
+        }
+
+        // Get our balance of `fromTokenAddress` token.
+        state.fromTokenBalance = IERC20Token(state.path[0]).balanceOf(address(this));
+
+        // Grant the Uniswap router an allowance.
+        LibERC20Token.approveIfBelow(
+            state.path[0],
+            _getUniswapV2Router01Address(),
+            state.fromTokenBalance
+        );
+
+        // Buy as much `toTokenAddress` token with `fromTokenAddress` token
+        // and transfer it to `to`.
+        IUniswapV2Router01 router = IUniswapV2Router01(_getUniswapV2Router01Address());
+        uint[] memory amounts = router.swapExactTokensForTokens(
+             // Sell all tokens we hold.
+            state.fromTokenBalance,
+             // Minimum buy amount.
+            amount,
+            // Convert `fromTokenAddress` to `toTokenAddress`.
+            state.path,
+            // Recipient is `to`.
+            to,
+            // Expires after this block.
+            block.timestamp
+        );
+
+        emit ERC20BridgeTransfer(
+            // input token
+            state.path[0],
+            // output token
+            toTokenAddress,
+            // input token amount
+            state.fromTokenBalance,
+            // output token amount
+            amounts[amounts.length - 1],
+            from,
+            to
+        );
+
+        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;
+    }
+}

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

@@ -0,0 +1,39 @@
+/*
+
+  Copyright 2020 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 IBalancerPool {
+    /// @dev Sell `tokenAmountIn` of `tokenIn` and receive `tokenOut`.
+    /// @param tokenIn The token being sold
+    /// @param tokenAmountIn The amount of `tokenIn` to sell.
+    /// @param tokenOut The token being bought.
+    /// @param minAmountOut The minimum amount of `tokenOut` to buy.
+    /// @param maxPrice The maximum value for `spotPriceAfter`.
+    /// @return tokenAmountOut The amount of `tokenOut` bought.
+    /// @return spotPriceAfter The new marginal spot price of the given
+    ///         token pair for this pool.
+    function swapExactAmountIn(
+        address tokenIn,
+        uint tokenAmountIn,
+        address tokenOut,
+        uint minAmountOut,
+        uint maxPrice
+    ) external returns (uint tokenAmountOut, uint spotPriceAfter);
+}

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

@@ -0,0 +1,38 @@
+/*
+
+  Copyright 2020 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 IContractRegistry {
+    function addressOf(
+        bytes32 contractName
+    ) external returns(address);
+}
+
+
+contract IBancorNetwork {
+    function convertByPath(
+        address[] calldata _path,
+        uint256 _amount,
+        uint256 _minReturn,
+        address _beneficiary,
+        address _affiliateAccount,
+        uint256 _affiliateFee
+    ) external payable returns (uint256);
+}

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

@@ -0,0 +1,70 @@
+/*
+
+  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;
+
+
+// solhint-disable func-name-mixedcase
+interface ICurve {
+
+    /// @dev Sell `sellAmount` of `fromToken` token and receive `toToken` token.
+    ///      This function exists on later versions of Curve (USDC/DAI/USDT)
+    /// @param i The token index being sold.
+    /// @param j The token index being bought.
+    /// @param sellAmount The amount of token being bought.
+    /// @param minBuyAmount The minimum buy amount of the token being bought.
+    function exchange_underlying(
+        int128 i,
+        int128 j,
+        uint256 sellAmount,
+        uint256 minBuyAmount
+    )
+        external;
+
+    /// @dev Get the amount of `toToken` by selling `sellAmount` of `fromToken`
+    /// @param i The token index being sold.
+    /// @param j The token index being bought.
+    /// @param sellAmount The amount of token being bought.
+    function get_dy_underlying(
+        int128 i,
+        int128 j,
+        uint256 sellAmount
+    )
+        external
+        returns (uint256 dy);
+
+    /// @dev Get the amount of `fromToken` by buying `buyAmount` of `toToken`
+    /// @param i The token index being sold.
+    /// @param j The token index being bought.
+    /// @param buyAmount The amount of token being bought.
+    function get_dx_underlying(
+        int128 i,
+        int128 j,
+        uint256 buyAmount
+    )
+        external
+        returns (uint256 dx);
+
+    /// @dev Get the underlying token address from the token index
+    /// @param i The token index.
+    function underlying_coins(
+        int128 i
+    )
+        external
+        returns (address tokenAddress);
+}

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

@@ -45,12 +45,12 @@ interface IDydx {
     /// parsed into before being processed.
     struct ActionArgs {
         ActionType actionType;
-        uint256 accountId;
+        uint256 accountIdx;
         AssetAmount amount;
         uint256 primaryMarketId;
         uint256 secondaryMarketId;
         address otherAddress;
-        uint256 otherAccountId;
+        uint256 otherAccountIdx;
         bytes data;
     }
 
@@ -71,6 +71,36 @@ interface IDydx {
         uint256 value;
     }
 
+    struct D256 {
+        uint256 value;
+    }
+
+    struct Value {
+        uint256 value;
+    }
+
+    struct Price {
+        uint256 value;
+    }
+
+    struct OperatorArg {
+        address operator;
+        bool trusted;
+    }
+
+    /// @dev The global risk parameters that govern the health and security of the system
+    struct RiskParams {
+        // Required ratio of over-collateralization
+        D256 marginRatio;
+        // Percentage penalty incurred by liquidated accounts
+        D256 liquidationSpread;
+        // Percentage of the borrower's interest fee that gets passed to the suppliers
+        D256 earningsRate;
+        // The minimum absolute borrow value of an account
+        // There must be sufficient incentivize to liquidate undercollateralized accounts
+        Value minBorrowedValue;
+    }
+
     /// @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.
@@ -86,4 +116,77 @@ interface IDydx {
         ActionArgs[] calldata actions
     )
         external;
+
+    // @dev Approves/disapproves any number of operators. An operator is an external address that has the
+    //      same permissions to manipulate an account as the owner of the account. Operators are simply
+    //      addresses and therefore may either be externally-owned Ethereum accounts OR smart contracts.
+    //      Operators are also able to act as AutoTrader contracts on behalf of the account owner if the
+    //      operator is a smart contract and implements the IAutoTrader interface.
+    // @param args A list of OperatorArgs which have an address and a boolean. The boolean value
+    //        denotes whether to approve (true) or revoke approval (false) for that address.
+    function setOperators(OperatorArg[] calldata args) external;
+
+    /// @dev Return true if a particular address is approved as an operator for an owner's accounts.
+    ///      Approved operators can act on the accounts of the owner as if it were the operator's own.
+    /// @param owner The owner of the accounts
+    /// @param operator The possible operator
+    /// @return isLocalOperator True if operator is approved for owner's accounts
+    function getIsLocalOperator(
+        address owner,
+        address operator
+    )
+        external
+        view
+        returns (bool isLocalOperator);
+
+    /// @dev Get the ERC20 token address for a market.
+    /// @param marketId The market to query
+    /// @return tokenAddress The token address
+    function getMarketTokenAddress(
+        uint256 marketId
+    )
+        external
+        view
+        returns (address tokenAddress);
+
+    /// @dev Get all risk parameters in a single struct.
+    /// @return riskParams All global risk parameters
+    function getRiskParams()
+        external
+        view
+        returns (RiskParams memory riskParams);
+
+    /// @dev Get the price of the token for a market.
+    /// @param marketId The market to query
+    /// @return price The price of each atomic unit of the token
+    function getMarketPrice(
+        uint256 marketId
+    )
+        external
+        view
+        returns (Price memory price);
+
+    /// @dev Get the margin premium for a market. A margin premium makes it so that any positions that
+    ///      include the market require a higher collateralization to avoid being liquidated.
+    /// @param  marketId  The market to query
+    /// @return premium The market's margin premium
+    function getMarketMarginPremium(uint256 marketId)
+        external
+        view
+        returns (D256 memory premium);
+
+    /// @dev Get the total supplied and total borrowed values of an account adjusted by the marginPremium
+    ///      of each market. Supplied values are divided by (1 + marginPremium) for each market and
+    ///      borrowed values are multiplied by (1 + marginPremium) for each market. Comparing these
+    ///      adjusted values gives the margin-ratio of the account which will be compared to the global
+    ///      margin-ratio when determining if the account can be liquidated.
+    /// @param account The account to query
+    /// @return supplyValue The supplied value of the account (adjusted for marginPremium)
+    /// @return borrowValue The borrowed value of the account (adjusted for marginPremium)
+    function getAdjustedAccountValues(
+        AccountInfo calldata account
+    )
+        external
+        view
+        returns (Value memory supplyValue, Value memory borrowValue);
 }

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

@@ -29,7 +29,7 @@ interface IDydxBridge {
 
     struct BridgeAction {
         BridgeActionType actionType;            // Action to run on dydx account.
-        uint256 accountId;                      // Index in `BridgeData.accountNumbers` for this action.
+        uint256 accountIdx;                     // 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).
@@ -39,4 +39,4 @@ interface IDydxBridge {
         uint256[] accountNumbers;               // Account number used to identify the owner's specific account.
         BridgeAction[] actions;                 // Actions to carry out on the owner's accounts.
     }
-}
+}

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

@@ -21,16 +21,32 @@ pragma solidity ^0.5.9;
 
 contract IERC20Bridge {
 
-    // @dev Result of a successful bridge call.
+    /// @dev Result of a successful bridge call.
     bytes4 constant internal BRIDGE_SUCCESS = 0xdc1600f3;
 
+    /// @dev Emitted when a trade occurs.
+    /// @param inputToken The token the bridge is converting from.
+    /// @param outputToken The token the bridge is converting to.
+    /// @param inputTokenAmount Amount of input token.
+    /// @param outputTokenAmount Amount of output token.
+    /// @param from The `from` address in `bridgeTransferFrom()`
+    /// @param to The `to` address in `bridgeTransferFrom()`
+    event ERC20BridgeTransfer(
+        address inputToken,
+        address outputToken,
+        uint256 inputTokenAmount,
+        uint256 outputTokenAmount,
+        address from,
+        address to
+    );
+
     /// @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.
+    /// @return success The magic bytes `0xdc1600f3` if successful.
     function bridgeTransferFrom(
         address tokenAddress,
         address from,

contracts/asset-proxy/contracts/src/interfaces/IGasToken.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.15;
+
+import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
+
+
+contract IGasToken is IERC20Token {
+
+    /// @dev Frees up to `value` sub-tokens
+    /// @param value The amount of tokens to free
+    /// @return How many tokens were freed
+    function freeUpTo(uint256 value) external returns (uint256 freed);
+
+    /// @dev Frees up to `value` sub-tokens owned by `from`
+    /// @param from The owner of tokens to spend
+    /// @param value The amount of tokens to free
+    /// @return How many tokens were freed
+    function freeFromUpTo(address from, uint256 value) external returns (uint256 freed);
+
+    /// @dev Mints `value` amount of tokens
+    /// @param value The amount of tokens to mint
+    function mint(uint256 value) external;
+}

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

@@ -42,5 +42,31 @@ interface IKyberNetworkProxy {
     )
         external
         payable
-        returns(uint256 boughtAmount);
+        returns (uint256 boughtAmount);
+
+    /// @dev Sells `sellTokenAddress` tokens for `buyTokenAddress` tokens
+    /// using a hint for the reserve.
+    /// @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
+    /// @param hint The hint for the selective inclusion (or exclusion) of reserves
+    /// @return boughtAmount Amount of tokens bought.
+    function tradeWithHint(
+        address sellTokenAddress,
+        uint256 sellAmount,
+        address buyTokenAddress,
+        address payable recipientAddress,
+        uint256 maxBuyTokenAmount,
+        uint256 minConversionRate,
+        address payable walletId,
+        bytes calldata hint
+    )
+        external
+        payable
+        returns (uint256 boughtAmount);
 }

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

@@ -0,0 +1,32 @@
+/*
+
+  Copyright 2020 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 IMStable {
+
+    function swap(
+        address _input,
+        address _output,
+        uint256 _quantity,
+        address _recipient
+    )
+        external
+        returns (uint256 output);
+}

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

@@ -0,0 +1,40 @@
+/*
+
+  Copyright 2020 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 IMooniswapRegistry {
+
+    function pools(address token1, address token2) external view returns(address);
+}
+
+
+interface IMooniswap {
+
+    function swap(
+        address fromToken,
+        address destToken,
+        uint256 amount,
+        uint256 minReturn,
+        address referral
+    )
+        external
+        payable
+        returns(uint256 returnAmount);
+}

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

@@ -0,0 +1,34 @@
+/*
+
+  Copyright 2020 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 IShell {
+
+    function originSwap(
+        address from,
+        address to,
+        uint256 fromAmount,
+        uint256 minTargetAmount,
+        uint256 deadline
+    )
+        external
+        returns (uint256 toAmount);
+}
+

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

@@ -0,0 +1,40 @@
+/*
+
+  Copyright 2020 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 IUniswapV2Router01 {
+
+    /// @dev Swaps an exact amount of input tokens for as many output tokens as possible, along the route determined by the path.
+    ///      The first element of path is the input token, the last is the output token, and any intermediate elements represent
+    ///      intermediate pairs to trade through (if, for example, a direct pair does not exist).
+    /// @param amountIn The amount of input tokens to send.
+    /// @param amountOutMin The minimum amount of output tokens that must be received for the transaction not to revert.
+    /// @param path An array of token addresses. path.length must be >= 2. Pools for each consecutive pair of addresses must exist and have liquidity.
+    /// @param to Recipient of the output tokens.
+    /// @param deadline Unix timestamp after which the transaction will revert.
+    /// @return amounts The input token amount and all subsequent output token amounts.
+    function swapExactTokensForTokens(
+        uint amountIn,
+        uint amountOutMin,
+        address[] calldata path,
+        address to,
+        uint deadline
+    ) external returns (uint[] memory amounts);
+}

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

@@ -0,0 +1,247 @@
+/*
+
+  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 "@0x/contracts-utils/contracts/src/LibAddressArray.sol";
+import "../src/bridges/BancorBridge.sol";
+import "../src/interfaces/IBancorNetwork.sol";
+
+
+contract TestEventsRaiser {
+
+    event TokenTransfer(
+        address token,
+        address from,
+        address to,
+        uint256 amount
+    );
+
+    event TokenApprove(
+        address spender,
+        uint256 allowance
+    );
+
+    event ConvertByPathInput(
+        uint amountIn,
+        uint amountOutMin,
+        address toTokenAddress,
+        address to,
+        address feeRecipient,
+        uint256 feeAmount
+    );
+
+    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 raiseConvertByPathInput(
+        uint amountIn,
+        uint amountOutMin,
+        address toTokenAddress,
+        address to,
+        address feeRecipient,
+        uint256 feeAmount
+    ) external
+    {
+        emit ConvertByPathInput(
+            amountIn,
+            amountOutMin,
+            toTokenAddress,
+            to,
+            feeRecipient,
+            feeAmount
+        );
+    }
+}
+
+
+/// @dev A minimalist ERC20 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, uint256 balance)
+        external
+        payable
+    {
+        balances[owner] = balance;
+    }
+
+    /// @dev Just emits a TokenTransfer event on the caller
+    function transfer(address to, uint256 amount)
+        external
+        returns (bool)
+    {
+        TestEventsRaiser(msg.sender).raiseTokenTransfer(msg.sender, to, amount);
+        return true;
+    }
+
+    /// @dev Just emits a TokenApprove event on the caller
+    function approve(address spender, uint256 allowance)
+        external
+        returns (bool)
+    {
+        TestEventsRaiser(msg.sender).raiseTokenApprove(spender, allowance);
+        return true;
+    }
+
+    function allowance(address, address) external view returns (uint256) {
+        return 0;
+    }
+
+    /// @dev Retrieve the balance for `owner`.
+    function balanceOf(address owner)
+        external
+        view
+        returns (uint256)
+    {
+        return balances[owner];
+    }
+}
+
+
+/// @dev Mock the BancorNetwork contract
+contract TestBancorNetwork is
+    IBancorNetwork
+{
+    string private _nextRevertReason;
+
+    /// @dev Set the revert reason for `swapExactTokensForTokens`.
+    function setRevertReason(string calldata reason)
+        external
+    {
+        _nextRevertReason = reason;
+    }
+
+    function convertByPath(
+        address[] calldata _path,
+        uint256 _amount,
+        uint256 _minReturn,
+        address _beneficiary,
+        address _affiliateAccount,
+        uint256 _affiliateFee
+    ) external payable returns (uint256)
+    {
+        _revertIfReasonExists();
+
+        TestEventsRaiser(msg.sender).raiseConvertByPathInput(
+            // tokens sold
+            _amount,
+            // tokens bought
+            _minReturn,
+            // output token
+            _path[_path.length - 1],
+            // recipient
+            _beneficiary,
+            // fee recipient
+            _affiliateAccount,
+            // fee amount
+            _affiliateFee
+        );
+    }
+
+    function _revertIfReasonExists()
+        private
+        view
+    {
+        if (bytes(_nextRevertReason).length != 0) {
+            revert(_nextRevertReason);
+        }
+    }
+
+}
+
+
+/// @dev BancorBridge overridden to mock tokens and BancorNetwork
+contract TestBancorBridge is
+    BancorBridge,
+    TestEventsRaiser
+{
+
+    // Token address to TestToken instance.
+    mapping (address => TestToken) private _testTokens;
+    // TestRouter instance.
+    TestBancorNetwork private _testNetwork;
+
+    constructor() public {
+        _testNetwork = new TestBancorNetwork();
+    }
+
+    function setNetworkRevertReason(string calldata revertReason)
+        external
+    {
+        _testNetwork.setRevertReason(revertReason);
+    }
+
+    /// @dev Sets the balance of this contract for an existing token.
+    function setTokenBalance(address tokenAddress, uint256 balance)
+        external
+    {
+        TestToken token = _testTokens[tokenAddress];
+        token.setBalance(address(this), balance);
+    }
+
+    /// @dev Create a new token
+    /// @param tokenAddress The token address. If zero, one will be created.
+    function createToken(
+        address tokenAddress
+    )
+        external
+        returns (TestToken token)
+    {
+        token = TestToken(tokenAddress);
+        if (tokenAddress == address(0)) {
+            token = new TestToken();
+        }
+        _testTokens[address(token)] = token;
+
+        return token;
+    }
+
+    function getNetworkAddress()
+        external
+        view
+        returns (address)
+    {
+        return address(_testNetwork);
+    }
+
+}

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

@@ -0,0 +1,244 @@
+/*
+
+  Copyright 2020 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/DexForwarderBridge.sol";
+import "@0x/contracts-utils/contracts/src/LibSafeMath.sol";
+
+
+interface ITestDexForwarderBridge {
+    event BridgeTransferFromCalled(
+        address caller,
+        uint256 inputTokenBalance,
+        address inputToken,
+        address outputToken,
+        address from,
+        address to,
+        uint256 amount
+    );
+
+    event TokenTransferCalled(
+        address from,
+        address to,
+        uint256 amount
+    );
+
+    function emitBridgeTransferFromCalled(
+        address caller,
+        uint256 inputTokenBalance,
+        address inputToken,
+        address outputToken,
+        address from,
+        address to,
+        uint256 amount
+    ) external;
+
+    function emitTokenTransferCalled(
+        address from,
+        address to,
+        uint256 amount
+    ) external;
+}
+
+
+interface ITestDexForwarderBridgeTestToken {
+
+    function transfer(address to, uint256 amount)
+        external
+        returns (bool);
+
+    function mint(address to, uint256 amount)
+        external;
+
+    function balanceOf(address owner) external view returns (uint256);
+}
+
+
+contract TestDexForwarderBridgeTestBridge {
+
+    bytes4 private _returnCode;
+    string private _revertError;
+    uint256 private _transferAmount;
+    ITestDexForwarderBridge private _testContract;
+
+    constructor(bytes4 returnCode, string memory revertError) public {
+        _testContract = ITestDexForwarderBridge(msg.sender);
+        _returnCode = returnCode;
+        _revertError = revertError;
+    }
+
+    function setTransferAmount(uint256 amount) external {
+        _transferAmount = amount;
+    }
+
+    function bridgeTransferFrom(
+        address outputToken,
+        address from,
+        address to,
+        uint256 amount,
+        bytes memory bridgeData
+    )
+        public
+        returns (bytes4 success)
+    {
+        if (bytes(_revertError).length != 0) {
+            revert(_revertError);
+        }
+        address inputToken = abi.decode(bridgeData, (address));
+        _testContract.emitBridgeTransferFromCalled(
+            msg.sender,
+            ITestDexForwarderBridgeTestToken(inputToken).balanceOf(address(this)),
+            inputToken,
+            outputToken,
+            from,
+            to,
+            amount
+        );
+        ITestDexForwarderBridgeTestToken(outputToken).mint(to, _transferAmount);
+        return _returnCode;
+    }
+}
+
+
+contract TestDexForwarderBridgeTestToken {
+
+    using LibSafeMath for uint256;
+
+    mapping(address => uint256) public balanceOf;
+    ITestDexForwarderBridge private _testContract;
+
+    constructor() public {
+        _testContract = ITestDexForwarderBridge(msg.sender);
+    }
+
+    function transfer(address to, uint256 amount)
+        external
+        returns (bool)
+    {
+        balanceOf[msg.sender] = balanceOf[msg.sender].safeSub(amount);
+        balanceOf[to] = balanceOf[to].safeAdd(amount);
+        _testContract.emitTokenTransferCalled(msg.sender, to, amount);
+        return true;
+    }
+
+    function mint(address owner, uint256 amount)
+        external
+    {
+        balanceOf[owner] = balanceOf[owner].safeAdd(amount);
+    }
+
+    function setBalance(address owner, uint256 amount)
+        external
+    {
+        balanceOf[owner] = amount;
+    }
+}
+
+
+contract TestDexForwarderBridge is
+    ITestDexForwarderBridge,
+    DexForwarderBridge
+{
+    address private AUTHORIZED_ADDRESS; // solhint-disable-line var-name-mixedcase
+
+    function setAuthorized(address authorized)
+        public
+    {
+        AUTHORIZED_ADDRESS = authorized;
+    }
+
+    function createBridge(
+        bytes4 returnCode,
+        string memory revertError
+    )
+        public
+        returns (address bridge)
+    {
+        return address(new TestDexForwarderBridgeTestBridge(returnCode, revertError));
+    }
+
+    function createToken() public returns (address token) {
+        return address(new TestDexForwarderBridgeTestToken());
+    }
+
+    function setTokenBalance(address token, address owner, uint256 amount) public {
+        TestDexForwarderBridgeTestToken(token).setBalance(owner, amount);
+    }
+
+    function setBridgeTransferAmount(address bridge, uint256 amount) public {
+        TestDexForwarderBridgeTestBridge(bridge).setTransferAmount(amount);
+    }
+
+    function emitBridgeTransferFromCalled(
+        address caller,
+        uint256 inputTokenBalance,
+        address inputToken,
+        address outputToken,
+        address from,
+        address to,
+        uint256 amount
+    )
+        public
+    {
+        emit BridgeTransferFromCalled(
+            caller,
+            inputTokenBalance,
+            inputToken,
+            outputToken,
+            from,
+            to,
+            amount
+        );
+    }
+
+    function emitTokenTransferCalled(
+        address from,
+        address to,
+        uint256 amount
+    )
+        public
+    {
+        emit TokenTransferCalled(
+            from,
+            to,
+            amount
+        );
+    }
+
+    function balanceOf(address token, address owner) public view returns (uint256) {
+        return TestDexForwarderBridgeTestToken(token).balanceOf(owner);
+    }
+
+    function _getGstAddress()
+        internal
+        view
+        returns (address gst)
+    {
+        return address(0);
+    }
+
+    function _getERC20BridgeProxyAddress()
+        internal
+        view
+        returns (address erc20BridgeProxyAddress)
+    {
+        return AUTHORIZED_ADDRESS;
+    }
+}

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

@@ -23,6 +23,7 @@ import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
 import "../src/bridges/DydxBridge.sol";
 
 
+// solhint-disable no-empty-blocks
 contract TestDydxBridgeToken {
 
     uint256 private constant INIT_HOLDER_BALANCE = 10 * 10**18; // 10 tokens
@@ -79,7 +80,7 @@ contract TestDydxBridge is
 
     event OperateAction(
         ActionType actionType,
-        uint256 accountId,
+        uint256 accountIdx,
         bool amountSign,
         AssetDenomination amountDenomination,
         AssetReference amountRef,
@@ -120,7 +121,7 @@ contract TestDydxBridge is
         for (uint i = 0; i < actions.length; ++i) {
             emit OperateAction(
                 actions[i].actionType,
-                actions[i].accountId,
+                actions[i].accountIdx,
                 actions[i].amount.sign,
                 actions[i].amount.denomination,
                 actions[i].amount.ref,
@@ -128,7 +129,7 @@ contract TestDydxBridge is
                 actions[i].primaryMarketId,
                 actions[i].secondaryMarketId,
                 actions[i].otherAddress,
-                actions[i].otherAccountId,
+                actions[i].otherAccountIdx,
                 actions[i].data
             );
 
@@ -171,6 +172,60 @@ contract TestDydxBridge is
         return _testTokenAddress;
     }
 
+    /// @dev Unused.
+    function setOperators(OperatorArg[] calldata args) external {}
+
+    /// @dev Unused.
+    function getIsLocalOperator(
+        address owner,
+        address operator
+    )
+        external
+        view
+        returns (bool isLocalOperator)
+    {}
+
+    /// @dev Unused.
+    function getMarketTokenAddress(
+        uint256 marketId
+    )
+        external
+        view
+        returns (address tokenAddress)
+    {}
+
+    /// @dev Unused.
+    function getRiskParams()
+        external
+        view
+        returns (RiskParams memory riskParams)
+    {}
+
+    /// @dev Unsused.
+    function getMarketPrice(
+        uint256 marketId
+    )
+        external
+        view
+        returns (Price memory price)
+    {}
+
+    /// @dev Unsused
+    function getMarketMarginPremium(uint256 marketId)
+        external
+        view
+        returns (IDydx.D256 memory premium)
+    {}
+
+    /// @dev Unused.
+    function getAdjustedAccountValues(
+        AccountInfo calldata account
+    )
+        external
+        view
+        returns (Value memory supplyValue, Value memory borrowValue)
+    {}
+
     /// @dev overrides `_getDydxAddress()` from `DeploymentConstants` to return this address.
     function _getDydxAddress()
         internal
@@ -188,4 +243,4 @@ contract TestDydxBridge is
     {
         return msg.sender == ALWAYS_REVERT_ADDRESS ? address(0) : msg.sender;
     }
-}
+}

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

@@ -110,6 +110,10 @@ contract TestToken {
         return true;
     }
 
+    function allowance(address, address) external view returns (uint256) {
+        return 0;
+    }
+
     /// @dev Retrieve the balance for `owner`.
     function balanceOf(address owner)
         external

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

@@ -110,6 +110,10 @@ contract TestToken {
         return _testContract.wethDeposit.value(msg.value)(msg.sender);
     }
 
+    function allowance(address, address) external view returns (uint256) {
+        return 0;
+    }
+
     function balanceOf(address owner)
         external
         view
@@ -197,6 +201,33 @@ contract TestKyberBridge is
         return _nextFillAmount;
     }
 
+    function tradeWithHint(
+        address sellTokenAddress,
+        uint256 sellAmount,
+        address buyTokenAddress,
+        address payable recipientAddress,
+        uint256 maxBuyTokenAmount,
+        uint256 minConversionRate,
+        address payable walletId,
+        bytes calldata hint
+    )
+        external
+        payable
+        returns (uint256 boughtAmount)
+    {
+        emit KyberBridgeTrade(
+            msg.value,
+            sellTokenAddress,
+            sellAmount,
+            buyTokenAddress,
+            recipientAddress,
+            maxBuyTokenAmount,
+            minConversionRate,
+            walletId
+        );
+        return _nextFillAmount;
+    }
+
     function createToken(uint8 decimals)
         external
         returns (address tokenAddress)

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

@@ -224,6 +224,10 @@ contract TestToken {
         TestEventsRaiser(msg.sender).raiseWethWithdraw(amount);
     }
 
+    function allowance(address, address) external view returns (uint256) {
+        return 0;
+    }
+
     /// @dev Retrieve the balance for `owner`.
     function balanceOf(address owner)
         external

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

@@ -0,0 +1,253 @@
+/*
+
+  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 "@0x/contracts-utils/contracts/src/LibAddressArray.sol";
+import "../src/bridges/UniswapV2Bridge.sol";
+import "../src/interfaces/IUniswapV2Router01.sol";
+
+
+contract TestEventsRaiser {
+
+    event TokenTransfer(
+        address token,
+        address from,
+        address to,
+        uint256 amount
+    );
+
+    event TokenApprove(
+        address spender,
+        uint256 allowance
+    );
+
+    event SwapExactTokensForTokensInput(
+        uint amountIn,
+        uint amountOutMin,
+        address toTokenAddress,
+        address to,
+        uint deadline
+    );
+
+    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 raiseSwapExactTokensForTokensInput(
+        uint amountIn,
+        uint amountOutMin,
+        address toTokenAddress,
+        address to,
+        uint deadline
+    ) external
+    {
+        emit SwapExactTokensForTokensInput(
+            amountIn,
+            amountOutMin,
+            toTokenAddress,
+            to,
+            deadline
+        );
+    }
+}
+
+
+/// @dev A minimalist ERC20 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, uint256 balance)
+        external
+        payable
+    {
+        balances[owner] = balance;
+    }
+
+    /// @dev Just emits a TokenTransfer event on the caller
+    function transfer(address to, uint256 amount)
+        external
+        returns (bool)
+    {
+        TestEventsRaiser(msg.sender).raiseTokenTransfer(msg.sender, to, amount);
+        return true;
+    }
+
+    /// @dev Just emits a TokenApprove event on the caller
+    function approve(address spender, uint256 allowance)
+        external
+        returns (bool)
+    {
+        TestEventsRaiser(msg.sender).raiseTokenApprove(spender, allowance);
+        return true;
+    }
+
+    function allowance(address, address) external view returns (uint256) {
+        return 0;
+    }
+
+    /// @dev Retrieve the balance for `owner`.
+    function balanceOf(address owner)
+        external
+        view
+        returns (uint256)
+    {
+        return balances[owner];
+    }
+}
+
+
+/// @dev Mock the UniswapV2Router01 contract
+contract TestRouter is
+    IUniswapV2Router01
+{
+    string private _nextRevertReason;
+
+    /// @dev Set the revert reason for `swapExactTokensForTokens`.
+    function setRevertReason(string calldata reason)
+        external
+    {
+        _nextRevertReason = reason;
+    }
+
+    function swapExactTokensForTokens(
+        uint amountIn,
+        uint amountOutMin,
+        address[] calldata path,
+        address to,
+        uint deadline
+    ) external returns (uint[] memory amounts)
+    {
+        _revertIfReasonExists();
+
+        amounts = new uint[](path.length);
+        amounts[0] = amountIn;
+        amounts[amounts.length - 1] = amountOutMin;
+
+        TestEventsRaiser(msg.sender).raiseSwapExactTokensForTokensInput(
+            // tokens sold
+            amountIn,
+            // tokens bought
+            amountOutMin,
+            // output token (toTokenAddress)
+            path[path.length - 1],
+            // recipient
+            to,
+            // deadline
+            deadline
+        );
+    }
+
+    function _revertIfReasonExists()
+        private
+        view
+    {
+        if (bytes(_nextRevertReason).length != 0) {
+            revert(_nextRevertReason);
+        }
+    }
+
+}
+
+
+/// @dev UniswapV2Bridge overridden to mock tokens and Uniswap router
+contract TestUniswapV2Bridge is
+    UniswapV2Bridge,
+    TestEventsRaiser
+{
+
+    // Token address to TestToken instance.
+    mapping (address => TestToken) private _testTokens;
+    // TestRouter instance.
+    TestRouter private _testRouter;
+
+    constructor() public {
+        _testRouter = new TestRouter();
+    }
+
+    function setRouterRevertReason(string calldata revertReason)
+        external
+    {
+        _testRouter.setRevertReason(revertReason);
+    }
+
+    /// @dev Sets the balance of this contract for an existing token.
+    ///      The wei attached will be the balance.
+    function setTokenBalance(address tokenAddress, uint256 balance)
+        external
+    {
+        TestToken token = _testTokens[tokenAddress];
+        token.setBalance(address(this), balance);
+    }
+
+    /// @dev Create a new token
+    /// @param tokenAddress The token address. If zero, one will be created.
+    function createToken(
+        address tokenAddress
+    )
+        external
+        returns (TestToken token)
+    {
+        token = TestToken(tokenAddress);
+        if (tokenAddress == address(0)) {
+            token = new TestToken();
+        }
+        _testTokens[address(token)] = token;
+
+        return token;
+    }
+
+    function getRouterAddress()
+        external
+        view
+        returns (address)
+    {
+        return address(_testRouter);
+    }
+
+    function _getUniswapV2Router01Address()
+        internal
+        view
+        returns (address)
+    {
+        return address(_testRouter);
+    }
+}

contracts/asset-proxy/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-asset-proxy",
-    "version": "3.2.0",
+    "version": "3.5.0",
     "engines": {
         "node": ">=6.12"
     },
@@ -38,30 +38,31 @@
         "docs:json": "typedoc --excludePrivate --excludeExternals --excludeProtected --ignoreCompilerErrors --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES"
     },
     "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": "./test/generated-artifacts/@(BalancerBridge|BancorBridge|ChaiBridge|CreamBridge|CurveBridge|DODOBridge|DexForwarderBridge|DydxBridge|ERC1155Proxy|ERC20BridgeProxy|ERC20Proxy|ERC721Proxy|Eth2DaiBridge|IAssetData|IAssetProxy|IAssetProxyDispatcher|IAuthorizable|IBalancerPool|IBancorNetwork|IChai|ICurve|IDydx|IDydxBridge|IERC20Bridge|IEth2Dai|IGasToken|IKyberNetworkProxy|IMStable|IMooniswap|IShell|IUniswapExchange|IUniswapExchangeFactory|IUniswapV2Router01|KyberBridge|MStableBridge|MixinAssetProxyDispatcher|MixinAuthorizable|MixinGasToken|MooniswapBridge|MultiAssetProxy|Ownable|ShellBridge|StaticCallProxy|SushiSwapBridge|TestBancorBridge|TestChaiBridge|TestDexForwarderBridge|TestDydxBridge|TestERC20Bridge|TestEth2DaiBridge|TestKyberBridge|TestStaticCallTarget|TestUniswapBridge|TestUniswapV2Bridge|UniswapBridge|UniswapV2Bridge).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {
         "type": "git",
-        "url": "https://github.com/0xProject/0x-monorepo.git"
+        "url": "https://github.com/0xProject/protocol.git"
     },
     "license": "Apache-2.0",
     "bugs": {
-        "url": "https://github.com/0xProject/0x-monorepo/issues"
+        "url": "https://github.com/0xProject/protocol/issues"
     },
-    "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
+    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/protocol",
     "devDependencies": {
-        "@0x/abi-gen": "^5.2.0",
-        "@0x/contracts-gen": "^2.0.7",
-        "@0x/contracts-test-utils": "^5.1.4",
-        "@0x/contracts-utils": "^4.3.0",
-        "@0x/dev-utils": "^3.2.0",
-        "@0x/sol-compiler": "^4.0.7",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.0.0",
+        "@0x/abi-gen": "^5.4.3",
+        "@0x/contract-wrappers": "^13.9.0",
+        "@0x/contracts-gen": "2.0.13",
+        "@0x/contracts-test-utils": "^5.3.5",
+        "@0x/contracts-utils": "^4.5.2",
+        "@0x/dev-utils": "^3.3.4",
+        "@0x/sol-compiler": "^4.2.3",
+        "@0x/ts-doc-gen": "^0.0.28",
+        "@0x/tslint-config": "^4.1.3",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
-        "@types/node": "*",
+        "@types/node": "12.12.54",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
@@ -74,24 +75,25 @@
         "solhint": "^1.4.1",
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
-        "typedoc": "^0.15.0",
+        "typedoc": "~0.16.11",
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.2.0",
-        "@0x/contracts-erc1155": "^2.1.0",
-        "@0x/contracts-erc20": "^3.1.0",
-        "@0x/contracts-erc721": "^3.1.0",
-        "@0x/contracts-exchange-libs": "^4.3.0",
-        "@0x/order-utils": "^10.2.0",
-        "@0x/types": "^3.1.2",
-        "@0x/typescript-typings": "^5.0.2",
-        "@0x/utils": "^5.4.0",
-        "@0x/web3-wrapper": "^7.0.6",
-        "ethereum-types": "^3.1.0",
+        "@0x/base-contract": "^6.2.7",
+        "@0x/contracts-erc1155": "^2.1.8",
+        "@0x/contracts-erc20": "^3.2.2",
+        "@0x/contracts-erc721": "^3.1.8",
+        "@0x/contracts-exchange-libs": "^4.3.8",
+        "@0x/order-utils": "^10.4.0",
+        "@0x/types": "^3.2.4",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^5.6.3",
+        "@0x/web3-wrapper": "^7.2.4",
+        "ethereum-types": "^3.3.3",
         "lodash": "^4.17.11"
     },
     "publishConfig": {
         "access": "public"
-    }
+    },
+    "gitHead": "4f91bfd907996b2f4dd383778b50c479c2602b56"
 }

contracts/asset-proxy/src/artifacts.ts

@@ -5,7 +5,13 @@
  */
 import { ContractArtifact } from 'ethereum-types';
 
+import * as BalancerBridge from '../generated-artifacts/BalancerBridge.json';
+import * as BancorBridge from '../generated-artifacts/BancorBridge.json';
 import * as ChaiBridge from '../generated-artifacts/ChaiBridge.json';
+import * as CreamBridge from '../generated-artifacts/CreamBridge.json';
+import * as CurveBridge from '../generated-artifacts/CurveBridge.json';
+import * as DexForwarderBridge from '../generated-artifacts/DexForwarderBridge.json';
+import * as DODOBridge from '../generated-artifacts/DODOBridge.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';
@@ -16,28 +22,45 @@ 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 IBalancerPool from '../generated-artifacts/IBalancerPool.json';
+import * as IBancorNetwork from '../generated-artifacts/IBancorNetwork.json';
 import * as IChai from '../generated-artifacts/IChai.json';
+import * as ICurve from '../generated-artifacts/ICurve.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 IGasToken from '../generated-artifacts/IGasToken.json';
 import * as IKyberNetworkProxy from '../generated-artifacts/IKyberNetworkProxy.json';
+import * as IMooniswap from '../generated-artifacts/IMooniswap.json';
+import * as IMStable from '../generated-artifacts/IMStable.json';
+import * as IShell from '../generated-artifacts/IShell.json';
 import * as IUniswapExchange from '../generated-artifacts/IUniswapExchange.json';
 import * as IUniswapExchangeFactory from '../generated-artifacts/IUniswapExchangeFactory.json';
+import * as IUniswapV2Router01 from '../generated-artifacts/IUniswapV2Router01.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 MixinGasToken from '../generated-artifacts/MixinGasToken.json';
+import * as MooniswapBridge from '../generated-artifacts/MooniswapBridge.json';
+import * as MStableBridge from '../generated-artifacts/MStableBridge.json';
 import * as MultiAssetProxy from '../generated-artifacts/MultiAssetProxy.json';
 import * as Ownable from '../generated-artifacts/Ownable.json';
+import * as ShellBridge from '../generated-artifacts/ShellBridge.json';
 import * as StaticCallProxy from '../generated-artifacts/StaticCallProxy.json';
+import * as SushiSwapBridge from '../generated-artifacts/SushiSwapBridge.json';
+import * as TestBancorBridge from '../generated-artifacts/TestBancorBridge.json';
 import * as TestChaiBridge from '../generated-artifacts/TestChaiBridge.json';
+import * as TestDexForwarderBridge from '../generated-artifacts/TestDexForwarderBridge.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 TestUniswapV2Bridge from '../generated-artifacts/TestUniswapV2Bridge.json';
 import * as UniswapBridge from '../generated-artifacts/UniswapBridge.json';
+import * as UniswapV2Bridge from '../generated-artifacts/UniswapV2Bridge.json';
 export const artifacts = {
     MixinAssetProxyDispatcher: MixinAssetProxyDispatcher as ContractArtifact,
     MixinAuthorizable: MixinAuthorizable as ContractArtifact,
@@ -48,28 +71,51 @@ export const artifacts = {
     ERC721Proxy: ERC721Proxy as ContractArtifact,
     MultiAssetProxy: MultiAssetProxy as ContractArtifact,
     StaticCallProxy: StaticCallProxy as ContractArtifact,
+    BalancerBridge: BalancerBridge as ContractArtifact,
+    BancorBridge: BancorBridge as ContractArtifact,
     ChaiBridge: ChaiBridge as ContractArtifact,
+    CreamBridge: CreamBridge as ContractArtifact,
+    CurveBridge: CurveBridge as ContractArtifact,
+    DODOBridge: DODOBridge as ContractArtifact,
+    DexForwarderBridge: DexForwarderBridge as ContractArtifact,
     DydxBridge: DydxBridge as ContractArtifact,
     Eth2DaiBridge: Eth2DaiBridge as ContractArtifact,
     KyberBridge: KyberBridge as ContractArtifact,
+    MStableBridge: MStableBridge as ContractArtifact,
+    MixinGasToken: MixinGasToken as ContractArtifact,
+    MooniswapBridge: MooniswapBridge as ContractArtifact,
+    ShellBridge: ShellBridge as ContractArtifact,
+    SushiSwapBridge: SushiSwapBridge as ContractArtifact,
     UniswapBridge: UniswapBridge as ContractArtifact,
+    UniswapV2Bridge: UniswapV2Bridge as ContractArtifact,
     IAssetData: IAssetData as ContractArtifact,
     IAssetProxy: IAssetProxy as ContractArtifact,
     IAssetProxyDispatcher: IAssetProxyDispatcher as ContractArtifact,
     IAuthorizable: IAuthorizable as ContractArtifact,
+    IBalancerPool: IBalancerPool as ContractArtifact,
+    IBancorNetwork: IBancorNetwork as ContractArtifact,
     IChai: IChai as ContractArtifact,
+    ICurve: ICurve as ContractArtifact,
     IDydx: IDydx as ContractArtifact,
     IDydxBridge: IDydxBridge as ContractArtifact,
     IERC20Bridge: IERC20Bridge as ContractArtifact,
     IEth2Dai: IEth2Dai as ContractArtifact,
+    IGasToken: IGasToken as ContractArtifact,
     IKyberNetworkProxy: IKyberNetworkProxy as ContractArtifact,
+    IMStable: IMStable as ContractArtifact,
+    IMooniswap: IMooniswap as ContractArtifact,
+    IShell: IShell as ContractArtifact,
     IUniswapExchange: IUniswapExchange as ContractArtifact,
     IUniswapExchangeFactory: IUniswapExchangeFactory as ContractArtifact,
+    IUniswapV2Router01: IUniswapV2Router01 as ContractArtifact,
+    TestBancorBridge: TestBancorBridge as ContractArtifact,
     TestChaiBridge: TestChaiBridge as ContractArtifact,
+    TestDexForwarderBridge: TestDexForwarderBridge 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,
+    TestUniswapV2Bridge: TestUniswapV2Bridge as ContractArtifact,
 };

contracts/asset-proxy/src/dex_forwarder_bridge.ts

@@ -0,0 +1,27 @@
+import { AbiEncoder, BigNumber } from '@0x/utils';
+
+export interface DexForwarderBridgeCall {
+    target: string;
+    inputTokenAmount: BigNumber;
+    outputTokenAmount: BigNumber;
+    bridgeData: string;
+}
+
+export interface DexForwaderBridgeData {
+    inputToken: string;
+    calls: DexForwarderBridgeCall[];
+}
+
+export const dexForwarderBridgeDataEncoder = AbiEncoder.create([
+    { name: 'inputToken', type: 'address' },
+    {
+        name: 'calls',
+        type: 'tuple[]',
+        components: [
+            { name: 'target', type: 'address' },
+            { name: 'inputTokenAmount', type: 'uint256' },
+            { name: 'outputTokenAmount', type: 'uint256' },
+            { name: 'bridgeData', type: 'bytes' },
+        ],
+    },
+]);

contracts/asset-proxy/src/dydx_bridge_encoder.ts

@@ -7,7 +7,7 @@ export enum DydxBridgeActionType {
 
 export interface DydxBridgeAction {
     actionType: DydxBridgeActionType;
-    accountId: BigNumber;
+    accountIdx: BigNumber;
     marketId: BigNumber;
     conversionRateNumerator: BigNumber;
     conversionRateDenominator: BigNumber;
@@ -29,7 +29,7 @@ export const dydxBridgeDataEncoder = AbiEncoder.create([
                 type: 'tuple[]',
                 components: [
                     { name: 'actionType', type: 'uint8' },
-                    { name: 'accountId', type: 'uint256' },
+                    { name: 'accountIdx', type: 'uint256' },
                     { name: 'marketId', type: 'uint256' },
                     { name: 'conversionRateNumerator', type: 'uint256' },
                     { name: 'conversionRateDenominator', type: 'uint256' },

contracts/asset-proxy/src/index.ts

@@ -1,21 +1,24 @@
 export { artifacts } from './artifacts';
 export {
+    BalancerBridgeContract,
+    ChaiBridgeContract,
     ERC1155ProxyContract,
     ERC20BridgeProxyContract,
     ERC20ProxyContract,
     ERC721ProxyContract,
     Eth2DaiBridgeContract,
     DydxBridgeContract,
-    TestDydxBridgeContract,
     IAssetDataContract,
     IAssetProxyContract,
+    IChaiContract,
+    IDydxContract,
+    KyberBridgeContract,
     MultiAssetProxyContract,
     StaticCallProxyContract,
+    TestDydxBridgeContract,
     TestStaticCallTargetContract,
     UniswapBridgeContract,
-    KyberBridgeContract,
-    ChaiBridgeContract,
-    IChaiContract,
+    DexForwarderBridgeContract,
 } from './wrappers';
 
 export { ERC20Wrapper } from './erc20_wrapper';
@@ -87,3 +90,4 @@ export {
 } from './asset_data';
 
 export * from './dydx_bridge_encoder';
+export * from './dex_forwarder_bridge';

contracts/asset-proxy/src/wrappers.ts

@@ -3,7 +3,13 @@
  * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
  * -----------------------------------------------------------------------------
  */
+export * from '../generated-wrappers/balancer_bridge';
+export * from '../generated-wrappers/bancor_bridge';
 export * from '../generated-wrappers/chai_bridge';
+export * from '../generated-wrappers/cream_bridge';
+export * from '../generated-wrappers/curve_bridge';
+export * from '../generated-wrappers/d_o_d_o_bridge';
+export * from '../generated-wrappers/dex_forwarder_bridge';
 export * from '../generated-wrappers/dydx_bridge';
 export * from '../generated-wrappers/erc1155_proxy';
 export * from '../generated-wrappers/erc20_bridge_proxy';
@@ -14,25 +20,42 @@ 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_balancer_pool';
+export * from '../generated-wrappers/i_bancor_network';
 export * from '../generated-wrappers/i_chai';
+export * from '../generated-wrappers/i_curve';
 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_gas_token';
 export * from '../generated-wrappers/i_kyber_network_proxy';
+export * from '../generated-wrappers/i_m_stable';
+export * from '../generated-wrappers/i_mooniswap';
+export * from '../generated-wrappers/i_shell';
 export * from '../generated-wrappers/i_uniswap_exchange';
 export * from '../generated-wrappers/i_uniswap_exchange_factory';
+export * from '../generated-wrappers/i_uniswap_v2_router01';
 export * from '../generated-wrappers/kyber_bridge';
+export * from '../generated-wrappers/m_stable_bridge';
 export * from '../generated-wrappers/mixin_asset_proxy_dispatcher';
 export * from '../generated-wrappers/mixin_authorizable';
+export * from '../generated-wrappers/mixin_gas_token';
+export * from '../generated-wrappers/mooniswap_bridge';
 export * from '../generated-wrappers/multi_asset_proxy';
 export * from '../generated-wrappers/ownable';
+export * from '../generated-wrappers/shell_bridge';
 export * from '../generated-wrappers/static_call_proxy';
+export * from '../generated-wrappers/sushi_swap_bridge';
+export * from '../generated-wrappers/test_bancor_bridge';
 export * from '../generated-wrappers/test_chai_bridge';
+export * from '../generated-wrappers/test_dex_forwarder_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/test_uniswap_v2_bridge';
 export * from '../generated-wrappers/uniswap_bridge';
+export * from '../generated-wrappers/uniswap_v2_bridge';

contracts/asset-proxy/test/artifacts.ts

@@ -5,7 +5,13 @@
  */
 import { ContractArtifact } from 'ethereum-types';
 
+import * as BalancerBridge from '../test/generated-artifacts/BalancerBridge.json';
+import * as BancorBridge from '../test/generated-artifacts/BancorBridge.json';
 import * as ChaiBridge from '../test/generated-artifacts/ChaiBridge.json';
+import * as CreamBridge from '../test/generated-artifacts/CreamBridge.json';
+import * as CurveBridge from '../test/generated-artifacts/CurveBridge.json';
+import * as DexForwarderBridge from '../test/generated-artifacts/DexForwarderBridge.json';
+import * as DODOBridge from '../test/generated-artifacts/DODOBridge.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';
@@ -16,28 +22,45 @@ 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 IBalancerPool from '../test/generated-artifacts/IBalancerPool.json';
+import * as IBancorNetwork from '../test/generated-artifacts/IBancorNetwork.json';
 import * as IChai from '../test/generated-artifacts/IChai.json';
+import * as ICurve from '../test/generated-artifacts/ICurve.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 IGasToken from '../test/generated-artifacts/IGasToken.json';
 import * as IKyberNetworkProxy from '../test/generated-artifacts/IKyberNetworkProxy.json';
+import * as IMooniswap from '../test/generated-artifacts/IMooniswap.json';
+import * as IMStable from '../test/generated-artifacts/IMStable.json';
+import * as IShell from '../test/generated-artifacts/IShell.json';
 import * as IUniswapExchange from '../test/generated-artifacts/IUniswapExchange.json';
 import * as IUniswapExchangeFactory from '../test/generated-artifacts/IUniswapExchangeFactory.json';
+import * as IUniswapV2Router01 from '../test/generated-artifacts/IUniswapV2Router01.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 MixinGasToken from '../test/generated-artifacts/MixinGasToken.json';
+import * as MooniswapBridge from '../test/generated-artifacts/MooniswapBridge.json';
+import * as MStableBridge from '../test/generated-artifacts/MStableBridge.json';
 import * as MultiAssetProxy from '../test/generated-artifacts/MultiAssetProxy.json';
 import * as Ownable from '../test/generated-artifacts/Ownable.json';
+import * as ShellBridge from '../test/generated-artifacts/ShellBridge.json';
 import * as StaticCallProxy from '../test/generated-artifacts/StaticCallProxy.json';
+import * as SushiSwapBridge from '../test/generated-artifacts/SushiSwapBridge.json';
+import * as TestBancorBridge from '../test/generated-artifacts/TestBancorBridge.json';
 import * as TestChaiBridge from '../test/generated-artifacts/TestChaiBridge.json';
+import * as TestDexForwarderBridge from '../test/generated-artifacts/TestDexForwarderBridge.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 TestUniswapV2Bridge from '../test/generated-artifacts/TestUniswapV2Bridge.json';
 import * as UniswapBridge from '../test/generated-artifacts/UniswapBridge.json';
+import * as UniswapV2Bridge from '../test/generated-artifacts/UniswapV2Bridge.json';
 export const artifacts = {
     MixinAssetProxyDispatcher: MixinAssetProxyDispatcher as ContractArtifact,
     MixinAuthorizable: MixinAuthorizable as ContractArtifact,
@@ -48,28 +71,51 @@ export const artifacts = {
     ERC721Proxy: ERC721Proxy as ContractArtifact,
     MultiAssetProxy: MultiAssetProxy as ContractArtifact,
     StaticCallProxy: StaticCallProxy as ContractArtifact,
+    BalancerBridge: BalancerBridge as ContractArtifact,
+    BancorBridge: BancorBridge as ContractArtifact,
     ChaiBridge: ChaiBridge as ContractArtifact,
+    CreamBridge: CreamBridge as ContractArtifact,
+    CurveBridge: CurveBridge as ContractArtifact,
+    DODOBridge: DODOBridge as ContractArtifact,
+    DexForwarderBridge: DexForwarderBridge as ContractArtifact,
     DydxBridge: DydxBridge as ContractArtifact,
     Eth2DaiBridge: Eth2DaiBridge as ContractArtifact,
     KyberBridge: KyberBridge as ContractArtifact,
+    MStableBridge: MStableBridge as ContractArtifact,
+    MixinGasToken: MixinGasToken as ContractArtifact,
+    MooniswapBridge: MooniswapBridge as ContractArtifact,
+    ShellBridge: ShellBridge as ContractArtifact,
+    SushiSwapBridge: SushiSwapBridge as ContractArtifact,
     UniswapBridge: UniswapBridge as ContractArtifact,
+    UniswapV2Bridge: UniswapV2Bridge as ContractArtifact,
     IAssetData: IAssetData as ContractArtifact,
     IAssetProxy: IAssetProxy as ContractArtifact,
     IAssetProxyDispatcher: IAssetProxyDispatcher as ContractArtifact,
     IAuthorizable: IAuthorizable as ContractArtifact,
+    IBalancerPool: IBalancerPool as ContractArtifact,
+    IBancorNetwork: IBancorNetwork as ContractArtifact,
     IChai: IChai as ContractArtifact,
+    ICurve: ICurve as ContractArtifact,
     IDydx: IDydx as ContractArtifact,
     IDydxBridge: IDydxBridge as ContractArtifact,
     IERC20Bridge: IERC20Bridge as ContractArtifact,
     IEth2Dai: IEth2Dai as ContractArtifact,
+    IGasToken: IGasToken as ContractArtifact,
     IKyberNetworkProxy: IKyberNetworkProxy as ContractArtifact,
+    IMStable: IMStable as ContractArtifact,
+    IMooniswap: IMooniswap as ContractArtifact,
+    IShell: IShell as ContractArtifact,
     IUniswapExchange: IUniswapExchange as ContractArtifact,
     IUniswapExchangeFactory: IUniswapExchangeFactory as ContractArtifact,
+    IUniswapV2Router01: IUniswapV2Router01 as ContractArtifact,
+    TestBancorBridge: TestBancorBridge as ContractArtifact,
     TestChaiBridge: TestChaiBridge as ContractArtifact,
+    TestDexForwarderBridge: TestDexForwarderBridge 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,
+    TestUniswapV2Bridge: TestUniswapV2Bridge as ContractArtifact,
 };

contracts/asset-proxy/test/bancor_bridge.ts

@@ -0,0 +1,205 @@
+import {
+    blockchainTests,
+    constants,
+    expect,
+    filterLogsToArguments,
+    getRandomInteger,
+    randomAddress,
+} from '@0x/contracts-test-utils';
+import { AssetProxyId } from '@0x/types';
+import { AbiEncoder, BigNumber, hexUtils } from '@0x/utils';
+import { DecodedLogs } from 'ethereum-types';
+import * as _ from 'lodash';
+
+import { artifacts } from './artifacts';
+
+import { TestBancorBridgeContract } from './generated-wrappers/test_bancor_bridge';
+import {
+    TestBancorBridgeConvertByPathInputEventArgs as ConvertByPathArgs,
+    TestBancorBridgeEvents as ContractEvents,
+    TestBancorBridgeTokenApproveEventArgs as TokenApproveArgs,
+    TestBancorBridgeTokenTransferEventArgs as TokenTransferArgs,
+} from './wrappers';
+
+blockchainTests.resets('Bancor unit tests', env => {
+    const FROM_TOKEN_DECIMALS = 6;
+    const TO_TOKEN_DECIMALS = 18;
+    const FROM_TOKEN_BASE = new BigNumber(10).pow(FROM_TOKEN_DECIMALS);
+    const TO_TOKEN_BASE = new BigNumber(10).pow(TO_TOKEN_DECIMALS);
+    let testContract: TestBancorBridgeContract;
+
+    before(async () => {
+        testContract = await TestBancorBridgeContract.deployFrom0xArtifactAsync(
+            artifacts.TestBancorBridge,
+            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 TransferFromOpts {
+            tokenAddressesPath: string[];
+            toAddress: string;
+            // Amount to pass into `bridgeTransferFrom()`
+            amount: BigNumber;
+            // Token balance of the bridge.
+            fromTokenBalance: BigNumber;
+            // Router reverts with this reason
+            routerRevertReason: string;
+        }
+
+        interface TransferFromResult {
+            opts: TransferFromOpts;
+            result: string;
+            logs: DecodedLogs;
+            blocktime: number;
+        }
+
+        function createTransferFromOpts(opts?: Partial<TransferFromOpts>): TransferFromOpts {
+            const amount = getRandomInteger(1, TO_TOKEN_BASE.times(100));
+            return {
+                tokenAddressesPath: Array(3).fill(constants.NULL_ADDRESS),
+                amount,
+                toAddress: randomAddress(),
+                fromTokenBalance: getRandomInteger(1, FROM_TOKEN_BASE.times(100)),
+                routerRevertReason: '',
+                ...opts,
+            };
+        }
+
+        const bridgeDataEncoder = AbiEncoder.create('(address[], address)');
+
+        async function transferFromAsync(opts?: Partial<TransferFromOpts>): Promise<TransferFromResult> {
+            const _opts = createTransferFromOpts(opts);
+
+            for (let i = 0; i < _opts.tokenAddressesPath.length; i++) {
+                const createFromTokenFn = testContract.createToken(_opts.tokenAddressesPath[i]);
+                _opts.tokenAddressesPath[i] = await createFromTokenFn.callAsync();
+                await createFromTokenFn.awaitTransactionSuccessAsync();
+            }
+
+            // Set the token balance for the token we're converting from.
+            await testContract
+                .setTokenBalance(_opts.tokenAddressesPath[0], _opts.fromTokenBalance)
+                .awaitTransactionSuccessAsync();
+
+            // Set revert reason for the router.
+            await testContract.setNetworkRevertReason(_opts.routerRevertReason).awaitTransactionSuccessAsync();
+
+            // Call bridgeTransferFrom().
+            const bridgeTransferFromFn = testContract.bridgeTransferFrom(
+                // Output token
+                _opts.tokenAddressesPath[_opts.tokenAddressesPath.length - 1],
+                // Random maker address.
+                randomAddress(),
+                // Recipient address.
+                _opts.toAddress,
+                // Transfer amount.
+                _opts.amount,
+                // ABI-encode the input token address as the bridge data.
+                bridgeDataEncoder.encode([
+                    _opts.tokenAddressesPath,
+                    await testContract.getNetworkAddress().callAsync(),
+                ]),
+            );
+            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),
+            };
+        }
+
+        it('returns magic bytes on success', async () => {
+            const { result } = await transferFromAsync();
+            expect(result).to.eq(AssetProxyId.ERC20Bridge);
+        });
+
+        it('performs transfer when both tokens are the same', async () => {
+            const createTokenFn = testContract.createToken(constants.NULL_ADDRESS);
+            const tokenAddress = await createTokenFn.callAsync();
+            await createTokenFn.awaitTransactionSuccessAsync();
+
+            const { opts, result, logs } = await transferFromAsync({
+                tokenAddressesPath: [tokenAddress, tokenAddress],
+            });
+            expect(result).to.eq(AssetProxyId.ERC20Bridge, 'asset proxy id');
+            const transfers = filterLogsToArguments<TokenTransferArgs>(logs, ContractEvents.TokenTransfer);
+
+            expect(transfers.length).to.eq(1);
+            expect(transfers[0].token).to.eq(tokenAddress, 'input token address');
+            expect(transfers[0].from).to.eq(testContract.address);
+            expect(transfers[0].to).to.eq(opts.toAddress, 'recipient address');
+            expect(transfers[0].amount).to.bignumber.eq(opts.amount, 'amount');
+        });
+
+        describe('token -> token', async () => {
+            it('calls BancorNetwork.convertByPath()', async () => {
+                const { opts, result, logs } = await transferFromAsync();
+                expect(result).to.eq(AssetProxyId.ERC20Bridge, 'asset proxy id');
+                const transfers = filterLogsToArguments<ConvertByPathArgs>(logs, ContractEvents.ConvertByPathInput);
+
+                expect(transfers.length).to.eq(1);
+                expect(transfers[0].toTokenAddress).to.eq(
+                    opts.tokenAddressesPath[opts.tokenAddressesPath.length - 1],
+                    'output token address',
+                );
+                expect(transfers[0].to).to.eq(opts.toAddress, 'recipient address');
+                expect(transfers[0].amountIn).to.bignumber.eq(opts.fromTokenBalance, 'input token amount');
+                expect(transfers[0].amountOutMin).to.bignumber.eq(opts.amount, 'output token amount');
+                expect(transfers[0].feeRecipient).to.eq(constants.NULL_ADDRESS);
+                expect(transfers[0].feeAmount).to.bignumber.eq(new BigNumber(0));
+            });
+
+            it('sets allowance for "from" token', async () => {
+                const { logs } = await transferFromAsync();
+                const approvals = filterLogsToArguments<TokenApproveArgs>(logs, ContractEvents.TokenApprove);
+                const networkAddress = await testContract.getNetworkAddress().callAsync();
+                expect(approvals.length).to.eq(1);
+                expect(approvals[0].spender).to.eq(networkAddress);
+                expect(approvals[0].allowance).to.bignumber.eq(constants.MAX_UINT256);
+            });
+
+            it('fails if the router fails', async () => {
+                const revertReason = 'FOOBAR';
+                const tx = transferFromAsync({
+                    routerRevertReason: revertReason,
+                });
+                return expect(tx).to.eventually.be.rejectedWith(revertReason);
+            });
+        });
+        describe('token -> token -> token', async () => {
+            it('calls BancorNetwork.convertByPath()', async () => {
+                const { opts, result, logs } = await transferFromAsync({
+                    tokenAddressesPath: Array(5).fill(constants.NULL_ADDRESS),
+                });
+                expect(result).to.eq(AssetProxyId.ERC20Bridge, 'asset proxy id');
+                const transfers = filterLogsToArguments<ConvertByPathArgs>(logs, ContractEvents.ConvertByPathInput);
+
+                expect(transfers.length).to.eq(1);
+                expect(transfers[0].toTokenAddress).to.eq(
+                    opts.tokenAddressesPath[opts.tokenAddressesPath.length - 1],
+                    'output token address',
+                );
+                expect(transfers[0].to).to.eq(opts.toAddress, 'recipient address');
+                expect(transfers[0].amountIn).to.bignumber.eq(opts.fromTokenBalance, 'input token amount');
+                expect(transfers[0].amountOutMin).to.bignumber.eq(opts.amount, 'output token amount');
+                expect(transfers[0].feeRecipient).to.eq(constants.NULL_ADDRESS);
+                expect(transfers[0].feeAmount).to.bignumber.eq(new BigNumber(0));
+            });
+        });
+    });
+});

contracts/asset-proxy/test/dex_forwarder_bridge.ts

@@ -0,0 +1,354 @@
+import { ContractTxFunctionObj } from '@0x/contract-wrappers';
+import {
+    blockchainTests,
+    constants,
+    expect,
+    filterLogsToArguments,
+    getRandomInteger,
+    randomAddress,
+    shortZip,
+} from '@0x/contracts-test-utils';
+import { BigNumber, hexUtils, NULL_ADDRESS } from '@0x/utils';
+import { DecodedLogs } from 'ethereum-types';
+import * as _ from 'lodash';
+
+import { DexForwarderBridgeCall, dexForwarderBridgeDataEncoder } from '../src/dex_forwarder_bridge';
+
+import { artifacts } from './artifacts';
+import {
+    TestDexForwarderBridgeBridgeTransferFromCalledEventArgs as BtfCalledEventArgs,
+    TestDexForwarderBridgeContract,
+    TestDexForwarderBridgeEvents as TestEvents,
+} from './wrappers';
+
+const { ZERO_AMOUNT } = constants;
+
+blockchainTests.resets('DexForwarderBridge unit tests', env => {
+    let testContract: TestDexForwarderBridgeContract;
+    let inputToken: string;
+    let outputToken: string;
+    const BRIDGE_SUCCESS = '0xdc1600f3';
+    const BRIDGE_FAILURE = '0xffffffff';
+    const BRIDGE_REVERT_ERROR = 'oopsie';
+    const NOT_AUTHORIZED_REVERT = 'DexForwarderBridge/SENDER_NOT_AUTHORIZED';
+    const DEFAULTS = {
+        toAddress: randomAddress(),
+    };
+
+    before(async () => {
+        testContract = await TestDexForwarderBridgeContract.deployFrom0xArtifactAsync(
+            artifacts.TestDexForwarderBridge,
+            env.provider,
+            env.txDefaults,
+            artifacts,
+        );
+        // Create test tokens.
+        [inputToken, outputToken] = [
+            await callAndTransactAsync(testContract.createToken()),
+            await callAndTransactAsync(testContract.createToken()),
+        ];
+        await callAndTransactAsync(testContract.setAuthorized(env.txDefaults.from as string));
+    });
+
+    async function callAndTransactAsync<TResult>(fnCall: ContractTxFunctionObj<TResult>): Promise<TResult> {
+        const result = await fnCall.callAsync();
+        await fnCall.awaitTransactionSuccessAsync({}, { shouldValidate: false });
+        return result;
+    }
+
+    function getRandomBridgeCall(
+        bridgeAddress: string,
+        fields: Partial<DexForwarderBridgeCall> = {},
+    ): DexForwarderBridgeCall {
+        return {
+            target: bridgeAddress,
+            inputTokenAmount: getRandomInteger(1, '100e18'),
+            outputTokenAmount: getRandomInteger(1, '100e18'),
+            bridgeData: hexUtils.leftPad(inputToken),
+            ...fields,
+        };
+    }
+
+    describe('bridgeTransferFrom()', () => {
+        let goodBridgeCalls: DexForwarderBridgeCall[];
+        let revertingBridgeCall: DexForwarderBridgeCall;
+        let failingBridgeCall: DexForwarderBridgeCall;
+        let allBridgeCalls: DexForwarderBridgeCall[];
+        let totalFillableOutputAmount: BigNumber;
+        let totalFillableInputAmount: BigNumber;
+        let recipientOutputBalance: BigNumber;
+
+        beforeEach(async () => {
+            goodBridgeCalls = [];
+            for (let i = 0; i < 4; ++i) {
+                goodBridgeCalls.push(await createBridgeCallAsync({ returnCode: BRIDGE_SUCCESS }));
+            }
+            revertingBridgeCall = await createBridgeCallAsync({ revertError: BRIDGE_REVERT_ERROR });
+            failingBridgeCall = await createBridgeCallAsync({ returnCode: BRIDGE_FAILURE });
+            allBridgeCalls = _.shuffle([failingBridgeCall, revertingBridgeCall, ...goodBridgeCalls]);
+
+            totalFillableInputAmount = BigNumber.sum(...goodBridgeCalls.map(c => c.inputTokenAmount));
+            totalFillableOutputAmount = BigNumber.sum(...goodBridgeCalls.map(c => c.outputTokenAmount));
+
+            // Grant the taker some output tokens.
+            await testContract.setTokenBalance(
+                outputToken,
+                DEFAULTS.toAddress,
+                (recipientOutputBalance = getRandomInteger(1, '100e18')),
+            );
+        });
+
+        async function setForwarderInputBalanceAsync(amount: BigNumber): Promise<void> {
+            await testContract
+                .setTokenBalance(inputToken, testContract.address, amount)
+                .awaitTransactionSuccessAsync({}, { shouldValidate: false });
+        }
+
+        async function createBridgeCallAsync(
+            opts: Partial<{
+                returnCode: string;
+                revertError: string;
+                callFields: Partial<DexForwarderBridgeCall>;
+                outputFillAmount: BigNumber;
+            }>,
+        ): Promise<DexForwarderBridgeCall> {
+            const { returnCode, revertError, callFields, outputFillAmount } = {
+                returnCode: BRIDGE_SUCCESS,
+                revertError: '',
+                ...opts,
+            };
+            const bridge = await callAndTransactAsync(testContract.createBridge(returnCode, revertError));
+            const call = getRandomBridgeCall(bridge, callFields);
+            await testContract
+                .setBridgeTransferAmount(call.target, outputFillAmount || call.outputTokenAmount)
+                .awaitTransactionSuccessAsync({}, { shouldValidate: false });
+            return call;
+        }
+
+        async function callBridgeTransferFromAsync(opts: {
+            bridgeData: string;
+            sellAmount?: BigNumber;
+            buyAmount?: BigNumber;
+        }): Promise<DecodedLogs> {
+            // Fund the forwarder with input tokens to sell.
+            await setForwarderInputBalanceAsync(opts.sellAmount || totalFillableInputAmount);
+            const call = testContract.bridgeTransferFrom(
+                outputToken,
+                testContract.address,
+                DEFAULTS.toAddress,
+                opts.buyAmount || totalFillableOutputAmount,
+                opts.bridgeData,
+            );
+            const returnCode = await call.callAsync();
+            if (returnCode !== BRIDGE_SUCCESS) {
+                throw new Error('Expected BRIDGE_SUCCESS');
+            }
+            const receipt = await call.awaitTransactionSuccessAsync({}, { shouldValidate: false });
+            // tslint:disable-next-line: no-unnecessary-type-assertion
+            return receipt.logs as DecodedLogs;
+        }
+
+        it('succeeds with no bridge calls and no input balance', async () => {
+            const bridgeData = dexForwarderBridgeDataEncoder.encode({
+                inputToken,
+                calls: [],
+            });
+            await callBridgeTransferFromAsync({ bridgeData, sellAmount: ZERO_AMOUNT });
+        });
+
+        it('succeeds with bridge calls and no input balance', async () => {
+            const bridgeData = dexForwarderBridgeDataEncoder.encode({
+                inputToken,
+                calls: allBridgeCalls,
+            });
+            await callBridgeTransferFromAsync({ bridgeData, sellAmount: ZERO_AMOUNT });
+        });
+
+        it('succeeds with no bridge calls and an input balance', async () => {
+            const bridgeData = dexForwarderBridgeDataEncoder.encode({
+                inputToken,
+                calls: [],
+            });
+            await callBridgeTransferFromAsync({
+                bridgeData,
+                sellAmount: new BigNumber(1),
+            });
+        });
+
+        it('succeeds if entire input token balance is not consumed', async () => {
+            const bridgeData = dexForwarderBridgeDataEncoder.encode({
+                inputToken,
+                calls: allBridgeCalls,
+            });
+            await callBridgeTransferFromAsync({
+                bridgeData,
+                sellAmount: totalFillableInputAmount.plus(1),
+            });
+        });
+
+        it('fails if not authorized', async () => {
+            const calls = goodBridgeCalls.slice(0, 1);
+            const bridgeData = dexForwarderBridgeDataEncoder.encode({
+                inputToken,
+                calls,
+            });
+            await callAndTransactAsync(testContract.setAuthorized(NULL_ADDRESS));
+            return expect(callBridgeTransferFromAsync({ bridgeData, sellAmount: new BigNumber(1) })).to.revertWith(
+                NOT_AUTHORIZED_REVERT,
+            );
+        });
+
+        it('succeeds with one bridge call', async () => {
+            const calls = goodBridgeCalls.slice(0, 1);
+            const bridgeData = dexForwarderBridgeDataEncoder.encode({
+                inputToken,
+                calls,
+            });
+            await callBridgeTransferFromAsync({ bridgeData, sellAmount: calls[0].inputTokenAmount });
+        });
+
+        it('succeeds with many bridge calls', async () => {
+            const calls = goodBridgeCalls;
+            const bridgeData = dexForwarderBridgeDataEncoder.encode({
+                inputToken,
+                calls,
+            });
+            await callBridgeTransferFromAsync({ bridgeData });
+        });
+
+        it('swallows a failing bridge call', async () => {
+            const calls = _.shuffle([...goodBridgeCalls, failingBridgeCall]);
+            const bridgeData = dexForwarderBridgeDataEncoder.encode({
+                inputToken,
+                calls,
+            });
+            await callBridgeTransferFromAsync({ bridgeData });
+        });
+
+        it('consumes input tokens for output tokens', async () => {
+            const calls = allBridgeCalls;
+            const bridgeData = dexForwarderBridgeDataEncoder.encode({
+                inputToken,
+                calls,
+            });
+            await callBridgeTransferFromAsync({ bridgeData });
+            const currentBridgeInputBalance = await testContract
+                .balanceOf(inputToken, testContract.address)
+                .callAsync();
+            expect(currentBridgeInputBalance).to.bignumber.eq(0);
+            const currentRecipientOutputBalance = await testContract
+                .balanceOf(outputToken, DEFAULTS.toAddress)
+                .callAsync();
+            expect(currentRecipientOutputBalance).to.bignumber.eq(totalFillableOutputAmount);
+        });
+
+        it("transfers only up to each call's input amount to each bridge", async () => {
+            const calls = goodBridgeCalls;
+            const bridgeData = dexForwarderBridgeDataEncoder.encode({
+                inputToken,
+                calls,
+            });
+            const logs = await callBridgeTransferFromAsync({ bridgeData });
+            const btfs = filterLogsToArguments<BtfCalledEventArgs>(logs, TestEvents.BridgeTransferFromCalled);
+            for (const [call, btf] of shortZip(goodBridgeCalls, btfs)) {
+                expect(btf.inputTokenBalance).to.bignumber.eq(call.inputTokenAmount);
+            }
+        });
+
+        it('transfers only up to outstanding sell amount to each bridge', async () => {
+            // Prepend an extra bridge call.
+            const calls = [
+                await createBridgeCallAsync({
+                    callFields: {
+                        inputTokenAmount: new BigNumber(1),
+                        outputTokenAmount: new BigNumber(1),
+                    },
+                }),
+                ...goodBridgeCalls,
+            ];
+            const bridgeData = dexForwarderBridgeDataEncoder.encode({
+                inputToken,
+                calls,
+            });
+            const logs = await callBridgeTransferFromAsync({ bridgeData });
+            const btfs = filterLogsToArguments<BtfCalledEventArgs>(logs, TestEvents.BridgeTransferFromCalled);
+            expect(btfs).to.be.length(goodBridgeCalls.length + 1);
+            // The last call will receive 1 less token.
+            const lastCall = calls.slice(-1)[0];
+            const lastBtf = btfs.slice(-1)[0];
+            expect(lastBtf.inputTokenBalance).to.bignumber.eq(lastCall.inputTokenAmount.minus(1));
+        });
+
+        it('recoups funds from a bridge that fails', async () => {
+            // Prepend a call that will take the whole input amount but will
+            // fail.
+            const badCall = await createBridgeCallAsync({
+                callFields: { inputTokenAmount: totalFillableInputAmount },
+                returnCode: BRIDGE_FAILURE,
+            });
+            const calls = [badCall, ...goodBridgeCalls];
+            const bridgeData = dexForwarderBridgeDataEncoder.encode({
+                inputToken,
+                calls,
+            });
+            const logs = await callBridgeTransferFromAsync({ bridgeData });
+            const btfs = filterLogsToArguments<BtfCalledEventArgs>(logs, TestEvents.BridgeTransferFromCalled);
+            expect(btfs).to.be.length(goodBridgeCalls.length);
+        });
+
+        it('recoups funds from a bridge that reverts', async () => {
+            // Prepend a call that will take the whole input amount but will
+            // revert.
+            const badCall = await createBridgeCallAsync({
+                callFields: { inputTokenAmount: totalFillableInputAmount },
+                revertError: BRIDGE_REVERT_ERROR,
+            });
+            const calls = [badCall, ...goodBridgeCalls];
+            const bridgeData = dexForwarderBridgeDataEncoder.encode({
+                inputToken,
+                calls,
+            });
+            const logs = await callBridgeTransferFromAsync({ bridgeData });
+            const btfs = filterLogsToArguments<BtfCalledEventArgs>(logs, TestEvents.BridgeTransferFromCalled);
+            expect(btfs).to.be.length(goodBridgeCalls.length);
+        });
+
+        it('recoups funds from a bridge that under-pays', async () => {
+            // Prepend a call that will take the whole input amount but will
+            // underpay the output amount..
+            const badCall = await createBridgeCallAsync({
+                callFields: {
+                    inputTokenAmount: totalFillableInputAmount,
+                    outputTokenAmount: new BigNumber(2),
+                },
+                outputFillAmount: new BigNumber(1),
+            });
+            const calls = [badCall, ...goodBridgeCalls];
+            const bridgeData = dexForwarderBridgeDataEncoder.encode({
+                inputToken,
+                calls,
+            });
+            const logs = await callBridgeTransferFromAsync({ bridgeData });
+            const btfs = filterLogsToArguments<BtfCalledEventArgs>(logs, TestEvents.BridgeTransferFromCalled);
+            expect(btfs).to.be.length(goodBridgeCalls.length);
+        });
+    });
+
+    describe('executeBridgeCall()', () => {
+        it('cannot be called externally', async () => {
+            return expect(
+                testContract
+                    .executeBridgeCall(
+                        randomAddress(),
+                        randomAddress(),
+                        randomAddress(),
+                        randomAddress(),
+                        new BigNumber(1),
+                        new BigNumber(1),
+                        constants.NULL_BYTES,
+                    )
+                    .callAsync(),
+            ).to.revertWith('DexForwarderBridge/ONLY_SELF');
+        });
+    });
+});

contracts/asset-proxy/test/dydx_bridge.ts

@@ -17,14 +17,14 @@ blockchainTests.resets('DydxBridge unit tests', env => {
     const notAuthorized = '0x0000000000000000000000000000000000000001';
     const defaultDepositAction = {
         actionType: DydxBridgeActionType.Deposit,
-        accountId: constants.ZERO_AMOUNT,
+        accountIdx: constants.ZERO_AMOUNT,
         marketId,
         conversionRateNumerator: constants.ZERO_AMOUNT,
         conversionRateDenominator: constants.ZERO_AMOUNT,
     };
     const defaultWithdrawAction = {
         actionType: DydxBridgeActionType.Withdraw,
-        accountId: constants.ZERO_AMOUNT,
+        accountIdx: constants.ZERO_AMOUNT,
         marketId,
         conversionRateNumerator: constants.ZERO_AMOUNT,
         conversionRateDenominator: constants.ZERO_AMOUNT,
@@ -118,7 +118,7 @@ blockchainTests.resets('DydxBridge unit tests', env => {
             for (const action of bridgeData.actions) {
                 expectedOperateActionEvents.push({
                     actionType: action.actionType as number,
-                    accountId: action.accountId,
+                    accountIdx: action.accountIdx,
                     amountSign: action.actionType === DydxBridgeActionType.Deposit ? true : false,
                     amountDenomination: weiDenomination,
                     amountRef: deltaAmountRef,

contracts/asset-proxy/test/kyber_bridge.ts

@@ -16,7 +16,8 @@ import { artifacts } from './artifacts';
 
 import { TestKyberBridgeContract, TestKyberBridgeEvents } from './wrappers';
 
-blockchainTests.resets('KyberBridge unit tests', env => {
+// TODO(dorothy-zbornak): Tests need to be updated.
+blockchainTests.resets.skip('KyberBridge unit tests', env => {
     const KYBER_ETH_ADDRESS = '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee';
     const FROM_TOKEN_DECIMALS = 6;
     const TO_TOKEN_DECIMALS = 18;
@@ -115,7 +116,7 @@ blockchainTests.resets('KyberBridge unit tests', env => {
                 // Transfer amount.
                 _opts.amount,
                 // ABI-encode the input token address as the bridge data.
-                hexUtils.leftPad(_opts.fromTokenAddress),
+                hexUtils.concat(hexUtils.leftPad(_opts.fromTokenAddress), hexUtils.leftPad(32), hexUtils.leftPad(0)),
             );
             const result = await bridgeTransferFromFn.callAsync();
             const { logs } = await bridgeTransferFromFn.awaitTransactionSuccessAsync();

contracts/asset-proxy/test/uniswapv2_bridge.ts

@@ -0,0 +1,216 @@
+import {
+    blockchainTests,
+    constants,
+    expect,
+    filterLogsToArguments,
+    getRandomInteger,
+    randomAddress,
+} from '@0x/contracts-test-utils';
+import { AssetProxyId } from '@0x/types';
+import { AbiEncoder, BigNumber, hexUtils } from '@0x/utils';
+import { DecodedLogs } from 'ethereum-types';
+import * as _ from 'lodash';
+
+import { artifacts } from './artifacts';
+
+import {
+    TestUniswapV2BridgeContract,
+    TestUniswapV2BridgeEvents as ContractEvents,
+    TestUniswapV2BridgeSwapExactTokensForTokensInputEventArgs as SwapExactTokensForTokensArgs,
+    TestUniswapV2BridgeTokenApproveEventArgs as TokenApproveArgs,
+    TestUniswapV2BridgeTokenTransferEventArgs as TokenTransferArgs,
+} from './wrappers';
+
+blockchainTests.resets('UniswapV2 unit tests', env => {
+    const FROM_TOKEN_DECIMALS = 6;
+    const TO_TOKEN_DECIMALS = 18;
+    const FROM_TOKEN_BASE = new BigNumber(10).pow(FROM_TOKEN_DECIMALS);
+    const TO_TOKEN_BASE = new BigNumber(10).pow(TO_TOKEN_DECIMALS);
+    let testContract: TestUniswapV2BridgeContract;
+
+    before(async () => {
+        testContract = await TestUniswapV2BridgeContract.deployFrom0xArtifactAsync(
+            artifacts.TestUniswapV2Bridge,
+            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 TransferFromOpts {
+            tokenAddressesPath: string[];
+            toAddress: string;
+            // Amount to pass into `bridgeTransferFrom()`
+            amount: BigNumber;
+            // Token balance of the bridge.
+            fromTokenBalance: BigNumber;
+            // Router reverts with this reason
+            routerRevertReason: string;
+        }
+
+        interface TransferFromResult {
+            opts: TransferFromOpts;
+            result: string;
+            logs: DecodedLogs;
+            blocktime: number;
+        }
+
+        function createTransferFromOpts(opts?: Partial<TransferFromOpts>): TransferFromOpts {
+            const amount = getRandomInteger(1, TO_TOKEN_BASE.times(100));
+            return {
+                tokenAddressesPath: Array(2).fill(constants.NULL_ADDRESS),
+                amount,
+                toAddress: randomAddress(),
+                fromTokenBalance: getRandomInteger(1, FROM_TOKEN_BASE.times(100)),
+                routerRevertReason: '',
+                ...opts,
+            };
+        }
+
+        const bridgeDataEncoder = AbiEncoder.create('(address[])');
+
+        async function transferFromAsync(opts?: Partial<TransferFromOpts>): Promise<TransferFromResult> {
+            const _opts = createTransferFromOpts(opts);
+
+            for (let i = 0; i < _opts.tokenAddressesPath.length; i++) {
+                const createFromTokenFn = testContract.createToken(_opts.tokenAddressesPath[i]);
+                _opts.tokenAddressesPath[i] = await createFromTokenFn.callAsync();
+                await createFromTokenFn.awaitTransactionSuccessAsync();
+            }
+
+            // Set the token balance for the token we're converting from.
+            await testContract
+                .setTokenBalance(_opts.tokenAddressesPath[0], _opts.fromTokenBalance)
+                .awaitTransactionSuccessAsync();
+
+            // Set revert reason for the router.
+            await testContract.setRouterRevertReason(_opts.routerRevertReason).awaitTransactionSuccessAsync();
+
+            // Call bridgeTransferFrom().
+            const bridgeTransferFromFn = testContract.bridgeTransferFrom(
+                // Output token
+                _opts.tokenAddressesPath[_opts.tokenAddressesPath.length - 1],
+                // Random maker address.
+                randomAddress(),
+                // Recipient address.
+                _opts.toAddress,
+                // Transfer amount.
+                _opts.amount,
+                // ABI-encode the input token address as the bridge data. // FIXME
+                bridgeDataEncoder.encode([_opts.tokenAddressesPath]),
+            );
+            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),
+            };
+        }
+
+        it('returns magic bytes on success', async () => {
+            const { result } = await transferFromAsync();
+            expect(result).to.eq(AssetProxyId.ERC20Bridge);
+        });
+
+        it('performs transfer when both tokens are the same', async () => {
+            const createTokenFn = testContract.createToken(constants.NULL_ADDRESS);
+            const tokenAddress = await createTokenFn.callAsync();
+            await createTokenFn.awaitTransactionSuccessAsync();
+
+            const { opts, result, logs } = await transferFromAsync({
+                tokenAddressesPath: [tokenAddress, tokenAddress],
+            });
+            expect(result).to.eq(AssetProxyId.ERC20Bridge, 'asset proxy id');
+            const transfers = filterLogsToArguments<TokenTransferArgs>(logs, ContractEvents.TokenTransfer);
+
+            expect(transfers.length).to.eq(1);
+            expect(transfers[0].token).to.eq(tokenAddress, 'input token address');
+            expect(transfers[0].from).to.eq(testContract.address);
+            expect(transfers[0].to).to.eq(opts.toAddress, 'recipient address');
+            expect(transfers[0].amount).to.bignumber.eq(opts.amount, 'amount');
+        });
+
+        describe('token -> token', async () => {
+            it('calls UniswapV2Router01.swapExactTokensForTokens()', async () => {
+                const { opts, result, logs, blocktime } = await transferFromAsync();
+                expect(result).to.eq(AssetProxyId.ERC20Bridge, 'asset proxy id');
+                const transfers = filterLogsToArguments<SwapExactTokensForTokensArgs>(
+                    logs,
+                    ContractEvents.SwapExactTokensForTokensInput,
+                );
+
+                expect(transfers.length).to.eq(1);
+                expect(transfers[0].toTokenAddress).to.eq(
+                    opts.tokenAddressesPath[opts.tokenAddressesPath.length - 1],
+                    'output token address',
+                );
+                expect(transfers[0].to).to.eq(opts.toAddress, 'recipient address');
+                expect(transfers[0].amountIn).to.bignumber.eq(opts.fromTokenBalance, 'input token amount');
+                expect(transfers[0].amountOutMin).to.bignumber.eq(opts.amount, 'output token amount');
+                expect(transfers[0].deadline).to.bignumber.eq(blocktime, 'deadline');
+            });
+
+            it('sets allowance for "from" token', async () => {
+                const { logs } = await transferFromAsync();
+                const approvals = filterLogsToArguments<TokenApproveArgs>(logs, ContractEvents.TokenApprove);
+                const routerAddress = await testContract.getRouterAddress().callAsync();
+                expect(approvals.length).to.eq(1);
+                expect(approvals[0].spender).to.eq(routerAddress);
+                expect(approvals[0].allowance).to.bignumber.eq(constants.MAX_UINT256);
+            });
+
+            it('sets allowance for "from" token on subsequent calls', async () => {
+                const { opts } = await transferFromAsync();
+                const { logs } = await transferFromAsync(opts);
+                const approvals = filterLogsToArguments<TokenApproveArgs>(logs, ContractEvents.TokenApprove);
+                const routerAddress = await testContract.getRouterAddress().callAsync();
+                expect(approvals.length).to.eq(1);
+                expect(approvals[0].spender).to.eq(routerAddress);
+                expect(approvals[0].allowance).to.bignumber.eq(constants.MAX_UINT256);
+            });
+
+            it('fails if the router fails', async () => {
+                const revertReason = 'FOOBAR';
+                const tx = transferFromAsync({
+                    routerRevertReason: revertReason,
+                });
+                return expect(tx).to.eventually.be.rejectedWith(revertReason);
+            });
+        });
+        describe('token -> token -> token', async () => {
+            it('calls UniswapV2Router01.swapExactTokensForTokens()', async () => {
+                const { opts, result, logs, blocktime } = await transferFromAsync({
+                    tokenAddressesPath: Array(3).fill(constants.NULL_ADDRESS),
+                });
+                expect(result).to.eq(AssetProxyId.ERC20Bridge, 'asset proxy id');
+                const transfers = filterLogsToArguments<SwapExactTokensForTokensArgs>(
+                    logs,
+                    ContractEvents.SwapExactTokensForTokensInput,
+                );
+
+                expect(transfers.length).to.eq(1);
+                expect(transfers[0].toTokenAddress).to.eq(
+                    opts.tokenAddressesPath[opts.tokenAddressesPath.length - 1],
+                    'output token address',
+                );
+                expect(transfers[0].to).to.eq(opts.toAddress, 'recipient address');
+                expect(transfers[0].amountIn).to.bignumber.eq(opts.fromTokenBalance, 'input token amount');
+                expect(transfers[0].amountOutMin).to.bignumber.eq(opts.amount, 'output token amount');
+                expect(transfers[0].deadline).to.bignumber.eq(blocktime, 'deadline');
+            });
+        });
+    });
+});

contracts/asset-proxy/test/wrappers.ts

@@ -3,7 +3,13 @@
  * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
  * -----------------------------------------------------------------------------
  */
+export * from '../test/generated-wrappers/balancer_bridge';
+export * from '../test/generated-wrappers/bancor_bridge';
 export * from '../test/generated-wrappers/chai_bridge';
+export * from '../test/generated-wrappers/cream_bridge';
+export * from '../test/generated-wrappers/curve_bridge';
+export * from '../test/generated-wrappers/d_o_d_o_bridge';
+export * from '../test/generated-wrappers/dex_forwarder_bridge';
 export * from '../test/generated-wrappers/dydx_bridge';
 export * from '../test/generated-wrappers/erc1155_proxy';
 export * from '../test/generated-wrappers/erc20_bridge_proxy';
@@ -14,25 +20,42 @@ 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_balancer_pool';
+export * from '../test/generated-wrappers/i_bancor_network';
 export * from '../test/generated-wrappers/i_chai';
+export * from '../test/generated-wrappers/i_curve';
 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_gas_token';
 export * from '../test/generated-wrappers/i_kyber_network_proxy';
+export * from '../test/generated-wrappers/i_m_stable';
+export * from '../test/generated-wrappers/i_mooniswap';
+export * from '../test/generated-wrappers/i_shell';
 export * from '../test/generated-wrappers/i_uniswap_exchange';
 export * from '../test/generated-wrappers/i_uniswap_exchange_factory';
+export * from '../test/generated-wrappers/i_uniswap_v2_router01';
 export * from '../test/generated-wrappers/kyber_bridge';
+export * from '../test/generated-wrappers/m_stable_bridge';
 export * from '../test/generated-wrappers/mixin_asset_proxy_dispatcher';
 export * from '../test/generated-wrappers/mixin_authorizable';
+export * from '../test/generated-wrappers/mixin_gas_token';
+export * from '../test/generated-wrappers/mooniswap_bridge';
 export * from '../test/generated-wrappers/multi_asset_proxy';
 export * from '../test/generated-wrappers/ownable';
+export * from '../test/generated-wrappers/shell_bridge';
 export * from '../test/generated-wrappers/static_call_proxy';
+export * from '../test/generated-wrappers/sushi_swap_bridge';
+export * from '../test/generated-wrappers/test_bancor_bridge';
 export * from '../test/generated-wrappers/test_chai_bridge';
+export * from '../test/generated-wrappers/test_dex_forwarder_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/test_uniswap_v2_bridge';
 export * from '../test/generated-wrappers/uniswap_bridge';
+export * from '../test/generated-wrappers/uniswap_v2_bridge';

contracts/asset-proxy/tsconfig.json

@@ -3,7 +3,13 @@
     "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
     "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
     "files": [
+        "generated-artifacts/BalancerBridge.json",
+        "generated-artifacts/BancorBridge.json",
         "generated-artifacts/ChaiBridge.json",
+        "generated-artifacts/CreamBridge.json",
+        "generated-artifacts/CurveBridge.json",
+        "generated-artifacts/DODOBridge.json",
+        "generated-artifacts/DexForwarderBridge.json",
         "generated-artifacts/DydxBridge.json",
         "generated-artifacts/ERC1155Proxy.json",
         "generated-artifacts/ERC20BridgeProxy.json",
@@ -14,29 +20,52 @@
         "generated-artifacts/IAssetProxy.json",
         "generated-artifacts/IAssetProxyDispatcher.json",
         "generated-artifacts/IAuthorizable.json",
+        "generated-artifacts/IBalancerPool.json",
+        "generated-artifacts/IBancorNetwork.json",
         "generated-artifacts/IChai.json",
+        "generated-artifacts/ICurve.json",
         "generated-artifacts/IDydx.json",
         "generated-artifacts/IDydxBridge.json",
         "generated-artifacts/IERC20Bridge.json",
         "generated-artifacts/IEth2Dai.json",
+        "generated-artifacts/IGasToken.json",
         "generated-artifacts/IKyberNetworkProxy.json",
+        "generated-artifacts/IMStable.json",
+        "generated-artifacts/IMooniswap.json",
+        "generated-artifacts/IShell.json",
         "generated-artifacts/IUniswapExchange.json",
         "generated-artifacts/IUniswapExchangeFactory.json",
+        "generated-artifacts/IUniswapV2Router01.json",
         "generated-artifacts/KyberBridge.json",
+        "generated-artifacts/MStableBridge.json",
         "generated-artifacts/MixinAssetProxyDispatcher.json",
         "generated-artifacts/MixinAuthorizable.json",
+        "generated-artifacts/MixinGasToken.json",
+        "generated-artifacts/MooniswapBridge.json",
         "generated-artifacts/MultiAssetProxy.json",
         "generated-artifacts/Ownable.json",
+        "generated-artifacts/ShellBridge.json",
         "generated-artifacts/StaticCallProxy.json",
+        "generated-artifacts/SushiSwapBridge.json",
+        "generated-artifacts/TestBancorBridge.json",
         "generated-artifacts/TestChaiBridge.json",
+        "generated-artifacts/TestDexForwarderBridge.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/TestUniswapV2Bridge.json",
         "generated-artifacts/UniswapBridge.json",
+        "generated-artifacts/UniswapV2Bridge.json",
+        "test/generated-artifacts/BalancerBridge.json",
+        "test/generated-artifacts/BancorBridge.json",
         "test/generated-artifacts/ChaiBridge.json",
+        "test/generated-artifacts/CreamBridge.json",
+        "test/generated-artifacts/CurveBridge.json",
+        "test/generated-artifacts/DODOBridge.json",
+        "test/generated-artifacts/DexForwarderBridge.json",
         "test/generated-artifacts/DydxBridge.json",
         "test/generated-artifacts/ERC1155Proxy.json",
         "test/generated-artifacts/ERC20BridgeProxy.json",
@@ -47,28 +76,45 @@
         "test/generated-artifacts/IAssetProxy.json",
         "test/generated-artifacts/IAssetProxyDispatcher.json",
         "test/generated-artifacts/IAuthorizable.json",
+        "test/generated-artifacts/IBalancerPool.json",
+        "test/generated-artifacts/IBancorNetwork.json",
         "test/generated-artifacts/IChai.json",
+        "test/generated-artifacts/ICurve.json",
         "test/generated-artifacts/IDydx.json",
         "test/generated-artifacts/IDydxBridge.json",
         "test/generated-artifacts/IERC20Bridge.json",
         "test/generated-artifacts/IEth2Dai.json",
+        "test/generated-artifacts/IGasToken.json",
         "test/generated-artifacts/IKyberNetworkProxy.json",
+        "test/generated-artifacts/IMStable.json",
+        "test/generated-artifacts/IMooniswap.json",
+        "test/generated-artifacts/IShell.json",
         "test/generated-artifacts/IUniswapExchange.json",
         "test/generated-artifacts/IUniswapExchangeFactory.json",
+        "test/generated-artifacts/IUniswapV2Router01.json",
         "test/generated-artifacts/KyberBridge.json",
+        "test/generated-artifacts/MStableBridge.json",
         "test/generated-artifacts/MixinAssetProxyDispatcher.json",
         "test/generated-artifacts/MixinAuthorizable.json",
+        "test/generated-artifacts/MixinGasToken.json",
+        "test/generated-artifacts/MooniswapBridge.json",
         "test/generated-artifacts/MultiAssetProxy.json",
         "test/generated-artifacts/Ownable.json",
+        "test/generated-artifacts/ShellBridge.json",
         "test/generated-artifacts/StaticCallProxy.json",
+        "test/generated-artifacts/SushiSwapBridge.json",
+        "test/generated-artifacts/TestBancorBridge.json",
         "test/generated-artifacts/TestChaiBridge.json",
+        "test/generated-artifacts/TestDexForwarderBridge.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"
+        "test/generated-artifacts/TestUniswapV2Bridge.json",
+        "test/generated-artifacts/UniswapBridge.json",
+        "test/generated-artifacts/UniswapV2Bridge.json"
     ],
     "exclude": ["./deploy/solc/solc_bin"]
 }

contracts/broker/CHANGELOG.json

@@ -1,4 +1,78 @@
 [
+    {
+        "timestamp": 1603265572,
+        "version": "1.1.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1594788383,
+        "version": "1.1.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.1.5",
+        "changes": [
+            {
+                "note": "Fix broken tests.",
+                "pr": 2591
+            }
+        ],
+        "timestamp": 1592969527
+    },
+    {
+        "timestamp": 1583220306,
+        "version": "1.1.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1582837861,
+        "version": "1.1.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1582677073,
+        "version": "1.1.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1582623685,
+        "version": "1.1.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.1.0",
+        "changes": [
+            {
+                "note": "Added decoders for broker data",
+                "pr": 2484
+            }
+        ],
+        "timestamp": 1581748629
+    },
     {
         "timestamp": 1581204851,
         "version": "1.0.2",

contracts/broker/CHANGELOG.md

@@ -5,6 +5,38 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.1.7 - _October 21, 2020_
+
+    * Dependencies updated
+
+## v1.1.6 - _July 15, 2020_
+
+    * Dependencies updated
+
+## v1.1.5 - _June 24, 2020_
+
+    * Fix broken tests. (#2591)
+
+## v1.1.4 - _March 3, 2020_
+
+    * Dependencies updated
+
+## v1.1.3 - _February 27, 2020_
+
+    * Dependencies updated
+
+## v1.1.2 - _February 26, 2020_
+
+    * Dependencies updated
+
+## v1.1.1 - _February 25, 2020_
+
+    * Dependencies updated
+
+## v1.1.0 - _February 15, 2020_
+
+    * Added decoders for broker data (#2484)
+
 ## v1.0.2 - _February 8, 2020_
 
     * Dependencies updated

contracts/broker/compiler.json

@@ -3,6 +3,7 @@
     "contractsDir": "./contracts",
     "useDockerisedSolc": false,
     "isOfflineMode": false,
+    "shouldSaveStandardInput": true,
     "compilerSettings": {
         "evmVersion": "istanbul",
         "optimizer": {

contracts/broker/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-broker",
-    "version": "1.0.2",
+    "version": "1.1.7",
     "engines": {
         "node": ">=6.12"
     },
@@ -43,31 +43,31 @@
     },
     "repository": {
         "type": "git",
-        "url": "https://github.com/0xProject/0x-monorepo.git"
+        "url": "https://github.com/0xProject/protocol.git"
     },
     "license": "Apache-2.0",
     "bugs": {
-        "url": "https://github.com/0xProject/0x-monorepo/issues"
+        "url": "https://github.com/0xProject/protocol/issues"
     },
-    "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
+    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions",
     "devDependencies": {
-        "@0x/abi-gen": "^5.2.0",
-        "@0x/contracts-asset-proxy": "^3.2.0",
-        "@0x/contracts-erc20": "^3.1.0",
-        "@0x/contracts-erc721": "^3.1.0",
-        "@0x/contracts-exchange": "^3.2.0",
-        "@0x/contracts-exchange-libs": "^4.3.0",
-        "@0x/contracts-gen": "^2.0.7",
-        "@0x/contracts-test-utils": "^5.1.4",
-        "@0x/contracts-utils": "^4.3.0",
-        "@0x/sol-compiler": "^4.0.7",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.0.0",
-        "@0x/types": "^3.1.2",
-        "@0x/web3-wrapper": "^7.0.6",
+        "@0x/abi-gen": "^5.4.3",
+        "@0x/contracts-asset-proxy": "^3.5.0",
+        "@0x/contracts-erc20": "^3.2.2",
+        "@0x/contracts-erc721": "^3.1.8",
+        "@0x/contracts-exchange": "^3.2.8",
+        "@0x/contracts-exchange-libs": "^4.3.8",
+        "@0x/contracts-gen": "2.0.13",
+        "@0x/contracts-test-utils": "^5.3.5",
+        "@0x/contracts-utils": "^4.5.2",
+        "@0x/sol-compiler": "^4.2.3",
+        "@0x/ts-doc-gen": "^0.0.28",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/types": "^3.2.4",
+        "@0x/web3-wrapper": "^7.2.4",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
-        "@types/node": "*",
+        "@types/node": "12.12.54",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
@@ -80,17 +80,18 @@
         "solhint": "^1.4.1",
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
-        "typedoc": "^0.15.0",
+        "typedoc": "~0.16.11",
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.2.0",
-        "@0x/order-utils": "^10.2.0",
-        "@0x/typescript-typings": "^5.0.2",
-        "@0x/utils": "^5.4.0",
-        "ethereum-types": "^3.1.0"
+        "@0x/base-contract": "^6.2.7",
+        "@0x/order-utils": "^10.4.0",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^5.6.3",
+        "ethereum-types": "^3.3.3"
     },
     "publishConfig": {
         "access": "public"
-    }
+    },
+    "gitHead": "4f91bfd907996b2f4dd383778b50c479c2602b56"
 }

contracts/broker/src/gods_unchained_utils.ts

@@ -1,42 +1,59 @@
 import { assetDataUtils } from '@0x/order-utils';
+import { ERC1155AssetData } from '@0x/types';
 import { AbiEncoder, BigNumber } from '@0x/utils';
 
-export const godsUnchainedUtils = {
-    /**
-     * Encodes the given proto and quality into the bytes format expected by the GodsUnchainedValidator.
-     */
-    encodePropertyData(proto: BigNumber, quality: BigNumber): string {
-        return AbiEncoder.create([{ name: 'proto', type: 'uint16' }, { name: 'quality', type: 'uint8' }]).encode({
-            proto,
-            quality,
-        });
-    },
-    /**
-     * Encodes the given proto and quality into ERC1155 asset data to be used as the takerAssetData
-     * of a property-based GodsUnchained order. Must also provide the addresses of the Broker,
-     * GodsUnchained, and GodsUnchainedValidator contracts. The optional bundleSize parameter specifies
-     * how many cards are expected for each "unit" of the takerAssetAmount. For example, If the
-     * takerAssetAmount is 3 and the bundleSize is 2, the taker must provide 2, 4, or 6 cards
-     * with the given proto and quality to fill the order. If an odd number is provided, the fill fails.
-     */
-    encodeBrokerAssetData(
-        brokerAddress: string,
-        godsUnchainedAddress: string,
-        validatorAddress: string,
-        proto: BigNumber,
-        quality: BigNumber,
-        bundleSize: number = 1,
-    ): string {
-        const dataEncoder = AbiEncoder.create([
-            { name: 'godsUnchainedAddress', type: 'address' },
-            { name: 'validatorAddress', type: 'address' },
-            { name: 'propertyData', type: 'bytes' },
-        ]);
-        const propertyData = AbiEncoder.create([
-            { name: 'proto', type: 'uint16' },
-            { name: 'quality', type: 'uint8' },
-        ]).encode({ proto, quality });
-        const data = dataEncoder.encode({ godsUnchainedAddress, validatorAddress, propertyData });
-        return assetDataUtils.encodeERC1155AssetData(brokerAddress, [], [new BigNumber(bundleSize)], data);
-    },
-};
+export interface GodsUnchainedProperties {
+    proto: BigNumber | number;
+    quality: BigNumber | number;
+}
+
+const propertyDataEncoder = AbiEncoder.create([{ name: 'proto', type: 'uint16' }, { name: 'quality', type: 'uint8' }]);
+const brokerDataEncoder = AbiEncoder.create([
+    { name: 'godsUnchainedAddress', type: 'address' },
+    { name: 'validatorAddress', type: 'address' },
+    { name: 'propertyData', type: 'bytes' },
+]);
+
+/**
+ * Encodes the given proto and quality into the bytes format expected by the GodsUnchainedValidator.
+ */
+export function encodePropertyData(properties: GodsUnchainedProperties): string {
+    return propertyDataEncoder.encode(properties);
+}
+
+/**
+ * Encodes the given proto and quality into ERC1155 asset data to be used as the takerAssetData
+ * of a property-based GodsUnchained order. Must also provide the addresses of the Broker,
+ * GodsUnchained, and GodsUnchainedValidator contracts. The optional bundleSize parameter specifies
+ * how many cards are expected for each "unit" of the takerAssetAmount. For example, If the
+ * takerAssetAmount is 3 and the bundleSize is 2, the taker must provide 2, 4, or 6 cards
+ * with the given proto and quality to fill the order. If an odd number is provided, the fill fails.
+ */
+export function encodeBrokerAssetData(
+    brokerAddress: string,
+    godsUnchainedAddress: string,
+    validatorAddress: string,
+    properties: GodsUnchainedProperties,
+    bundleSize: number = 1,
+): string {
+    const propertyData = propertyDataEncoder.encode(properties);
+    const brokerData = brokerDataEncoder.encode({ godsUnchainedAddress, validatorAddress, propertyData });
+    return assetDataUtils.encodeERC1155AssetData(brokerAddress, [], [new BigNumber(bundleSize)], brokerData);
+}
+
+/**
+ * Decodes proto and quality from the bytes format expected by the GodsUnchainedValidator.
+ */
+export function decodePropertyData(propertyData: string): GodsUnchainedProperties {
+    return propertyDataEncoder.decode(propertyData);
+}
+
+/**
+ * Decodes proto and quality from the ERC1155 takerAssetData of a property-based GodsUnchained order.
+ */
+export function decodeBrokerAssetData(brokerAssetData: string): GodsUnchainedProperties {
+    // tslint:disable-next-line:no-unnecessary-type-assertion
+    const { callbackData: brokerData } = assetDataUtils.decodeAssetDataOrThrow(brokerAssetData) as ERC1155AssetData;
+    const { propertyData } = brokerDataEncoder.decode(brokerData);
+    return decodePropertyData(propertyData);
+}

contracts/broker/src/index.ts

@@ -1,6 +1,6 @@
 export { artifacts } from './artifacts';
 export { BrokerContract, GodsUnchainedValidatorContract, TestGodsUnchainedContract } from './wrappers';
-export { godsUnchainedUtils } from './gods_unchained_utils';
+export * from './gods_unchained_utils';
 export { BrokerRevertErrors } from '@0x/utils';
 export {
     ContractArtifact,

contracts/broker/test/gods_unchained_validator_test.ts

@@ -2,7 +2,7 @@ import { blockchainTests, constants, expect, getRandomInteger } from '@0x/contra
 import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 
-import { godsUnchainedUtils } from '../src/gods_unchained_utils';
+import { encodePropertyData } from '../src/gods_unchained_utils';
 
 import { artifacts } from './artifacts';
 import { GodsUnchainedValidatorContract, TestGodsUnchainedContract } from './wrappers';
@@ -33,7 +33,7 @@ blockchainTests.resets('GodsUnchainedValidator unit tests', env => {
     describe('checkBrokerAsset', () => {
         const proto = new BigNumber(42);
         const quality = new BigNumber(7);
-        const propertyData = godsUnchainedUtils.encodePropertyData(proto, quality);
+        const propertyData = encodePropertyData({ proto, quality });
 
         it('succeeds if assetData proto and quality match propertyData', async () => {
             const tokenId = getRandomInteger(0, constants.MAX_UINT256);
@@ -44,13 +44,13 @@ blockchainTests.resets('GodsUnchainedValidator unit tests', env => {
             const tokenId = getRandomInteger(0, constants.MAX_UINT256);
             await godsUnchained.setTokenProperties(tokenId, proto.plus(1), quality).awaitTransactionSuccessAsync();
             const tx = validator.checkBrokerAsset(tokenId, propertyData).callAsync();
-            expect(tx).to.revertWith('PROTO_MISMATCH');
+            expect(tx).to.revertWith('GodsUnchainedValidator/PROTO_MISMATCH');
         });
         it("reverts if assetData quality doesn't match proeprtyData", async () => {
             const tokenId = getRandomInteger(0, constants.MAX_UINT256);
             await godsUnchained.setTokenProperties(tokenId, proto, quality.plus(1)).awaitTransactionSuccessAsync();
             const tx = validator.checkBrokerAsset(tokenId, propertyData).callAsync();
-            expect(tx).to.revertWith('QUALITY_MISMATCH');
+            expect(tx).to.revertWith('GodsUnchainedValidator/QUALITY_MISMATCH');
         });
     });
 });

contracts/coordinator/CHANGELOG.json

@@ -1,4 +1,76 @@
 [
+    {
+        "timestamp": 1603265572,
+        "version": "3.1.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1594788383,
+        "version": "3.1.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1592969527,
+        "version": "3.1.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1583220306,
+        "version": "3.1.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1582837861,
+        "version": "3.1.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1582677073,
+        "version": "3.1.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1582623685,
+        "version": "3.1.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1581748629,
+        "version": "3.1.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "3.1.0",
         "changes": [

contracts/coordinator/CHANGELOG.md

@@ -5,6 +5,38 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.1.8 - _October 21, 2020_
+
+    * Dependencies updated
+
+## v3.1.7 - _July 15, 2020_
+
+    * Dependencies updated
+
+## v3.1.6 - _June 24, 2020_
+
+    * Dependencies updated
+
+## v3.1.5 - _March 3, 2020_
+
+    * Dependencies updated
+
+## v3.1.4 - _February 27, 2020_
+
+    * Dependencies updated
+
+## v3.1.3 - _February 26, 2020_
+
+    * Dependencies updated
+
+## v3.1.2 - _February 25, 2020_
+
+    * Dependencies updated
+
+## v3.1.1 - _February 15, 2020_
+
+    * Dependencies updated
+
 ## v3.1.0 - _February 8, 2020_
 
     * Update tests. (#2462)

contracts/coordinator/compiler.json

@@ -2,6 +2,7 @@
     "artifactsDir": "./test/generated-artifacts",
     "contractsDir": "./contracts",
     "useDockerisedSolc": false,
+    "shouldSaveStandardInput": true,
     "compilerSettings": {
         "evmVersion": "istanbul",
         "optimizer": {

contracts/coordinator/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-coordinator",
-    "version": "3.1.0",
+    "version": "3.1.8",
     "engines": {
         "node": ">=6.12"
     },
@@ -44,30 +44,28 @@
     },
     "repository": {
         "type": "git",
-        "url": "https://github.com/0xProject/0x-monorepo.git"
+        "url": "https://github.com/0xProject/protocol.git"
     },
     "license": "Apache-2.0",
     "bugs": {
-        "url": "https://github.com/0xProject/0x-monorepo/issues"
+        "url": "https://github.com/0xProject/protocol/issues"
     },
-    "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
+    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions",
     "devDependencies": {
-        "@0x/abi-gen": "^5.2.0",
-        "@0x/contracts-asset-proxy": "^3.2.0",
-        "@0x/contracts-dev-utils": "^1.1.0",
-        "@0x/contracts-erc20": "^3.1.0",
-        "@0x/contracts-exchange": "^3.2.0",
-        "@0x/contracts-gen": "^2.0.7",
-        "@0x/contracts-test-utils": "^5.1.4",
-        "@0x/dev-utils": "^3.2.0",
-        "@0x/order-utils": "^10.2.0",
-        "@0x/sol-compiler": "^4.0.7",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.0.0",
-        "@0x/web3-wrapper": "^7.0.6",
+        "@0x/abi-gen": "^5.4.3",
+        "@0x/contracts-asset-proxy": "^3.5.0",
+        "@0x/contracts-dev-utils": "^1.3.6",
+        "@0x/contracts-erc20": "^3.2.2",
+        "@0x/contracts-gen": "2.0.13",
+        "@0x/dev-utils": "^3.3.4",
+        "@0x/order-utils": "^10.4.0",
+        "@0x/sol-compiler": "^4.2.3",
+        "@0x/ts-doc-gen": "^0.0.28",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/web3-wrapper": "^7.2.4",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
-        "@types/node": "*",
+        "@types/node": "12.12.54",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
@@ -80,22 +78,25 @@
         "solhint": "^1.4.1",
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
-        "typedoc": "^0.15.0",
+        "typedoc": "~0.16.11",
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/assert": "^3.0.6",
-        "@0x/base-contract": "^6.2.0",
-        "@0x/contract-addresses": "^4.5.0",
-        "@0x/contracts-utils": "^4.3.0",
-        "@0x/json-schemas": "^5.0.6",
-        "@0x/types": "^3.1.2",
-        "@0x/typescript-typings": "^5.0.2",
-        "@0x/utils": "^5.4.0",
-        "ethereum-types": "^3.1.0",
+        "@0x/assert": "^3.0.13",
+        "@0x/base-contract": "^6.2.7",
+        "@0x/contract-addresses": "^4.12.0",
+        "@0x/contracts-exchange": "^3.2.8",
+        "@0x/contracts-test-utils": "^5.3.5",
+        "@0x/contracts-utils": "^4.5.2",
+        "@0x/json-schemas": "^5.2.3",
+        "@0x/types": "^3.2.4",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^5.6.3",
+        "ethereum-types": "^3.3.3",
         "http-status-codes": "^1.3.2"
     },
     "publishConfig": {
         "access": "public"
-    }
+    },
+    "gitHead": "4f91bfd907996b2f4dd383778b50c479c2602b56"
 }

contracts/dev-utils/CHANGELOG.json

@@ -1,4 +1,86 @@
 [
+    {
+        "timestamp": 1603265572,
+        "version": "1.3.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1594788383,
+        "version": "1.3.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1592969527,
+        "version": "1.3.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1583220306,
+        "version": "1.3.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1582837861,
+        "version": "1.3.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1582677073,
+        "version": "1.3.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "1.3.0",
+        "changes": [
+            {
+                "note": "Update `DevUtils` addresses in `DeploymentConstants`",
+                "pr": 2493
+            }
+        ],
+        "timestamp": 1582623685
+    },
+    {
+        "version": "1.2.0",
+        "changes": [
+            {
+                "note": "Add `DydxBridge` order validation",
+                "pr": 2466
+            }
+        ]
+    },
+    {
+        "timestamp": 1581748629,
+        "version": "1.1.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "1.1.0",
         "changes": [

contracts/dev-utils/CHANGELOG.md

@@ -5,6 +5,42 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.3.6 - _October 21, 2020_
+
+    * Dependencies updated
+
+## v1.3.5 - _July 15, 2020_
+
+    * Dependencies updated
+
+## v1.3.4 - _June 24, 2020_
+
+    * Dependencies updated
+
+## v1.3.3 - _March 3, 2020_
+
+    * Dependencies updated
+
+## v1.3.2 - _February 27, 2020_
+
+    * Dependencies updated
+
+## v1.3.1 - _February 26, 2020_
+
+    * Dependencies updated
+
+## v1.3.0 - _February 25, 2020_
+
+    * Update `DevUtils` addresses in `DeploymentConstants` (#2493)
+
+## v1.2.0 - _Invalid date_
+
+    * Add `DydxBridge` order validation (#2466)
+
+## v1.1.1 - _February 15, 2020_
+
+    * Dependencies updated
+
 ## v1.1.0 - _February 8, 2020_
 
     * Refactor mixins into public libraries. (#2464)

contracts/dev-utils/compiler.json

@@ -3,6 +3,7 @@
     "contractsDir": "./contracts",
     "useDockerisedSolc": false,
     "isOfflineMode": false,
+    "shouldSaveStandardInput": true,
     "compilerSettings": {
         "evmVersion": "istanbul",
         "optimizer": {

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

@@ -34,15 +34,18 @@ contract Addresses is
     address public erc1155ProxyAddress;
     address public staticCallProxyAddress;
     address public chaiBridgeAddress;
+    address public dydxBridgeAddress;
 
     constructor (
         address exchange_,
-        address chaiBridge_
+        address chaiBridge_,
+        address dydxBridge_
     )
         public
     {
         exchangeAddress = exchange_;
         chaiBridgeAddress = chaiBridge_;
+        dydxBridgeAddress = dydxBridge_;
         erc20ProxyAddress = IExchange(exchange_).getAssetProxy(IAssetData(address(0)).ERC20Token.selector);
         erc721ProxyAddress = IExchange(exchange_).getAssetProxy(IAssetData(address(0)).ERC721Token.selector);
         erc1155ProxyAddress = IExchange(exchange_).getAssetProxy(IAssetData(address(0)).ERC1155Assets.selector);

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

@@ -28,7 +28,7 @@ import "@0x/contracts-erc1155/contracts/src/interfaces/IERC1155.sol";
 import "@0x/contracts-asset-proxy/contracts/src/interfaces/IChai.sol";
 import "@0x/contracts-exchange-libs/contracts/src/LibMath.sol";
 import "./Addresses.sol";
-import "./LibAssetData.sol";
+import "./LibDydxBalance.sol";
 
 
 contract AssetBalance is
@@ -269,11 +269,14 @@ contract AssetBalance is
 
         } else if (assetProxyId == IAssetData(address(0)).ERC20Bridge.selector) {
             // Get address of ERC20 token and bridge contract
-            (, address tokenAddress, address bridgeAddress,) = LibAssetData.decodeERC20BridgeAssetData(assetData);
+            (, address tokenAddress, address bridgeAddress,) =
+                LibAssetData.decodeERC20BridgeAssetData(assetData);
             if (tokenAddress == _getDaiAddress() && bridgeAddress == chaiBridgeAddress) {
                 uint256 chaiAllowance = LibERC20Token.allowance(_getChaiAddress(), ownerAddress, chaiBridgeAddress);
                 // Dai allowance is unlimited if Chai allowance is unlimited
                 allowance = chaiAllowance == _MAX_UINT256 ? _MAX_UINT256 : _convertChaiToDaiAmount(chaiAllowance);
+            } else if (bridgeAddress == dydxBridgeAddress) {
+                allowance = LibDydxBalance.getDydxMakerAllowance(ownerAddress, bridgeAddress, _getDydxAddress());
             }
             // Allowance will be 0 if bridge is not supported
         }
@@ -366,6 +369,17 @@ contract AssetBalance is
         if (order.makerAssetData.length < 4) {
             return (0, 0);
         }
+        bytes4 assetProxyId = order.makerAssetData.readBytes4(0);
+        // Handle dydx bridge assets.
+        if (assetProxyId == IAssetData(address(0)).ERC20Bridge.selector) {
+            (, , address bridgeAddress, ) = LibAssetData.decodeERC20BridgeAssetData(order.makerAssetData);
+            if (bridgeAddress == dydxBridgeAddress) {
+                return (
+                    LibDydxBalance.getDydxMakerBalance(order, _getDydxAddress()),
+                    getAssetProxyAllowance(order.makerAddress, order.makerAssetData)
+                );
+            }
+        }
         return (
             getBalance(order.makerAddress, order.makerAssetData),
             getAssetProxyAllowance(order.makerAddress, order.makerAssetData)

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

@@ -40,12 +40,14 @@ contract DevUtils is
 {
     constructor (
         address exchange_,
-        address chaiBridge_
+        address chaiBridge_,
+        address dydxBridge_
     )
         public
         Addresses(
             exchange_,
-            chaiBridge_
+            chaiBridge_,
+            dydxBridge_
         )
         LibEIP712ExchangeDomain(uint256(0), address(0)) // null args because because we only use constants
     {}

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

@@ -0,0 +1,436 @@
+/*
+
+  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.16;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-asset-proxy/contracts/src/interfaces/IAssetData.sol";
+import "@0x/contracts-asset-proxy/contracts/src/interfaces/IDydxBridge.sol";
+import "@0x/contracts-asset-proxy/contracts/src/interfaces/IDydx.sol";
+import "@0x/contracts-erc20/contracts/src/LibERC20Token.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
+import "@0x/contracts-utils/contracts/src/LibBytes.sol";
+import "@0x/contracts-utils/contracts/src/LibSafeMath.sol";
+import "@0x/contracts-utils/contracts/src/D18.sol";
+import "./LibAssetData.sol";
+
+
+library LibDydxBalance {
+
+    using LibBytes for bytes;
+    using LibSafeMath for uint256;
+
+    /// @dev Padding % added to the minimum collateralization ratio to
+    ///      prevent withdrawing exactly the amount that would make an account
+    ///      insolvent. 1 bps.
+    int256 private constant MARGIN_RATIO_PADDING = 0.0001e18;
+
+    /// @dev Structure that holds all pertinent info needed to perform a balance
+    ///      check.
+    struct BalanceCheckInfo {
+        IDydx dydx;
+        address bridgeAddress;
+        address makerAddress;
+        address makerTokenAddress;
+        address takerTokenAddress;
+        int256 orderMakerToTakerRate;
+        uint256[] accounts;
+        IDydxBridge.BridgeAction[] actions;
+    }
+
+    /// @dev Gets the maker asset allowance for a Dydx bridge order.
+    /// @param makerAddress The maker of the order.
+    /// @param bridgeAddress The address of the Dydx bridge.
+    /// @param dydx The Dydx contract address.
+    /// @return allowance The maker asset allowance.
+    function getDydxMakerAllowance(address makerAddress, address bridgeAddress, address dydx)
+        public
+        view
+        returns (uint256 allowance)
+    {
+        // Allowance is infinite if the dydx bridge is an operator for the maker.
+        return IDydx(dydx).getIsLocalOperator(makerAddress, bridgeAddress)
+            ? uint256(-1) : 0;
+    }
+
+    /// @dev Gets the maker allowance for a
+    /// @dev Get the maker asset balance of an order with a `DydxBridge` maker asset.
+    /// @param order An order with a dydx maker asset.
+    /// @param dydx The address of the dydx contract.
+    /// @return balance The maker asset balance.
+    function getDydxMakerBalance(LibOrder.Order memory order, address dydx)
+        public
+        view
+        returns (uint256 balance)
+    {
+        BalanceCheckInfo memory info = _getBalanceCheckInfo(order, dydx);
+        // Actions must be well-formed.
+        if (!_areActionsWellFormed(info)) {
+            return 0;
+        }
+        // If the rate we withdraw maker tokens is less than one, the asset
+        // proxy will throw because we will always transfer less maker tokens
+        // than asked.
+        if (_getMakerTokenWithdrawRate(info) < D18.one()) {
+            return 0;
+        }
+        // The maker balance is the smaller of:
+        return LibSafeMath.min256(
+            // How many times we can execute all the deposit actions.
+            _getDepositableMakerAmount(info),
+            // How many times we can execute all the actions before the an
+            // account becomes undercollateralized.
+            _getSolventMakerAmount(info)
+        );
+    }
+
+    /// @dev Checks that:
+    ///      1. Actions are arranged as [...deposits, withdraw].
+    ///      2. There is only one deposit for each market ID.
+    ///      3. Every action has a valid account index.
+    ///      4. There is exactly one withdraw at the end and it is for the
+    ///         maker token.
+    /// @param info State from `_getBalanceCheckInfo()`.
+    /// @return areWellFormed Whether the actions are well-formed.
+    function _areActionsWellFormed(BalanceCheckInfo memory info)
+        internal
+        view
+        returns (bool areWellFormed)
+    {
+        if (info.actions.length == 0) {
+            return false;
+        }
+        uint256 depositCount = 0;
+        // Count the number of deposits.
+        for (; depositCount < info.actions.length; ++depositCount) {
+            IDydxBridge.BridgeAction memory action = info.actions[depositCount];
+            if (action.actionType != IDydxBridge.BridgeActionType.Deposit) {
+                break;
+            }
+            // Search all prior actions for the same market ID.
+            uint256 marketId = action.marketId;
+            for (uint256 j = 0; j < depositCount; ++j) {
+                if (info.actions[j].marketId == marketId) {
+                    // Market ID is not unique.
+                    return false;
+                }
+            }
+            // Check that the account index is within the valid range.
+            if (action.accountIdx >= info.accounts.length) {
+                return false;
+            }
+        }
+        // There must be exactly one withdraw action at the end.
+        if (depositCount + 1 != info.actions.length) {
+            return false;
+        }
+        IDydxBridge.BridgeAction memory withdraw = info.actions[depositCount];
+        if (withdraw.actionType != IDydxBridge.BridgeActionType.Withdraw) {
+            return false;
+        }
+        // And it must be for the maker token.
+        if (info.dydx.getMarketTokenAddress(withdraw.marketId) != info.makerTokenAddress) {
+            return false;
+        }
+        // Check the account index.
+        return withdraw.accountIdx < info.accounts.length;
+    }
+
+    /// @dev Returns the rate at which we withdraw maker tokens.
+    /// @param info State from `_getBalanceCheckInfo()`.
+    /// @return makerTokenWithdrawRate Maker token withdraw rate.
+    function _getMakerTokenWithdrawRate(BalanceCheckInfo memory info)
+        internal
+        pure
+        returns (int256 makerTokenWithdrawRate)
+    {
+        // The last action is always a withdraw for the maker token.
+        IDydxBridge.BridgeAction memory withdraw = info.actions[info.actions.length - 1];
+        return _getActionRate(withdraw);
+    }
+
+    /// @dev Get how much maker asset we can transfer before a deposit fails.
+    /// @param info State from `_getBalanceCheckInfo()`.
+    function _getDepositableMakerAmount(BalanceCheckInfo memory info)
+        internal
+        view
+        returns (uint256 depositableMakerAmount)
+    {
+        depositableMakerAmount = uint256(-1);
+        // Take the minimum maker amount from all deposits.
+        for (uint256 i = 0; i < info.actions.length; ++i) {
+            IDydxBridge.BridgeAction memory action = info.actions[i];
+            // Only looking at deposit actions.
+            if (action.actionType != IDydxBridge.BridgeActionType.Deposit) {
+                continue;
+            }
+            // `depositRate` is the rate at which we convert a maker token into
+            // a taker token for deposit.
+            int256 depositRate = _getActionRate(action);
+            // Taker tokens will be transferred to the maker for every fill, so
+            // we reduce the effective deposit rate if we're depositing the taker
+            // token.
+            address depositToken = info.dydx.getMarketTokenAddress(action.marketId);
+            if (info.takerTokenAddress != address(0) && depositToken == info.takerTokenAddress) {
+                depositRate = D18.sub(depositRate, info.orderMakerToTakerRate);
+            }
+            // If the deposit rate is > 0, we are limited by the transferrable
+            // token balance of the maker.
+            if (depositRate > 0) {
+                uint256 supply = _getTransferabeTokenAmount(
+                    depositToken,
+                    info.makerAddress,
+                    address(info.dydx)
+                );
+                depositableMakerAmount = LibSafeMath.min256(
+                    depositableMakerAmount,
+                    uint256(D18.div(supply, depositRate))
+                );
+            }
+        }
+    }
+
+    /// @dev Get how much maker asset we can transfer before an account
+    ///      becomes insolvent.
+    /// @param info State from `_getBalanceCheckInfo()`.
+    function _getSolventMakerAmount(BalanceCheckInfo memory info)
+        internal
+        view
+        returns (uint256 solventMakerAmount)
+    {
+        solventMakerAmount = uint256(-1);
+        assert(info.actions.length >= 1);
+        IDydxBridge.BridgeAction memory withdraw = info.actions[info.actions.length - 1];
+        assert(withdraw.actionType == IDydxBridge.BridgeActionType.Withdraw);
+        int256 minCr = D18.add(_getMinimumCollateralizationRatio(info.dydx), MARGIN_RATIO_PADDING);
+        // Loop through the accounts.
+        for (uint256 accountIdx = 0; accountIdx < info.accounts.length; ++accountIdx) {
+            (uint256 supplyValue, uint256 borrowValue) =
+                _getAccountMarketValues(info, info.accounts[accountIdx]);
+            // All accounts must currently be solvent.
+            if (borrowValue != 0 && D18.div(supplyValue, borrowValue) < minCr) {
+                return 0;
+            }
+            // If this is the same account used to in the withdraw/borrow action,
+            // compute the maker amount at which it will become insolvent.
+            if (accountIdx != withdraw.accountIdx) {
+                continue;
+            }
+            // Compute the deposit/collateralization rate, which is the rate at
+            // which (USD) value is added to the account across all markets.
+            int256 dd = 0;
+            for (uint256 i = 0; i < info.actions.length - 1; ++i) {
+                IDydxBridge.BridgeAction memory deposit = info.actions[i];
+                assert(deposit.actionType == IDydxBridge.BridgeActionType.Deposit);
+                if (deposit.accountIdx == accountIdx) {
+                    dd = D18.add(
+                        dd,
+                        _getActionRateValue(
+                            info,
+                            deposit
+                        )
+                    );
+                }
+            }
+            // Compute the borrow/withdraw rate, which is the rate at which
+            // (USD) value is deducted from the account.
+            int256 db = _getActionRateValue(
+                info,
+                withdraw
+            );
+            // If the deposit to withdraw ratio is >= the minimum collateralization
+            // ratio, then we will never become insolvent at these prices.
+            if (D18.div(dd, db) >= minCr) {
+                continue;
+            }
+            // If the adjusted deposit rates are equal, the account will remain
+            // at the same level of collateralization.
+            if (D18.mul(minCr, db) == dd) {
+                continue;
+            }
+            // The collateralization ratio for this account, parameterized by
+            // `t` (maker amount), is given by:
+            //      `cr = (supplyValue + t * dd) / (borrowValue + t * db)`
+            // Solving for `t` gives us:
+            //      `t = (supplyValue - cr * borrowValue) / (cr * db - dd)`
+            int256 t = D18.div(
+                D18.sub(supplyValue, D18.mul(minCr, borrowValue)),
+                D18.sub(D18.mul(minCr, db), dd)
+            );
+            solventMakerAmount = LibSafeMath.min256(
+                solventMakerAmount,
+                // `t` is in maker token units, so convert it to maker wei.
+                _toWei(info.makerTokenAddress, uint256(D18.clip(t)))
+            );
+        }
+    }
+
+    /// @dev Create a `BalanceCheckInfo` struct.
+    /// @param order An order with a `DydxBridge` maker asset.
+    /// @param dydx The address of the Dydx contract.
+    /// @return info The `BalanceCheckInfo` struct.
+    function _getBalanceCheckInfo(LibOrder.Order memory order, address dydx)
+        private
+        pure
+        returns (BalanceCheckInfo memory info)
+    {
+        bytes memory rawBridgeData;
+        (, info.makerTokenAddress, info.bridgeAddress, rawBridgeData) =
+            LibAssetData.decodeERC20BridgeAssetData(order.makerAssetData);
+        info.dydx = IDydx(dydx);
+        info.makerAddress = order.makerAddress;
+        if (order.takerAssetData.length == 36) {
+            if (order.takerAssetData.readBytes4(0) == IAssetData(0).ERC20Token.selector) {
+                (, info.takerTokenAddress) =
+                    LibAssetData.decodeERC20AssetData(order.takerAssetData);
+            }
+        }
+        info.orderMakerToTakerRate = D18.div(order.takerAssetAmount, order.makerAssetAmount);
+        (IDydxBridge.BridgeData memory bridgeData) =
+            abi.decode(rawBridgeData, (IDydxBridge.BridgeData));
+        info.accounts = bridgeData.accountNumbers;
+        info.actions = bridgeData.actions;
+    }
+
+    /// @dev Returns the conversion rate for an action.
+    /// @param action A `BridgeAction`.
+    function _getActionRate(IDydxBridge.BridgeAction memory action)
+        private
+        pure
+        returns (int256 rate)
+    {
+        rate = action.conversionRateDenominator == 0
+            ? D18.one()
+            : D18.div(
+                action.conversionRateNumerator,
+                action.conversionRateDenominator
+            );
+    }
+
+    /// @dev Returns the USD value of an action based on its conversion rate
+    ///      and market prices.
+    /// @param info State from `_getBalanceCheckInfo()`.
+    /// @param action A `BridgeAction`.
+    function _getActionRateValue(
+        BalanceCheckInfo memory info,
+        IDydxBridge.BridgeAction memory action
+    )
+        private
+        view
+        returns (int256 value)
+    {
+        address toToken = info.dydx.getMarketTokenAddress(action.marketId);
+        uint256 fromTokenDecimals = LibERC20Token.decimals(info.makerTokenAddress);
+        uint256 toTokenDecimals = LibERC20Token.decimals(toToken);
+        // First express the rate as 18-decimal units.
+        value = toTokenDecimals > fromTokenDecimals
+            ? int256(
+                uint256(_getActionRate(action))
+                    .safeDiv(10 ** (toTokenDecimals - fromTokenDecimals))
+            )
+            : int256(
+                uint256(_getActionRate(action))
+                    .safeMul(10 ** (fromTokenDecimals - toTokenDecimals))
+            );
+        // Prices have 18 + (18 - TOKEN_DECIMALS) decimal places because
+        // consistency is stupid.
+        uint256 price = info.dydx.getMarketPrice(action.marketId).value;
+        // Make prices have 18 decimals.
+        if (toTokenDecimals > 18) {
+            price = price.safeMul(10 ** (toTokenDecimals - 18));
+        } else {
+            price = price.safeDiv(10 ** (18 - toTokenDecimals));
+        }
+        // The action value is the action rate times the price.
+        value = D18.mul(price, value);
+        // Scale by the market premium.
+        int256 marketPremium = D18.add(
+            D18.one(),
+            info.dydx.getMarketMarginPremium(action.marketId).value
+        );
+        if (action.actionType == IDydxBridge.BridgeActionType.Deposit) {
+            value = D18.div(value, marketPremium);
+        } else {
+            value = D18.mul(value, marketPremium);
+        }
+    }
+
+    /// @dev Convert a `D18` fraction of 1 token to the equivalent integer wei.
+    /// @param token Address the of the token.
+    /// @param units Token units expressed with 18 digit precision.
+    function _toWei(address token, uint256 units)
+        private
+        view
+        returns (uint256 rate)
+    {
+        uint256 decimals = LibERC20Token.decimals(token);
+        rate = decimals > 18
+            ? units.safeMul(10 ** (decimals - 18))
+            : units.safeDiv(10 ** (18 - decimals));
+    }
+
+    /// @dev Get the global minimum collateralization ratio required for
+    ///      an account to be considered solvent.
+    /// @param dydx The Dydx interface.
+    function _getMinimumCollateralizationRatio(IDydx dydx)
+        private
+        view
+        returns (int256 ratio)
+    {
+        IDydx.RiskParams memory riskParams = dydx.getRiskParams();
+        return D18.add(D18.one(), D18.toSigned(riskParams.marginRatio.value));
+    }
+
+    /// @dev Get the total supply and borrow values for an account across all markets.
+    /// @param info State from `_getBalanceCheckInfo()`.
+    /// @param account The Dydx account identifier.
+    function _getAccountMarketValues(BalanceCheckInfo memory info, uint256 account)
+        private
+        view
+        returns (uint256 supplyValue, uint256 borrowValue)
+    {
+        (IDydx.Value memory supplyValue_, IDydx.Value memory borrowValue_) =
+            info.dydx.getAdjustedAccountValues(IDydx.AccountInfo(
+                info.makerAddress,
+                account
+            ));
+        // Account values have 36 decimal places because dydx likes to make sure
+        // you're paying attention.
+        return (supplyValue_.value / 1e18, borrowValue_.value / 1e18);
+    }
+
+    /// @dev Get the amount of an ERC20 token held by `owner` that can be transferred
+    ///      by `spender`.
+    /// @param tokenAddress The address of the ERC20 token.
+    /// @param owner The address of the token holder.
+    /// @param spender The address of the token spender.
+    function _getTransferabeTokenAmount(
+        address tokenAddress,
+        address owner,
+        address spender
+    )
+        private
+        view
+        returns (uint256 transferableAmount)
+    {
+        return LibSafeMath.min256(
+            LibERC20Token.allowance(tokenAddress, owner, spender),
+            LibERC20Token.balanceOf(tokenAddress, owner)
+        );
+    }
+}

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

@@ -118,22 +118,14 @@ contract OrderValidationUtils is
             transferableTakerAssetAmount
         );
 
-        // Execute the maker transfers.
-        fillableTakerAssetAmount = LibOrderTransferSimulation.getSimulatedOrderMakerTransferResults(
-            exchangeAddress,
-            order,
-            order.takerAddress,
-            fillableTakerAssetAmount
-        ) == LibOrderTransferSimulation.OrderTransferResults.TransfersSuccessful ? fillableTakerAssetAmount : 0;
-
-        if (!_isAssetDataValid(order.takerAssetData)) {
-            fillableTakerAssetAmount = 0;
-        }
-
-        if (order.takerFee != 0 && !_isAssetDataValid(order.takerFeeAssetData)) {
+        // Ensure that all of the asset data is valid. Fee asset data only needs
+        // to be valid if the fees are nonzero.
+        if (!_areOrderAssetDatasValid(order)) {
             fillableTakerAssetAmount = 0;
         }
 
+        // If the order is not fillable, then the fillable taker asset amount is
+        // zero by definition.
         if (orderInfo.orderStatus != LibOrder.OrderStatus.FILLABLE) {
             fillableTakerAssetAmount = 0;
         }
@@ -207,7 +199,22 @@ contract OrderValidationUtils is
     {
         (uint256 balance, uint256 allowance) = _getConvertibleMakerBalanceAndAssetProxyAllowance(order);
         transferableAssetAmount = LibSafeMath.min256(balance, allowance);
-        return transferableAssetAmount;
+        return LibSafeMath.min256(transferableAssetAmount, order.makerAssetAmount);
+    }
+
+    /// @dev Checks that the asset data contained in a ZeroEx is valid and returns
+    /// a boolean that indicates whether or not the asset data was found to be valid.
+    /// @param order A ZeroEx order to validate.
+    /// @return The validatity of the asset data.
+    function _areOrderAssetDatasValid(LibOrder.Order memory order)
+        internal
+        pure
+        returns (bool)
+    {
+        return _isAssetDataValid(order.makerAssetData) &&
+            (order.makerFee == 0 || _isAssetDataValid(order.makerFeeAssetData)) &&
+            _isAssetDataValid(order.takerAssetData) &&
+            (order.takerFee == 0 || _isAssetDataValid(order.takerFeeAssetData));
     }
 
     /// @dev This function handles the edge cases around taker validation. This function

contracts/dev-utils/contracts/test/TestDydx.sol

@@ -0,0 +1,181 @@
+/*
+
+  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.16;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-asset-proxy/contracts/src/interfaces/IDydx.sol";
+import "@0x/contracts-erc20/contracts/src/LibERC20Token.sol";
+
+
+// solhint-disable separate-by-one-line-in-contract
+contract TestDydx {
+
+    struct OperatorConfig {
+        address owner;
+        address operator;
+    }
+
+    struct AccountConfig {
+        address owner;
+        uint256 accountId;
+        int256[] balances;
+    }
+
+    struct MarketInfo {
+        address token;
+        uint256 price;
+    }
+
+    struct TestConfig {
+        uint256 marginRatio;
+        OperatorConfig[] operators;
+        AccountConfig[] accounts;
+        MarketInfo[] markets;
+    }
+
+    mapping (bytes32 => bool) private _operators;
+    mapping (bytes32 => int256) private _balance;
+    MarketInfo[] private _markets;
+    uint256 private _marginRatio;
+
+    constructor(TestConfig memory config) public {
+        _marginRatio = config.marginRatio;
+        for (uint256 marketId = 0; marketId < config.markets.length; ++marketId) {
+            _markets.push(config.markets[marketId]);
+        }
+        for (uint256 i = 0; i < config.operators.length; ++i) {
+            OperatorConfig memory op = config.operators[i];
+            _operators[_getOperatorHash(op.owner, op.operator)] = true;
+        }
+        for (uint256 i = 0; i < config.accounts.length; ++i) {
+            AccountConfig memory acct = config.accounts[i];
+            for (uint256 marketId = 0; marketId < acct.balances.length; ++marketId) {
+                _balance[_getBalanceHash(acct.owner, acct.accountId, marketId)] =
+                    acct.balances[marketId];
+            }
+        }
+    }
+
+    function getIsLocalOperator(
+        address owner,
+        address operator
+    )
+        external
+        view
+        returns (bool isLocalOperator)
+    {
+        return _operators[_getOperatorHash(owner, operator)];
+    }
+
+    function getMarketTokenAddress(
+        uint256 marketId
+    )
+        external
+        view
+        returns (address tokenAddress)
+    {
+        return _markets[marketId].token;
+    }
+
+    function getRiskParams()
+        external
+        view
+        returns (IDydx.RiskParams memory riskParams)
+    {
+        return IDydx.RiskParams({
+            marginRatio: IDydx.D256(_marginRatio),
+            liquidationSpread: IDydx.D256(0),
+            earningsRate: IDydx.D256(0),
+            minBorrowedValue: IDydx.Value(0)
+        });
+    }
+
+    function getAdjustedAccountValues(
+        IDydx.AccountInfo calldata account
+    )
+        external
+        view
+        returns (IDydx.Value memory supplyValue, IDydx.Value memory borrowValue)
+    {
+        for (uint256 marketId = 0; marketId < _markets.length; ++marketId) {
+            int256 balance =
+                _balance[_getBalanceHash(account.owner, account.number, marketId)];
+            // Account values have 36 decimal places.
+            // `getMarketPrice()` returns a unit with
+            // 18 + (18 - TOKEN_DECIMALS) decimal places so multiplying the price
+            // with the wei balance will result in a 36 decimal value.
+            balance = balance * int256(getMarketPrice(marketId).value);
+            if (balance >= 0) {
+                supplyValue.value += uint256(balance);
+            } else {
+                borrowValue.value += uint256(-balance);
+            }
+        }
+    }
+
+    function getMarketMarginPremium(uint256)
+        external
+        view
+        returns (IDydx.D256 memory premium)
+    {
+        // Return 0.
+        return premium;
+    }
+
+    function getMarketPrice(
+        uint256 marketId
+    )
+        public
+        view
+        returns (IDydx.Price memory price)
+    {
+        MarketInfo memory market = _markets[marketId];
+        uint256 decimals = LibERC20Token.decimals(market.token);
+        price.value = _markets[marketId].price;
+        // Market prices have 18 + (18 - TOKEN_DECIMALS)
+        if (decimals > 18) {
+            price.value /= 10 ** (decimals - 18);
+        } else {
+            price.value *= 10 ** (18 - decimals);
+        }
+    }
+
+    function _getOperatorHash(address owner, address operator)
+        private
+        pure
+        returns (bytes32 operatorHash)
+    {
+        return keccak256(abi.encode(
+            owner,
+            operator
+        ));
+    }
+
+    function _getBalanceHash(address owner, uint256 accountId, uint256 marketId)
+        private
+        pure
+        returns (bytes32 balanceHash)
+    {
+        return keccak256(abi.encode(
+            owner,
+            accountId,
+            marketId
+        ));
+    }
+}

contracts/dev-utils/contracts/test/TestLibDydxBalance.sol

@@ -0,0 +1,116 @@
+/*
+
+  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.16;
+pragma experimental ABIEncoderV2;
+
+import "../src/LibDydxBalance.sol";
+
+
+contract TestLibDydxBalanceToken {
+
+    uint8 public decimals;
+    mapping (address => uint256) public balanceOf;
+    mapping (address => mapping (address => uint256)) public allowance;
+
+    constructor(uint8 decimals_) public {
+        decimals = decimals_;
+    }
+
+    function setBalance(address owner, uint256 balance) external {
+        balanceOf[owner] = balance;
+    }
+
+    function setApproval(
+        address owner,
+        address spender,
+        uint256 allowance_
+    )
+        external
+    {
+        allowance[owner][spender] = allowance_;
+    }
+}
+
+
+contract TestLibDydxBalance {
+
+    mapping (address => TestLibDydxBalanceToken) private tokens;
+
+    function createToken(uint8 decimals) external returns (address) {
+        TestLibDydxBalanceToken token = new TestLibDydxBalanceToken(decimals);
+        return address(tokens[address(token)] = token);
+    }
+
+    function setTokenBalance(
+        address tokenAddress,
+        address owner,
+        uint256 balance
+    )
+        external
+    {
+        tokens[tokenAddress].setBalance(owner, balance);
+    }
+
+    function setTokenApproval(
+        address tokenAddress,
+        address owner,
+        address spender,
+        uint256 allowance
+    )
+        external
+    {
+        tokens[tokenAddress].setApproval(owner, spender, allowance);
+    }
+
+    function getDydxMakerBalance(LibOrder.Order memory order, address dydx)
+        public
+        view
+        returns (uint256 balance)
+    {
+        return LibDydxBalance.getDydxMakerBalance(order, dydx);
+    }
+
+    function getSolventMakerAmount(
+        LibDydxBalance.BalanceCheckInfo memory info
+    )
+        public
+        view
+        returns (uint256 solventMakerAmount)
+    {
+        return LibDydxBalance._getSolventMakerAmount(info);
+    }
+
+    function getDepositableMakerAmount(
+        LibDydxBalance.BalanceCheckInfo memory info
+    )
+        public
+        view
+        returns (uint256 depositableMakerAmount)
+    {
+        return LibDydxBalance._getDepositableMakerAmount(info);
+    }
+
+    function areActionsWellFormed(LibDydxBalance.BalanceCheckInfo memory info)
+        public
+        view
+        returns (bool areWellFormed)
+    {
+        return LibDydxBalance._areActionsWellFormed(info);
+    }
+}

contracts/dev-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-dev-utils",
-    "version": "1.1.0",
+    "version": "1.3.6",
     "engines": {
         "node": ">=6.12"
     },
@@ -8,7 +8,7 @@
     "main": "lib/src/index.js",
     "scripts": {
         "build": "yarn pre_build && tsc -b",
-        "test": "yarn assert_deployable",
+        "test": "yarn assert_deployable && yarn mocha -t 10000 -b ./lib/test/**_test.js",
         "assert_deployable": "node -e \"const bytecodeLen = (require('./generated-artifacts/DevUtils.json').compilerOutput.evm.bytecode.object.length-2)/2; assert(bytecodeLen<=0x6000,'DevUtils contract is too big to deploy, per EIP-170. '+bytecodeLen+'>'+0x6000)\"",
         "build:ci": "yarn build",
         "pre_build": "run-s compile quantify_bytecode contracts:gen generate_contract_wrappers contracts:copy",
@@ -27,46 +27,47 @@
         "docs:json": "typedoc --excludePrivate --excludeExternals --excludeProtected --ignoreCompilerErrors --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES"
     },
     "config": {
-        "publicInterfaceContracts": "DevUtils,LibAssetData,LibOrderTransferSimulation,LibTransactionDecoder",
-        "abis": "./test/generated-artifacts/@(Addresses|AssetBalance|DevUtils|EthBalanceChecker|ExternalFunctions|LibAssetData|LibOrderTransferSimulation|LibTransactionDecoder|OrderTransferSimulationUtils|OrderValidationUtils).json",
+        "publicInterfaceContracts": "DevUtils,LibAssetData,LibDydxBalance,LibOrderTransferSimulation,LibTransactionDecoder",
+        "abis": "./test/generated-artifacts/@(Addresses|AssetBalance|DevUtils|EthBalanceChecker|ExternalFunctions|LibAssetData|LibDydxBalance|LibOrderTransferSimulation|LibTransactionDecoder|OrderTransferSimulationUtils|OrderValidationUtils|TestDydx|TestLibDydxBalance).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {
         "type": "git",
-        "url": "https://github.com/0xProject/0x-monorepo.git"
+        "url": "https://github.com/0xProject/protocol.git"
     },
     "license": "Apache-2.0",
     "bugs": {
-        "url": "https://github.com/0xProject/0x-monorepo/issues"
+        "url": "https://github.com/0xProject/protocol/issues"
     },
-    "homepage": "https://github.com/0xProject/0x-monorepo/contracts/dev-utils/README.md",
+    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/dev-utils",
     "devDependencies": {
-        "@0x/abi-gen": "^5.2.0",
-        "@0x/assert": "^3.0.6",
-        "@0x/contracts-asset-proxy": "^3.2.0",
-        "@0x/contracts-erc20": "^3.1.0",
-        "@0x/contracts-gen": "^2.0.7",
-        "@0x/contracts-test-utils": "^5.1.4",
-        "@0x/sol-compiler": "^4.0.7",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.0.0",
-        "@0x/types": "^3.1.2",
-        "@0x/utils": "^5.4.0",
-        "@types/node": "*",
-        "ethereum-types": "^3.1.0",
+        "@0x/abi-gen": "^5.4.3",
+        "@0x/assert": "^3.0.13",
+        "@0x/contracts-asset-proxy": "^3.5.0",
+        "@0x/contracts-erc20": "^3.2.2",
+        "@0x/contracts-gen": "2.0.13",
+        "@0x/contracts-test-utils": "^5.3.5",
+        "@0x/sol-compiler": "^4.2.3",
+        "@0x/ts-doc-gen": "^0.0.28",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/types": "^3.2.4",
+        "@0x/utils": "^5.6.3",
+        "ethereum-types": "^3.3.3",
         "ethers": "~4.0.4",
         "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",
+        "typedoc": "~0.16.11",
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.2.0"
+        "@0x/base-contract": "^6.2.7",
+        "@types/node": "12.12.54"
     },
     "publishConfig": {
         "access": "public"
-    }
+    },
+    "gitHead": "4f91bfd907996b2f4dd383778b50c479c2602b56"
 }

contracts/dev-utils/src/artifacts.ts

@@ -7,11 +7,13 @@ import { ContractArtifact } from 'ethereum-types';
 
 import * as DevUtils from '../generated-artifacts/DevUtils.json';
 import * as LibAssetData from '../generated-artifacts/LibAssetData.json';
+import * as LibDydxBalance from '../generated-artifacts/LibDydxBalance.json';
 import * as LibOrderTransferSimulation from '../generated-artifacts/LibOrderTransferSimulation.json';
 import * as LibTransactionDecoder from '../generated-artifacts/LibTransactionDecoder.json';
 export const artifacts = {
     DevUtils: DevUtils as ContractArtifact,
     LibAssetData: LibAssetData as ContractArtifact,
+    LibDydxBalance: LibDydxBalance as ContractArtifact,
     LibOrderTransferSimulation: LibOrderTransferSimulation as ContractArtifact,
     LibTransactionDecoder: LibTransactionDecoder as ContractArtifact,
 };

contracts/dev-utils/src/wrappers.ts

@@ -5,5 +5,6 @@
  */
 export * from '../generated-wrappers/dev_utils';
 export * from '../generated-wrappers/lib_asset_data';
+export * from '../generated-wrappers/lib_dydx_balance';
 export * from '../generated-wrappers/lib_order_transfer_simulation';
 export * from '../generated-wrappers/lib_transaction_decoder';

contracts/dev-utils/test/artifacts.ts

@@ -11,10 +11,13 @@ import * as DevUtils from '../test/generated-artifacts/DevUtils.json';
 import * as EthBalanceChecker from '../test/generated-artifacts/EthBalanceChecker.json';
 import * as ExternalFunctions from '../test/generated-artifacts/ExternalFunctions.json';
 import * as LibAssetData from '../test/generated-artifacts/LibAssetData.json';
+import * as LibDydxBalance from '../test/generated-artifacts/LibDydxBalance.json';
 import * as LibOrderTransferSimulation from '../test/generated-artifacts/LibOrderTransferSimulation.json';
 import * as LibTransactionDecoder from '../test/generated-artifacts/LibTransactionDecoder.json';
 import * as OrderTransferSimulationUtils from '../test/generated-artifacts/OrderTransferSimulationUtils.json';
 import * as OrderValidationUtils from '../test/generated-artifacts/OrderValidationUtils.json';
+import * as TestDydx from '../test/generated-artifacts/TestDydx.json';
+import * as TestLibDydxBalance from '../test/generated-artifacts/TestLibDydxBalance.json';
 export const artifacts = {
     Addresses: Addresses as ContractArtifact,
     AssetBalance: AssetBalance as ContractArtifact,
@@ -22,8 +25,11 @@ export const artifacts = {
     EthBalanceChecker: EthBalanceChecker as ContractArtifact,
     ExternalFunctions: ExternalFunctions as ContractArtifact,
     LibAssetData: LibAssetData as ContractArtifact,
+    LibDydxBalance: LibDydxBalance as ContractArtifact,
     LibOrderTransferSimulation: LibOrderTransferSimulation as ContractArtifact,
     LibTransactionDecoder: LibTransactionDecoder as ContractArtifact,
     OrderTransferSimulationUtils: OrderTransferSimulationUtils as ContractArtifact,
     OrderValidationUtils: OrderValidationUtils as ContractArtifact,
+    TestDydx: TestDydx as ContractArtifact,
+    TestLibDydxBalance: TestLibDydxBalance as ContractArtifact,
 };

contracts/dev-utils/test/wrappers.ts

@@ -9,7 +9,10 @@ export * from '../test/generated-wrappers/dev_utils';
 export * from '../test/generated-wrappers/eth_balance_checker';
 export * from '../test/generated-wrappers/external_functions';
 export * from '../test/generated-wrappers/lib_asset_data';
+export * from '../test/generated-wrappers/lib_dydx_balance';
 export * from '../test/generated-wrappers/lib_order_transfer_simulation';
 export * from '../test/generated-wrappers/lib_transaction_decoder';
 export * from '../test/generated-wrappers/order_transfer_simulation_utils';
 export * from '../test/generated-wrappers/order_validation_utils';
+export * from '../test/generated-wrappers/test_dydx';
+export * from '../test/generated-wrappers/test_lib_dydx_balance';

contracts/dev-utils/tsconfig.json

@@ -5,6 +5,7 @@
     "files": [
         "generated-artifacts/DevUtils.json",
         "generated-artifacts/LibAssetData.json",
+        "generated-artifacts/LibDydxBalance.json",
         "generated-artifacts/LibOrderTransferSimulation.json",
         "generated-artifacts/LibTransactionDecoder.json",
         "test/generated-artifacts/Addresses.json",
@@ -13,10 +14,13 @@
         "test/generated-artifacts/EthBalanceChecker.json",
         "test/generated-artifacts/ExternalFunctions.json",
         "test/generated-artifacts/LibAssetData.json",
+        "test/generated-artifacts/LibDydxBalance.json",
         "test/generated-artifacts/LibOrderTransferSimulation.json",
         "test/generated-artifacts/LibTransactionDecoder.json",
         "test/generated-artifacts/OrderTransferSimulationUtils.json",
-        "test/generated-artifacts/OrderValidationUtils.json"
+        "test/generated-artifacts/OrderValidationUtils.json",
+        "test/generated-artifacts/TestDydx.json",
+        "test/generated-artifacts/TestLibDydxBalance.json"
     ],
     "exclude": ["./deploy/solc/solc_bin"]
 }

contracts/erc1155/CHANGELOG.json

@@ -1,4 +1,76 @@
 [
+    {
+        "timestamp": 1603265572,
+        "version": "2.1.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1594788383,
+        "version": "2.1.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1592969527,
+        "version": "2.1.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1583220306,
+        "version": "2.1.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1582837861,
+        "version": "2.1.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1582677073,
+        "version": "2.1.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1582623685,
+        "version": "2.1.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1581748629,
+        "version": "2.1.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "2.1.0",
         "changes": [

contracts/erc1155/CHANGELOG.md

@@ -5,6 +5,38 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.1.8 - _October 21, 2020_
+
+    * Dependencies updated
+
+## v2.1.7 - _July 15, 2020_
+
+    * Dependencies updated
+
+## v2.1.6 - _June 24, 2020_
+
+    * Dependencies updated
+
+## v2.1.5 - _March 3, 2020_
+
+    * Dependencies updated
+
+## v2.1.4 - _February 27, 2020_
+
+    * Dependencies updated
+
+## v2.1.3 - _February 26, 2020_
+
+    * Dependencies updated
+
+## v2.1.2 - _February 25, 2020_
+
+    * Dependencies updated
+
+## v2.1.1 - _February 15, 2020_
+
+    * Dependencies updated
+
 ## v2.1.0 - _February 8, 2020_
 
     * Fix broken tests (#2462)

contracts/erc1155/compiler.json

@@ -3,6 +3,7 @@
     "contractsDir": "./contracts",
     "useDockerisedSolc": false,
     "isOfflineMode": false,
+    "shouldSaveStandardInput": true,
     "compilerSettings": {
         "evmVersion": "istanbul",
         "optimizer": {

contracts/erc1155/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc1155",
-    "version": "2.1.0",
+    "version": "2.1.8",
     "engines": {
         "node": ">=6.12"
     },
@@ -44,31 +44,31 @@
     },
     "repository": {
         "type": "git",
-        "url": "https://github.com/0xProject/0x-monorepo.git"
+        "url": "https://github.com/0xProject/protocol.git"
     },
     "license": "Apache-2.0",
     "bugs": {
-        "url": "https://github.com/0xProject/0x-monorepo/issues"
+        "url": "https://github.com/0xProject/protocol/issues"
     },
-    "homepage": "https://github.com/0xProject/0x-monorepo/contracts/tokens/README.md",
+    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens",
     "devDependencies": {
-        "@0x/abi-gen": "^5.2.0",
-        "@0x/contracts-gen": "^2.0.7",
-        "@0x/contracts-utils": "^4.3.0",
-        "@0x/dev-utils": "^3.2.0",
-        "@0x/sol-compiler": "^4.0.7",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.0.0",
-        "@0x/types": "^3.1.2",
-        "@0x/typescript-typings": "^5.0.2",
+        "@0x/abi-gen": "^5.4.3",
+        "@0x/contracts-gen": "2.0.13",
+        "@0x/contracts-utils": "^4.5.2",
+        "@0x/dev-utils": "^3.3.4",
+        "@0x/sol-compiler": "^4.2.3",
+        "@0x/ts-doc-gen": "^0.0.28",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/types": "^3.2.4",
+        "@0x/typescript-typings": "^5.1.5",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^5.2.7",
-        "@types/node": "*",
+        "@types/node": "12.12.54",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
-        "ethereum-types": "^3.1.0",
+        "ethereum-types": "^3.3.3",
         "make-promises-safe": "^1.1.0",
         "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
@@ -76,17 +76,18 @@
         "solhint": "^1.4.1",
         "truffle": "^5.0.32",
         "tslint": "5.11.0",
-        "typedoc": "^0.15.0",
+        "typedoc": "~0.16.11",
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^6.2.0",
-        "@0x/contracts-test-utils": "^5.1.4",
-        "@0x/utils": "^5.4.0",
-        "@0x/web3-wrapper": "^7.0.6",
+        "@0x/base-contract": "^6.2.7",
+        "@0x/contracts-test-utils": "^5.3.5",
+        "@0x/utils": "^5.6.3",
+        "@0x/web3-wrapper": "^7.2.4",
         "lodash": "^4.17.11"
     },
     "publishConfig": {
         "access": "public"
-    }
+    },
+    "gitHead": "4f91bfd907996b2f4dd383778b50c479c2602b56"
 }

contracts/erc20-bridge-sampler/CHANGELOG.json

@@ -1,102 +0,0 @@
-[
-    {
-        "version": "1.3.0",
-        "changes": [
-            {
-                "note": "Catch reverts to `DevUtils` calls",
-                "pr": 2476
-            }
-        ],
-        "timestamp": 1581204851
-    },
-    {
-        "timestamp": 1580988106,
-        "version": "1.2.1",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "version": "1.2.0",
-        "changes": [
-            {
-                "note": "Make source IDs static on all networks, not inherited from `DeploymentConstants`.",
-                "pr": 2459
-            }
-        ],
-        "timestamp": 1580811564
-    },
-    {
-        "version": "1.1.0",
-        "changes": [
-            {
-                "note": "Add batch functions to query quotes",
-                "pr": 2427
-            },
-            {
-                "note": "Early exit if a DEX sample fails",
-                "pr": 2427
-            }
-        ],
-        "timestamp": 1579682890
-    },
-    {
-        "version": "1.0.3",
-        "changes": [
-            {
-                "note": "Add gas limits to external quote calls.",
-                "pr": 2405
-            }
-        ],
-        "timestamp": 1578272714
-    },
-    {
-        "version": "1.0.2",
-        "changes": [
-            {
-                "note": "Do not query empty/unsigned orders. Swallow revets on DEX quotes.",
-                "pr": 2395
-            }
-        ],
-        "timestamp": 1576540892
-    },
-    {
-        "timestamp": 1575931811,
-        "version": "1.0.1",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "version": "1.0.0",
-        "changes": [
-            {
-                "note": "Created package.",
-                "pr": 2344
-            }
-        ],
-        "timestamp": 1575296764
-    },
-    {
-        "version": "1.0.0-beta.2",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ],
-        "timestamp": 1575290197
-    },
-    {
-        "version": "1.0.0-beta.1",
-        "changes": [
-            {
-                "note": "Created package.",
-                "pr": 2344
-            }
-        ]
-    }
-]

contracts/erc20-bridge-sampler/CHANGELOG.md

@@ -1,47 +0,0 @@
-<!--
-changelogUtils.file is auto-generated using the monorepo-scripts package. Don't edit directly.
-Edit the package's CHANGELOG.json file only.
--->
-
-CHANGELOG
-
-## v1.3.0 - _February 8, 2020_
-
-    * Catch reverts to `DevUtils` calls (#2476)
-
-## v1.2.1 - _February 6, 2020_
-
-    * Dependencies updated
-
-## v1.2.0 - _February 4, 2020_
-
-    * Make source IDs static on all networks, not inherited from `DeploymentConstants`. (#2459)
-
-## v1.1.0 - _January 22, 2020_
-
-    * Add batch functions to query quotes (#2427)
-    * Early exit if a DEX sample fails (#2427)
-
-## v1.0.3 - _January 6, 2020_
-
-    * Add gas limits to external quote calls. (#2405)
-
-## v1.0.2 - _December 17, 2019_
-
-    * Do not query empty/unsigned orders. Swallow revets on DEX quotes. (#2395)
-
-## v1.0.1 - _December 9, 2019_
-
-    * Dependencies updated
-
-## v1.0.0 - _December 2, 2019_
-
-    * Created package. (#2344)
-
-## v1.0.0-beta.2 - _December 2, 2019_
-
-    * Dependencies updated
-
-## v1.0.0-beta.1 - _Invalid date_
-
-    * Created package. (#2344)

contracts/erc20-bridge-sampler/contracts/src/ERC20BridgeSampler.sol

@@ -1,703 +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-asset-proxy/contracts/src/interfaces/IUniswapExchangeFactory.sol";
-import "@0x/contracts-erc20/contracts/src/LibERC20Token.sol";
-import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
-import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
-import "@0x/contracts-exchange-libs/contracts/src/LibMath.sol";
-import "@0x/contracts-utils/contracts/src/DeploymentConstants.sol";
-import "./IDevUtils.sol";
-import "./IERC20BridgeSampler.sol";
-import "./IEth2Dai.sol";
-import "./IKyberNetwork.sol";
-import "./IUniswapExchangeQuotes.sol";
-
-
-contract ERC20BridgeSampler is
-    IERC20BridgeSampler,
-    DeploymentConstants
-{
-    bytes4 constant internal ERC20_PROXY_ID = 0xf47261b0; // bytes4(keccak256("ERC20Token(address)"));
-    uint256 constant internal KYBER_SAMPLE_CALL_GAS = 1500e3;
-    uint256 constant internal UNISWAP_SAMPLE_CALL_GAS = 150e3;
-    uint256 constant internal ETH2DAI_SAMPLE_CALL_GAS = 1000e3;
-    uint256 constant internal DEV_UTILS_CALL_GAS = 500e3;
-    address constant private UNISWAP_SOURCE = 0xc0a47dFe034B400B47bDaD5FecDa2621de6c4d95;
-    address constant private ETH2DAI_SOURCE = 0x39755357759cE0d7f32dC8dC45414CCa409AE24e;
-    address constant private KYBER_SOURCE = 0x818E6FECD516Ecc3849DAf6845e3EC868087B755;
-
-    /// @dev Query batches of native orders and sample sell quotes on multiple DEXes at once.
-    /// @param orders Batches of Native orders to query.
-    /// @param orderSignatures Batches of Signatures for each respective order in `orders`.
-    /// @param sources Address of each DEX. Passing in an unsupported DEX will throw.
-    /// @param takerTokenAmounts Batches of Taker token sell amount for each sample.
-    /// @return ordersAndSamples How much taker asset can be filled
-    ///         by each order in `orders`. Maker amounts bought for each source at
-    ///         each taker token amount. First indexed by source index, then sample
-    ///         index.
-    function queryBatchOrdersAndSampleSells(
-        LibOrder.Order[][] memory orders,
-        bytes[][] memory orderSignatures,
-        address[] memory sources,
-        uint256[][] memory takerTokenAmounts
-    )
-        public
-        view
-        returns (
-            OrdersAndSample[] memory ordersAndSamples
-        )
-    {
-        ordersAndSamples = new OrdersAndSample[](orders.length);
-        for (uint256 i = 0; i != orders.length; i++) {
-            (
-                uint256[] memory orderFillableAssetAmounts,
-                uint256[][] memory tokenAmountsBySource
-            ) = queryOrdersAndSampleSells(orders[i], orderSignatures[i], sources, takerTokenAmounts[i]);
-            ordersAndSamples[i].orderFillableAssetAmounts = orderFillableAssetAmounts;
-            ordersAndSamples[i].tokenAmountsBySource = tokenAmountsBySource;
-        }
-    }
-
-    /// @dev Query batches of native orders and sample buy quotes on multiple DEXes at once.
-    /// @param orders Batches of Native orders to query.
-    /// @param orderSignatures Batches of Signatures for each respective order in `orders`.
-    /// @param sources Address of each DEX. Passing in an unsupported DEX will throw.
-    /// @param makerTokenAmounts Batches of Maker token sell amount for each sample.
-    /// @return ordersAndSamples How much taker asset can be filled
-    ///         by each order in `orders`. Taker amounts sold for each source at
-    ///         each maker token amount. First indexed by source index, then sample
-    ///         index.
-    function queryBatchOrdersAndSampleBuys(
-        LibOrder.Order[][] memory orders,
-        bytes[][] memory orderSignatures,
-        address[] memory sources,
-        uint256[][] memory makerTokenAmounts
-    )
-        public
-        view
-        returns (
-            OrdersAndSample[] memory ordersAndSamples
-        )
-    {
-        ordersAndSamples = new OrdersAndSample[](orders.length);
-        for (uint256 i = 0; i != orders.length; i++) {
-            (
-                uint256[] memory orderFillableAssetAmounts,
-                uint256[][] memory tokenAmountsBySource
-            ) = queryOrdersAndSampleBuys(orders[i], orderSignatures[i], sources, makerTokenAmounts[i]);
-            ordersAndSamples[i].orderFillableAssetAmounts = orderFillableAssetAmounts;
-            ordersAndSamples[i].tokenAmountsBySource = tokenAmountsBySource;
-        }
-    }
-
-    /// @dev Query native orders and sample sell quotes on multiple DEXes at once.
-    /// @param orders Native orders to query.
-    /// @param orderSignatures Signatures for each respective order in `orders`.
-    /// @param sources Address of each DEX. Passing in an unsupported DEX will throw.
-    /// @param takerTokenAmounts Taker token sell amount for each sample.
-    /// @return orderFillableTakerAssetAmounts How much taker asset can be filled
-    ///         by each order in `orders`.
-    /// @return makerTokenAmountsBySource Maker amounts bought for each source at
-    ///         each taker token amount. First indexed by source index, then sample
-    ///         index.
-    function queryOrdersAndSampleSells(
-        LibOrder.Order[] memory orders,
-        bytes[] memory orderSignatures,
-        address[] memory sources,
-        uint256[] memory takerTokenAmounts
-    )
-        public
-        view
-        returns (
-            uint256[] memory orderFillableTakerAssetAmounts,
-            uint256[][] memory makerTokenAmountsBySource
-        )
-    {
-        require(orders.length != 0, "ERC20BridgeSampler/EMPTY_ORDERS");
-        orderFillableTakerAssetAmounts = getOrderFillableTakerAssetAmounts(
-            orders,
-            orderSignatures
-        );
-        makerTokenAmountsBySource = sampleSells(
-            sources,
-            _assetDataToTokenAddress(orders[0].takerAssetData),
-            _assetDataToTokenAddress(orders[0].makerAssetData),
-            takerTokenAmounts
-        );
-    }
-
-    /// @dev Query native orders and sample buy quotes on multiple DEXes at once.
-    /// @param orders Native orders to query.
-    /// @param orderSignatures Signatures for each respective order in `orders`.
-    /// @param sources Address of each DEX. Passing in an unsupported DEX will throw.
-    /// @param makerTokenAmounts Maker token buy amount for each sample.
-    /// @return orderFillableMakerAssetAmounts How much maker asset can be filled
-    ///         by each order in `orders`.
-    /// @return takerTokenAmountsBySource Taker amounts sold for each source at
-    ///         each maker token amount. First indexed by source index, then sample
-    ///         index.
-    function queryOrdersAndSampleBuys(
-        LibOrder.Order[] memory orders,
-        bytes[] memory orderSignatures,
-        address[] memory sources,
-        uint256[] memory makerTokenAmounts
-    )
-        public
-        view
-        returns (
-            uint256[] memory orderFillableMakerAssetAmounts,
-            uint256[][] memory makerTokenAmountsBySource
-        )
-    {
-        require(orders.length != 0, "ERC20BridgeSampler/EMPTY_ORDERS");
-        orderFillableMakerAssetAmounts = getOrderFillableMakerAssetAmounts(
-            orders,
-            orderSignatures
-        );
-        makerTokenAmountsBySource = sampleBuys(
-            sources,
-            _assetDataToTokenAddress(orders[0].takerAssetData),
-            _assetDataToTokenAddress(orders[0].makerAssetData),
-            makerTokenAmounts
-        );
-    }
-
-    /// @dev Queries the fillable taker asset amounts of native orders.
-    ///      Effectively ignores orders that have empty signatures or
-    /// maker/taker asset amounts (returning 0).
-    /// @param orders Native orders to query.
-    /// @param orderSignatures Signatures for each respective order in `orders`.
-    /// @return orderFillableTakerAssetAmounts How much taker asset can be filled
-    ///         by each order in `orders`.
-    function getOrderFillableTakerAssetAmounts(
-        LibOrder.Order[] memory orders,
-        bytes[] memory orderSignatures
-    )
-        public
-        view
-        returns (uint256[] memory orderFillableTakerAssetAmounts)
-    {
-        orderFillableTakerAssetAmounts = new uint256[](orders.length);
-        for (uint256 i = 0; i != orders.length; i++) {
-            // Ignore orders with no signature or empty maker/taker amounts.
-            if (orderSignatures[i].length == 0 ||
-                orders[i].makerAssetAmount == 0 ||
-                orders[i].takerAssetAmount == 0) {
-                orderFillableTakerAssetAmounts[i] = 0;
-                continue;
-            }
-            // solhint-disable indent
-            (bool didSucceed, bytes memory resultData) =
-                _getDevUtilsAddress()
-                    .staticcall
-                    .gas(DEV_UTILS_CALL_GAS)
-                    (abi.encodeWithSelector(
-                       IDevUtils(_getDevUtilsAddress()).getOrderRelevantState.selector,
-                       orders[i],
-                       orderSignatures[i]
-                    ));
-            // solhint-enable indent
-            if (!didSucceed) {
-                orderFillableTakerAssetAmounts[i] = 0;
-                continue;
-            }
-            (
-                LibOrder.OrderInfo memory orderInfo,
-                uint256 fillableTakerAssetAmount,
-                bool isValidSignature
-            ) = abi.decode(
-                resultData,
-                (LibOrder.OrderInfo, uint256, bool)
-            );
-            // The fillable amount is zero if the order is not fillable or if the
-            // signature is invalid.
-            if (orderInfo.orderStatus != LibOrder.OrderStatus.FILLABLE ||
-                !isValidSignature) {
-                orderFillableTakerAssetAmounts[i] = 0;
-            } else {
-                orderFillableTakerAssetAmounts[i] = fillableTakerAssetAmount;
-            }
-        }
-    }
-
-    /// @dev Queries the fillable taker asset amounts of native orders.
-    ///      Effectively ignores orders that have empty signatures or
-    /// @param orders Native orders to query.
-    /// @param orderSignatures Signatures for each respective order in `orders`.
-    /// @return orderFillableMakerAssetAmounts How much maker asset can be filled
-    ///         by each order in `orders`.
-    function getOrderFillableMakerAssetAmounts(
-        LibOrder.Order[] memory orders,
-        bytes[] memory orderSignatures
-    )
-        public
-        view
-        returns (uint256[] memory orderFillableMakerAssetAmounts)
-    {
-        orderFillableMakerAssetAmounts = getOrderFillableTakerAssetAmounts(
-            orders,
-            orderSignatures
-        );
-        // `orderFillableMakerAssetAmounts` now holds taker asset amounts, so
-        // convert them to maker asset amounts.
-        for (uint256 i = 0; i < orders.length; ++i) {
-            if (orderFillableMakerAssetAmounts[i] != 0) {
-                orderFillableMakerAssetAmounts[i] = LibMath.getPartialAmountCeil(
-                    orderFillableMakerAssetAmounts[i],
-                    orders[i].takerAssetAmount,
-                    orders[i].makerAssetAmount
-                );
-            }
-        }
-    }
-
-    /// @dev Sample sell quotes on multiple DEXes at once.
-    /// @param sources Address of each DEX. Passing in an unsupported DEX will throw.
-    /// @param takerToken Address of the taker token (what to sell).
-    /// @param makerToken Address of the maker token (what to buy).
-    /// @param takerTokenAmounts Taker token sell amount for each sample.
-    /// @return makerTokenAmountsBySource Maker amounts bought for each source at
-    ///         each taker token amount. First indexed by source index, then sample
-    ///         index.
-    function sampleSells(
-        address[] memory sources,
-        address takerToken,
-        address makerToken,
-        uint256[] memory takerTokenAmounts
-    )
-        public
-        view
-        returns (uint256[][] memory makerTokenAmountsBySource)
-    {
-        uint256 numSources = sources.length;
-        makerTokenAmountsBySource = new uint256[][](numSources);
-        for (uint256 i = 0; i < numSources; i++) {
-            makerTokenAmountsBySource[i] = _sampleSellSource(
-                sources[i],
-                takerToken,
-                makerToken,
-                takerTokenAmounts
-            );
-        }
-    }
-
-    /// @dev Query native orders and sample buy quotes on multiple DEXes at once.
-    /// @param sources Address of each DEX. Passing in an unsupported DEX will throw.
-    /// @param takerToken Address of the taker token (what to sell).
-    /// @param makerToken Address of the maker token (what to buy).
-    /// @param makerTokenAmounts Maker token buy amount for each sample.
-    /// @return takerTokenAmountsBySource Taker amounts sold for each source at
-    ///         each maker token amount. First indexed by source index, then sample
-    ///         index.
-    function sampleBuys(
-        address[] memory sources,
-        address takerToken,
-        address makerToken,
-        uint256[] memory makerTokenAmounts
-    )
-        public
-        view
-        returns (uint256[][] memory takerTokenAmountsBySource)
-    {
-        uint256 numSources = sources.length;
-        takerTokenAmountsBySource = new uint256[][](numSources);
-        for (uint256 i = 0; i < numSources; i++) {
-            takerTokenAmountsBySource[i] = _sampleBuySource(
-                sources[i],
-                takerToken,
-                makerToken,
-                makerTokenAmounts
-            );
-        }
-    }
-
-    /// @dev Sample sell quotes from Kyber.
-    /// @param takerToken Address of the taker token (what to sell).
-    /// @param makerToken Address of the maker token (what to buy).
-    /// @param takerTokenAmounts Taker token sell amount for each sample.
-    /// @return makerTokenAmounts Maker amounts bought at each taker token
-    ///         amount.
-    function sampleSellsFromKyberNetwork(
-        address takerToken,
-        address makerToken,
-        uint256[] memory takerTokenAmounts
-    )
-        public
-        view
-        returns (uint256[] memory makerTokenAmounts)
-    {
-        _assertValidPair(makerToken, takerToken);
-        address _takerToken = takerToken == _getWethAddress() ? KYBER_ETH_ADDRESS : takerToken;
-        address _makerToken = makerToken == _getWethAddress() ? KYBER_ETH_ADDRESS : makerToken;
-        uint256 takerTokenDecimals = _getTokenDecimals(takerToken);
-        uint256 makerTokenDecimals = _getTokenDecimals(makerToken);
-        uint256 numSamples = takerTokenAmounts.length;
-        makerTokenAmounts = new uint256[](numSamples);
-        for (uint256 i = 0; i < numSamples; i++) {
-            (bool didSucceed, bytes memory resultData) =
-                _getKyberNetworkProxyAddress().staticcall.gas(KYBER_SAMPLE_CALL_GAS)(
-                    abi.encodeWithSelector(
-                        IKyberNetwork(0).getExpectedRate.selector,
-                        _takerToken,
-                        _makerToken,
-                        takerTokenAmounts[i]
-                    ));
-            uint256 rate = 0;
-            if (didSucceed) {
-                rate = abi.decode(resultData, (uint256));
-            } else {
-                break;
-            }
-            makerTokenAmounts[i] =
-                rate *
-                takerTokenAmounts[i] *
-                10 ** makerTokenDecimals /
-                10 ** takerTokenDecimals /
-                10 ** 18;
-        }
-    }
-
-    /// @dev Sample sell quotes from Eth2Dai/Oasis.
-    /// @param takerToken Address of the taker token (what to sell).
-    /// @param makerToken Address of the maker token (what to buy).
-    /// @param takerTokenAmounts Taker token sell amount for each sample.
-    /// @return makerTokenAmounts Maker amounts bought at each taker token
-    ///         amount.
-    function sampleSellsFromEth2Dai(
-        address takerToken,
-        address makerToken,
-        uint256[] memory takerTokenAmounts
-    )
-        public
-        view
-        returns (uint256[] memory makerTokenAmounts)
-    {
-        _assertValidPair(makerToken, takerToken);
-        uint256 numSamples = takerTokenAmounts.length;
-        makerTokenAmounts = new uint256[](numSamples);
-        for (uint256 i = 0; i < numSamples; i++) {
-            (bool didSucceed, bytes memory resultData) =
-                _getEth2DaiAddress().staticcall.gas(ETH2DAI_SAMPLE_CALL_GAS)(
-                    abi.encodeWithSelector(
-                        IEth2Dai(0).getBuyAmount.selector,
-                        makerToken,
-                        takerToken,
-                        takerTokenAmounts[i]
-                    ));
-            uint256 buyAmount = 0;
-            if (didSucceed) {
-                buyAmount = abi.decode(resultData, (uint256));
-            } else{
-                break;
-            }
-            makerTokenAmounts[i] = buyAmount;
-        }
-    }
-
-    /// @dev Sample buy quotes from Eth2Dai/Oasis.
-    /// @param takerToken Address of the taker token (what to sell).
-    /// @param makerToken Address of the maker token (what to buy).
-    /// @param takerTokenAmounts Maker token sell amount for each sample.
-    /// @return takerTokenAmounts Taker amounts sold at each maker token
-    ///         amount.
-    function sampleBuysFromEth2Dai(
-        address takerToken,
-        address makerToken,
-        uint256[] memory makerTokenAmounts
-    )
-        public
-        view
-        returns (uint256[] memory takerTokenAmounts)
-    {
-        _assertValidPair(makerToken, takerToken);
-        uint256 numSamples = makerTokenAmounts.length;
-        takerTokenAmounts = new uint256[](numSamples);
-        for (uint256 i = 0; i < numSamples; i++) {
-            (bool didSucceed, bytes memory resultData) =
-                _getEth2DaiAddress().staticcall.gas(ETH2DAI_SAMPLE_CALL_GAS)(
-                    abi.encodeWithSelector(
-                        IEth2Dai(0).getPayAmount.selector,
-                        takerToken,
-                        makerToken,
-                        makerTokenAmounts[i]
-                    ));
-            uint256 sellAmount = 0;
-            if (didSucceed) {
-                sellAmount = abi.decode(resultData, (uint256));
-            } else {
-                break;
-            }
-            takerTokenAmounts[i] = sellAmount;
-        }
-    }
-
-    /// @dev Sample sell quotes from Uniswap.
-    /// @param takerToken Address of the taker token (what to sell).
-    /// @param makerToken Address of the maker token (what to buy).
-    /// @param takerTokenAmounts Taker token sell amount for each sample.
-    /// @return makerTokenAmounts Maker amounts bought at each taker token
-    ///         amount.
-    function sampleSellsFromUniswap(
-        address takerToken,
-        address makerToken,
-        uint256[] memory takerTokenAmounts
-    )
-        public
-        view
-        returns (uint256[] memory makerTokenAmounts)
-    {
-        _assertValidPair(makerToken, takerToken);
-        uint256 numSamples = takerTokenAmounts.length;
-        makerTokenAmounts = new uint256[](numSamples);
-        IUniswapExchangeQuotes takerTokenExchange = takerToken == _getWethAddress() ?
-            IUniswapExchangeQuotes(0) : _getUniswapExchange(takerToken);
-        IUniswapExchangeQuotes makerTokenExchange = makerToken == _getWethAddress() ?
-            IUniswapExchangeQuotes(0) : _getUniswapExchange(makerToken);
-        for (uint256 i = 0; i < numSamples; i++) {
-            bool didSucceed = true;
-            if (makerToken == _getWethAddress()) {
-                (makerTokenAmounts[i], didSucceed) = _callUniswapExchangePriceFunction(
-                    address(takerTokenExchange),
-                    takerTokenExchange.getTokenToEthInputPrice.selector,
-                    takerTokenAmounts[i]
-                );
-            } else if (takerToken == _getWethAddress()) {
-                (makerTokenAmounts[i], didSucceed) = _callUniswapExchangePriceFunction(
-                    address(makerTokenExchange),
-                    makerTokenExchange.getEthToTokenInputPrice.selector,
-                    takerTokenAmounts[i]
-                );
-            } else {
-                uint256 ethBought;
-                (ethBought, didSucceed) = _callUniswapExchangePriceFunction(
-                    address(takerTokenExchange),
-                    takerTokenExchange.getTokenToEthInputPrice.selector,
-                    takerTokenAmounts[i]
-                );
-                if (ethBought != 0) {
-                    (makerTokenAmounts[i], didSucceed) = _callUniswapExchangePriceFunction(
-                        address(makerTokenExchange),
-                        makerTokenExchange.getEthToTokenInputPrice.selector,
-                        ethBought
-                    );
-                } else {
-                    makerTokenAmounts[i] = 0;
-                }
-            }
-            if (!didSucceed) {
-                break;
-            }
-        }
-    }
-
-    /// @dev Sample buy quotes from Uniswap.
-    /// @param takerToken Address of the taker token (what to sell).
-    /// @param makerToken Address of the maker token (what to buy).
-    /// @param makerTokenAmounts Maker token sell amount for each sample.
-    /// @return takerTokenAmounts Taker amounts sold at each maker token
-    ///         amount.
-    function sampleBuysFromUniswap(
-        address takerToken,
-        address makerToken,
-        uint256[] memory makerTokenAmounts
-    )
-        public
-        view
-        returns (uint256[] memory takerTokenAmounts)
-    {
-        _assertValidPair(makerToken, takerToken);
-        uint256 numSamples = makerTokenAmounts.length;
-        takerTokenAmounts = new uint256[](numSamples);
-        IUniswapExchangeQuotes takerTokenExchange = takerToken == _getWethAddress() ?
-            IUniswapExchangeQuotes(0) : _getUniswapExchange(takerToken);
-        IUniswapExchangeQuotes makerTokenExchange = makerToken == _getWethAddress() ?
-            IUniswapExchangeQuotes(0) : _getUniswapExchange(makerToken);
-        for (uint256 i = 0; i < numSamples; i++) {
-            bool didSucceed = true;
-            if (makerToken == _getWethAddress()) {
-                (takerTokenAmounts[i], didSucceed) = _callUniswapExchangePriceFunction(
-                    address(takerTokenExchange),
-                    takerTokenExchange.getTokenToEthOutputPrice.selector,
-                    makerTokenAmounts[i]
-                );
-            } else if (takerToken == _getWethAddress()) {
-                (takerTokenAmounts[i], didSucceed) = _callUniswapExchangePriceFunction(
-                    address(makerTokenExchange),
-                    makerTokenExchange.getEthToTokenOutputPrice.selector,
-                    makerTokenAmounts[i]
-                );
-            } else {
-                uint256 ethSold;
-                (ethSold, didSucceed) = _callUniswapExchangePriceFunction(
-                    address(makerTokenExchange),
-                    makerTokenExchange.getEthToTokenOutputPrice.selector,
-                    makerTokenAmounts[i]
-                );
-                if (ethSold != 0) {
-                    (takerTokenAmounts[i], didSucceed) = _callUniswapExchangePriceFunction(
-                        address(takerTokenExchange),
-                        takerTokenExchange.getTokenToEthOutputPrice.selector,
-                        ethSold
-                    );
-                } else {
-                    takerTokenAmounts[i] = 0;
-                }
-            }
-            if (!didSucceed) {
-                break;
-            }
-        }
-    }
-
-    /// @dev Overridable way to get token decimals.
-    /// @param tokenAddress Address of the token.
-    /// @return decimals The decimal places for the token.
-    function _getTokenDecimals(address tokenAddress)
-        internal
-        view
-        returns (uint8 decimals)
-    {
-        return LibERC20Token.decimals(tokenAddress);
-    }
-
-    /// @dev Gracefully calls a Uniswap pricing function.
-    /// @param uniswapExchangeAddress Address of an `IUniswapExchangeQuotes` exchange.
-    /// @param functionSelector Selector of the target function.
-    /// @param inputAmount Quantity parameter particular to the pricing function.
-    /// @return outputAmount The returned amount from the function call. Will be
-    ///         zero if the call fails or if `uniswapExchangeAddress` is zero.
-    function _callUniswapExchangePriceFunction(
-        address uniswapExchangeAddress,
-        bytes4 functionSelector,
-        uint256 inputAmount
-    )
-        private
-        view
-        returns (uint256 outputAmount, bool didSucceed)
-    {
-        if (uniswapExchangeAddress == address(0)) {
-            return (outputAmount, didSucceed);
-        }
-        bytes memory resultData;
-        (didSucceed, resultData) =
-            uniswapExchangeAddress.staticcall.gas(UNISWAP_SAMPLE_CALL_GAS)(
-                abi.encodeWithSelector(
-                    functionSelector,
-                    inputAmount
-                ));
-        if (didSucceed) {
-            outputAmount = abi.decode(resultData, (uint256));
-        }
-    }
-
-    /// @dev Samples a supported sell source, defined by its address.
-    /// @param takerToken Address of the taker token (what to sell).
-    /// @param makerToken Address of the maker token (what to buy).
-    /// @param takerTokenAmounts Taker token sell amount for each sample.
-    /// @return makerTokenAmounts Maker amounts bought at each taker token
-    ///         amount.
-    function _sampleSellSource(
-        address source,
-        address takerToken,
-        address makerToken,
-        uint256[] memory takerTokenAmounts
-    )
-        private
-        view
-        returns (uint256[] memory makerTokenAmounts)
-    {
-        if (source == ETH2DAI_SOURCE) {
-            return sampleSellsFromEth2Dai(takerToken, makerToken, takerTokenAmounts);
-        }
-        if (source == UNISWAP_SOURCE) {
-            return sampleSellsFromUniswap(takerToken, makerToken, takerTokenAmounts);
-        }
-        if (source == KYBER_SOURCE) {
-            return sampleSellsFromKyberNetwork(takerToken, makerToken, takerTokenAmounts);
-        }
-        revert("ERC20BridgeSampler/UNSUPPORTED_SOURCE");
-    }
-
-    /// @dev Samples a supported buy source, defined by its address.
-    /// @param takerToken Address of the taker token (what to sell).
-    /// @param makerToken Address of the maker token (what to buy).
-    /// @param makerTokenAmounts Maker token sell amount for each sample.
-    /// @return takerTokenAmounts Taker amounts sold at each maker token
-    ///         amount.
-    function _sampleBuySource(
-        address source,
-        address takerToken,
-        address makerToken,
-        uint256[] memory makerTokenAmounts
-    )
-        private
-        view
-        returns (uint256[] memory takerTokenAmounts)
-    {
-        if (source == ETH2DAI_SOURCE) {
-            return sampleBuysFromEth2Dai(takerToken, makerToken, makerTokenAmounts);
-        }
-        if (source == UNISWAP_SOURCE) {
-            return sampleBuysFromUniswap(takerToken, makerToken, makerTokenAmounts);
-        }
-        revert("ERC20BridgeSampler/UNSUPPORTED_SOURCE");
-    }
-
-    /// @dev Retrive an existing Uniswap exchange contract.
-    ///      Throws if the exchange does not exist.
-    /// @param tokenAddress Address of the token contract.
-    /// @return exchange `IUniswapExchangeQuotes` for the token.
-    function _getUniswapExchange(address tokenAddress)
-        private
-        view
-        returns (IUniswapExchangeQuotes exchange)
-    {
-        exchange = IUniswapExchangeQuotes(
-            address(IUniswapExchangeFactory(_getUniswapExchangeFactoryAddress())
-            .getExchange(tokenAddress))
-        );
-    }
-
-    /// @dev Extract the token address from ERC20 proxy asset data.
-    /// @param assetData ERC20 asset data.
-    /// @return tokenAddress The decoded token address.
-    function _assetDataToTokenAddress(bytes memory assetData)
-        private
-        pure
-        returns (address tokenAddress)
-    {
-        require(assetData.length == 36, "ERC20BridgeSampler/INVALID_ASSET_DATA");
-        bytes4 selector;
-        assembly {
-            selector := and(mload(add(assetData, 0x20)), 0xFFFFFFFF00000000000000000000000000000000000000000000000000000000)
-            tokenAddress := mload(add(assetData, 0x24))
-        }
-        require(selector == ERC20_PROXY_ID, "ERC20BridgeSampler/UNSUPPORTED_ASSET_PROXY");
-    }
-
-    function _assertValidPair(address makerToken, address takerToken)
-        private
-        pure
-    {
-        require(makerToken != takerToken, "ERC20BridgeSampler/INVALID_TOKEN_PAIR");
-    }
-}

contracts/erc20-bridge-sampler/contracts/src/IDevUtils.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;
-pragma experimental ABIEncoderV2;
-
-import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
-
-
-interface IDevUtils {
-
-    /// @dev Fetches all order-relevant information needed to validate if the supplied order is fillable.
-    /// @param order The order structure.
-    /// @param signature Signature provided by maker that proves the order's authenticity.
-    /// `0x01` can always be provided if the signature does not need to be validated.
-    /// @return The orderInfo (hash, status, and `takerAssetAmount` already filled for the given order),
-    /// fillableTakerAssetAmount (amount of the order's `takerAssetAmount` that is fillable given all on-chain state),
-    /// and isValidSignature (validity of the provided signature).
-    /// NOTE: If the `takerAssetData` encodes data for multiple assets, `fillableTakerAssetAmount` will represent a "scaled"
-    /// amount, meaning it must be multiplied by all the individual asset amounts within the `takerAssetData` to get the final
-    /// amount of each asset that can be filled.
-    function getOrderRelevantState(LibOrder.Order calldata order, bytes calldata signature)
-        external
-        view
-        returns (
-            LibOrder.OrderInfo memory orderInfo,
-            uint256 fillableTakerAssetAmount,
-            bool isValidSignature
-        );
-}

contracts/erc20-bridge-sampler/contracts/src/IERC20BridgeSampler.sol

@@ -1,180 +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-exchange-libs/contracts/src/LibOrder.sol";
-
-
-interface IERC20BridgeSampler {
-    struct OrdersAndSample {
-        uint256[] orderFillableAssetAmounts;
-        uint256[][] tokenAmountsBySource;
-    }
-
-    /// @dev Query batches of native orders and sample sell quotes on multiple DEXes at once.
-    /// @param orders Batches of Native orders to query.
-    /// @param orderSignatures Batches of Signatures for each respective order in `orders`.
-    /// @param sources Address of each DEX. Passing in an unsupported DEX will throw.
-    /// @param takerTokenAmounts Batches of Taker token sell amount for each sample.
-    /// @return ordersAndSamples How much taker asset can be filled
-    ///         by each order in `orders`. Maker amounts bought for each source at
-    ///         each taker token amount. First indexed by source index, then sample
-    ///         index.
-    function queryBatchOrdersAndSampleSells(
-        LibOrder.Order[][] calldata orders,
-        bytes[][] calldata orderSignatures,
-        address[] calldata sources,
-        uint256[][] calldata takerTokenAmounts
-    )
-        external
-        view
-        returns (
-            OrdersAndSample[] memory ordersAndSamples
-        );
-
-    /// @dev Query batches of native orders and sample buy quotes on multiple DEXes at once.
-    /// @param orders Batches of Native orders to query.
-    /// @param orderSignatures Batches of Signatures for each respective order in `orders`.
-    /// @param sources Address of each DEX. Passing in an unsupported DEX will throw.
-    /// @param makerTokenAmounts Batches of Maker token sell amount for each sample.
-    /// @return ordersAndSamples How much taker asset can be filled
-    ///         by each order in `orders`. Taker amounts sold for each source at
-    ///         each maker token amount. First indexed by source index, then sample
-    ///         index
-    function queryBatchOrdersAndSampleBuys(
-        LibOrder.Order[][] calldata orders,
-        bytes[][] calldata orderSignatures,
-        address[] calldata sources,
-        uint256[][] calldata makerTokenAmounts
-    )
-        external
-        view
-        returns (
-            OrdersAndSample[] memory ordersAndSamples
-        );
-
-    /// @dev Query native orders and sample sell quotes on multiple DEXes at once.
-    /// @param orders Native orders to query.
-    /// @param orderSignatures Signatures for each respective order in `orders`.
-    /// @param sources Address of each DEX. Passing in an unsupported DEX will throw.
-    /// @param takerTokenAmounts Taker token sell amount for each sample.
-    /// @return orderFillableTakerAssetAmounts How much taker asset can be filled
-    ///         by each order in `orders`.
-    /// @return makerTokenAmountsBySource Maker amounts bought for each source at
-    ///         each taker token amount. First indexed by source index, then sample
-    ///         index.
-    function queryOrdersAndSampleSells(
-        LibOrder.Order[] calldata orders,
-        bytes[] calldata orderSignatures,
-        address[] calldata sources,
-        uint256[] calldata takerTokenAmounts
-    )
-        external
-        view
-        returns (
-            uint256[] memory orderFillableTakerAssetAmounts,
-            uint256[][] memory makerTokenAmountsBySource
-        );
-
-    /// @dev Query native orders and sample buy quotes on multiple DEXes at once.
-    /// @param orders Native orders to query.
-    /// @param orderSignatures Signatures for each respective order in `orders`.
-    /// @param sources Address of each DEX. Passing in an unsupported DEX will throw.
-    /// @param makerTokenAmounts Maker token buy amount for each sample.
-    /// @return orderFillableMakerAssetAmounts How much maker asset can be filled
-    ///         by each order in `orders`.
-    /// @return takerTokenAmountsBySource Taker amounts sold for each source at
-    ///         each maker token amount. First indexed by source index, then sample
-    ///         index.
-    function queryOrdersAndSampleBuys(
-        LibOrder.Order[] calldata orders,
-        bytes[] calldata orderSignatures,
-        address[] calldata sources,
-        uint256[] calldata makerTokenAmounts
-    )
-        external
-        view
-        returns (
-            uint256[] memory orderFillableMakerAssetAmounts,
-            uint256[][] memory makerTokenAmountsBySource
-        );
-
-    /// @dev Queries the fillable taker asset amounts of native orders.
-    /// @param orders Native orders to query.
-    /// @param orderSignatures Signatures for each respective order in `orders`.
-    /// @return orderFillableTakerAssetAmounts How much taker asset can be filled
-    ///         by each order in `orders`.
-    function getOrderFillableTakerAssetAmounts(
-        LibOrder.Order[] calldata orders,
-        bytes[] calldata orderSignatures
-    )
-        external
-        view
-        returns (uint256[] memory orderFillableTakerAssetAmounts);
-
-    /// @dev Queries the fillable maker asset amounts of native orders.
-    /// @param orders Native orders to query.
-    /// @param orderSignatures Signatures for each respective order in `orders`.
-    /// @return orderFillableMakerAssetAmounts How much maker asset can be filled
-    ///         by each order in `orders`.
-    function getOrderFillableMakerAssetAmounts(
-        LibOrder.Order[] calldata orders,
-        bytes[] calldata orderSignatures
-    )
-        external
-        view
-        returns (uint256[] memory orderFillableMakerAssetAmounts);
-
-    /// @dev Sample sell quotes on multiple DEXes at once.
-    /// @param sources Address of each DEX. Passing in an unsupported DEX will throw.
-    /// @param takerToken Address of the taker token (what to sell).
-    /// @param makerToken Address of the maker token (what to buy).
-    /// @param takerTokenAmounts Taker token sell amount for each sample.
-    /// @return makerTokenAmountsBySource Maker amounts bought for each source at
-    ///         each taker token amount. First indexed by source index, then sample
-    ///         index.
-    function sampleSells(
-        address[] calldata sources,
-        address takerToken,
-        address makerToken,
-        uint256[] calldata takerTokenAmounts
-    )
-        external
-        view
-        returns (uint256[][] memory makerTokenAmountsBySource);
-
-    /// @dev Query native orders and sample buy quotes on multiple DEXes at once.
-    /// @param sources Address of each DEX. Passing in an unsupported DEX will throw.
-    /// @param takerToken Address of the taker token (what to sell).
-    /// @param makerToken Address of the maker token (what to buy).
-    /// @param makerTokenAmounts Maker token buy amount for each sample.
-    /// @return takerTokenAmountsBySource Taker amounts sold for each source at
-    ///         each maker token amount. First indexed by source index, then sample
-    ///         index.
-    function sampleBuys(
-        address[] calldata sources,
-        address takerToken,
-        address makerToken,
-        uint256[] calldata makerTokenAmounts
-    )
-        external
-        view
-        returns (uint256[][] memory takerTokenAmountsBySource);
-}