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
Updated CHANGELOGS & MD docs
2020-10-21 03:33:23 -04:00 · 2020-10-21 03:33:18 -04:00 · 2020-10-21 03:08:33 -04:00 · 2020-10-21 02:53:41 -04:00 · 2020-10-21 02:27:55 -04:00 · 2020-10-21 02:14:47 -04:00
1328 changed files with 13251 additions and 136586 deletions
--- a/.circleci/config.yml
+++ b/.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
@@ -41,7 +31,7 @@ jobs:
    test-exchange-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:
@@ -51,7 +41,7 @@ jobs:
    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:
@@ -61,27 +51,37 @@ jobs:
    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-staking
-    test-contracts-rest-ganache:
+    test-contracts-extra-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-coordinator @0x/contracts-erc20-bridge-sampler @0x/contracts-broker @0x/contracts-zero-ex
+            - 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,7 +95,7 @@ jobs:
                  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:
@@ -106,230 +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
-              environment:
-                  VERSION: '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,94 +143,42 @@ 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:
-                  requires:
-                      - build
-            - test-integrations-ganache:
-                  requires:
-                      - build
-            - test-contracts-staking-ganache:
-                  requires:
-                      - build
+            # 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
@@ -441,18 +194,14 @@ workflows:
            - test-doc-generation:
                  requires:
                      - build
-            - submit-coverage:
-                  requires:
-                      - test-contracts-rest-ganache
-                      - test-contracts-staking-ganache
-                      - test-exchange-ganache
-                      - 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
--- a/.gitattributes
+++ b/.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
-
--- a/.github/autolabeler.yml
+++ b/.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']
--- a/.gitignore
+++ b/.gitignore
@@ -113,8 +113,6 @@ contracts/dev-utils/generated-artifacts/
 contracts/dev-utils/test/generated-artifacts/
 contracts/zero-ex/generated-artifacts/
 contracts/zero-ex/test/generated-artifacts/
-packages/sol-tracing-utils/test/fixtures/artifacts/
-python-packages/contract_artifacts/src/zero_ex/contract_artifacts/artifacts/

 # generated truffle contract artifacts/
 contracts/broker/build/
@@ -169,24 +167,6 @@ contracts/dev-utils/generated-wrappers/
 contracts/dev-utils/test/generated-wrappers/
 contracts/zero-ex/generated-wrappers/
 contracts/zero-ex/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

 # Doc README copy
 packages/*/docs/README.md
--- a/.prettierignore
+++ b/.prettierignore
@@ -76,23 +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-wrappers
-/packages/asset-swapper/test/generated-wrappers
 /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
--- a/.prettierrc
+++ b/.prettierrc
@@ -2,5 +2,6 @@
    "printWidth": 120,
    "tabWidth": 4,
    "singleQuote": true,
-    "trailingComma": "all"
+    "trailingComma": "all",
+    "bracketSpacing": true
 }
--- a/26
+++ b/26
@@ -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
--- a/CONTRIBUTING.md
+++ b/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.
--- a/2
+++ b/2
@@ -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.
--- a/README.md
+++ b/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:
--- a/contracts/asset-proxy/CHANGELOG.json
+++ b/contracts/asset-proxy/CHANGELOG.json
@@ -25,8 +25,21 @@
            {
                "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",
--- a/contracts/asset-proxy/CHANGELOG.md
+++ b/contracts/asset-proxy/CHANGELOG.md
@@ -5,6 +5,18 @@ 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)
--- a/contracts/asset-proxy/contracts/src/bridges/CreamBridge.sol
+++ b/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;
+    }
+}
--- a/contracts/asset-proxy/contracts/src/bridges/DODOBridge.sol
+++ b/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;
+    }
+}
--- a/contracts/asset-proxy/contracts/src/bridges/ShellBridge.sol
+++ b/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;
+    }
+}
--- a/contracts/asset-proxy/contracts/src/bridges/SushiSwapBridge.sol
+++ b/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;
+    }
+}
--- a/packages/sol-compiler/test/fixtures/contracts/V6Contract.sol
+++ b/packages/sol-compiler/test/fixtures/contracts/V6Contract.sol
@@ -16,22 +16,19 @@

 */

-pragma solidity 0.6.4;
+pragma solidity ^0.5.9;


-contract V6Contract {
+interface IShell {

-    uint256 private _privateNumber;
-
-    constructor(uint256 privateNumber) public {
-        _privateNumber = privateNumber;
-    }
-
-    fallback() external {
-        revert('nope');
-    }
-
-    receive() payable external {
-        // no-op
-    }
+    function originSwap(
+        address from,
+        address to,
+        uint256 fromAmount,
+        uint256 minTargetAmount,
+        uint256 deadline
+    )
+        external
+        returns (uint256 toAmount);
 }
+
--- a/contracts/asset-proxy/contracts/test/TestKyberBridge.sol
+++ b/contracts/asset-proxy/contracts/test/TestKyberBridge.sol
@@ -201,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)
--- a/contracts/asset-proxy/package.json
+++ b/contracts/asset-proxy/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-asset-proxy",
-    "version": "3.4.0",
+    "version": "3.5.0",
    "engines": {
        "node": ">=6.12"
    },
@@ -38,31 +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/@(BalancerBridge|BancorBridge|ChaiBridge|CurveBridge|DexForwarderBridge|DydxBridge|ERC1155Proxy|ERC20BridgeProxy|ERC20Proxy|ERC721Proxy|Eth2DaiBridge|IAssetData|IAssetProxy|IAssetProxyDispatcher|IAuthorizable|IBalancerPool|IBancorNetwork|IChai|ICurve|IDydx|IDydxBridge|IERC20Bridge|IEth2Dai|IGasToken|IKyberNetworkProxy|IMStable|IMooniswap|IUniswapExchange|IUniswapExchangeFactory|IUniswapV2Router01|KyberBridge|MStableBridge|MixinAssetProxyDispatcher|MixinAuthorizable|MixinGasToken|MooniswapBridge|MultiAssetProxy|Ownable|StaticCallProxy|TestBancorBridge|TestChaiBridge|TestDexForwarderBridge|TestDydxBridge|TestERC20Bridge|TestEth2DaiBridge|TestKyberBridge|TestStaticCallTarget|TestUniswapBridge|TestUniswapV2Bridge|UniswapBridge|UniswapV2Bridge).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.3.1",
-        "@0x/contract-wrappers": "^13.8.0",
-        "@0x/contracts-gen": "^2.0.10",
-        "@0x/contracts-test-utils": "^5.3.4",
-        "@0x/contracts-utils": "^4.5.1",
-        "@0x/dev-utils": "^3.3.0",
-        "@0x/sol-compiler": "^4.1.1",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.1.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",
@@ -75,21 +75,21 @@
        "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.3",
-        "@0x/contracts-erc1155": "^2.1.7",
-        "@0x/contracts-erc20": "^3.2.1",
-        "@0x/contracts-erc721": "^3.1.7",
-        "@0x/contracts-exchange-libs": "^4.3.7",
-        "@0x/order-utils": "^10.3.0",
-        "@0x/types": "^3.2.0",
-        "@0x/typescript-typings": "^5.1.1",
-        "@0x/utils": "^5.5.1",
-        "@0x/web3-wrapper": "^7.2.0",
-        "ethereum-types": "^3.2.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": {
--- a/contracts/asset-proxy/src/artifacts.ts
+++ b/contracts/asset-proxy/src/artifacts.ts
@@ -8,8 +8,10 @@ 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';
@@ -32,6 +34,7 @@ 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';
@@ -43,7 +46,9 @@ 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';
@@ -69,7 +74,9 @@ export const artifacts = {
    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,
@@ -77,6 +84,8 @@ export const artifacts = {
    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,
@@ -95,6 +104,7 @@ export const artifacts = {
    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,
--- a/contracts/asset-proxy/src/wrappers.ts
+++ b/contracts/asset-proxy/src/wrappers.ts
@@ -6,7 +6,9 @@
 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';
@@ -30,6 +32,7 @@ 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';
@@ -41,7 +44,9 @@ 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';
--- a/contracts/asset-proxy/test/artifacts.ts
+++ b/contracts/asset-proxy/test/artifacts.ts
@@ -8,8 +8,10 @@ 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';
@@ -32,6 +34,7 @@ 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';
@@ -43,7 +46,9 @@ import * as MooniswapBridge from '../test/generated-artifacts/MooniswapBridge.js
 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';
@@ -69,7 +74,9 @@ export const artifacts = {
    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,
@@ -77,6 +84,8 @@ export const artifacts = {
    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,
@@ -95,6 +104,7 @@ export const artifacts = {
    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,
--- a/contracts/asset-proxy/test/kyber_bridge.ts
+++ b/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();
--- a/contracts/asset-proxy/test/wrappers.ts
+++ b/contracts/asset-proxy/test/wrappers.ts
@@ -6,7 +6,9 @@
 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';
@@ -30,6 +32,7 @@ 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';
@@ -41,7 +44,9 @@ 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';
--- a/contracts/asset-proxy/tsconfig.json
+++ b/contracts/asset-proxy/tsconfig.json
@@ -6,7 +6,9 @@
        "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",
@@ -30,6 +32,7 @@
        "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",
@@ -41,7 +44,9 @@
        "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",
@@ -57,7 +62,9 @@
        "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",
@@ -81,6 +88,7 @@
        "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",
@@ -92,7 +100,9 @@
        "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",
--- a/contracts/broker/CHANGELOG.json
+++ b/contracts/broker/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1603265572,
+        "version": "1.1.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1594788383,
        "version": "1.1.6",
--- a/contracts/broker/CHANGELOG.md
+++ b/contracts/broker/CHANGELOG.md
@@ -5,6 +5,10 @@ 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
--- a/contracts/broker/package.json
+++ b/contracts/broker/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-broker",
-    "version": "1.1.6",
+    "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.3.1",
-        "@0x/contracts-asset-proxy": "^3.4.0",
-        "@0x/contracts-erc20": "^3.2.1",
-        "@0x/contracts-erc721": "^3.1.7",
-        "@0x/contracts-exchange": "^3.2.7",
-        "@0x/contracts-exchange-libs": "^4.3.7",
-        "@0x/contracts-gen": "^2.0.10",
-        "@0x/contracts-test-utils": "^5.3.4",
-        "@0x/contracts-utils": "^4.5.1",
-        "@0x/sol-compiler": "^4.1.1",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.1.0",
-        "@0x/types": "^3.2.0",
-        "@0x/web3-wrapper": "^7.2.0",
+        "@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,15 +80,15 @@
        "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.3",
-        "@0x/order-utils": "^10.3.0",
-        "@0x/typescript-typings": "^5.1.1",
-        "@0x/utils": "^5.5.1",
-        "ethereum-types": "^3.2.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"
--- a/contracts/coordinator/CHANGELOG.json
+++ b/contracts/coordinator/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1603265572,
+        "version": "3.1.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1594788383,
        "version": "3.1.7",
--- a/contracts/coordinator/CHANGELOG.md
+++ b/contracts/coordinator/CHANGELOG.md
@@ -5,6 +5,10 @@ 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
--- a/contracts/coordinator/package.json
+++ b/contracts/coordinator/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-coordinator",
-    "version": "3.1.7",
+    "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.3.1",
-        "@0x/contracts-asset-proxy": "^3.4.0",
-        "@0x/contracts-dev-utils": "^1.3.5",
-        "@0x/contracts-erc20": "^3.2.1",
-        "@0x/contracts-exchange": "^3.2.7",
-        "@0x/contracts-gen": "^2.0.10",
-        "@0x/contracts-test-utils": "^5.3.4",
-        "@0x/dev-utils": "^3.3.0",
-        "@0x/order-utils": "^10.3.0",
-        "@0x/sol-compiler": "^4.1.1",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.1.0",
-        "@0x/web3-wrapper": "^7.2.0",
+        "@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,19 +78,21 @@
        "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.9",
-        "@0x/base-contract": "^6.2.3",
-        "@0x/contract-addresses": "^4.11.0",
-        "@0x/contracts-utils": "^4.5.1",
-        "@0x/json-schemas": "^5.1.0",
-        "@0x/types": "^3.2.0",
-        "@0x/typescript-typings": "^5.1.1",
-        "@0x/utils": "^5.5.1",
-        "ethereum-types": "^3.2.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": {
--- a/contracts/dev-utils/CHANGELOG.json
+++ b/contracts/dev-utils/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1603265572,
+        "version": "1.3.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1594788383,
        "version": "1.3.5",
--- a/contracts/dev-utils/CHANGELOG.md
+++ b/contracts/dev-utils/CHANGELOG.md
@@ -5,6 +5,10 @@ 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
--- a/contracts/dev-utils/package.json
+++ b/contracts/dev-utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-dev-utils",
-    "version": "1.3.5",
+    "version": "1.3.6",
    "engines": {
        "node": ">=6.12"
    },
@@ -33,38 +33,38 @@
    },
    "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.3.1",
-        "@0x/assert": "^3.0.9",
-        "@0x/contracts-asset-proxy": "^3.4.0",
-        "@0x/contracts-erc20": "^3.2.1",
-        "@0x/contracts-gen": "^2.0.10",
-        "@0x/contracts-test-utils": "^5.3.4",
-        "@0x/sol-compiler": "^4.1.1",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.1.0",
-        "@0x/types": "^3.2.0",
-        "@0x/utils": "^5.5.1",
-        "@types/node": "*",
-        "ethereum-types": "^3.2.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.3"
+        "@0x/base-contract": "^6.2.7",
+        "@types/node": "12.12.54"
    },
    "publishConfig": {
        "access": "public"
--- a/contracts/erc1155/CHANGELOG.json
+++ b/contracts/erc1155/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1603265572,
+        "version": "2.1.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1594788383,
        "version": "2.1.7",
--- a/contracts/erc1155/CHANGELOG.md
+++ b/contracts/erc1155/CHANGELOG.md
@@ -5,6 +5,10 @@ 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
--- a/contracts/erc1155/package.json
+++ b/contracts/erc1155/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-erc1155",
-    "version": "2.1.7",
+    "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.3.1",
-        "@0x/contracts-gen": "^2.0.10",
-        "@0x/contracts-utils": "^4.5.1",
-        "@0x/dev-utils": "^3.3.0",
-        "@0x/sol-compiler": "^4.1.1",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.1.0",
-        "@0x/types": "^3.2.0",
-        "@0x/typescript-typings": "^5.1.1",
+        "@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.2.0",
+        "ethereum-types": "^3.3.3",
        "make-promises-safe": "^1.1.0",
        "mocha": "^6.2.0",
        "npm-run-all": "^4.1.2",
@@ -76,14 +76,14 @@
        "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.3",
-        "@0x/contracts-test-utils": "^5.3.4",
-        "@0x/utils": "^5.5.1",
-        "@0x/web3-wrapper": "^7.2.0",
+        "@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": {
--- a/contracts/erc20/CHANGELOG.json
+++ b/contracts/erc20/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1603265572,
+        "version": "3.2.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1594788383,
        "version": "3.2.1",
--- a/contracts/erc20/CHANGELOG.md
+++ b/contracts/erc20/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v3.2.2 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v3.2.1 - _July 15, 2020_

    * Dependencies updated
--- a/contracts/erc20/package.json
+++ b/contracts/erc20/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-erc20",
-    "version": "3.2.1",
+    "version": "3.2.2",
    "engines": {
        "node": ">=6.12"
    },
@@ -43,34 +43,34 @@
    },
    "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.3.1",
-        "@0x/contracts-gen": "^2.0.10",
-        "@0x/contracts-test-utils": "^5.3.4",
-        "@0x/contracts-utils": "^4.5.1",
-        "@0x/dev-utils": "^3.3.0",
-        "@0x/sol-compiler": "^4.1.1",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.1.0",
-        "@0x/types": "^3.2.0",
-        "@0x/typescript-typings": "^5.1.1",
-        "@0x/utils": "^5.5.1",
-        "@0x/web3-wrapper": "^7.2.0",
+        "@0x/abi-gen": "^5.4.3",
+        "@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",
+        "@0x/types": "^3.2.4",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^5.6.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",
        "dirty-chai": "^2.0.1",
-        "ethereum-types": "^3.2.0",
+        "ethereum-types": "^3.3.3",
        "lodash": "^4.17.11",
        "make-promises-safe": "^1.1.0",
        "mocha": "^6.2.0",
@@ -78,11 +78,11 @@
        "shx": "^0.2.2",
        "solhint": "^1.4.1",
        "tslint": "5.11.0",
-        "typedoc": "^0.15.0",
+        "typedoc": "~0.16.11",
        "typescript": "3.0.1"
    },
    "dependencies": {
-        "@0x/base-contract": "^6.2.3"
+        "@0x/base-contract": "^6.2.7"
    },
    "publishConfig": {
        "access": "public"
--- a/contracts/erc721/CHANGELOG.json
+++ b/contracts/erc721/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1603265572,
+        "version": "3.1.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1594788383,
        "version": "3.1.7",
--- a/contracts/erc721/CHANGELOG.md
+++ b/contracts/erc721/CHANGELOG.md
@@ -5,6 +5,10 @@ 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
--- a/contracts/erc721/package.json
+++ b/contracts/erc721/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-erc721",
-    "version": "3.1.7",
+    "version": "3.1.8",
    "engines": {
        "node": ">=6.12"
    },
@@ -44,34 +44,34 @@
    },
    "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.3.1",
-        "@0x/contracts-gen": "^2.0.10",
-        "@0x/contracts-test-utils": "^5.3.4",
-        "@0x/contracts-utils": "^4.5.1",
-        "@0x/dev-utils": "^3.3.0",
-        "@0x/sol-compiler": "^4.1.1",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.1.0",
-        "@0x/types": "^3.2.0",
-        "@0x/typescript-typings": "^5.1.1",
-        "@0x/utils": "^5.5.1",
-        "@0x/web3-wrapper": "^7.2.0",
+        "@0x/abi-gen": "^5.4.3",
+        "@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",
+        "@0x/types": "^3.2.4",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^5.6.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",
        "dirty-chai": "^2.0.1",
-        "ethereum-types": "^3.2.0",
+        "ethereum-types": "^3.3.3",
        "lodash": "^4.17.11",
        "make-promises-safe": "^1.1.0",
        "mocha": "^6.2.0",
@@ -80,11 +80,11 @@
        "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.3"
+        "@0x/base-contract": "^6.2.7"
    },
    "publishConfig": {
        "access": "public"
--- a/contracts/exchange-forwarder/CHANGELOG.json
+++ b/contracts/exchange-forwarder/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1603265572,
+        "version": "4.2.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1594788383,
        "version": "4.2.7",
--- a/contracts/exchange-forwarder/CHANGELOG.md
+++ b/contracts/exchange-forwarder/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v4.2.8 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v4.2.7 - _July 15, 2020_

    * Dependencies updated
--- a/contracts/exchange-forwarder/package.json
+++ b/contracts/exchange-forwarder/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-exchange-forwarder",
-    "version": "4.2.7",
+    "version": "4.2.8",
    "engines": {
        "node": ">=6.12"
    },
@@ -44,36 +44,36 @@
    },
    "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.3.1",
-        "@0x/contracts-asset-proxy": "^3.4.0",
-        "@0x/contracts-dev-utils": "^1.3.5",
-        "@0x/contracts-erc1155": "^2.1.7",
-        "@0x/contracts-erc20": "^3.2.1",
-        "@0x/contracts-erc721": "^3.1.7",
-        "@0x/contracts-exchange": "^3.2.7",
-        "@0x/contracts-exchange-libs": "^4.3.7",
-        "@0x/contracts-gen": "^2.0.10",
-        "@0x/contracts-test-utils": "^5.3.4",
-        "@0x/contracts-utils": "^4.5.1",
-        "@0x/dev-utils": "^3.3.0",
-        "@0x/order-utils": "^10.3.0",
-        "@0x/sol-compiler": "^4.1.1",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.1.0",
-        "@0x/types": "^3.2.0",
-        "@0x/utils": "^5.5.1",
-        "@0x/web3-wrapper": "^7.2.0",
+        "@0x/abi-gen": "^5.4.3",
+        "@0x/contracts-asset-proxy": "^3.5.0",
+        "@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": "^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/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/types": "^3.2.4",
+        "@0x/utils": "^5.6.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",
@@ -86,13 +86,13 @@
        "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.3",
-        "@0x/typescript-typings": "^5.1.1",
-        "ethereum-types": "^3.2.0"
+        "@0x/base-contract": "^6.2.7",
+        "@0x/typescript-typings": "^5.1.5",
+        "ethereum-types": "^3.3.3"
    },
    "publishConfig": {
        "access": "public"
--- a/contracts/exchange-libs/CHANGELOG.json
+++ b/contracts/exchange-libs/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1603265572,
+        "version": "4.3.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1594788383,
        "version": "4.3.7",
--- a/contracts/exchange-libs/CHANGELOG.md
+++ b/contracts/exchange-libs/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v4.3.8 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v4.3.7 - _July 15, 2020_

    * Dependencies updated
--- a/contracts/exchange-libs/package.json
+++ b/contracts/exchange-libs/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-exchange-libs",
-    "version": "4.3.7",
+    "version": "4.3.8",
    "engines": {
        "node": ">=6.12"
    },
@@ -44,25 +44,25 @@
    },
    "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/libs/README.md",
+    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/libs",
    "devDependencies": {
-        "@0x/abi-gen": "^5.3.1",
-        "@0x/contracts-gen": "^2.0.10",
-        "@0x/dev-utils": "^3.3.0",
-        "@0x/sol-compiler": "^4.1.1",
-        "@0x/subproviders": "^6.1.1",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.1.0",
-        "@0x/web3-wrapper": "^7.2.0",
+        "@0x/abi-gen": "^5.4.3",
+        "@0x/contracts-gen": "2.0.13",
+        "@0x/dev-utils": "^3.3.4",
+        "@0x/sol-compiler": "^4.2.3",
+        "@0x/subproviders": "^6.1.5",
+        "@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",
@@ -76,18 +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.3",
-        "@0x/contracts-test-utils": "^5.3.4",
-        "@0x/contracts-utils": "^4.5.1",
-        "@0x/order-utils": "^10.3.0",
-        "@0x/types": "^3.2.0",
-        "@0x/typescript-typings": "^5.1.1",
-        "@0x/utils": "^5.5.1",
-        "ethereum-types": "^3.2.0"
+        "@0x/base-contract": "^6.2.7",
+        "@0x/contracts-test-utils": "^5.3.5",
+        "@0x/contracts-utils": "^4.5.2",
+        "@0x/order-utils": "^10.4.0",
+        "@0x/types": "^3.2.4",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^5.6.3",
+        "ethereum-types": "^3.3.3"
    },
    "publishConfig": {
        "access": "public"
--- a/contracts/exchange/CHANGELOG.json
+++ b/contracts/exchange/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1603265572,
+        "version": "3.2.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1594788383,
        "version": "3.2.7",
--- a/contracts/exchange/CHANGELOG.md
+++ b/contracts/exchange/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v3.2.8 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v3.2.7 - _July 15, 2020_

    * Dependencies updated
--- a/contracts/exchange/package.json
+++ b/contracts/exchange/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-exchange",
-    "version": "3.2.7",
+    "version": "3.2.8",
    "engines": {
        "node": ">=6.12"
    },
@@ -44,37 +44,37 @@
    },
    "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.3.1",
-        "@0x/contracts-asset-proxy": "^3.4.0",
-        "@0x/contracts-exchange-libs": "^4.3.7",
-        "@0x/contracts-gen": "^2.0.10",
-        "@0x/contracts-multisig": "^4.1.7",
-        "@0x/contracts-staking": "^2.0.14",
-        "@0x/contracts-test-utils": "^5.3.4",
-        "@0x/contracts-utils": "^4.5.1",
-        "@0x/dev-utils": "^3.3.0",
-        "@0x/sol-compiler": "^4.1.1",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.1.0",
-        "@0x/types": "^3.2.0",
-        "@0x/typescript-typings": "^5.1.1",
-        "@0x/web3-wrapper": "^7.2.0",
+        "@0x/abi-gen": "^5.4.3",
+        "@0x/contracts-asset-proxy": "^3.5.0",
+        "@0x/contracts-exchange-libs": "^4.3.8",
+        "@0x/contracts-gen": "2.0.13",
+        "@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/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",
+        "@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",
        "dirty-chai": "^2.0.1",
-        "ethereum-types": "^3.2.0",
+        "ethereum-types": "^3.3.3",
        "ethereumjs-util": "^5.1.1",
        "js-combinatorics": "^0.5.3",
        "make-promises-safe": "^1.1.0",
@@ -84,17 +84,17 @@
        "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.3",
-        "@0x/contracts-dev-utils": "^1.3.5",
-        "@0x/contracts-erc1155": "^2.1.7",
-        "@0x/contracts-erc20": "^3.2.1",
-        "@0x/contracts-erc721": "^3.1.7",
-        "@0x/order-utils": "^10.3.0",
-        "@0x/utils": "^5.5.1",
+        "@0x/base-contract": "^6.2.7",
+        "@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/order-utils": "^10.4.0",
+        "@0x/utils": "^5.6.3",
        "lodash": "^4.17.11"
    },
    "publishConfig": {
--- a/contracts/extensions/CHANGELOG.json
+++ b/contracts/extensions/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1603265572,
+        "version": "6.2.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1594788383,
        "version": "6.2.1",
--- a/contracts/extensions/CHANGELOG.md
+++ b/contracts/extensions/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v6.2.2 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v6.2.1 - _July 15, 2020_

    * Dependencies updated
--- a/contracts/extensions/package.json
+++ b/contracts/extensions/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-extensions",
-    "version": "6.2.1",
+    "version": "6.2.2",
    "engines": {
        "node": ">=6.12"
    },
@@ -44,35 +44,34 @@
    },
    "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.3.1",
-        "@0x/contracts-asset-proxy": "^3.4.0",
-        "@0x/contracts-dev-utils": "^1.3.5",
-        "@0x/contracts-erc20": "^3.2.1",
-        "@0x/contracts-erc721": "^3.1.7",
-        "@0x/contracts-exchange": "^3.2.7",
-        "@0x/contracts-exchange-libs": "^4.3.7",
-        "@0x/contracts-gen": "^2.0.10",
-        "@0x/contracts-test-utils": "^5.3.4",
-        "@0x/contracts-utils": "^4.5.1",
-        "@0x/dev-utils": "^3.3.0",
-        "@0x/order-utils": "^10.3.0",
-        "@0x/sol-compiler": "^4.1.1",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.1.0",
-        "@0x/types": "^3.2.0",
-        "@0x/utils": "^5.5.1",
-        "@0x/web3-wrapper": "^7.2.0",
+        "@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-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-utils": "^4.5.2",
+        "@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/types": "^3.2.4",
+        "@0x/utils": "^5.6.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",
@@ -87,13 +86,14 @@
        "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.3",
-        "@0x/typescript-typings": "^5.1.1",
-        "ethereum-types": "^3.2.0"
+        "@0x/base-contract": "^6.2.7",
+        "@0x/contracts-test-utils": "^5.3.5",
+        "@0x/typescript-typings": "^5.1.5",
+        "ethereum-types": "^3.3.3"
    },
    "publishConfig": {
        "access": "public"
--- a/contracts/integrations/CHANGELOG.json
+++ b/contracts/integrations/CHANGELOG.json
@@ -10,7 +10,8 @@
                "note": "Add EP RFQT + MTX tests",
                "pr": 2692
            }
-        ]
+        ],
+        "timestamp": 1603265572
    },
    {
        "version": "2.6.0",
--- a/contracts/integrations/CHANGELOG.md
+++ b/contracts/integrations/CHANGELOG.md
@@ -5,6 +5,11 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v2.7.0 - _October 21, 2020_
+
+    * Update curveBridge tests (#2633)
+    * Add EP RFQT + MTX tests (#2692)
+
 ## v2.6.0 - _July 15, 2020_

    * Add `BalancerBridge` mainnet tests (#2613)
--- a/contracts/integrations/package.json
+++ b/contracts/integrations/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-integrations",
-    "version": "2.6.0",
+    "version": "2.7.0",
    "engines": {
        "node": ">=6.12"
    },
@@ -43,36 +43,36 @@
    },
    "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.3.1",
-        "@0x/contract-addresses": "^4.11.0",
-        "@0x/contract-wrappers": "^13.8.0",
-        "@0x/contracts-broker": "^1.1.6",
-        "@0x/contracts-coordinator": "^3.1.7",
-        "@0x/contracts-dev-utils": "^1.3.5",
-        "@0x/contracts-exchange-forwarder": "^4.2.7",
-        "@0x/contracts-exchange-libs": "^4.3.7",
-        "@0x/contracts-extensions": "^6.2.1",
-        "@0x/contracts-gen": "^2.0.10",
-        "@0x/contracts-utils": "^4.5.1",
+        "@0x/abi-gen": "^5.4.3",
+        "@0x/contract-addresses": "^4.12.0",
+        "@0x/contract-wrappers": "^13.9.0",
+        "@0x/contracts-broker": "^1.1.7",
+        "@0x/contracts-coordinator": "^3.1.8",
+        "@0x/contracts-dev-utils": "^1.3.6",
+        "@0x/contracts-exchange-forwarder": "^4.2.8",
+        "@0x/contracts-exchange-libs": "^4.3.8",
+        "@0x/contracts-extensions": "^6.2.2",
+        "@0x/contracts-gen": "2.0.13",
+        "@0x/contracts-utils": "^4.5.2",
        "@0x/coordinator-server": "^1.0.5",
-        "@0x/dev-utils": "^3.3.0",
-        "@0x/migrations": "^6.4.0",
-        "@0x/order-utils": "^10.3.0",
-        "@0x/sol-compiler": "^4.1.1",
-        "@0x/tslint-config": "^4.1.0",
-        "@0x/web3-wrapper": "^7.2.0",
+        "@0x/dev-utils": "^3.3.4",
+        "@0x/migrations": "^6.4.1",
+        "@0x/order-utils": "^10.4.0",
+        "@0x/sol-compiler": "^4.2.3",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/web3-wrapper": "^7.2.4",
        "@azure/core-asynciterator-polyfill": "^1.0.0",
        "@types/lodash": "4.14.104",
        "@types/mocha": "^5.2.7",
-        "@types/node": "*",
+        "@types/node": "12.12.54",
        "@types/seedrandom": "^2.4.28",
        "chai": "^4.0.1",
        "chai-as-promised": "^7.1.0",
@@ -91,22 +91,22 @@
        "typescript": "3.0.1"
    },
    "dependencies": {
-        "@0x/asset-swapper": "^4.6.0",
-        "@0x/base-contract": "^6.2.3",
-        "@0x/contracts-asset-proxy": "^3.4.0",
-        "@0x/contracts-erc1155": "^2.1.7",
-        "@0x/contracts-erc20": "^3.2.1",
-        "@0x/contracts-erc721": "^3.1.7",
-        "@0x/contracts-exchange": "^3.2.7",
-        "@0x/contracts-multisig": "^4.1.7",
-        "@0x/contracts-staking": "^2.0.14",
-        "@0x/contracts-test-utils": "^5.3.4",
-        "@0x/contracts-zero-ex": "^0.2.0",
-        "@0x/subproviders": "^6.1.1",
-        "@0x/types": "^3.2.0",
-        "@0x/typescript-typings": "^5.1.1",
-        "@0x/utils": "^5.5.1",
-        "ethereum-types": "^3.2.0",
+        "@0x/asset-swapper": "0xProject/gitpkg-registry#0x-asset-swapper-v4.6.0-36546480b",
+        "@0x/base-contract": "^6.2.7",
+        "@0x/contracts-asset-proxy": "^3.5.0",
+        "@0x/contracts-erc1155": "^2.1.8",
+        "@0x/contracts-erc20": "^3.2.2",
+        "@0x/contracts-erc721": "^3.1.8",
+        "@0x/contracts-exchange": "^3.2.8",
+        "@0x/contracts-multisig": "^4.1.8",
+        "@0x/contracts-staking": "^2.0.15",
+        "@0x/contracts-test-utils": "^5.3.5",
+        "@0x/contracts-zero-ex": "^0.3.0",
+        "@0x/subproviders": "^6.1.5",
+        "@0x/types": "^3.2.4",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^5.6.3",
+        "ethereum-types": "^3.3.3",
        "ethereumjs-util": "^6.2.0",
        "lodash": "^4.17.11"
    },
--- a/contracts/multisig/CHANGELOG.json
+++ b/contracts/multisig/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1603265572,
+        "version": "4.1.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1594788383,
        "version": "4.1.7",
--- a/contracts/multisig/CHANGELOG.md
+++ b/contracts/multisig/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v4.1.8 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v4.1.7 - _July 15, 2020_

    * Dependencies updated
--- a/contracts/multisig/package.json
+++ b/contracts/multisig/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-multisig",
-    "version": "4.1.7",
+    "version": "4.1.8",
    "engines": {
        "node": ">=6.12"
    },
@@ -41,29 +41,29 @@
    },
    "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/multisig/README.md",
+    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/multisig",
    "devDependencies": {
-        "@0x/abi-gen": "^5.3.1",
-        "@0x/contracts-asset-proxy": "^3.4.0",
-        "@0x/contracts-erc20": "^3.2.1",
-        "@0x/contracts-gen": "^2.0.10",
-        "@0x/contracts-test-utils": "^5.3.4",
-        "@0x/contracts-utils": "^4.5.1",
-        "@0x/dev-utils": "^3.3.0",
-        "@0x/sol-compiler": "^4.1.1",
-        "@0x/tslint-config": "^4.1.0",
-        "@0x/types": "^3.2.0",
-        "@0x/utils": "^5.5.1",
-        "@0x/web3-wrapper": "^7.2.0",
+        "@0x/abi-gen": "^5.4.3",
+        "@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/contracts-utils": "^4.5.2",
+        "@0x/dev-utils": "^3.3.4",
+        "@0x/sol-compiler": "^4.2.3",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/types": "^3.2.4",
+        "@0x/utils": "^5.6.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",
@@ -78,9 +78,9 @@
        "typescript": "3.0.1"
    },
    "dependencies": {
-        "@0x/base-contract": "^6.2.3",
-        "@0x/typescript-typings": "^5.1.1",
-        "ethereum-types": "^3.2.0"
+        "@0x/base-contract": "^6.2.7",
+        "@0x/typescript-typings": "^5.1.5",
+        "ethereum-types": "^3.3.3"
    },
    "publishConfig": {
        "access": "public"
--- a/contracts/staking/CHANGELOG.json
+++ b/contracts/staking/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1603265572,
+        "version": "2.0.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1594788383,
        "version": "2.0.14",
--- a/contracts/staking/CHANGELOG.md
+++ b/contracts/staking/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v2.0.15 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v2.0.14 - _July 15, 2020_

    * Dependencies updated
--- a/contracts/staking/package.json
+++ b/contracts/staking/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-staking",
-    "version": "2.0.14",
+    "version": "2.0.15",
    "engines": {
        "node": ">=6.12"
    },
@@ -45,30 +45,30 @@
    },
    "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.3.1",
-        "@0x/contracts-asset-proxy": "^3.4.0",
-        "@0x/contracts-dev-utils": "^1.3.5",
-        "@0x/contracts-erc20": "^3.2.1",
-        "@0x/contracts-exchange-libs": "^4.3.7",
-        "@0x/contracts-gen": "^2.0.10",
-        "@0x/contracts-utils": "^4.5.1",
-        "@0x/dev-utils": "^3.3.0",
-        "@0x/order-utils": "^10.3.0",
-        "@0x/sol-compiler": "^4.1.1",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.1.0",
-        "@0x/types": "^3.2.0",
-        "@0x/web3-wrapper": "^7.2.0",
+        "@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-exchange-libs": "^4.3.8",
+        "@0x/contracts-gen": "2.0.13",
+        "@0x/contracts-utils": "^4.5.2",
+        "@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/types": "^3.2.4",
+        "@0x/web3-wrapper": "^7.2.4",
        "@types/lodash": "4.14.104",
-        "@types/node": "*",
+        "@types/node": "12.12.54",
        "chai": "^4.0.1",
        "chai-as-promised": "^7.1.0",
        "chai-bignumber": "^3.0.0",
@@ -83,15 +83,15 @@
        "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.3",
-        "@0x/contracts-test-utils": "^5.3.4",
-        "@0x/typescript-typings": "^5.1.1",
-        "@0x/utils": "^5.5.1",
-        "ethereum-types": "^3.2.0",
+        "@0x/base-contract": "^6.2.7",
+        "@0x/contracts-test-utils": "^5.3.5",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^5.6.3",
+        "ethereum-types": "^3.3.3",
        "ethereumjs-util": "^5.1.1"
    },
    "publishConfig": {
--- a/contracts/test-utils/CHANGELOG.json
+++ b/contracts/test-utils/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1603265572,
+        "version": "5.3.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "timestamp": 1594788383,
        "version": "5.3.4",
--- a/contracts/test-utils/CHANGELOG.md
+++ b/contracts/test-utils/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v5.3.5 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v5.3.4 - _July 15, 2020_

    * Dependencies updated
--- a/contracts/test-utils/package.json
+++ b/contracts/test-utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-test-utils",
-    "version": "5.3.4",
+    "version": "5.3.5",
    "engines": {
        "node": ">=6.12"
    },
@@ -26,48 +26,48 @@
    },
    "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/test-utils/README.md",
+    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/test-utils",
    "devDependencies": {
-        "@0x/sol-compiler": "^4.1.1",
-        "@0x/tslint-config": "^4.1.0",
+        "@0x/sol-compiler": "^4.2.3",
+        "@0x/tslint-config": "^4.1.3",
        "npm-run-all": "^4.1.2",
        "shx": "^0.2.2",
        "tslint": "5.11.0",
        "typescript": "3.0.1"
    },
    "dependencies": {
-        "@0x/assert": "^3.0.9",
-        "@0x/base-contract": "^6.2.3",
-        "@0x/contract-addresses": "^4.11.0",
-        "@0x/dev-utils": "^3.3.0",
-        "@0x/json-schemas": "^5.1.0",
-        "@0x/order-utils": "^10.3.0",
-        "@0x/sol-coverage": "^4.0.10",
-        "@0x/sol-profiler": "^4.1.0",
-        "@0x/sol-trace": "^3.0.10",
-        "@0x/subproviders": "^6.1.1",
-        "@0x/types": "^3.2.0",
-        "@0x/typescript-typings": "^5.1.1",
-        "@0x/utils": "^5.5.1",
-        "@0x/web3-wrapper": "^7.2.0",
+        "@0x/assert": "^3.0.13",
+        "@0x/base-contract": "^6.2.7",
+        "@0x/contract-addresses": "^4.12.0",
+        "@0x/dev-utils": "^3.3.4",
+        "@0x/json-schemas": "^5.2.3",
+        "@0x/order-utils": "^10.4.0",
+        "@0x/sol-coverage": "^4.0.14",
+        "@0x/sol-profiler": "^4.1.4",
+        "@0x/sol-trace": "^3.0.14",
+        "@0x/subproviders": "^6.1.5",
+        "@0x/types": "^3.2.4",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^5.6.3",
+        "@0x/web3-wrapper": "^7.2.4",
        "@types/bn.js": "^4.11.0",
        "@types/js-combinatorics": "^0.5.29",
        "@types/lodash": "4.14.104",
        "@types/mocha": "^5.2.7",
-        "@types/node": "*",
+        "@types/node": "12.12.54",
        "bn.js": "^4.11.8",
        "chai": "^4.0.1",
        "chai-as-promised": "^7.1.0",
        "chai-bignumber": "^3.0.0",
        "decimal.js": "^10.2.0",
        "dirty-chai": "^2.0.1",
-        "ethereum-types": "^3.2.0",
+        "ethereum-types": "^3.3.3",
        "ethereumjs-util": "^5.1.1",
        "ethers": "~4.0.4",
        "js-combinatorics": "^0.5.3",
--- a/contracts/utils/CHANGELOG.json
+++ b/contracts/utils/CHANGELOG.json
@@ -6,7 +6,8 @@
                "note": "Add Ropsten and Rinkeby addresses to `DeploymentConstants`",
                "pr": 2656
            }
-        ]
+        ],
+        "timestamp": 1603265572
    },
    {
        "version": "4.5.1",
--- a/contracts/utils/CHANGELOG.md
+++ b/contracts/utils/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v4.5.2 - _October 21, 2020_
+
+    * Add Ropsten and Rinkeby addresses to `DeploymentConstants` (#2656)
+
 ## v4.5.1 - _July 15, 2020_

    * Reorganize `DeploymentConstants` addresses (#2628)
--- a/contracts/utils/contracts/src/DeploymentConstants.sol
+++ b/contracts/utils/contracts/src/DeploymentConstants.sol
@@ -56,6 +56,12 @@ contract DeploymentConstants {
    address constant private MUSD_ADDRESS = 0xe2f2a5C287993345a840Db3B0845fbC70f5935a5;
    /// @dev Mainnet address of the Mooniswap Registry contract
    address constant private MOONISWAP_REGISTRY = 0x71CD6666064C3A1354a3B4dca5fA1E2D3ee7D303;
+    /// @dev Mainnet address of the Shell contract
+    address constant private SHELL_CONTRACT = 0x2E703D658f8dd21709a7B458967aB4081F8D3d05;
+    /// @dev Mainnet address of the DODO Registry (ZOO) contract
+    address constant private DODO_REGISTRY = 0x3A97247DF274a17C59A3bd12735ea3FcDFb49950;
+    /// @dev Mainnet address of the DODO Helper contract
+    address constant private DODO_HELPER = 0x533dA777aeDCE766CEAe696bf90f8541A4bA80Eb;

    // // Ropsten addresses ///////////////////////////////////////////////////////
    // /// @dev Mainnet address of the WETH contract.
@@ -288,12 +294,42 @@ contract DeploymentConstants {
    }

    /// @dev An overridable way to retrieve the Mooniswap registry address.
-    /// @return musd The Mooniswap registry address.
+    /// @return registry The Mooniswap registry address.
    function _getMooniswapAddress()
        internal
        view
-        returns (address registry)
+        returns (address)
    {
        return MOONISWAP_REGISTRY;
    }
+
+    /// @dev An overridable way to retrieve the Shell contract address.
+    /// @return registry The Shell contract address.
+    function _getShellAddress()
+        internal
+        view
+        returns (address)
+    {
+        return SHELL_CONTRACT;
+    }
+
+    /// @dev An overridable way to retrieve the DODO Registry contract address.
+    /// @return registry The DODO Registry contract address.
+    function _getDODORegistryAddress()
+        internal
+        view
+        returns (address)
+    {
+        return DODO_REGISTRY;
+    }
+
+    /// @dev An overridable way to retrieve the DODO Helper contract address.
+    /// @return registry The DODO Helper contract address.
+    function _getDODOHelperAddress()
+        internal
+        view
+        returns (address)
+    {
+        return DODO_HELPER;
+    }
 }
--- a/contracts/utils/package.json
+++ b/contracts/utils/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-utils",
-    "version": "4.5.1",
+    "version": "4.5.2",
    "engines": {
        "node": ">=6.12"
    },
@@ -42,27 +42,27 @@
    },
    "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/utils/README.md",
+    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/utils",
    "devDependencies": {
-        "@0x/abi-gen": "^5.3.1",
-        "@0x/contracts-gen": "^2.0.10",
-        "@0x/contracts-test-utils": "^5.3.4",
-        "@0x/dev-utils": "^3.3.0",
-        "@0x/order-utils": "^10.3.0",
-        "@0x/sol-compiler": "^4.1.1",
-        "@0x/tslint-config": "^4.1.0",
-        "@0x/types": "^3.2.0",
-        "@0x/web3-wrapper": "^7.2.0",
+        "@0x/abi-gen": "^5.4.3",
+        "@0x/contracts-gen": "2.0.13",
+        "@0x/contracts-test-utils": "^5.3.5",
+        "@0x/dev-utils": "^3.3.4",
+        "@0x/order-utils": "^10.4.0",
+        "@0x/sol-compiler": "^4.2.3",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/types": "^3.2.4",
+        "@0x/web3-wrapper": "^7.2.4",
        "@types/bn.js": "^4.11.0",
        "@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",
@@ -79,11 +79,11 @@
        "typescript": "3.0.1"
    },
    "dependencies": {
-        "@0x/base-contract": "^6.2.3",
-        "@0x/typescript-typings": "^5.1.1",
-        "@0x/utils": "^5.5.1",
+        "@0x/base-contract": "^6.2.7",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^5.6.3",
        "bn.js": "^4.11.8",
-        "ethereum-types": "^3.2.0"
+        "ethereum-types": "^3.3.3"
    },
    "publishConfig": {
        "access": "public"
--- a/contracts/zero-ex/CHANGELOG.json
+++ b/contracts/zero-ex/CHANGELOG.json
@@ -49,8 +49,29 @@
            {
                "note": "Add updated Kyber and Mooniswap rollup to FQT",
                "pr": 2692
+            },
+            {
+                "note": "Add `UniswapFeature`",
+                "pr": 2703
+            },
+            {
+                "note": "Fix versioning (`_encodeVersion()`) bug",
+                "pr": 2703
+            },
+            {
+                "note": "Added LiquidityProviderFeature",
+                "pr": 2691
+            },
+            {
+                "note": "Added `Shell` into FQT",
+                "pr": 2722
+            },
+            {
+                "note": "Added `CREAM` into FQT",
+                "pr": 2715
            }
-        ]
+        ],
+        "timestamp": 1603265572
    },
    {
        "version": "0.2.0",
--- a/contracts/zero-ex/CHANGELOG.md
+++ b/contracts/zero-ex/CHANGELOG.md
@@ -5,11 +5,32 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v0.3.0 - _October 21, 2020_
+
+    * Internal audit fixes (#2657)
+    * Add refund mechanism to meta-transactions (#2657)
+    * Pass sender address to transformers (#2657)
+    * Refund unused protocol fees to `refundReceiver` in FQT (#2657)
+    * Fix `TransformerDeployer.kill()` calling the wrong `die()` interface. (#2624)
+    * Address CD post-audit feedback (#2657)
+    * Add `LogMetadataTransformer` (#2657)
+    * Rename all feature contracts to have `Feature` suffix (#2657)
+    * Return `IZeroExContract` in `fullMigrateAsync()` (#2657)
+    * Add taker address enforcement to RFQT orders in FQT (#2692)
+    * All calldata is valid if quote signer is unset in `TransformERC20` (#2692)
+    * Add updated Kyber and Mooniswap rollup to FQT (#2692)
+    * Add `UniswapFeature` (#2703)
+    * Fix versioning (`_encodeVersion()`) bug (#2703)
+    * Added LiquidityProviderFeature (#2691)
+    * Added `Shell` into FQT (#2722)
+    * Added `CREAM` into FQT (#2715)
+
 ## v0.2.0 - _July 15, 2020_

    * Export migration tools (#2612)
    * Export `AffiliateFeeTransformerContract` (#2622)
    * Add `MetaTransactions` and `SignatureValidator` features (#2610)
+    * Update `TransformERC20` and `MetaTransactions` to handle signed calldata. (#2626)

 ## v0.1.1 - _June 24, 2020_

--- a/contracts/zero-ex/contracts/src/IZeroEx.sol
+++ b/contracts/zero-ex/contracts/src/IZeroEx.sol
@@ -25,6 +25,8 @@ import "./features/ITokenSpenderFeature.sol";
 import "./features/ISignatureValidatorFeature.sol";
 import "./features/ITransformERC20Feature.sol";
 import "./features/IMetaTransactionsFeature.sol";
+import "./features/IUniswapFeature.sol";
+import "./features/ILiquidityProviderFeature.sol";


 /// @dev Interface for a fully featured Exchange Proxy.
@@ -34,7 +36,9 @@ interface IZeroEx is
    ITokenSpenderFeature,
    ISignatureValidatorFeature,
    ITransformERC20Feature,
-    IMetaTransactionsFeature
+    IMetaTransactionsFeature,
+    IUniswapFeature,
+    ILiquidityProviderFeature
 {
    // solhint-disable state-visibility

--- a/contracts/zero-ex/contracts/src/errors/LibLiquidityProviderRichErrors.sol
+++ b/contracts/zero-ex/contracts/src/errors/LibLiquidityProviderRichErrors.sol
@@ -0,0 +1,63 @@
+/*
+
+  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.6.5;
+
+
+library LibLiquidityProviderRichErrors {
+
+    // solhint-disable func-name-mixedcase
+
+    function LiquidityProviderIncompleteSellError(
+        address providerAddress,
+        address makerToken,
+        address takerToken,
+        uint256 sellAmount,
+        uint256 boughtAmount,
+        uint256 minBuyAmount
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("LiquidityProviderIncompleteSellError(address,address,address,uint256,uint256,uint256)")),
+            providerAddress,
+            makerToken,
+            takerToken,
+            sellAmount,
+            boughtAmount,
+            minBuyAmount
+        );
+    }
+
+    function NoLiquidityProviderForMarketError(
+        address xAsset,
+        address yAsset
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("NoLiquidityProviderForMarketError(address,address)")),
+            xAsset,
+            yAsset
+        );
+    }
+}
--- a/contracts/zero-ex/contracts/src/features/ILiquidityProviderFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/ILiquidityProviderFeature.sol
@@ -0,0 +1,66 @@
+/*
+
+  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.6.5;
+pragma experimental ABIEncoderV2;
+
+
+/// @dev Feature to swap directly with an on-chain liquidity provider.
+interface ILiquidityProviderFeature {
+    event LiquidityProviderForMarketUpdated(
+        address indexed xAsset,
+        address indexed yAsset,
+        address providerAddress
+    );
+
+    function sellToLiquidityProvider(
+        address makerToken,
+        address takerToken,
+        address payable recipient,
+        uint256 sellAmount,
+        uint256 minBuyAmount
+    )
+        external
+        payable
+        returns (uint256 boughtAmount);
+
+    /// @dev Sets address of the liquidity provider for a market given
+    ///      (xAsset, yAsset).
+    /// @param xAsset First asset managed by the liquidity provider.
+    /// @param yAsset Second asset managed by the liquidity provider.
+    /// @param providerAddress Address of the liquidity provider.
+    function setLiquidityProviderForMarket(
+        address xAsset,
+        address yAsset,
+        address providerAddress
+    )
+        external;
+
+    /// @dev Returns the address of the liquidity provider for a market given
+    ///     (xAsset, yAsset), or reverts if pool does not exist.
+    /// @param xAsset First asset managed by the liquidity provider.
+    /// @param yAsset Second asset managed by the liquidity provider.
+    /// @return providerAddress Address of the liquidity provider.
+    function getLiquidityProviderForMarket(
+        address xAsset,
+        address yAsset
+    )
+        external
+        view
+        returns (address providerAddress);
+}
--- a/contracts/zero-ex/contracts/src/features/IUniswapFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/IUniswapFeature.sol
@@ -0,0 +1,43 @@
+/*
+
+  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.6.5;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
+
+
+/// @dev VIP uniswap fill functions.
+interface IUniswapFeature {
+
+    /// @dev Efficiently sell directly to uniswap/sushiswap.
+    /// @param tokens Sell path.
+    /// @param sellAmount of `tokens[0]` Amount to sell.
+    /// @param minBuyAmount Minimum amount of `tokens[-1]` to buy.
+    /// @param isSushi Use sushiswap if true.
+    /// @return buyAmount Amount of `tokens[-1]` bought.
+    function sellToUniswap(
+        IERC20TokenV06[] calldata tokens,
+        uint256 sellAmount,
+        uint256 minBuyAmount,
+        bool isSushi
+    )
+        external
+        payable
+        returns (uint256 buyAmount);
+}
--- a/contracts/zero-ex/contracts/src/features/LiquidityProviderFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/LiquidityProviderFeature.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.6.5;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
+import "@0x/contracts-erc20/contracts/src/v06/LibERC20TokenV06.sol";
+import "@0x/contracts-utils/contracts/src/v06/errors/LibRichErrorsV06.sol";
+import "@0x/contracts-utils/contracts/src/v06/LibSafeMathV06.sol";
+import "../errors/LibLiquidityProviderRichErrors.sol";
+import "../fixins/FixinCommon.sol";
+import "../migrations/LibMigrate.sol";
+import "../storage/LibLiquidityProviderStorage.sol";
+import "../vendor/v3/IERC20Bridge.sol";
+import "./IFeature.sol";
+import "./ILiquidityProviderFeature.sol";
+import "./ITokenSpenderFeature.sol";
+
+
+contract LiquidityProviderFeature is
+    IFeature,
+    ILiquidityProviderFeature,
+    FixinCommon
+{
+    using LibERC20TokenV06 for IERC20TokenV06;
+    using LibSafeMathV06 for uint256;
+    using LibRichErrorsV06 for bytes;
+
+    /// @dev Name of this feature.
+    string public constant override FEATURE_NAME = "LiquidityProviderFeature";
+    /// @dev Version of this feature.
+    uint256 public immutable override FEATURE_VERSION = _encodeVersion(1, 0, 0);
+
+    /// @dev ETH pseudo-token address.
+    address constant internal ETH_TOKEN_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
+    /// @dev The WETH contract address.
+    IEtherTokenV06 public immutable weth;
+
+    /// @dev Store the WETH address in an immutable.
+    /// @param weth_ The weth token.
+    constructor(IEtherTokenV06 weth_)
+        public
+        FixinCommon()
+    {
+        weth = weth_;
+    }
+
+    /// @dev Initialize and register this feature.
+    ///      Should be delegatecalled by `Migrate.migrate()`.
+    /// @return success `LibMigrate.SUCCESS` on success.
+    function migrate()
+        external
+        returns (bytes4 success)
+    {
+        _registerFeatureFunction(this.sellToLiquidityProvider.selector);
+        _registerFeatureFunction(this.setLiquidityProviderForMarket.selector);
+        _registerFeatureFunction(this.getLiquidityProviderForMarket.selector);
+        return LibMigrate.MIGRATE_SUCCESS;
+    }
+
+    function sellToLiquidityProvider(
+        address makerToken,
+        address takerToken,
+        address payable recipient,
+        uint256 sellAmount,
+        uint256 minBuyAmount
+    )
+        external
+        override
+        payable
+        returns (uint256 boughtAmount)
+    {
+        address providerAddress = getLiquidityProviderForMarket(makerToken, takerToken);
+        if (recipient == address(0)) {
+            recipient = msg.sender;
+        }
+
+        if (takerToken == ETH_TOKEN_ADDRESS) {
+            // Wrap ETH.
+            weth.deposit{value: sellAmount}();
+            weth.transfer(providerAddress, sellAmount);
+        } else {
+            ITokenSpenderFeature(address(this))._spendERC20Tokens(
+                IERC20TokenV06(takerToken),
+                msg.sender,
+                providerAddress,
+                sellAmount
+            );
+        }
+
+        if (makerToken == ETH_TOKEN_ADDRESS) {
+            uint256 balanceBefore = weth.balanceOf(address(this));
+            IERC20Bridge(providerAddress).bridgeTransferFrom(
+                address(weth),
+                address(0),
+                address(this),
+                minBuyAmount,
+                ""
+            );
+            boughtAmount = weth.balanceOf(address(this)).safeSub(balanceBefore);
+            // Unwrap wETH and send ETH to recipient.
+            weth.withdraw(boughtAmount);
+            recipient.transfer(boughtAmount);
+        } else {
+            uint256 balanceBefore = IERC20TokenV06(makerToken).balanceOf(recipient);
+            IERC20Bridge(providerAddress).bridgeTransferFrom(
+                makerToken,
+                address(0),
+                recipient,
+                minBuyAmount,
+                ""
+            );
+            boughtAmount = IERC20TokenV06(makerToken).balanceOf(recipient).safeSub(balanceBefore);
+        }
+        if (boughtAmount < minBuyAmount) {
+            LibLiquidityProviderRichErrors.LiquidityProviderIncompleteSellError(
+                providerAddress,
+                makerToken,
+                takerToken,
+                sellAmount,
+                boughtAmount,
+                minBuyAmount
+            ).rrevert();
+        }
+    }
+
+    /// @dev Sets address of the liquidity provider for a market given
+    ///      (xAsset, yAsset).
+    /// @param xAsset First asset managed by the liquidity provider.
+    /// @param yAsset Second asset managed by the liquidity provider.
+    /// @param providerAddress Address of the liquidity provider.
+    function setLiquidityProviderForMarket(
+        address xAsset,
+        address yAsset,
+        address providerAddress
+    )
+        external
+        override
+        onlyOwner
+    {
+        LibLiquidityProviderStorage.getStorage()
+            .addressBook[xAsset][yAsset] = providerAddress;
+        LibLiquidityProviderStorage.getStorage()
+            .addressBook[yAsset][xAsset] = providerAddress;
+        emit LiquidityProviderForMarketUpdated(
+            xAsset,
+            yAsset,
+            providerAddress
+        );
+    }
+
+    /// @dev Returns the address of the liquidity provider for a market given
+    ///     (xAsset, yAsset), or reverts if pool does not exist.
+    /// @param xAsset First asset managed by the liquidity provider.
+    /// @param yAsset Second asset managed by the liquidity provider.
+    /// @return providerAddress Address of the liquidity provider.
+    function getLiquidityProviderForMarket(
+        address xAsset,
+        address yAsset
+    )
+        public
+        view
+        override
+        returns (address providerAddress)
+    {
+        if (xAsset == ETH_TOKEN_ADDRESS) {
+            providerAddress = LibLiquidityProviderStorage.getStorage()
+                .addressBook[address(weth)][yAsset];
+        } else if (yAsset == ETH_TOKEN_ADDRESS) {
+            providerAddress = LibLiquidityProviderStorage.getStorage()
+                .addressBook[xAsset][address(weth)];
+        } else {
+            providerAddress = LibLiquidityProviderStorage.getStorage()
+                .addressBook[xAsset][yAsset];
+        }
+        if (providerAddress == address(0)) {
+            LibLiquidityProviderRichErrors.NoLiquidityProviderForMarketError(
+                xAsset,
+                yAsset
+            ).rrevert();
+        }
+    }
+}
--- a/contracts/zero-ex/contracts/src/features/MetaTransactionsFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/MetaTransactionsFeature.sol
@@ -184,7 +184,7 @@ contract MetaTransactionsFeature is

    /// @dev Execute a meta-transaction via `sender`. Privileged variant.
    ///      Only callable from within.
-    /// @param sender Who is executing the meta-transaction..
+    /// @param sender Who is executing the meta-transaction.
    /// @param mtx The meta-transaction.
    /// @param signature The signature by `mtx.signer`.
    /// @return returnResult The ABI-encoded result of the underlying call.
@@ -454,7 +454,7 @@ contract MetaTransactionsFeature is
    }

    /// @dev Make an arbitrary internal, meta-transaction call.
-    ///      Warning: Do not let unadulerated `callData` into this function.
+    ///      Warning: Do not let unadulterated `callData` into this function.
    function _callSelf(bytes32 hash, bytes memory callData, uint256 value)
        private
        returns (bytes memory returnResult)
--- a/contracts/zero-ex/contracts/src/features/UniswapFeature.sol
+++ b/contracts/zero-ex/contracts/src/features/UniswapFeature.sol
@@ -0,0 +1,366 @@
+/*
+
+  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.6.5;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IEtherTokenV06.sol";
+import "../migrations/LibMigrate.sol";
+import "../external/IAllowanceTarget.sol";
+import "../fixins/FixinCommon.sol";
+import "./IFeature.sol";
+import "./IUniswapFeature.sol";
+
+
+/// @dev VIP uniswap fill functions.
+contract UniswapFeature is
+    IFeature,
+    IUniswapFeature,
+    FixinCommon
+{
+    /// @dev Name of this feature.
+    string public constant override FEATURE_NAME = "UniswapFeature";
+    /// @dev Version of this feature.
+    uint256 public immutable override FEATURE_VERSION = _encodeVersion(1, 0, 0);
+    /// @dev WETH contract.
+    IEtherTokenV06 private immutable WETH;
+    /// @dev AllowanceTarget instance.
+    IAllowanceTarget private immutable ALLOWANCE_TARGET;
+
+    // 0xFF + address of the UniswapV2Factory contract.
+    uint256 constant private FF_UNISWAP_FACTORY = 0xFF5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f0000000000000000000000;
+    // 0xFF + address of the (Sushiswap) UniswapV2Factory contract.
+    uint256 constant private FF_SUSHISWAP_FACTORY = 0xFFC0AEe478e3658e2610c5F7A4A2E1777cE9e4f2Ac0000000000000000000000;
+    // Init code hash of the UniswapV2Pair contract.
+    uint256 constant private UNISWAP_PAIR_INIT_CODE_HASH = 0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f;
+    // Init code hash of the (Sushiswap) UniswapV2Pair contract.
+    uint256 constant private SUSHISWAP_PAIR_INIT_CODE_HASH = 0xe18a34eb0e04b04f7a0ac29a6e80748dca96319b42c54d679cb821dca90c6303;
+    // Mask of the lower 20 bytes of a bytes32.
+    uint256 constant private ADDRESS_MASK = 0x000000000000000000000000ffffffffffffffffffffffffffffffffffffffff;
+    // ETH pseudo-token address.
+    uint256 constant private ETH_TOKEN_ADDRESS_32 = 0x000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee;
+    // Maximum token quantity that can be swapped against the UniswapV2Pair contract.
+    uint256 constant private MAX_SWAP_AMOUNT = 2**112;
+
+    // bytes4(keccak256("executeCall(address,bytes)"))
+    uint256 constant private ALLOWANCE_TARGET_EXECUTE_CALL_SELECTOR_32 = 0xbca8c7b500000000000000000000000000000000000000000000000000000000;
+    // bytes4(keccak256("getReserves()"))
+    uint256 constant private UNISWAP_PAIR_RESERVES_CALL_SELECTOR_32 = 0x0902f1ac00000000000000000000000000000000000000000000000000000000;
+    // bytes4(keccak256("swap(uint256,uint256,address,bytes)"))
+    uint256 constant private UNISWAP_PAIR_SWAP_CALL_SELECTOR_32 = 0x022c0d9f00000000000000000000000000000000000000000000000000000000;
+    // bytes4(keccak256("transferFrom(address,address,uint256)"))
+    uint256 constant private TRANSFER_FROM_CALL_SELECTOR_32 = 0x23b872dd00000000000000000000000000000000000000000000000000000000;
+    // bytes4(keccak256("withdraw(uint256)"))
+    uint256 constant private WETH_WITHDRAW_CALL_SELECTOR_32 = 0x2e1a7d4d00000000000000000000000000000000000000000000000000000000;
+    // bytes4(keccak256("deposit()"))
+    uint256 constant private WETH_DEPOSIT_CALL_SELECTOR_32 = 0xd0e30db000000000000000000000000000000000000000000000000000000000;
+    // bytes4(keccak256("transfer(address,uint256)"))
+    uint256 constant private ERC20_TRANSFER_CALL_SELECTOR_32 = 0xa9059cbb00000000000000000000000000000000000000000000000000000000;
+
+    /// @dev Construct this contract.
+    /// @param weth The WETH contract.
+    /// @param allowanceTarget The AllowanceTarget contract.
+    constructor(IEtherTokenV06 weth, IAllowanceTarget allowanceTarget) public {
+        WETH = weth;
+        ALLOWANCE_TARGET = allowanceTarget;
+    }
+
+    /// @dev Initialize and register this feature.
+    ///      Should be delegatecalled by `Migrate.migrate()`.
+    /// @return success `LibMigrate.SUCCESS` on success.
+    function migrate()
+        external
+        returns (bytes4 success)
+    {
+        _registerFeatureFunction(this.sellToUniswap.selector);
+        return LibMigrate.MIGRATE_SUCCESS;
+    }
+
+    /// @dev Efficiently sell directly to uniswap/sushiswap.
+    /// @param tokens Sell path.
+    /// @param sellAmount of `tokens[0]` Amount to sell.
+    /// @param minBuyAmount Minimum amount of `tokens[-1]` to buy.
+    /// @param isSushi Use sushiswap if true.
+    /// @return buyAmount Amount of `tokens[-1]` bought.
+    function sellToUniswap(
+        IERC20TokenV06[] calldata tokens,
+        uint256 sellAmount,
+        uint256 minBuyAmount,
+        bool isSushi
+    )
+        external
+        payable
+        override
+        returns (uint256 buyAmount)
+    {
+        require(tokens.length > 1, "UniswapFeature/InvalidTokensLength");
+        {
+            // Load immutables onto the stack.
+            IEtherTokenV06 weth = WETH;
+            IAllowanceTarget allowanceTarget = ALLOWANCE_TARGET;
+
+            // Store some vars in memory to get around stack limits.
+            assembly {
+                // calldataload(mload(0xA00)) == first element of `tokens` array
+                mstore(0xA00, add(calldataload(0x04), 0x24))
+                // mload(0xA20) == isSushi
+                mstore(0xA20, isSushi)
+                // mload(0xA40) == WETH
+                mstore(0xA40, weth)
+                // mload(0xA60) == ALLOWANCE_TARGET
+                mstore(0xA60, allowanceTarget)
+            }
+        }
+
+        assembly {
+            // numPairs == tokens.length - 1
+            let numPairs := sub(calldataload(add(calldataload(0x04), 0x4)), 1)
+            // We use the previous buy amount as the sell amount for the next
+            // pair in a path. So for the first swap we want to set it to `sellAmount`.
+            buyAmount := sellAmount
+            let buyToken
+            let nextPair := 0
+
+            for {let i := 0} lt(i, numPairs) {i := add(i, 1)} {
+                // sellToken = tokens[i]
+                let sellToken := loadTokenAddress(i)
+                // buyToken = tokens[i+1]
+                buyToken := loadTokenAddress(add(i, 1))
+                // The canonical ordering of this token pair.
+                let pairOrder := lt(normalizeToken(sellToken), normalizeToken(buyToken))
+
+                // Compute the pair address if it hasn't already been computed
+                // from the last iteration.
+                let pair := nextPair
+                if iszero(pair) {
+                    pair := computePairAddress(sellToken, buyToken)
+                    nextPair := 0
+                }
+
+                if iszero(i) {
+                    switch eq(sellToken, ETH_TOKEN_ADDRESS_32)
+                        case 0 {
+                            // For the first pair we need to transfer sellTokens into the
+                            // pair contract using `AllowanceTarget.executeCall()`
+                            mstore(0xB00, ALLOWANCE_TARGET_EXECUTE_CALL_SELECTOR_32)
+                            mstore(0xB04, sellToken)
+                            mstore(0xB24, 0x40)
+                            mstore(0xB44, 0x64)
+                            mstore(0xB64, TRANSFER_FROM_CALL_SELECTOR_32)
+                            mstore(0xB68, caller())
+                            mstore(0xB88, pair)
+                            mstore(0xBA8, sellAmount)
+                            if iszero(call(gas(), mload(0xA60), 0, 0xB00, 0xC8, 0x00, 0x0)) {
+                                bubbleRevert()
+                            }
+                        }
+                        default {
+                            // If selling ETH, we need to wrap it to WETH and transfer to the
+                            // pair contract.
+                            if iszero(eq(callvalue(), sellAmount)) {
+                                revert(0, 0)
+                            }
+                            sellToken := mload(0xA40)// Re-assign to WETH
+                            // Call `WETH.deposit{value: sellAmount}()`
+                            mstore(0xB00, WETH_DEPOSIT_CALL_SELECTOR_32)
+                            if iszero(call(gas(), sellToken, sellAmount, 0xB00, 0x4, 0x00, 0x0)) {
+                                bubbleRevert()
+                            }
+                            // Call `WETH.transfer(pair, sellAmount)`
+                            mstore(0xB00, ERC20_TRANSFER_CALL_SELECTOR_32)
+                            mstore(0xB04, pair)
+                            mstore(0xB24, sellAmount)
+                            if iszero(call(gas(), sellToken, 0, 0xB00, 0x44, 0x00, 0x0)) {
+                                bubbleRevert()
+                            }
+                        }
+                    // No need to check results, if deposit/transfers failed the UniswapV2Pair will
+                    // reject our trade (or it may succeed if somehow the reserve was out of sync)
+                    // this is fine for the taker.
+                }
+
+                // Call pair.getReserves(), store the results at `0xC00`
+                mstore(0xB00, UNISWAP_PAIR_RESERVES_CALL_SELECTOR_32)
+                if iszero(staticcall(gas(), pair, 0xB00, 0x4, 0xC00, 0x40)) {
+                    bubbleRevert()
+                }
+
+                // Sell amount for this hop is the previous buy amount.
+                let pairSellAmount := buyAmount
+                // Compute the buy amount based on the pair reserves.
+                {
+                    let sellReserve
+                    let buyReserve
+                    switch iszero(pairOrder)
+                        case 0 {
+                            // Transpose if pair order is different.
+                            sellReserve := mload(0xC00)
+                            buyReserve := mload(0xC20)
+                        }
+                        default {
+                            sellReserve := mload(0xC20)
+                            buyReserve := mload(0xC00)
+                        }
+                    // Ensure that the sellAmount is < 2¹¹².
+                    if gt(pairSellAmount, MAX_SWAP_AMOUNT) {
+                        revert(0, 0)
+                    }
+                    // Pairs are in the range (0, 2¹¹²) so this shouldn't overflow.
+                    // buyAmount = (pairSellAmount * 997 * buyReserve) /
+                    //     (pairSellAmount * 997 + sellReserve * 1000);
+                    let sellAmountWithFee := mul(pairSellAmount, 997)
+                    buyAmount := div(
+                        mul(sellAmountWithFee, buyReserve),
+                        add(sellAmountWithFee, mul(sellReserve, 1000))
+                    )
+                }
+
+                let receiver
+                // Is this the last pair contract?
+                switch eq(add(i, 1), numPairs)
+                    case 0 {
+                        // Not the last pair contract, so forward bought tokens to
+                        // the next pair contract.
+                        nextPair := computePairAddress(
+                            buyToken,
+                            loadTokenAddress(add(i, 2))
+                        )
+                        receiver := nextPair
+                    }
+                    default {
+                        // The last pair contract.
+                        // Forward directly to taker UNLESS they want ETH back.
+                        switch eq(buyToken, ETH_TOKEN_ADDRESS_32)
+                            case 0 {
+                                receiver := caller()
+                            }
+                            default {
+                                receiver := address()
+                            }
+                    }
+
+                // Call pair.swap()
+                mstore(0xB00, UNISWAP_PAIR_SWAP_CALL_SELECTOR_32)
+                switch pairOrder
+                    case 0 {
+                        mstore(0xB04, buyAmount)
+                        mstore(0xB24, 0)
+                    }
+                    default {
+                        mstore(0xB04, 0)
+                        mstore(0xB24, buyAmount)
+                    }
+                mstore(0xB44, receiver)
+                mstore(0xB64, 0x80)
+                mstore(0xB84, 0)
+                if iszero(call(gas(), pair, 0, 0xB00, 0xA4, 0, 0)) {
+                    bubbleRevert()
+                }
+            } // End for-loop.
+
+            // If buying ETH, unwrap the WETH first
+            if eq(buyToken, ETH_TOKEN_ADDRESS_32) {
+                // Call `WETH.withdraw(buyAmount)`
+                mstore(0xB00, WETH_WITHDRAW_CALL_SELECTOR_32)
+                mstore(0xB04, buyAmount)
+                if iszero(call(gas(), mload(0xA40), 0, 0xB00, 0x24, 0x00, 0x0)) {
+                    bubbleRevert()
+                }
+                // Transfer ETH to the caller.
+                if iszero(call(gas(), caller(), buyAmount, 0xB00, 0x0, 0x00, 0x0)) {
+                    bubbleRevert()
+                }
+            }
+
+            // Functions ///////////////////////////////////////////////////////
+
+            // Load a token address from the `tokens` calldata argument.
+            function loadTokenAddress(idx) -> addr {
+                addr := and(ADDRESS_MASK, calldataload(add(mload(0xA00), mul(idx, 0x20))))
+            }
+
+            // Convert ETH pseudo-token addresses to WETH.
+            function normalizeToken(token) -> normalized {
+                normalized := token
+                // Translate ETH pseudo-tokens to WETH.
+                if eq(token, ETH_TOKEN_ADDRESS_32) {
+                    normalized := mload(0xA40)
+                }
+            }
+
+            // Compute the address of the UniswapV2Pair contract given two
+            // tokens.
+            function computePairAddress(tokenA, tokenB) -> pair {
+                // Convert ETH pseudo-token addresses to WETH.
+                tokenA := normalizeToken(tokenA)
+                tokenB := normalizeToken(tokenB)
+                // There is one contract for every combination of tokens,
+                // which is deployed using CREATE2.
+                // The derivation of this address is given by:
+                //   address(keccak256(abi.encodePacked(
+                //       bytes(0xFF),
+                //       address(UNISWAP_FACTORY_ADDRESS),
+                //       keccak256(abi.encodePacked(
+                //           tokenA < tokenB ? tokenA : tokenB,
+                //           tokenA < tokenB ? tokenB : tokenA,
+                //       )),
+                //       bytes32(UNISWAP_PAIR_INIT_CODE_HASH),
+                //   )));
+
+                // Compute the salt (the hash of the sorted tokens).
+                // Tokens are written in reverse memory order to packed encode
+                // them as two 20-byte values in a 40-byte chunk of memory
+                // starting at 0xB0C.
+                switch lt(tokenA, tokenB)
+                    case 0 {
+                        mstore(0xB14, tokenA)
+                        mstore(0xB00, tokenB)
+                    }
+                    default {
+                        mstore(0xB14, tokenB)
+                        mstore(0xB00, tokenA)
+                    }
+                let salt := keccak256(0xB0C, 0x28)
+                // Compute the pair address by hashing all the components together.
+                switch mload(0xA20) // isSushi
+                    case 0 {
+                        mstore(0xB00, FF_UNISWAP_FACTORY)
+                        mstore(0xB15, salt)
+                        mstore(0xB35, UNISWAP_PAIR_INIT_CODE_HASH)
+                    }
+                    default {
+                        mstore(0xB00, FF_SUSHISWAP_FACTORY)
+                        mstore(0xB15, salt)
+                        mstore(0xB35, SUSHISWAP_PAIR_INIT_CODE_HASH)
+                    }
+                pair := and(ADDRESS_MASK, keccak256(0xB00, 0x55))
+            }
+
+            // Revert with the return data from the most recent call.
+            function bubbleRevert() {
+                returndatacopy(0, 0, returndatasize())
+                revert(0, returndatasize())
+            }
+        }
+
+        // Revert if we bought too little.
+        // TODO: replace with rich revert?
+        require(buyAmount >= minBuyAmount, "UniswapFeature/UnderBought");
+    }
+}
--- a/contracts/zero-ex/contracts/src/fixins/FixinCommon.sol
+++ b/contracts/zero-ex/contracts/src/fixins/FixinCommon.sol
@@ -81,6 +81,6 @@ abstract contract FixinCommon {
        pure
        returns (uint256 encodedVersion)
    {
-        return (major << 64) | (minor << 32) | revision;
+        return (uint256(major) << 64) | (uint256(minor) << 32) | uint256(revision);
    }
 }
--- a/contracts/zero-ex/contracts/src/storage/LibLiquidityProviderStorage.sol
+++ b/contracts/zero-ex/contracts/src/storage/LibLiquidityProviderStorage.sol
@@ -0,0 +1,45 @@
+/*
+
+  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.6.5;
+pragma experimental ABIEncoderV2;
+
+import "./LibStorage.sol";
+
+
+/// @dev Storage helpers for `LiquidityProviderFeature`.
+library LibLiquidityProviderStorage {
+
+    /// @dev Storage bucket for this feature.
+    struct Storage {
+        // Mapping of taker token -> maker token -> liquidity provider address
+        // Note that addressBook[x][y] == addressBook[y][x] will always hold.
+        mapping (address => mapping (address => address)) addressBook;
+    }
+
+    /// @dev Get the storage bucket for this contract.
+    function getStorage() internal pure returns (Storage storage stor) {
+        uint256 storageSlot = LibStorage.getStorageSlot(
+            LibStorage.StorageId.LiquidityProvider
+        );
+        // Dip into assembly to change the slot pointed to by the local
+        // variable `stor`.
+        // See https://solidity.readthedocs.io/en/v0.6.8/assembly.html?highlight=slot#access-to-external-variables-functions-and-libraries
+        assembly { stor_slot := storageSlot }
+    }
+}
--- a/contracts/zero-ex/contracts/src/storage/LibStorage.sol
+++ b/contracts/zero-ex/contracts/src/storage/LibStorage.sol
@@ -36,7 +36,8 @@ library LibStorage {
        TokenSpender,
        TransformERC20,
        MetaTransactions,
-        ReentrancyGuard
+        ReentrancyGuard,
+        LiquidityProvider
    }

    /// @dev Get the storage slot given a storage ID. We assign unique, well-spaced
--- a/contracts/zero-ex/contracts/src/transformers/LibERC20Transformer.sol
+++ b/contracts/zero-ex/contracts/src/transformers/LibERC20Transformer.sol
@@ -29,6 +29,8 @@ library LibERC20Transformer {

    /// @dev ETH pseudo-token address.
    address constant internal ETH_TOKEN_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
+    /// @dev ETH pseudo-token.
+    IERC20TokenV06 constant internal ETH_TOKEN = IERC20TokenV06(ETH_TOKEN_ADDRESS);
    /// @dev Return value indicating success in `IERC20Transformer.transform()`.
    ///      This is just `keccak256('TRANSFORMER_SUCCESS')`.
    bytes4 constant internal TRANSFORMER_SUCCESS = 0x13c9929e;
--- a/contracts/zero-ex/contracts/src/transformers/bridges/BridgeAdapter.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/BridgeAdapter.sol
@@ -26,6 +26,7 @@ import "./mixins/MixinKyber.sol";
 import "./mixins/MixinMooniswap.sol";
 import "./mixins/MixinMStable.sol";
 import "./mixins/MixinOasis.sol";
+import "./mixins/MixinShell.sol";
 import "./mixins/MixinUniswap.sol";
 import "./mixins/MixinUniswapV2.sol";
 import "./mixins/MixinZeroExBridge.sol";
@@ -38,17 +39,20 @@ contract BridgeAdapter is
    MixinMooniswap,
    MixinMStable,
    MixinOasis,
+    MixinShell,
    MixinUniswap,
    MixinUniswapV2,
    MixinZeroExBridge
 {

    address private immutable BALANCER_BRIDGE_ADDRESS;
+    address private immutable CREAM_BRIDGE_ADDRESS;
    address private immutable CURVE_BRIDGE_ADDRESS;
    address private immutable KYBER_BRIDGE_ADDRESS;
    address private immutable MOONISWAP_BRIDGE_ADDRESS;
    address private immutable MSTABLE_BRIDGE_ADDRESS;
    address private immutable OASIS_BRIDGE_ADDRESS;
+    address private immutable SHELL_BRIDGE_ADDRESS;
    address private immutable UNISWAP_BRIDGE_ADDRESS;
    address private immutable UNISWAP_V2_BRIDGE_ADDRESS;

@@ -76,6 +80,7 @@ contract BridgeAdapter is
        MixinMooniswap(addresses)
        MixinMStable(addresses)
        MixinOasis(addresses)
+        MixinShell(addresses)
        MixinUniswap(addresses)
        MixinUniswapV2(addresses)
        MixinZeroExBridge()
@@ -86,8 +91,10 @@ contract BridgeAdapter is
        MOONISWAP_BRIDGE_ADDRESS = addresses.mooniswapBridge;
        MSTABLE_BRIDGE_ADDRESS = addresses.mStableBridge;
        OASIS_BRIDGE_ADDRESS = addresses.oasisBridge;
+        SHELL_BRIDGE_ADDRESS = addresses.shellBridge;
        UNISWAP_BRIDGE_ADDRESS = addresses.uniswapBridge;
        UNISWAP_V2_BRIDGE_ADDRESS = addresses.uniswapV2Bridge;
+        CREAM_BRIDGE_ADDRESS = addresses.creamBridge;
    }

    function trade(
@@ -129,7 +136,7 @@ contract BridgeAdapter is
                sellAmount,
                bridgeData
            );
-        } else if (bridgeAddress == BALANCER_BRIDGE_ADDRESS) {
+        } else if (bridgeAddress == BALANCER_BRIDGE_ADDRESS  || bridgeAddress == CREAM_BRIDGE_ADDRESS) {
            boughtAmount = _tradeBalancer(
                buyToken,
                sellAmount,
@@ -159,6 +166,12 @@ contract BridgeAdapter is
                sellAmount,
                bridgeData
            );
+        } else if (bridgeAddress == SHELL_BRIDGE_ADDRESS) {
+            boughtAmount = _tradeShell(
+                buyToken,
+                sellAmount,
+                bridgeData
+            );
        } else {
            boughtAmount = _tradeZeroExBridge(
                bridgeAddress,
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinAdapterAddresses.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinAdapterAddresses.sol
@@ -24,11 +24,13 @@ contract MixinAdapterAddresses
    struct AdapterAddresses {
        // Bridges
        address balancerBridge;
+        address creamBridge;
        address curveBridge;
        address kyberBridge;
        address mooniswapBridge;
        address mStableBridge;
        address oasisBridge;
+        address shellBridge;
        address uniswapBridge;
        address uniswapV2Bridge;
        // Exchanges
@@ -37,6 +39,7 @@ contract MixinAdapterAddresses
        address uniswapV2Router;
        address uniswapExchangeFactory;
        address mStable;
+        address shell;
        // Other
        address weth;
    }
--- a/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinShell.sol
+++ b/contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinShell.sol
@@ -0,0 +1,84 @@
+
+/*
+
+  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.6.5;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/v06/LibERC20TokenV06.sol";
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
+import "./MixinAdapterAddresses.sol";
+
+interface IShell {
+
+    function originSwap(
+        address from,
+        address to,
+        uint256 fromAmount,
+        uint256 minTargetAmount,
+        uint256 deadline
+    )
+        external
+        returns (uint256 toAmount);
+}
+
+
+
+contract MixinShell is
+    MixinAdapterAddresses
+{
+    using LibERC20TokenV06 for IERC20TokenV06;
+
+    /// @dev Mainnet address of the `Shell` contract.
+    IShell private immutable SHELL;
+
+    constructor(AdapterAddresses memory addresses)
+        public
+    {
+        SHELL = IShell(addresses.shell);
+    }
+
+    function _tradeShell(
+        IERC20TokenV06 buyToken,
+        uint256 sellAmount,
+        bytes memory bridgeData
+    )
+        internal
+        returns (uint256 boughtAmount)
+    {
+        (address fromTokenAddress) = abi.decode(bridgeData, (address));
+
+        // Grant the Shell contract an allowance to sell the first token.
+        IERC20TokenV06(fromTokenAddress).approveIfBelow(
+            address(SHELL),
+            sellAmount
+        );
+
+        uint256 buyAmount = SHELL.originSwap(
+            fromTokenAddress,
+            address(buyToken),
+             // Sell all tokens we hold.
+            sellAmount,
+             // Minimum buy amount.
+            1,
+            // deadline
+            block.timestamp + 1
+        );
+        return buyAmount;
+    }
+}
--- a/contracts/zero-ex/contracts/test/TestBridge.sol
+++ b/contracts/zero-ex/contracts/test/TestBridge.sol
@@ -0,0 +1,69 @@
+/*
+
+  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.6.5;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
+import "../src/vendor/v3/IERC20Bridge.sol";
+
+
+contract TestBridge is
+    IERC20Bridge
+{
+    IERC20TokenV06 public immutable xAsset;
+    IERC20TokenV06 public immutable yAsset;
+
+    constructor(IERC20TokenV06 xAsset_, IERC20TokenV06 yAsset_)
+        public
+    {
+        xAsset = xAsset_;
+        yAsset = yAsset_;
+    }
+
+    /// @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 `0xdc1600f3` if successful.
+    function bridgeTransferFrom(
+        address tokenAddress,
+        address from,
+        address to,
+        uint256 amount,
+        bytes calldata bridgeData
+    )
+        external
+        override
+        returns (bytes4 success)
+    {
+        IERC20TokenV06 takerToken = tokenAddress == address(xAsset) ? yAsset : xAsset;
+        uint256 takerTokenBalance = takerToken.balanceOf(address(this));
+        emit ERC20BridgeTransfer(
+            address(takerToken),
+            tokenAddress,
+            takerTokenBalance,
+            amount,
+            from,
+            to
+        );
+        return 0xdecaf000;
+    }
+}
--- a/contracts/zero-ex/package.json
+++ b/contracts/zero-ex/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-zero-ex",
-    "version": "0.2.0",
+    "version": "0.3.0",
    "engines": {
        "node": ">=6.12"
    },
@@ -39,28 +39,29 @@
        "publish:private": "yarn build && gitpkg publish"
    },
    "config": {
-        "publicInterfaceContracts": "IZeroEx,ZeroEx,FullMigration,InitialMigration,IFlashWallet,IAllowanceTarget,IERC20Transformer,IOwnableFeature,ISimpleFunctionRegistryFeature,ITokenSpenderFeature,ITransformERC20Feature,FillQuoteTransformer,PayTakerTransformer,WethTransformer,OwnableFeature,SimpleFunctionRegistryFeature,TransformERC20Feature,TokenSpenderFeature,AffiliateFeeTransformer,SignatureValidatorFeature,MetaTransactionsFeature,LogMetadataTransformer,BridgeAdapter",
+        "publicInterfaceContracts": "IZeroEx,ZeroEx,FullMigration,InitialMigration,IFlashWallet,IAllowanceTarget,IERC20Transformer,IOwnableFeature,ISimpleFunctionRegistryFeature,ITokenSpenderFeature,ITransformERC20Feature,FillQuoteTransformer,PayTakerTransformer,WethTransformer,OwnableFeature,SimpleFunctionRegistryFeature,TransformERC20Feature,TokenSpenderFeature,AffiliateFeeTransformer,SignatureValidatorFeature,MetaTransactionsFeature,LogMetadataTransformer,BridgeAdapter,LiquidityProviderFeature",
        "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.",
-        "abis": "./test/generated-artifacts/@(AffiliateFeeTransformer|AllowanceTarget|BootstrapFeature|BridgeAdapter|FillQuoteTransformer|FixinCommon|FixinEIP712|FixinReentrancyGuard|FlashWallet|FullMigration|IAllowanceTarget|IBootstrapFeature|IBridgeAdapter|IERC20Bridge|IERC20Transformer|IExchange|IFeature|IFlashWallet|IGasToken|IMetaTransactionsFeature|IOwnableFeature|ISignatureValidatorFeature|ISimpleFunctionRegistryFeature|ITestSimpleFunctionRegistryFeature|ITokenSpenderFeature|ITransformERC20Feature|IZeroEx|InitialMigration|LibBootstrap|LibCommonRichErrors|LibERC20Transformer|LibMetaTransactionsRichErrors|LibMetaTransactionsStorage|LibMigrate|LibOwnableRichErrors|LibOwnableStorage|LibProxyRichErrors|LibProxyStorage|LibReentrancyGuardStorage|LibSignatureRichErrors|LibSignedCallData|LibSimpleFunctionRegistryRichErrors|LibSimpleFunctionRegistryStorage|LibSpenderRichErrors|LibStorage|LibTokenSpenderStorage|LibTransformERC20RichErrors|LibTransformERC20Storage|LibWalletRichErrors|LogMetadataTransformer|MetaTransactionsFeature|MixinAdapterAddresses|MixinBalancer|MixinCurve|MixinKyber|MixinMStable|MixinMooniswap|MixinOasis|MixinUniswap|MixinUniswapV2|MixinZeroExBridge|OwnableFeature|PayTakerTransformer|SignatureValidatorFeature|SimpleFunctionRegistryFeature|TestCallTarget|TestDelegateCaller|TestFillQuoteTransformerBridge|TestFillQuoteTransformerExchange|TestFillQuoteTransformerHost|TestFullMigration|TestInitialMigration|TestMetaTransactionsTransformERC20Feature|TestMigrator|TestMintTokenERC20Transformer|TestMintableERC20Token|TestSimpleFunctionRegistryFeatureImpl1|TestSimpleFunctionRegistryFeatureImpl2|TestTokenSpender|TestTokenSpenderERC20Token|TestTransformERC20|TestTransformerBase|TestTransformerDeployerTransformer|TestTransformerHost|TestWeth|TestWethTransformerHost|TestZeroExFeature|TokenSpenderFeature|TransformERC20Feature|Transformer|TransformerDeployer|WethTransformer|ZeroEx).json"
+        "abis": "./test/generated-artifacts/@(AffiliateFeeTransformer|AllowanceTarget|BootstrapFeature|BridgeAdapter|FillQuoteTransformer|FixinCommon|FixinEIP712|FixinReentrancyGuard|FlashWallet|FullMigration|IAllowanceTarget|IBootstrapFeature|IBridgeAdapter|IERC20Bridge|IERC20Transformer|IExchange|IFeature|IFlashWallet|IGasToken|ILiquidityProviderFeature|IMetaTransactionsFeature|IOwnableFeature|ISignatureValidatorFeature|ISimpleFunctionRegistryFeature|ITestSimpleFunctionRegistryFeature|ITokenSpenderFeature|ITransformERC20Feature|IUniswapFeature|IZeroEx|InitialMigration|LibBootstrap|LibCommonRichErrors|LibERC20Transformer|LibLiquidityProviderRichErrors|LibLiquidityProviderStorage|LibMetaTransactionsRichErrors|LibMetaTransactionsStorage|LibMigrate|LibOwnableRichErrors|LibOwnableStorage|LibProxyRichErrors|LibProxyStorage|LibReentrancyGuardStorage|LibSignatureRichErrors|LibSignedCallData|LibSimpleFunctionRegistryRichErrors|LibSimpleFunctionRegistryStorage|LibSpenderRichErrors|LibStorage|LibTokenSpenderStorage|LibTransformERC20RichErrors|LibTransformERC20Storage|LibWalletRichErrors|LiquidityProviderFeature|LogMetadataTransformer|MetaTransactionsFeature|MixinAdapterAddresses|MixinBalancer|MixinCurve|MixinKyber|MixinMStable|MixinMooniswap|MixinOasis|MixinShell|MixinUniswap|MixinUniswapV2|MixinZeroExBridge|OwnableFeature|PayTakerTransformer|SignatureValidatorFeature|SimpleFunctionRegistryFeature|TestBridge|TestCallTarget|TestDelegateCaller|TestFillQuoteTransformerBridge|TestFillQuoteTransformerExchange|TestFillQuoteTransformerHost|TestFullMigration|TestInitialMigration|TestMetaTransactionsTransformERC20Feature|TestMigrator|TestMintTokenERC20Transformer|TestMintableERC20Token|TestSimpleFunctionRegistryFeatureImpl1|TestSimpleFunctionRegistryFeatureImpl2|TestTokenSpender|TestTokenSpenderERC20Token|TestTransformERC20|TestTransformerBase|TestTransformerDeployerTransformer|TestTransformerHost|TestWeth|TestWethTransformerHost|TestZeroExFeature|TokenSpenderFeature|TransformERC20Feature|Transformer|TransformerDeployer|UniswapFeature|WethTransformer|ZeroEx).json"
    },
    "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/zero-ex/README.md",
+    "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/zero-ex",
    "devDependencies": {
-        "@0x/abi-gen": "^5.3.1",
-        "@0x/contracts-gen": "^2.0.10",
-        "@0x/contracts-test-utils": "^5.3.4",
-        "@0x/dev-utils": "^3.3.0",
-        "@0x/order-utils": "^10.3.0",
-        "@0x/sol-compiler": "^4.1.1",
-        "@0x/ts-doc-gen": "^0.0.22",
-        "@0x/tslint-config": "^4.1.0",
+        "@0x/abi-gen": "^5.4.3",
+        "@0x/contracts-erc20": "^3.2.2",
+        "@0x/contracts-gen": "2.0.13",
+        "@0x/contracts-test-utils": "^5.3.5",
+        "@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",
        "@types/lodash": "4.14.104",
        "@types/mocha": "^5.2.7",
        "lodash": "^4.17.11",
@@ -70,17 +71,17 @@
        "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.3",
-        "@0x/subproviders": "^6.1.1",
-        "@0x/types": "^3.2.0",
-        "@0x/typescript-typings": "^5.1.1",
-        "@0x/utils": "^5.5.1",
-        "@0x/web3-wrapper": "^7.2.0",
-        "ethereum-types": "^3.2.0",
+        "@0x/base-contract": "^6.2.7",
+        "@0x/subproviders": "^6.1.5",
+        "@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",
        "ethereumjs-util": "^5.1.1"
    },
    "publishConfig": {
--- a/contracts/zero-ex/src/artifacts.ts
+++ b/contracts/zero-ex/src/artifacts.ts
@@ -18,6 +18,7 @@ import * as ISimpleFunctionRegistryFeature from '../generated-artifacts/ISimpleF
 import * as ITokenSpenderFeature from '../generated-artifacts/ITokenSpenderFeature.json';
 import * as ITransformERC20Feature from '../generated-artifacts/ITransformERC20Feature.json';
 import * as IZeroEx from '../generated-artifacts/IZeroEx.json';
+import * as LiquidityProviderFeature from '../generated-artifacts/LiquidityProviderFeature.json';
 import * as LogMetadataTransformer from '../generated-artifacts/LogMetadataTransformer.json';
 import * as MetaTransactionsFeature from '../generated-artifacts/MetaTransactionsFeature.json';
 import * as OwnableFeature from '../generated-artifacts/OwnableFeature.json';
@@ -52,4 +53,5 @@ export const artifacts = {
    MetaTransactionsFeature: MetaTransactionsFeature as ContractArtifact,
    LogMetadataTransformer: LogMetadataTransformer as ContractArtifact,
    BridgeAdapter: BridgeAdapter as ContractArtifact,
+    LiquidityProviderFeature: LiquidityProviderFeature as ContractArtifact,
 };
--- a/contracts/zero-ex/src/wrappers.ts
+++ b/contracts/zero-ex/src/wrappers.ts
@@ -16,6 +16,7 @@ export * from '../generated-wrappers/i_token_spender_feature';
 export * from '../generated-wrappers/i_transform_erc20_feature';
 export * from '../generated-wrappers/i_zero_ex';
 export * from '../generated-wrappers/initial_migration';
+export * from '../generated-wrappers/liquidity_provider_feature';
 export * from '../generated-wrappers/log_metadata_transformer';
 export * from '../generated-wrappers/meta_transactions_feature';
 export * from '../generated-wrappers/ownable_feature';
--- a/contracts/zero-ex/test/artifacts.ts
+++ b/contracts/zero-ex/test/artifacts.ts
@@ -24,6 +24,7 @@ import * as IExchange from '../test/generated-artifacts/IExchange.json';
 import * as IFeature from '../test/generated-artifacts/IFeature.json';
 import * as IFlashWallet from '../test/generated-artifacts/IFlashWallet.json';
 import * as IGasToken from '../test/generated-artifacts/IGasToken.json';
+import * as ILiquidityProviderFeature from '../test/generated-artifacts/ILiquidityProviderFeature.json';
 import * as IMetaTransactionsFeature from '../test/generated-artifacts/IMetaTransactionsFeature.json';
 import * as InitialMigration from '../test/generated-artifacts/InitialMigration.json';
 import * as IOwnableFeature from '../test/generated-artifacts/IOwnableFeature.json';
@@ -32,10 +33,13 @@ import * as ISimpleFunctionRegistryFeature from '../test/generated-artifacts/ISi
 import * as ITestSimpleFunctionRegistryFeature from '../test/generated-artifacts/ITestSimpleFunctionRegistryFeature.json';
 import * as ITokenSpenderFeature from '../test/generated-artifacts/ITokenSpenderFeature.json';
 import * as ITransformERC20Feature from '../test/generated-artifacts/ITransformERC20Feature.json';
+import * as IUniswapFeature from '../test/generated-artifacts/IUniswapFeature.json';
 import * as IZeroEx from '../test/generated-artifacts/IZeroEx.json';
 import * as LibBootstrap from '../test/generated-artifacts/LibBootstrap.json';
 import * as LibCommonRichErrors from '../test/generated-artifacts/LibCommonRichErrors.json';
 import * as LibERC20Transformer from '../test/generated-artifacts/LibERC20Transformer.json';
+import * as LibLiquidityProviderRichErrors from '../test/generated-artifacts/LibLiquidityProviderRichErrors.json';
+import * as LibLiquidityProviderStorage from '../test/generated-artifacts/LibLiquidityProviderStorage.json';
 import * as LibMetaTransactionsRichErrors from '../test/generated-artifacts/LibMetaTransactionsRichErrors.json';
 import * as LibMetaTransactionsStorage from '../test/generated-artifacts/LibMetaTransactionsStorage.json';
 import * as LibMigrate from '../test/generated-artifacts/LibMigrate.json';
@@ -54,6 +58,7 @@ import * as LibTokenSpenderStorage from '../test/generated-artifacts/LibTokenSpe
 import * as LibTransformERC20RichErrors from '../test/generated-artifacts/LibTransformERC20RichErrors.json';
 import * as LibTransformERC20Storage from '../test/generated-artifacts/LibTransformERC20Storage.json';
 import * as LibWalletRichErrors from '../test/generated-artifacts/LibWalletRichErrors.json';
+import * as LiquidityProviderFeature from '../test/generated-artifacts/LiquidityProviderFeature.json';
 import * as LogMetadataTransformer from '../test/generated-artifacts/LogMetadataTransformer.json';
 import * as MetaTransactionsFeature from '../test/generated-artifacts/MetaTransactionsFeature.json';
 import * as MixinAdapterAddresses from '../test/generated-artifacts/MixinAdapterAddresses.json';
@@ -63,6 +68,7 @@ import * as MixinKyber from '../test/generated-artifacts/MixinKyber.json';
 import * as MixinMooniswap from '../test/generated-artifacts/MixinMooniswap.json';
 import * as MixinMStable from '../test/generated-artifacts/MixinMStable.json';
 import * as MixinOasis from '../test/generated-artifacts/MixinOasis.json';
+import * as MixinShell from '../test/generated-artifacts/MixinShell.json';
 import * as MixinUniswap from '../test/generated-artifacts/MixinUniswap.json';
 import * as MixinUniswapV2 from '../test/generated-artifacts/MixinUniswapV2.json';
 import * as MixinZeroExBridge from '../test/generated-artifacts/MixinZeroExBridge.json';
@@ -70,6 +76,7 @@ import * as OwnableFeature from '../test/generated-artifacts/OwnableFeature.json
 import * as PayTakerTransformer from '../test/generated-artifacts/PayTakerTransformer.json';
 import * as SignatureValidatorFeature from '../test/generated-artifacts/SignatureValidatorFeature.json';
 import * as SimpleFunctionRegistryFeature from '../test/generated-artifacts/SimpleFunctionRegistryFeature.json';
+import * as TestBridge from '../test/generated-artifacts/TestBridge.json';
 import * as TestCallTarget from '../test/generated-artifacts/TestCallTarget.json';
 import * as TestDelegateCaller from '../test/generated-artifacts/TestDelegateCaller.json';
 import * as TestFillQuoteTransformerBridge from '../test/generated-artifacts/TestFillQuoteTransformerBridge.json';
@@ -96,12 +103,14 @@ import * as TokenSpenderFeature from '../test/generated-artifacts/TokenSpenderFe
 import * as Transformer from '../test/generated-artifacts/Transformer.json';
 import * as TransformERC20Feature from '../test/generated-artifacts/TransformERC20Feature.json';
 import * as TransformerDeployer from '../test/generated-artifacts/TransformerDeployer.json';
+import * as UniswapFeature from '../test/generated-artifacts/UniswapFeature.json';
 import * as WethTransformer from '../test/generated-artifacts/WethTransformer.json';
 import * as ZeroEx from '../test/generated-artifacts/ZeroEx.json';
 export const artifacts = {
    IZeroEx: IZeroEx as ContractArtifact,
    ZeroEx: ZeroEx as ContractArtifact,
    LibCommonRichErrors: LibCommonRichErrors as ContractArtifact,
+    LibLiquidityProviderRichErrors: LibLiquidityProviderRichErrors as ContractArtifact,
    LibMetaTransactionsRichErrors: LibMetaTransactionsRichErrors as ContractArtifact,
    LibOwnableRichErrors: LibOwnableRichErrors as ContractArtifact,
    LibProxyRichErrors: LibProxyRichErrors as ContractArtifact,
@@ -118,18 +127,22 @@ export const artifacts = {
    BootstrapFeature: BootstrapFeature as ContractArtifact,
    IBootstrapFeature: IBootstrapFeature as ContractArtifact,
    IFeature: IFeature as ContractArtifact,
+    ILiquidityProviderFeature: ILiquidityProviderFeature as ContractArtifact,
    IMetaTransactionsFeature: IMetaTransactionsFeature as ContractArtifact,
    IOwnableFeature: IOwnableFeature as ContractArtifact,
    ISignatureValidatorFeature: ISignatureValidatorFeature as ContractArtifact,
    ISimpleFunctionRegistryFeature: ISimpleFunctionRegistryFeature as ContractArtifact,
    ITokenSpenderFeature: ITokenSpenderFeature as ContractArtifact,
    ITransformERC20Feature: ITransformERC20Feature as ContractArtifact,
+    IUniswapFeature: IUniswapFeature as ContractArtifact,
+    LiquidityProviderFeature: LiquidityProviderFeature as ContractArtifact,
    MetaTransactionsFeature: MetaTransactionsFeature as ContractArtifact,
    OwnableFeature: OwnableFeature as ContractArtifact,
    SignatureValidatorFeature: SignatureValidatorFeature as ContractArtifact,
    SimpleFunctionRegistryFeature: SimpleFunctionRegistryFeature as ContractArtifact,
    TokenSpenderFeature: TokenSpenderFeature as ContractArtifact,
    TransformERC20Feature: TransformERC20Feature as ContractArtifact,
+    UniswapFeature: UniswapFeature as ContractArtifact,
    LibSignedCallData: LibSignedCallData as ContractArtifact,
    FixinCommon: FixinCommon as ContractArtifact,
    FixinEIP712: FixinEIP712 as ContractArtifact,
@@ -138,6 +151,7 @@ export const artifacts = {
    InitialMigration: InitialMigration as ContractArtifact,
    LibBootstrap: LibBootstrap as ContractArtifact,
    LibMigrate: LibMigrate as ContractArtifact,
+    LibLiquidityProviderStorage: LibLiquidityProviderStorage as ContractArtifact,
    LibMetaTransactionsStorage: LibMetaTransactionsStorage as ContractArtifact,
    LibOwnableStorage: LibOwnableStorage as ContractArtifact,
    LibProxyStorage: LibProxyStorage as ContractArtifact,
@@ -163,6 +177,7 @@ export const artifacts = {
    MixinMStable: MixinMStable as ContractArtifact,
    MixinMooniswap: MixinMooniswap as ContractArtifact,
    MixinOasis: MixinOasis as ContractArtifact,
+    MixinShell: MixinShell as ContractArtifact,
    MixinUniswap: MixinUniswap as ContractArtifact,
    MixinUniswapV2: MixinUniswapV2 as ContractArtifact,
    MixinZeroExBridge: MixinZeroExBridge as ContractArtifact,
@@ -170,6 +185,7 @@ export const artifacts = {
    IExchange: IExchange as ContractArtifact,
    IGasToken: IGasToken as ContractArtifact,
    ITestSimpleFunctionRegistryFeature: ITestSimpleFunctionRegistryFeature as ContractArtifact,
+    TestBridge: TestBridge as ContractArtifact,
    TestCallTarget: TestCallTarget as ContractArtifact,
    TestDelegateCaller: TestDelegateCaller as ContractArtifact,
    TestFillQuoteTransformerBridge: TestFillQuoteTransformerBridge as ContractArtifact,
--- a/contracts/zero-ex/test/features/liquidity_provider_test.ts
+++ b/contracts/zero-ex/test/features/liquidity_provider_test.ts
@@ -0,0 +1,250 @@
+import { artifacts as erc20Artifacts, DummyERC20TokenContract } from '@0x/contracts-erc20';
+import { blockchainTests, constants, expect, randomAddress, verifyEventsFromLogs } from '@0x/contracts-test-utils';
+import { BigNumber, OwnableRevertErrors, ZeroExRevertErrors } from '@0x/utils';
+
+import {
+    IOwnableFeatureContract,
+    IZeroExContract,
+    LiquidityProviderFeatureContract,
+    TokenSpenderFeatureContract,
+} from '../../src/wrappers';
+import { artifacts } from '../artifacts';
+import { abis } from '../utils/abis';
+import { fullMigrateAsync } from '../utils/migration';
+import { IERC20BridgeEvents, TestBridgeContract, TestWethContract } from '../wrappers';
+
+blockchainTests('LiquidityProvider feature', env => {
+    let zeroEx: IZeroExContract;
+    let feature: LiquidityProviderFeatureContract;
+    let token: DummyERC20TokenContract;
+    let weth: TestWethContract;
+    let owner: string;
+    let taker: string;
+
+    before(async () => {
+        [owner, taker] = await env.getAccountAddressesAsync();
+        zeroEx = await fullMigrateAsync(owner, env.provider, env.txDefaults, {
+            tokenSpender: (await TokenSpenderFeatureContract.deployFrom0xArtifactAsync(
+                artifacts.TestTokenSpender,
+                env.provider,
+                env.txDefaults,
+                artifacts,
+            )).address,
+        });
+        const tokenSpender = new TokenSpenderFeatureContract(zeroEx.address, env.provider, env.txDefaults, abis);
+        const allowanceTarget = await tokenSpender.getAllowanceTarget().callAsync();
+
+        token = await DummyERC20TokenContract.deployFrom0xArtifactAsync(
+            erc20Artifacts.DummyERC20Token,
+            env.provider,
+            env.txDefaults,
+            erc20Artifacts,
+            constants.DUMMY_TOKEN_NAME,
+            constants.DUMMY_TOKEN_SYMBOL,
+            constants.DUMMY_TOKEN_DECIMALS,
+            constants.DUMMY_TOKEN_TOTAL_SUPPLY,
+        );
+        await token.setBalance(taker, constants.INITIAL_ERC20_BALANCE).awaitTransactionSuccessAsync();
+        weth = await TestWethContract.deployFrom0xArtifactAsync(
+            artifacts.TestWeth,
+            env.provider,
+            env.txDefaults,
+            artifacts,
+        );
+        await token
+            .approve(allowanceTarget, constants.INITIAL_ERC20_ALLOWANCE)
+            .awaitTransactionSuccessAsync({ from: taker });
+
+        feature = new LiquidityProviderFeatureContract(zeroEx.address, env.provider, env.txDefaults, abis);
+        const featureImpl = await LiquidityProviderFeatureContract.deployFrom0xArtifactAsync(
+            artifacts.LiquidityProviderFeature,
+            env.provider,
+            env.txDefaults,
+            artifacts,
+            weth.address,
+        );
+        await new IOwnableFeatureContract(zeroEx.address, env.provider, env.txDefaults, abis)
+            .migrate(featureImpl.address, featureImpl.migrate().getABIEncodedTransactionData(), owner)
+            .awaitTransactionSuccessAsync();
+    });
+    describe('Registry', () => {
+        it('`getLiquidityProviderForMarket` reverts if address is not set', async () => {
+            const [xAsset, yAsset] = [randomAddress(), randomAddress()];
+            let tx = feature.getLiquidityProviderForMarket(xAsset, yAsset).awaitTransactionSuccessAsync();
+            expect(tx).to.revertWith(
+                new ZeroExRevertErrors.LiquidityProvider.NoLiquidityProviderForMarketError(xAsset, yAsset),
+            );
+            tx = feature.getLiquidityProviderForMarket(yAsset, xAsset).awaitTransactionSuccessAsync();
+            return expect(tx).to.revertWith(
+                new ZeroExRevertErrors.LiquidityProvider.NoLiquidityProviderForMarketError(yAsset, xAsset),
+            );
+        });
+        it('can set/get a liquidity provider address for a given market', async () => {
+            const expectedAddress = randomAddress();
+            await feature
+                .setLiquidityProviderForMarket(token.address, weth.address, expectedAddress)
+                .awaitTransactionSuccessAsync();
+            let actualAddress = await feature.getLiquidityProviderForMarket(token.address, weth.address).callAsync();
+            expect(actualAddress).to.equal(expectedAddress);
+            actualAddress = await feature.getLiquidityProviderForMarket(weth.address, token.address).callAsync();
+            expect(actualAddress).to.equal(expectedAddress);
+        });
+        it('can update a liquidity provider address for a given market', async () => {
+            const expectedAddress = randomAddress();
+            await feature
+                .setLiquidityProviderForMarket(token.address, weth.address, expectedAddress)
+                .awaitTransactionSuccessAsync();
+            let actualAddress = await feature.getLiquidityProviderForMarket(token.address, weth.address).callAsync();
+            expect(actualAddress).to.equal(expectedAddress);
+            actualAddress = await feature.getLiquidityProviderForMarket(weth.address, token.address).callAsync();
+            expect(actualAddress).to.equal(expectedAddress);
+        });
+        it('can effectively remove a liquidity provider for a market by setting the address to 0', async () => {
+            await feature
+                .setLiquidityProviderForMarket(token.address, weth.address, constants.NULL_ADDRESS)
+                .awaitTransactionSuccessAsync();
+            const tx = feature
+                .getLiquidityProviderForMarket(token.address, weth.address)
+                .awaitTransactionSuccessAsync();
+            return expect(tx).to.revertWith(
+                new ZeroExRevertErrors.LiquidityProvider.NoLiquidityProviderForMarketError(token.address, weth.address),
+            );
+        });
+        it('reverts if non-owner attempts to set an address', async () => {
+            const tx = feature
+                .setLiquidityProviderForMarket(randomAddress(), randomAddress(), randomAddress())
+                .awaitTransactionSuccessAsync({ from: taker });
+            return expect(tx).to.revertWith(new OwnableRevertErrors.OnlyOwnerError(taker, owner));
+        });
+    });
+    blockchainTests.resets('Swap', () => {
+        let liquidityProvider: TestBridgeContract;
+        const ETH_TOKEN_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';
+
+        before(async () => {
+            liquidityProvider = await TestBridgeContract.deployFrom0xArtifactAsync(
+                artifacts.TestBridge,
+                env.provider,
+                env.txDefaults,
+                artifacts,
+                token.address,
+                weth.address,
+            );
+            await feature
+                .setLiquidityProviderForMarket(token.address, weth.address, liquidityProvider.address)
+                .awaitTransactionSuccessAsync();
+        });
+        it('Cannot execute a swap for a market without a liquidity provider set', async () => {
+            const [xAsset, yAsset] = [randomAddress(), randomAddress()];
+            const tx = feature
+                .sellToLiquidityProvider(
+                    xAsset,
+                    yAsset,
+                    constants.NULL_ADDRESS,
+                    constants.ONE_ETHER,
+                    constants.ZERO_AMOUNT,
+                )
+                .awaitTransactionSuccessAsync({ from: taker });
+            return expect(tx).to.revertWith(
+                new ZeroExRevertErrors.LiquidityProvider.NoLiquidityProviderForMarketError(xAsset, yAsset),
+            );
+        });
+        it('Successfully executes an ERC20-ERC20 swap', async () => {
+            const tx = await feature
+                .sellToLiquidityProvider(
+                    weth.address,
+                    token.address,
+                    constants.NULL_ADDRESS,
+                    constants.ONE_ETHER,
+                    constants.ZERO_AMOUNT,
+                )
+                .awaitTransactionSuccessAsync({ from: taker });
+            verifyEventsFromLogs(
+                tx.logs,
+                [
+                    {
+                        inputToken: token.address,
+                        outputToken: weth.address,
+                        inputTokenAmount: constants.ONE_ETHER,
+                        outputTokenAmount: constants.ZERO_AMOUNT,
+                        from: constants.NULL_ADDRESS,
+                        to: taker,
+                    },
+                ],
+                IERC20BridgeEvents.ERC20BridgeTransfer,
+            );
+        });
+        it('Reverts if cannot fulfill the minimum buy amount', async () => {
+            const minBuyAmount = new BigNumber(1);
+            const tx = feature
+                .sellToLiquidityProvider(
+                    weth.address,
+                    token.address,
+                    constants.NULL_ADDRESS,
+                    constants.ONE_ETHER,
+                    minBuyAmount,
+                )
+                .awaitTransactionSuccessAsync({ from: taker });
+            return expect(tx).to.revertWith(
+                new ZeroExRevertErrors.LiquidityProvider.LiquidityProviderIncompleteSellError(
+                    liquidityProvider.address,
+                    weth.address,
+                    token.address,
+                    constants.ONE_ETHER,
+                    constants.ZERO_AMOUNT,
+                    minBuyAmount,
+                ),
+            );
+        });
+        it('Successfully executes an ETH-ERC20 swap', async () => {
+            const tx = await feature
+                .sellToLiquidityProvider(
+                    token.address,
+                    ETH_TOKEN_ADDRESS,
+                    constants.NULL_ADDRESS,
+                    constants.ONE_ETHER,
+                    constants.ZERO_AMOUNT,
+                )
+                .awaitTransactionSuccessAsync({ from: taker, value: constants.ONE_ETHER });
+            verifyEventsFromLogs(
+                tx.logs,
+                [
+                    {
+                        inputToken: weth.address,
+                        outputToken: token.address,
+                        inputTokenAmount: constants.ONE_ETHER,
+                        outputTokenAmount: constants.ZERO_AMOUNT,
+                        from: constants.NULL_ADDRESS,
+                        to: taker,
+                    },
+                ],
+                IERC20BridgeEvents.ERC20BridgeTransfer,
+            );
+        });
+        it('Successfully executes an ERC20-ETH swap', async () => {
+            const tx = await feature
+                .sellToLiquidityProvider(
+                    ETH_TOKEN_ADDRESS,
+                    token.address,
+                    constants.NULL_ADDRESS,
+                    constants.ONE_ETHER,
+                    constants.ZERO_AMOUNT,
+                )
+                .awaitTransactionSuccessAsync({ from: taker });
+            verifyEventsFromLogs(
+                tx.logs,
+                [
+                    {
+                        inputToken: token.address,
+                        outputToken: weth.address,
+                        inputTokenAmount: constants.ONE_ETHER,
+                        outputTokenAmount: constants.ZERO_AMOUNT,
+                        from: constants.NULL_ADDRESS,
+                        to: zeroEx.address,
+                    },
+                ],
+                IERC20BridgeEvents.ERC20BridgeTransfer,
+            );
+        });
+    });
+});
--- a/contracts/zero-ex/test/transformers/fill_quote_transformer_test.ts
+++ b/contracts/zero-ex/test/transformers/fill_quote_transformer_test.ts
@@ -73,6 +73,9 @@ blockchainTests.resets('FillQuoteTransformer', env => {
                uniswapExchangeFactory: NULL_ADDRESS,
                mStable: NULL_ADDRESS,
                weth: NULL_ADDRESS,
+                shellBridge: NULL_ADDRESS,
+                shell: NULL_ADDRESS,
+                creamBridge: NULL_ADDRESS,
            },
        );
        transformer = await FillQuoteTransformerContract.deployFrom0xArtifactAsync(
--- a/contracts/zero-ex/test/wrappers.ts
+++ b/contracts/zero-ex/test/wrappers.ts
@@ -22,6 +22,7 @@ export * from '../test/generated-wrappers/i_exchange';
 export * from '../test/generated-wrappers/i_feature';
 export * from '../test/generated-wrappers/i_flash_wallet';
 export * from '../test/generated-wrappers/i_gas_token';
+export * from '../test/generated-wrappers/i_liquidity_provider_feature';
 export * from '../test/generated-wrappers/i_meta_transactions_feature';
 export * from '../test/generated-wrappers/i_ownable_feature';
 export * from '../test/generated-wrappers/i_signature_validator_feature';
@@ -29,11 +30,14 @@ export * from '../test/generated-wrappers/i_simple_function_registry_feature';
 export * from '../test/generated-wrappers/i_test_simple_function_registry_feature';
 export * from '../test/generated-wrappers/i_token_spender_feature';
 export * from '../test/generated-wrappers/i_transform_erc20_feature';
+export * from '../test/generated-wrappers/i_uniswap_feature';
 export * from '../test/generated-wrappers/i_zero_ex';
 export * from '../test/generated-wrappers/initial_migration';
 export * from '../test/generated-wrappers/lib_bootstrap';
 export * from '../test/generated-wrappers/lib_common_rich_errors';
 export * from '../test/generated-wrappers/lib_erc20_transformer';
+export * from '../test/generated-wrappers/lib_liquidity_provider_rich_errors';
+export * from '../test/generated-wrappers/lib_liquidity_provider_storage';
 export * from '../test/generated-wrappers/lib_meta_transactions_rich_errors';
 export * from '../test/generated-wrappers/lib_meta_transactions_storage';
 export * from '../test/generated-wrappers/lib_migrate';
@@ -52,6 +56,7 @@ export * from '../test/generated-wrappers/lib_token_spender_storage';
 export * from '../test/generated-wrappers/lib_transform_erc20_rich_errors';
 export * from '../test/generated-wrappers/lib_transform_erc20_storage';
 export * from '../test/generated-wrappers/lib_wallet_rich_errors';
+export * from '../test/generated-wrappers/liquidity_provider_feature';
 export * from '../test/generated-wrappers/log_metadata_transformer';
 export * from '../test/generated-wrappers/meta_transactions_feature';
 export * from '../test/generated-wrappers/mixin_adapter_addresses';
@@ -61,6 +66,7 @@ export * from '../test/generated-wrappers/mixin_kyber';
 export * from '../test/generated-wrappers/mixin_m_stable';
 export * from '../test/generated-wrappers/mixin_mooniswap';
 export * from '../test/generated-wrappers/mixin_oasis';
+export * from '../test/generated-wrappers/mixin_shell';
 export * from '../test/generated-wrappers/mixin_uniswap';
 export * from '../test/generated-wrappers/mixin_uniswap_v2';
 export * from '../test/generated-wrappers/mixin_zero_ex_bridge';
@@ -68,6 +74,7 @@ export * from '../test/generated-wrappers/ownable_feature';
 export * from '../test/generated-wrappers/pay_taker_transformer';
 export * from '../test/generated-wrappers/signature_validator_feature';
 export * from '../test/generated-wrappers/simple_function_registry_feature';
+export * from '../test/generated-wrappers/test_bridge';
 export * from '../test/generated-wrappers/test_call_target';
 export * from '../test/generated-wrappers/test_delegate_caller';
 export * from '../test/generated-wrappers/test_fill_quote_transformer_bridge';
@@ -94,5 +101,6 @@ export * from '../test/generated-wrappers/token_spender_feature';
 export * from '../test/generated-wrappers/transform_erc20_feature';
 export * from '../test/generated-wrappers/transformer';
 export * from '../test/generated-wrappers/transformer_deployer';
+export * from '../test/generated-wrappers/uniswap_feature';
 export * from '../test/generated-wrappers/weth_transformer';
 export * from '../test/generated-wrappers/zero_ex';
--- a/contracts/zero-ex/tsconfig.json
+++ b/contracts/zero-ex/tsconfig.json
@@ -16,6 +16,7 @@
        "generated-artifacts/ITransformERC20Feature.json",
        "generated-artifacts/IZeroEx.json",
        "generated-artifacts/InitialMigration.json",
+        "generated-artifacts/LiquidityProviderFeature.json",
        "generated-artifacts/LogMetadataTransformer.json",
        "generated-artifacts/MetaTransactionsFeature.json",
        "generated-artifacts/OwnableFeature.json",
@@ -45,6 +46,7 @@
        "test/generated-artifacts/IFeature.json",
        "test/generated-artifacts/IFlashWallet.json",
        "test/generated-artifacts/IGasToken.json",
+        "test/generated-artifacts/ILiquidityProviderFeature.json",
        "test/generated-artifacts/IMetaTransactionsFeature.json",
        "test/generated-artifacts/IOwnableFeature.json",
        "test/generated-artifacts/ISignatureValidatorFeature.json",
@@ -52,11 +54,14 @@
        "test/generated-artifacts/ITestSimpleFunctionRegistryFeature.json",
        "test/generated-artifacts/ITokenSpenderFeature.json",
        "test/generated-artifacts/ITransformERC20Feature.json",
+        "test/generated-artifacts/IUniswapFeature.json",
        "test/generated-artifacts/IZeroEx.json",
        "test/generated-artifacts/InitialMigration.json",
        "test/generated-artifacts/LibBootstrap.json",
        "test/generated-artifacts/LibCommonRichErrors.json",
        "test/generated-artifacts/LibERC20Transformer.json",
+        "test/generated-artifacts/LibLiquidityProviderRichErrors.json",
+        "test/generated-artifacts/LibLiquidityProviderStorage.json",
        "test/generated-artifacts/LibMetaTransactionsRichErrors.json",
        "test/generated-artifacts/LibMetaTransactionsStorage.json",
        "test/generated-artifacts/LibMigrate.json",
@@ -75,6 +80,7 @@
        "test/generated-artifacts/LibTransformERC20RichErrors.json",
        "test/generated-artifacts/LibTransformERC20Storage.json",
        "test/generated-artifacts/LibWalletRichErrors.json",
+        "test/generated-artifacts/LiquidityProviderFeature.json",
        "test/generated-artifacts/LogMetadataTransformer.json",
        "test/generated-artifacts/MetaTransactionsFeature.json",
        "test/generated-artifacts/MixinAdapterAddresses.json",
@@ -84,6 +90,7 @@
        "test/generated-artifacts/MixinMStable.json",
        "test/generated-artifacts/MixinMooniswap.json",
        "test/generated-artifacts/MixinOasis.json",
+        "test/generated-artifacts/MixinShell.json",
        "test/generated-artifacts/MixinUniswap.json",
        "test/generated-artifacts/MixinUniswapV2.json",
        "test/generated-artifacts/MixinZeroExBridge.json",
@@ -91,6 +98,7 @@
        "test/generated-artifacts/PayTakerTransformer.json",
        "test/generated-artifacts/SignatureValidatorFeature.json",
        "test/generated-artifacts/SimpleFunctionRegistryFeature.json",
+        "test/generated-artifacts/TestBridge.json",
        "test/generated-artifacts/TestCallTarget.json",
        "test/generated-artifacts/TestDelegateCaller.json",
        "test/generated-artifacts/TestFillQuoteTransformerBridge.json",
@@ -117,6 +125,7 @@
        "test/generated-artifacts/TransformERC20Feature.json",
        "test/generated-artifacts/Transformer.json",
        "test/generated-artifacts/TransformerDeployer.json",
+        "test/generated-artifacts/UniswapFeature.json",
        "test/generated-artifacts/WethTransformer.json",
        "test/generated-artifacts/ZeroEx.json"
    ],
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
    "lerna": "3.0.0-beta.23",
-    "packages": ["packages/*", "contracts/*"],
+    "packages": ["*"],
    "version": "independent",
    "command": {
        "publish": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "private": true,
-    "name": "0x-monorepo",
+    "name": "@0x/protocol-repo",
    "engines": {
        "node": ">=6.12"
    },
@@ -9,26 +9,25 @@
        "contracts/*"
    ],
    "scripts": {
-        "deps_versions:ci": "node ./packages/monorepo-scripts/lib/deps_versions.js",
+        "deps_versions:ci": "node ./node_modules/@0x/monorepo-scripts/lib/deps_versions.js",
        "fix": "wsrun fix $PKG --fast-exit --parallel --exclude-missing",
        "ganache": "ganache-cli -p 8545 --gasLimit 10000000 --networkId 50 -m \"${npm_package_config_mnemonic}\"",
        "prettier": "prettier --write '**/*.{ts,tsx,json,md}' --config .prettierrc",
        "prettier:ci": "prettier --list-different '**/*.{ts,tsx,json,md}' --config .prettierrc",
-        "report_coverage": "lcov-result-merger './{packages/*/coverage/lcov.info,python-packages/*/.coverage}' | coveralls",
-        "test:installation": "node ./packages/monorepo-scripts/lib/test_installation.js",
-        "test:installation:local": "IS_LOCAL_PUBLISH=true node ./packages/monorepo-scripts/lib/test_installation.js",
+        "report_coverage": "lcov-result-merger './packages/*/coverage/lcov.info' | coveralls",
+        "test:installation": "node ./node_modules/@0x/monorepo-scripts/lib/test_installation.js",
+        "test:installation:local": "IS_LOCAL_PUBLISH=true node ./node_modules/@0x/monorepo-scripts/lib/test_installation.js",
        "test:publish:circleci": "yarn npm-cli-login -u test -p test -e test@example.com -r http://localhost:4873 && IS_LOCAL_PUBLISH=true run-s script:publish test:installation:local",
-        "run:publish": "run-s install:all build:monorepo_scripts script:prepublish_checks rebuild script:publish",
+        "run:publish": "run-s install:all script:prepublish_checks rebuild script:publish",
        "run:publish:local": "IS_LOCAL_PUBLISH=true yarn run:publish",
-        "script:prepublish_checks": "node ./packages/monorepo-scripts/lib/prepublish_checks.js",
-        "script:publish": "node ./packages/monorepo-scripts/lib/publish.js",
+        "script:prepublish_checks": "node ./node_modules/@0x/monorepo-scripts/lib/prepublish_checks.js",
+        "script:publish": "node ./node_modules/@0x/monorepo-scripts/lib/publish.js --repo protocol",
        "install:all": "yarn install",
        "wsrun": "wsrun",
        "lerna": "lerna",
        "build": "lerna link && wsrun build $PKG -r --stages --fast-exit --exclude-missing",
-        "build:ci": "lerna link && wsrun build:ci $PKG --fast-exit -r --stages --exclude-missing --exclude @0x/instant",
+        "build:ci": "lerna link && wsrun build:ci $PKG --fast-exit -r --stages --exclude-missing",
        "build:contracts": "lerna link && wsrun build -p ${npm_package_config_contractsPackages} -c --fast-exit -r --stages --exclude-missing",
-        "build:monorepo_scripts": "PKG=@0x/monorepo-scripts yarn build",
        "build:ts": "tsc -b",
        "watch:ts": "tsc -b -w",
        "clean": "wsrun clean $PKG --fast-exit -r --parallel --exclude-missing",
@@ -39,50 +38,42 @@
        "contracts:watch": "wsrun watch $PKG --parallel --exclude-missing",
        "remove_node_modules": "lerna clean --yes; rm -rf node_modules",
        "rebuild": "run-s clean build",
-        "test": "wsrun test $PKG --fast-exit --serial --exclude-missing --exclude @0x/orderbook",
-        "test:contracts": "wsrun test -p ${npm_package_config_contractsPackages} -c --fast-exit --exclude-missing",
-        "generate_doc": "node ./packages/monorepo-scripts/lib/doc_generate.js",
+        "test": "wsrun test $(echo $(echo ${npm_package_config_contractsPackages} ${npm_package_config_nonContractPackages} | tr ' ' '\n' | sort | uniq) ${npm_package_config_ignoreTestsForPackages} | tr ' ' '\n' | sort | uniq -u | tr '\n' ' ') --fast-exit --serial --exclude-missing",
+        "test:all": "wsrun test $PKG --fast-exit --serial --exclude-missing",
+        "test:contracts": "wsrun test --serial -p $(echo ${npm_package_config_contractsPackages} ${npm_package_config_ignoreTestsForPackages} | tr ' ' '\n' | sort | uniq -u | tr '\n' ' ') -c --fast-exit --exclude-missing",
+        "test:contracts:all": "wsrun test --serial -p ${npm_package_config_contractsPackages} -c --fast-exit --exclude-missing",
+        "generate_doc": "node ./node_modules/@0x/monorepo-scripts/lib/doc_generate.js",
        "upload_md_docs": "aws s3 rm --recursive s3://docs-markdown; wsrun s3:sync_md_docs --exclude-missing",
        "diff_md_docs:ci": "wsrun diff_docs --exclude-missing",
        "test:generate_docs:circleci": "for i in ${npm_package_config_packagesWithDocPages}; do yarn generate_doc --package $i || break -1; done;",
        "bundlewatch": "bundlewatch",
        "lint": "wsrun lint $PKG --fast-exit --parallel --exclude-missing",
        "lint:stages": "wsrun lint $PKG --fast-exit --stages --exclude-missing",
-        "lint:contracts": "wsrun lint -p ${npm_package_config_contractsPackages} -c --fast-exit --stages --exclude-missing"
+        "lint:contracts": "wsrun lint -p ${npm_package_config_contractsPackages} -c --fast-exit --stages --exclude-missing",
+        "upgrade_org_deps": "node node_modules/@0x/monorepo-scripts/lib/upgrade_deps.js -p '@0x|ethereum-types'",
+        "upgrade_deps": "node node_modules/@0x/monorepo-scripts/lib/upgrade_deps.js",
+        "verdaccio": "docker run --rm -i -p 4873:4873 0xorg/verdaccio"
    },
    "config": {
        "contractsPackages": "@0x/contracts-asset-proxy @0x/contracts-dev-utils @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-exchange-libs @0x/contracts-integrations @0x/contracts-multisig @0x/contracts-staking @0x/contracts-test-utils @0x/contracts-utils @0x/contracts-coordinator @0x/contracts-broker @0x/contracts-zero-ex",
+        "nonContractPackages": "@0x/order-utils @0x/migrations @0x/contract-wrappers @0x/contract-addresses @0x/contract-artifacts @0x/contract-wrappers-test @0x/asset-swapper",
+        "ignoreTestsForPackages": "@0x/contracts-integrations @0x/contracts-staking @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-coordinator",
        "mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic",
-        "packagesWithDocPages": "0x.js @0x/contract-wrappers @0x/connect @0x/json-schemas @0x/subproviders @0x/web3-wrapper @0x/order-utils @0x/sol-compiler @0x/sol-coverage @0x/sol-profiler @0x/sol-trace @0x/dev-utils @0x/asset-swapper @0x/migrations @0x/orderbook @0x/contracts-asset-proxy @0x/contracts-coordinator @0x/contracts-dev-utils @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-exchange @0x/contracts-exchange-forwarder @0x/contracts-exchange-libs @0x/contracts-extensions @0x/contracts-staking @0x/contracts-zero-ex",
+        "packagesWithDocPages": "@0x/contract-wrappers @0x/order-utils @0x/migrations",
        "ignoreDependencyVersions": "@types/styled-components @types/node",
-        "ignoreDependencyVersionsForPackage": "instant contract-wrappers"
-    },
-    "bundlewatch": {
-        "files": [
-            {
-                "path": "packages/0x.js/_bundles/index.min.js",
-                "maxSize": "1300kB"
-            }
-        ],
-        "ci": {
-            "trackBranches": [
-                "master",
-                "development"
-            ],
-            "repoBranchBase": "development"
-        }
+        "ignoreDependencyVersionsForPackage": "contract-wrappers"
    },
    "devDependencies": {
+        "@0x/monorepo-scripts": "^2.0.3",
        "@0x-lerna-fork/lerna": "3.16.10",
        "@0xproject/npm-cli-login": "^0.0.11",
        "async-child-process": "^1.1.1",
-        "bundlewatch": "^0.2.1",
        "coveralls": "^3.0.0",
        "ganache-cli": "6.8.0-istanbul.0",
        "lcov-result-merger": "^3.0.0",
        "lerna": "^3.0.0-beta.25",
        "npm-run-all": "^4.1.2",
-        "prettier": "^1.16.3",
+        "prettier": "~1.16.3",
        "source-map-support": "^0.5.6",
        "typescript": "3.0.1",
        "wsrun": "^2.2.0"
--- a/packages/0x.js/.npmignore
+++ b/packages/0x.js/.npmignore
@@ -1,10 +0,0 @@
-# Blacklist all files
-.*
-*
-# Whitelist lib
-!lib/**/*
-# Blacklist tests and publish scripts
-/lib/test/*
-/lib/monorepo_scripts/
-# Package specific ignore
-!_bundles/**/*
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
--- a/Show More
+++ b/Show More