Publish

- @0x/contracts-asset-proxy@3.6.6
 - @0x/contracts-broker@1.1.14
 - @0x/contracts-coordinator@3.1.15
 - @0x/contracts-dev-utils@1.3.13
 - @0x/contracts-erc1155@2.1.15
 - @0x/contracts-erc20@3.2.9
 - @0x/contracts-erc721@3.1.15
 - @0x/contracts-exchange-forwarder@4.2.15
 - @0x/contracts-exchange-libs@4.3.15
 - @0x/contracts-exchange@3.2.15
 - @0x/contracts-extensions@6.2.9
 - @0x/contracts-integrations@2.7.10
 - @0x/contracts-multisig@4.1.15
 - @0x/contracts-staking@2.0.22
 - @0x/contracts-test-utils@5.3.12
 - @0x/contracts-utils@4.6.0
 - @0x/contracts-zero-ex@0.10.0
 - @0x/asset-swapper@5.2.0
 - @0x/contract-addresses@5.4.0
 - @0x/contract-wrappers-test@12.2.25
 - @0x/contract-wrappers@13.10.1
 - @0x/migrations@6.5.1
 - @0x/order-utils@10.4.7

.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

.gitattributes

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

.github/autolabeler.yml

@@ -1,33 +1,7 @@
 python: ['python-packages']
 contracts: ['contracts']
-@0x/sol-doc: ['packages/sol-doc']
-@0x/sol-resolver: ['packages/sol-resolver']
-@0x/contracts-gen: ['packages/contracts-gen']
-@0x/sra-spec: ['packages/sra-spec']
-@0x/subproviders: ['packages/subproviders']
 @0x/contract-addresses: ['packages/contract-addresses']
 @0x/migrations: ['packages/migrations']
-@0x/web3-wrapper: ['packages/web3-wrapper']
-@0x/sol-compiler: ['packages/sol-compiler']
-@0x/types: ['packages/types']
-@0x/instant: ['packages/instant']
-@0x/abi-gen-templates: ['packages/abi-gen-templates']
-@0x/abi-gen: ['packages/abi-gen']
-@0x/sol-coverage: ['packages/sol-coverage']
-@0x/sol-profiler: ['packages/sol-profiler']
-@0x/sol-trace: ['packages/sol-trace']
-@0x/sol-tracing-utils: ['packages/sol-tracing-utils']
-@0x/utils: ['packages/utils']
-@0x/tslint-config: ['packages/tslint-config']
-@0x/asset-swapper: ['packages/asset-swapper']
 @0x/order-utils: ['packages/order-utils']
-@0x/assert: ['packages/assert']
-@0x/base-contract: ['packages/base-contract']
-@0x/typescript-typings: ['packages/typescript-typings']
-0x.js: ['packages/0x.js']
 @0x/contract-artifacts: ['packages/contract-artifacts']
-@0x/dev-utils: ['packages/dev-utils']
 @0x/contract-wrappers: ['packages/contract-wrappers']
-@0x/json-schemas: ['packages/json-schemas']
-@0x/ethereum-types: ['ethereum-types']
-@0x/connect: ['packages/connect']

.github/workflows/publish.yml

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

.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

.prettierignore

@@ -76,23 +76,11 @@ 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
+docs/
 *.sol

.prettierrc

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

CODEOWNERS

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

CONTRIBUTING.md

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

LICENSE

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

README.md

@@ -8,7 +8,7 @@ This repository is a monorepo including the 0x protocol smart contracts and nume
 
 [website-url]: https://0x.org
 
-[![CircleCI](https://circleci.com/gh/0xProject/0x-monorepo.svg?style=svg&circle-token=61bf7cd8c9b4e11b132089dfcffdd1be277d1e0c)](https://circleci.com/gh/0xProject/0x-monorepo)
+[![CircleCI](https://circleci.com/gh/0xProject/protocol.svg?style=svg&circle-token=61bf7cd8c9b4e11b132089dfcffdd1be277d1e0c)](https://circleci.com/gh/0xProject/protocool)
 [![Coverage Status](https://coveralls.io/repos/github/0xProject/0x-monorepo/badge.svg?branch=development)](https://coveralls.io/github/0xProject/0x-monorepo?branch=development)
 [![Discord](https://img.shields.io/badge/chat-discord.chat-yellow.svg?style=flat)](https://discordapp.com/invite/d3FTX3M)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
@@ -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:
@@ -142,7 +92,7 @@ yarn build
 To build a specific package:
 
 ```bash
-PKG=@0x/web3-wrapper yarn build
+PKG=@0x/contract-wrappers yarn build
 ```
 
 To build all contracts packages:
@@ -165,7 +115,7 @@ To watch a specific package and all it's dependent packages:
 PKG=[NPM_PACKAGE_NAME] yarn watch
 
 e.g
-PKG=@0x/web3-wrapper yarn watch
+PKG=@0x/contract-wrappers yarn watch
 ```
 
 ### Clean
@@ -193,7 +143,7 @@ yarn rebuild
 To re-build (clean & build) a specific package & it's deps:
 
 ```bash
-PKG=0x.js yarn rebuild
+PKG=@0x/contract-wrappers yarn rebuild
 ```
 
 ### Lint
@@ -207,7 +157,7 @@ yarn lint
 Lint a specific package:
 
 ```bash
-PKG=0x.js yarn lint
+PKG=@0x/contract-wrappers yarn lint
 ```
 
 ### Run Tests
@@ -221,7 +171,7 @@ yarn test
 Run a specific package's test:
 
 ```bash
-PKG=@0x/web3-wrapper yarn test
+PKG=@0x/contract-wrappers yarn test
 ```
 
 Run all contracts packages tests:

contracts/asset-proxy/CHANGELOG.json

@@ -1,4 +1,68 @@
 [
+    {
+        "timestamp": 1605763885,
+        "version": "3.6.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "3.6.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "3.6.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "3.6.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "3.6.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "3.6.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "3.6.0",
+        "changes": [
+            {
+                "note": "Add `SwerveBridge` and `SnowSwapBridge` (duplicate of `CurveBridge`)",
+                "pr": 2707
+            }
+        ],
+        "timestamp": 1603833198
+    },
     {
         "version": "3.5.0",
         "changes": [
@@ -25,8 +89,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",

contracts/asset-proxy/CHANGELOG.md

@@ -5,6 +5,46 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.6.6 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v3.6.5 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v3.6.4 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.6.3 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.6.2 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v3.6.1 - _October 28, 2020_
+
+    * Dependencies updated
+
+## v3.6.0 - _October 27, 2020_
+
+    * Add `SwerveBridge` and `SnowSwapBridge` (duplicate of `CurveBridge`) (#2707)
+
+## 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)

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

@@ -0,0 +1,103 @@
+
+/*
+
+  Copyright 2020 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.5.9;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
+import "@0x/contracts-erc20/contracts/src/LibERC20Token.sol";
+import "@0x/contracts-exchange-libs/contracts/src/IWallet.sol";
+import "@0x/contracts-utils/contracts/src/DeploymentConstants.sol";
+import "../interfaces/IERC20Bridge.sol";
+import "../interfaces/IBalancerPool.sol";
+
+
+contract CreamBridge is
+    IERC20Bridge,
+    IWallet,
+    DeploymentConstants
+{
+    /// @dev Callback for `IERC20Bridge`. Tries to buy `amount` of
+    ///      `toTokenAddress` tokens by selling the entirety of the `fromTokenAddress`
+    ///      token encoded in the bridge data, then transfers the bought
+    ///      tokens to `to`.
+    /// @param toTokenAddress The token to buy and transfer to `to`.
+    /// @param from The maker (this contract).
+    /// @param to The recipient of the bought tokens.
+    /// @param amount Minimum amount of `toTokenAddress` tokens to buy.
+    /// @param bridgeData The abi-encoded addresses of the "from" token and Balancer pool.
+    /// @return success The magic bytes if successful.
+    function bridgeTransferFrom(
+        address toTokenAddress,
+        address from,
+        address to,
+        uint256 amount,
+        bytes calldata bridgeData
+    )
+        external
+        returns (bytes4 success)
+    {
+        // Decode the bridge data.
+        (address fromTokenAddress, address poolAddress) = abi.decode(
+            bridgeData,
+            (address, address)
+        );
+        require(toTokenAddress != fromTokenAddress, "CreamBridge/INVALID_PAIR");
+
+        uint256 fromTokenBalance = IERC20Token(fromTokenAddress).balanceOf(address(this));
+        // Grant an allowance to the exchange to spend `fromTokenAddress` token.
+        LibERC20Token.approveIfBelow(fromTokenAddress, poolAddress, fromTokenBalance);
+
+        // Sell all of this contract's `fromTokenAddress` token balance.
+        (uint256 boughtAmount,) = IBalancerPool(poolAddress).swapExactAmountIn(
+            fromTokenAddress, // tokenIn
+            fromTokenBalance, // tokenAmountIn
+            toTokenAddress,   // tokenOut
+            amount,           // minAmountOut
+            uint256(-1)       // maxPrice
+        );
+
+        // Transfer the converted `toToken`s to `to`.
+        LibERC20Token.transfer(toTokenAddress, to, boughtAmount);
+
+        emit ERC20BridgeTransfer(
+            fromTokenAddress,
+            toTokenAddress,
+            fromTokenBalance,
+            boughtAmount,
+            from,
+            to
+        );
+        return BRIDGE_SUCCESS;
+    }
+
+    /// @dev `SignatureType.Wallet` callback, so that this bridge can be the maker
+    ///      and sign for itself in orders. Always succeeds.
+    /// @return magicValue Magic success bytes, always.
+    function isValidSignature(
+        bytes32,
+        bytes calldata
+    )
+        external
+        view
+        returns (bytes4 magicValue)
+    {
+        return LEGACY_WALLET_MAGIC_VALUE;
+    }
+}

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

@@ -0,0 +1,147 @@
+/*
+
+  Copyright 2020 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.5.9;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
+import "@0x/contracts-erc20/contracts/src/LibERC20Token.sol";
+import "@0x/contracts-exchange-libs/contracts/src/IWallet.sol";
+import "@0x/contracts-utils/contracts/src/DeploymentConstants.sol";
+import "../interfaces/IERC20Bridge.sol";
+
+
+interface IDODOHelper {
+
+    function querySellQuoteToken(address dodo, uint256 amount) external view returns (uint256);
+}
+
+
+interface IDODO {
+
+    function sellBaseToken(uint256 amount, uint256 minReceiveQuote, bytes calldata data) external returns (uint256);
+
+    function buyBaseToken(uint256 amount, uint256 maxPayQuote, bytes calldata data) external returns (uint256);
+
+}
+
+
+contract DODOBridge is
+    IERC20Bridge,
+    IWallet,
+    DeploymentConstants
+{
+
+    struct TransferState {
+        address fromTokenAddress;
+        uint256 fromTokenBalance;
+        address pool;
+        bool isSellBase;
+    }
+
+    /// @dev Callback for `IERC20Bridge`. Tries to buy `amount` of
+    ///      `toTokenAddress` tokens by selling the entirety of the `fromTokenAddress`
+    ///      token encoded in the bridge data.
+    /// @param toTokenAddress The token to buy and transfer to `to`.
+    /// @param from The maker (this contract).
+    /// @param to The recipient of the bought tokens.
+    /// @param amount Minimum amount of `toTokenAddress` tokens to buy.
+    /// @param bridgeData The abi-encoded path of token addresses. Last element must be toTokenAddress
+    /// @return success The magic bytes if successful.
+    function bridgeTransferFrom(
+        address toTokenAddress,
+        address from,
+        address to,
+        uint256 amount,
+        bytes calldata bridgeData
+    )
+        external
+        returns (bytes4 success)
+    {
+        TransferState memory state;
+        // Decode the bridge data to get the `fromTokenAddress`.
+        (state.fromTokenAddress, state.pool, state.isSellBase) = abi.decode(bridgeData, (address, address, bool));
+        require(state.pool != address(0), "DODOBridge/InvalidPool");
+        IDODO exchange = IDODO(state.pool);
+        // Get our balance of `fromTokenAddress` token.
+        state.fromTokenBalance = IERC20Token(state.fromTokenAddress).balanceOf(address(this));
+
+        // Grant the pool an allowance.
+        LibERC20Token.approveIfBelow(
+            state.fromTokenAddress,
+            address(exchange),
+            state.fromTokenBalance
+        );
+
+        uint256 boughtAmount;
+        if (state.isSellBase) {
+            boughtAmount = exchange.sellBaseToken(
+                // amount to sell
+                state.fromTokenBalance,
+                // min receive amount
+                1,
+                new bytes(0)
+            );
+        } else {
+            // Need to re-calculate the sell quote amount into buyBase
+            boughtAmount = IDODOHelper(_getDODOHelperAddress()).querySellQuoteToken(
+                address(exchange),
+                state.fromTokenBalance
+            );
+            exchange.buyBaseToken(
+                // amount to buy
+                boughtAmount,
+                // max pay amount
+                state.fromTokenBalance,
+                new bytes(0)
+            );
+        }
+        // Transfer funds to `to`
+        IERC20Token(toTokenAddress).transfer(to, boughtAmount);
+
+
+        emit ERC20BridgeTransfer(
+            // input token
+            state.fromTokenAddress,
+            // output token
+            toTokenAddress,
+            // input token amount
+            state.fromTokenBalance,
+            // output token amount
+            boughtAmount,
+            from,
+            to
+        );
+
+        return BRIDGE_SUCCESS;
+    }
+
+    /// @dev `SignatureType.Wallet` callback, so that this bridge can be the maker
+    ///      and sign for itself in orders. Always succeeds.
+    /// @return magicValue Success bytes, always.
+    function isValidSignature(
+        bytes32,
+        bytes calldata
+    )
+        external
+        view
+        returns (bytes4 magicValue)
+    {
+        return LEGACY_WALLET_MAGIC_VALUE;
+    }
+}

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

@@ -0,0 +1,95 @@
+/*
+
+  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` and `pool`.
+        (address fromTokenAddress, address pool) = abi.decode(bridgeData, (address, address));
+
+        uint256 fromTokenBalance = IERC20Token(fromTokenAddress).balanceOf(address(this));
+        // Grant an allowance to the exchange to spend `fromTokenAddress` token.
+        LibERC20Token.approveIfBelow(fromTokenAddress, pool, fromTokenBalance);
+
+        // Try to sell all of this contract's `fromTokenAddress` token balance.
+        uint256 boughtAmount = IShell(pool).originSwap(
+            fromTokenAddress,
+            toTokenAddress,
+            fromTokenBalance,
+            amount, // min amount
+            block.timestamp + 1
+        );
+        LibERC20Token.transfer(toTokenAddress, to, boughtAmount);
+
+        emit ERC20BridgeTransfer(
+            fromTokenAddress,
+            toTokenAddress,
+            fromTokenBalance,
+            boughtAmount,
+            from,
+            to
+        );
+        return BRIDGE_SUCCESS;
+    }
+
+    /// @dev `SignatureType.Wallet` callback, so that this bridge can be the maker
+    ///      and sign for itself in orders. Always succeeds.
+    /// @return magicValue Magic success bytes, always.
+    function isValidSignature(
+        bytes32,
+        bytes calldata
+    )
+        external
+        view
+        returns (bytes4 magicValue)
+    {
+        return LEGACY_WALLET_MAGIC_VALUE;
+    }
+}

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

@@ -0,0 +1,119 @@
+
+/*
+
+  Copyright 2019 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.5.9;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
+import "@0x/contracts-erc20/contracts/src/LibERC20Token.sol";
+import "@0x/contracts-exchange-libs/contracts/src/IWallet.sol";
+import "@0x/contracts-utils/contracts/src/DeploymentConstants.sol";
+import "../interfaces/IERC20Bridge.sol";
+import "../interfaces/ICurve.sol";
+
+
+// solhint-disable not-rely-on-time
+// solhint-disable space-after-comma
+contract SnowSwapBridge is
+    IERC20Bridge,
+    IWallet,
+    DeploymentConstants
+{
+    struct SnowSwapBridgeData {
+        address curveAddress;
+        bytes4 exchangeFunctionSelector;
+        address fromTokenAddress;
+        int128 fromCoinIdx;
+        int128 toCoinIdx;
+    }
+
+    /// @dev Callback for `ICurve`. Tries to buy `amount` of
+    ///      `toTokenAddress` tokens by selling the entirety of the opposing asset
+    ///      (DAI, USDC) to the Curve contract, then transfers the bought
+    ///      tokens to `to`.
+    /// @param toTokenAddress The token to give to `to` (i.e DAI, USDC, USDT).
+    /// @param from The maker (this contract).
+    /// @param to The recipient of the bought tokens.
+    /// @param amount Minimum amount of `toTokenAddress` tokens to buy.
+    /// @param bridgeData The abi-encoeded "from" token address.
+    /// @return success The magic bytes if successful.
+    function bridgeTransferFrom(
+        address toTokenAddress,
+        address from,
+        address to,
+        uint256 amount,
+        bytes calldata bridgeData
+    )
+        external
+        returns (bytes4 success)
+    {
+        // Decode the bridge data to get the SnowSwap metadata.
+        SnowSwapBridgeData memory data = abi.decode(bridgeData, (SnowSwapBridgeData));
+
+        require(toTokenAddress != data.fromTokenAddress, "SnowSwapBridge/INVALID_PAIR");
+        uint256 fromTokenBalance = IERC20Token(data.fromTokenAddress).balanceOf(address(this));
+        // Grant an allowance to the exchange to spend `fromTokenAddress` token.
+        LibERC20Token.approveIfBelow(data.fromTokenAddress, data.curveAddress, fromTokenBalance);
+
+        // Try to sell all of this contract's `fromTokenAddress` token balance.
+        {
+            (bool didSucceed, bytes memory resultData) =
+                data.curveAddress.call(abi.encodeWithSelector(
+                    data.exchangeFunctionSelector,
+                    data.fromCoinIdx,
+                    data.toCoinIdx,
+                    // dx
+                    fromTokenBalance,
+                    // min dy
+                    amount
+                ));
+            if (!didSucceed) {
+                assembly { revert(add(resultData, 32), mload(resultData)) }
+            }
+        }
+
+        uint256 toTokenBalance = IERC20Token(toTokenAddress).balanceOf(address(this));
+        // Transfer the converted `toToken`s to `to`.
+        LibERC20Token.transfer(toTokenAddress, to, toTokenBalance);
+
+        emit ERC20BridgeTransfer(
+            data.fromTokenAddress,
+            toTokenAddress,
+            fromTokenBalance,
+            toTokenBalance,
+            from,
+            to
+        );
+        return BRIDGE_SUCCESS;
+    }
+
+    /// @dev `SignatureType.Wallet` callback, so that this bridge can be the maker
+    ///      and sign for itself in orders. Always succeeds.
+    /// @return magicValue Magic success bytes, always.
+    function isValidSignature(
+        bytes32,
+        bytes calldata
+    )
+        external
+        view
+        returns (bytes4 magicValue)
+    {
+        return LEGACY_WALLET_MAGIC_VALUE;
+    }
+}

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

@@ -0,0 +1,136 @@
+/*
+
+  Copyright 2020 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.5.9;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
+import "@0x/contracts-erc20/contracts/src/interfaces/IEtherToken.sol";
+import "@0x/contracts-erc20/contracts/src/LibERC20Token.sol";
+import "@0x/contracts-exchange-libs/contracts/src/IWallet.sol";
+import "@0x/contracts-utils/contracts/src/LibAddressArray.sol";
+import "@0x/contracts-utils/contracts/src/DeploymentConstants.sol";
+import "../interfaces/IUniswapV2Router01.sol";
+import "../interfaces/IERC20Bridge.sol";
+
+
+// solhint-disable space-after-comma
+// solhint-disable not-rely-on-time
+contract SushiSwapBridge is
+    IERC20Bridge,
+    IWallet,
+    DeploymentConstants
+{
+    struct TransferState {
+        address[] path;
+        address router;
+        uint256 fromTokenBalance;
+    }
+
+    /// @dev Callback for `IERC20Bridge`. Tries to buy `amount` of
+    ///      `toTokenAddress` tokens by selling the entirety of the `fromTokenAddress`
+    ///      token encoded in the bridge data.
+    /// @param toTokenAddress The token to buy and transfer to `to`.
+    /// @param from The maker (this contract).
+    /// @param to The recipient of the bought tokens.
+    /// @param amount Minimum amount of `toTokenAddress` tokens to buy.
+    /// @param bridgeData The abi-encoded path of token addresses. Last element must be toTokenAddress
+    /// @return success The magic bytes if successful.
+    function bridgeTransferFrom(
+        address toTokenAddress,
+        address from,
+        address to,
+        uint256 amount,
+        bytes calldata bridgeData
+    )
+        external
+        returns (bytes4 success)
+    {
+        // hold variables to get around stack depth limitations
+        TransferState memory state;
+
+        // Decode the bridge data to get the `fromTokenAddress`.
+        // solhint-disable indent
+        (state.path, state.router) = abi.decode(bridgeData, (address[], address));
+        // solhint-enable indent
+
+        require(state.path.length >= 2, "SushiSwapBridge/PATH_LENGTH_MUST_BE_AT_LEAST_TWO");
+        require(state.path[state.path.length - 1] == toTokenAddress, "SushiSwapBridge/LAST_ELEMENT_OF_PATH_MUST_MATCH_OUTPUT_TOKEN");
+
+        // Just transfer the tokens if they're the same.
+        if (state.path[0] == toTokenAddress) {
+            LibERC20Token.transfer(state.path[0], to, amount);
+            return BRIDGE_SUCCESS;
+        }
+
+        // Get our balance of `fromTokenAddress` token.
+        state.fromTokenBalance = IERC20Token(state.path[0]).balanceOf(address(this));
+
+        // Grant the SushiSwap router an allowance.
+        LibERC20Token.approveIfBelow(
+            state.path[0],
+            state.router,
+            state.fromTokenBalance
+        );
+
+        // Buy as much `toTokenAddress` token with `fromTokenAddress` token
+        // and transfer it to `to`.
+        IUniswapV2Router01 router = IUniswapV2Router01(state.router);
+        uint[] memory amounts = router.swapExactTokensForTokens(
+             // Sell all tokens we hold.
+            state.fromTokenBalance,
+             // Minimum buy amount.
+            amount,
+            // Convert `fromTokenAddress` to `toTokenAddress`.
+            state.path,
+            // Recipient is `to`.
+            to,
+            // Expires after this block.
+            block.timestamp
+        );
+
+        emit ERC20BridgeTransfer(
+            // input token
+            state.path[0],
+            // output token
+            toTokenAddress,
+            // input token amount
+            state.fromTokenBalance,
+            // output token amount
+            amounts[amounts.length - 1],
+            from,
+            to
+        );
+
+        return BRIDGE_SUCCESS;
+    }
+
+    /// @dev `SignatureType.Wallet` callback, so that this bridge can be the maker
+    ///      and sign for itself in orders. Always succeeds.
+    /// @return magicValue Success bytes, always.
+    function isValidSignature(
+        bytes32,
+        bytes calldata
+    )
+        external
+        view
+        returns (bytes4 magicValue)
+    {
+        return LEGACY_WALLET_MAGIC_VALUE;
+    }
+}

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

@@ -0,0 +1,119 @@
+
+/*
+
+  Copyright 2019 ZeroEx Intl.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+*/
+
+pragma solidity ^0.5.9;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
+import "@0x/contracts-erc20/contracts/src/LibERC20Token.sol";
+import "@0x/contracts-exchange-libs/contracts/src/IWallet.sol";
+import "@0x/contracts-utils/contracts/src/DeploymentConstants.sol";
+import "../interfaces/IERC20Bridge.sol";
+import "../interfaces/ICurve.sol";
+
+
+// solhint-disable not-rely-on-time
+// solhint-disable space-after-comma
+contract SwerveBridge is
+    IERC20Bridge,
+    IWallet,
+    DeploymentConstants
+{
+    struct SwerveBridgeData {
+        address curveAddress;
+        bytes4 exchangeFunctionSelector;
+        address fromTokenAddress;
+        int128 fromCoinIdx;
+        int128 toCoinIdx;
+    }
+
+    /// @dev Callback for `ICurve`. Tries to buy `amount` of
+    ///      `toTokenAddress` tokens by selling the entirety of the opposing asset
+    ///      (DAI, USDC) to the Curve contract, then transfers the bought
+    ///      tokens to `to`.
+    /// @param toTokenAddress The token to give to `to` (i.e DAI, USDC, USDT).
+    /// @param from The maker (this contract).
+    /// @param to The recipient of the bought tokens.
+    /// @param amount Minimum amount of `toTokenAddress` tokens to buy.
+    /// @param bridgeData The abi-encoeded "from" token address.
+    /// @return success The magic bytes if successful.
+    function bridgeTransferFrom(
+        address toTokenAddress,
+        address from,
+        address to,
+        uint256 amount,
+        bytes calldata bridgeData
+    )
+        external
+        returns (bytes4 success)
+    {
+        // Decode the bridge data to get the SwerveBridgeData metadata.
+        SwerveBridgeData memory data = abi.decode(bridgeData, (SwerveBridgeData));
+
+        require(toTokenAddress != data.fromTokenAddress, "SwerveBridge/INVALID_PAIR");
+        uint256 fromTokenBalance = IERC20Token(data.fromTokenAddress).balanceOf(address(this));
+        // Grant an allowance to the exchange to spend `fromTokenAddress` token.
+        LibERC20Token.approveIfBelow(data.fromTokenAddress, data.curveAddress, fromTokenBalance);
+
+        // Try to sell all of this contract's `fromTokenAddress` token balance.
+        {
+            (bool didSucceed, bytes memory resultData) =
+                data.curveAddress.call(abi.encodeWithSelector(
+                    data.exchangeFunctionSelector,
+                    data.fromCoinIdx,
+                    data.toCoinIdx,
+                    // dx
+                    fromTokenBalance,
+                    // min dy
+                    amount
+                ));
+            if (!didSucceed) {
+                assembly { revert(add(resultData, 32), mload(resultData)) }
+            }
+        }
+
+        uint256 toTokenBalance = IERC20Token(toTokenAddress).balanceOf(address(this));
+        // Transfer the converted `toToken`s to `to`.
+        LibERC20Token.transfer(toTokenAddress, to, toTokenBalance);
+
+        emit ERC20BridgeTransfer(
+            data.fromTokenAddress,
+            toTokenAddress,
+            fromTokenBalance,
+            toTokenBalance,
+            from,
+            to
+        );
+        return BRIDGE_SUCCESS;
+    }
+
+    /// @dev `SignatureType.Wallet` callback, so that this bridge can be the maker
+    ///      and sign for itself in orders. Always succeeds.
+    /// @return magicValue Magic success bytes, always.
+    function isValidSignature(
+        bytes32,
+        bytes calldata
+    )
+        external
+        view
+        returns (bytes4 magicValue)
+    {
+        return LEGACY_WALLET_MAGIC_VALUE;
+    }
+}

contracts/asset-proxy/contracts/src/interfaces/IShell.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);
 }
+

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)

contracts/asset-proxy/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-asset-proxy",
-    "version": "3.4.0",
+    "version": "3.6.6",
     "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|SnowSwapBridge|StaticCallProxy|SushiSwapBridge|SwerveBridge|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.7",
+        "@0x/contract-wrappers": "^13.10.1",
+        "@0x/contracts-gen": "2.0.18",
+        "@0x/contracts-test-utils": "^5.3.12",
+        "@0x/contracts-utils": "^4.6.0",
+        "@0x/dev-utils": "^4.0.1",
+        "@0x/sol-compiler": "^4.2.7",
+        "@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.11",
+        "@0x/contracts-erc1155": "^2.1.15",
+        "@0x/contracts-erc20": "^3.2.9",
+        "@0x/contracts-erc721": "^3.1.15",
+        "@0x/contracts-exchange-libs": "^4.3.15",
+        "@0x/order-utils": "^10.4.7",
+        "@0x/types": "^3.3.0",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^6.1.0",
+        "@0x/web3-wrapper": "^7.2.8",
+        "ethereum-types": "^3.3.3",
         "lodash": "^4.17.11"
     },
     "publishConfig": {

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,11 @@ 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 SnowSwapBridge from '../generated-artifacts/SnowSwapBridge.json';
 import * as StaticCallProxy from '../generated-artifacts/StaticCallProxy.json';
+import * as SushiSwapBridge from '../generated-artifacts/SushiSwapBridge.json';
+import * as SwerveBridge from '../generated-artifacts/SwerveBridge.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 +76,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 +86,10 @@ export const artifacts = {
     MStableBridge: MStableBridge as ContractArtifact,
     MixinGasToken: MixinGasToken as ContractArtifact,
     MooniswapBridge: MooniswapBridge as ContractArtifact,
+    ShellBridge: ShellBridge as ContractArtifact,
+    SnowSwapBridge: SnowSwapBridge as ContractArtifact,
+    SushiSwapBridge: SushiSwapBridge as ContractArtifact,
+    SwerveBridge: SwerveBridge as ContractArtifact,
     UniswapBridge: UniswapBridge as ContractArtifact,
     UniswapV2Bridge: UniswapV2Bridge as ContractArtifact,
     IAssetData: IAssetData as ContractArtifact,
@@ -95,6 +108,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,

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,11 @@ 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/snow_swap_bridge';
 export * from '../generated-wrappers/static_call_proxy';
+export * from '../generated-wrappers/sushi_swap_bridge';
+export * from '../generated-wrappers/swerve_bridge';
 export * from '../generated-wrappers/test_bancor_bridge';
 export * from '../generated-wrappers/test_chai_bridge';
 export * from '../generated-wrappers/test_dex_forwarder_bridge';

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,11 @@ 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 SnowSwapBridge from '../test/generated-artifacts/SnowSwapBridge.json';
 import * as StaticCallProxy from '../test/generated-artifacts/StaticCallProxy.json';
+import * as SushiSwapBridge from '../test/generated-artifacts/SushiSwapBridge.json';
+import * as SwerveBridge from '../test/generated-artifacts/SwerveBridge.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 +76,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 +86,10 @@ export const artifacts = {
     MStableBridge: MStableBridge as ContractArtifact,
     MixinGasToken: MixinGasToken as ContractArtifact,
     MooniswapBridge: MooniswapBridge as ContractArtifact,
+    ShellBridge: ShellBridge as ContractArtifact,
+    SnowSwapBridge: SnowSwapBridge as ContractArtifact,
+    SushiSwapBridge: SushiSwapBridge as ContractArtifact,
+    SwerveBridge: SwerveBridge as ContractArtifact,
     UniswapBridge: UniswapBridge as ContractArtifact,
     UniswapV2Bridge: UniswapV2Bridge as ContractArtifact,
     IAssetData: IAssetData as ContractArtifact,
@@ -95,6 +108,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,

contracts/asset-proxy/test/kyber_bridge.ts

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

contracts/asset-proxy/test/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,11 @@ 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/snow_swap_bridge';
 export * from '../test/generated-wrappers/static_call_proxy';
+export * from '../test/generated-wrappers/sushi_swap_bridge';
+export * from '../test/generated-wrappers/swerve_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';

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,11 @@
         "generated-artifacts/MooniswapBridge.json",
         "generated-artifacts/MultiAssetProxy.json",
         "generated-artifacts/Ownable.json",
+        "generated-artifacts/ShellBridge.json",
+        "generated-artifacts/SnowSwapBridge.json",
         "generated-artifacts/StaticCallProxy.json",
+        "generated-artifacts/SushiSwapBridge.json",
+        "generated-artifacts/SwerveBridge.json",
         "generated-artifacts/TestBancorBridge.json",
         "generated-artifacts/TestChaiBridge.json",
         "generated-artifacts/TestDexForwarderBridge.json",
@@ -57,7 +64,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 +90,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 +102,11 @@
         "test/generated-artifacts/MooniswapBridge.json",
         "test/generated-artifacts/MultiAssetProxy.json",
         "test/generated-artifacts/Ownable.json",
+        "test/generated-artifacts/ShellBridge.json",
+        "test/generated-artifacts/SnowSwapBridge.json",
         "test/generated-artifacts/StaticCallProxy.json",
+        "test/generated-artifacts/SushiSwapBridge.json",
+        "test/generated-artifacts/SwerveBridge.json",
         "test/generated-artifacts/TestBancorBridge.json",
         "test/generated-artifacts/TestChaiBridge.json",
         "test/generated-artifacts/TestDexForwarderBridge.json",

contracts/broker/CHANGELOG.json

@@ -1,4 +1,76 @@
 [
+    {
+        "timestamp": 1605763885,
+        "version": "1.1.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "1.1.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "1.1.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "1.1.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "1.1.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "1.1.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603833198,
+        "version": "1.1.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603265572,
+        "version": "1.1.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1594788383,
         "version": "1.1.6",

contracts/broker/CHANGELOG.md

@@ -5,6 +5,38 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.1.14 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v1.1.13 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v1.1.12 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v1.1.11 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v1.1.10 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v1.1.9 - _October 28, 2020_
+
+    * Dependencies updated
+
+## v1.1.8 - _October 27, 2020_
+
+    * Dependencies updated
+
+## v1.1.7 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v1.1.6 - _July 15, 2020_
 
     * Dependencies updated

contracts/broker/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-broker",
-    "version": "1.1.6",
+    "version": "1.1.14",
     "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.7",
+        "@0x/contracts-asset-proxy": "^3.6.6",
+        "@0x/contracts-erc20": "^3.2.9",
+        "@0x/contracts-erc721": "^3.1.15",
+        "@0x/contracts-exchange": "^3.2.15",
+        "@0x/contracts-exchange-libs": "^4.3.15",
+        "@0x/contracts-gen": "2.0.18",
+        "@0x/contracts-test-utils": "^5.3.12",
+        "@0x/contracts-utils": "^4.6.0",
+        "@0x/sol-compiler": "^4.2.7",
+        "@0x/ts-doc-gen": "^0.0.28",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/types": "^3.3.0",
+        "@0x/web3-wrapper": "^7.2.8",
         "@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.11",
+        "@0x/order-utils": "^10.4.7",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^6.1.0",
+        "ethereum-types": "^3.3.3"
     },
     "publishConfig": {
         "access": "public"

contracts/coordinator/CHANGELOG.json

@@ -1,4 +1,76 @@
 [
+    {
+        "timestamp": 1605763885,
+        "version": "3.1.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "3.1.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "3.1.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "3.1.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "3.1.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "3.1.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603833198,
+        "version": "3.1.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603265572,
+        "version": "3.1.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1594788383,
         "version": "3.1.7",

contracts/coordinator/CHANGELOG.md

@@ -5,6 +5,38 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.1.15 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v3.1.14 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v3.1.13 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.1.12 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.1.11 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v3.1.10 - _October 28, 2020_
+
+    * Dependencies updated
+
+## v3.1.9 - _October 27, 2020_
+
+    * Dependencies updated
+
+## v3.1.8 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v3.1.7 - _July 15, 2020_
 
     * Dependencies updated

contracts/coordinator/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-coordinator",
-    "version": "3.1.7",
+    "version": "3.1.15",
     "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.7",
+        "@0x/contracts-asset-proxy": "^3.6.6",
+        "@0x/contracts-dev-utils": "^1.3.13",
+        "@0x/contracts-erc20": "^3.2.9",
+        "@0x/contracts-gen": "2.0.18",
+        "@0x/dev-utils": "^4.0.1",
+        "@0x/order-utils": "^10.4.7",
+        "@0x/sol-compiler": "^4.2.7",
+        "@0x/ts-doc-gen": "^0.0.28",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/web3-wrapper": "^7.2.8",
         "@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.17",
+        "@0x/base-contract": "^6.2.11",
+        "@0x/contract-addresses": "^5.4.0",
+        "@0x/contracts-exchange": "^3.2.15",
+        "@0x/contracts-test-utils": "^5.3.12",
+        "@0x/contracts-utils": "^4.6.0",
+        "@0x/json-schemas": "^5.3.3",
+        "@0x/types": "^3.3.0",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^6.1.0",
+        "ethereum-types": "^3.3.3",
         "http-status-codes": "^1.3.2"
     },
     "publishConfig": {

contracts/dev-utils/CHANGELOG.json

@@ -1,4 +1,76 @@
 [
+    {
+        "timestamp": 1605763885,
+        "version": "1.3.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "1.3.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "1.3.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "1.3.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "1.3.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "1.3.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603833198,
+        "version": "1.3.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603265572,
+        "version": "1.3.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1594788383,
         "version": "1.3.5",

contracts/dev-utils/CHANGELOG.md

@@ -5,6 +5,38 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.3.13 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v1.3.12 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v1.3.11 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v1.3.10 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v1.3.9 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v1.3.8 - _October 28, 2020_
+
+    * Dependencies updated
+
+## v1.3.7 - _October 27, 2020_
+
+    * Dependencies updated
+
+## v1.3.6 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v1.3.5 - _July 15, 2020_
 
     * Dependencies updated

contracts/dev-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-dev-utils",
-    "version": "1.3.5",
+    "version": "1.3.13",
     "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.7",
+        "@0x/assert": "^3.0.17",
+        "@0x/contracts-asset-proxy": "^3.6.6",
+        "@0x/contracts-erc20": "^3.2.9",
+        "@0x/contracts-gen": "2.0.18",
+        "@0x/contracts-test-utils": "^5.3.12",
+        "@0x/sol-compiler": "^4.2.7",
+        "@0x/ts-doc-gen": "^0.0.28",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/types": "^3.3.0",
+        "@0x/utils": "^6.1.0",
+        "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.11",
+        "@types/node": "12.12.54"
     },
     "publishConfig": {
         "access": "public"

contracts/erc1155/CHANGELOG.json

@@ -1,4 +1,76 @@
 [
+    {
+        "timestamp": 1605763885,
+        "version": "2.1.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "2.1.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "2.1.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "2.1.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "2.1.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "2.1.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603833198,
+        "version": "2.1.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603265572,
+        "version": "2.1.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1594788383,
         "version": "2.1.7",

contracts/erc1155/CHANGELOG.md

@@ -5,6 +5,38 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.1.15 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v2.1.14 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v2.1.13 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v2.1.12 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v2.1.11 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v2.1.10 - _October 28, 2020_
+
+    * Dependencies updated
+
+## v2.1.9 - _October 27, 2020_
+
+    * Dependencies updated
+
+## v2.1.8 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v2.1.7 - _July 15, 2020_
 
     * Dependencies updated

contracts/erc1155/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc1155",
-    "version": "2.1.7",
+    "version": "2.1.15",
     "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.7",
+        "@0x/contracts-gen": "2.0.18",
+        "@0x/contracts-utils": "^4.6.0",
+        "@0x/dev-utils": "^4.0.1",
+        "@0x/sol-compiler": "^4.2.7",
+        "@0x/ts-doc-gen": "^0.0.28",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/types": "^3.3.0",
+        "@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.11",
+        "@0x/contracts-test-utils": "^5.3.12",
+        "@0x/utils": "^6.1.0",
+        "@0x/web3-wrapper": "^7.2.8",
         "lodash": "^4.17.11"
     },
     "publishConfig": {

contracts/erc20/CHANGELOG.json

@@ -1,4 +1,76 @@
 [
+    {
+        "timestamp": 1605763885,
+        "version": "3.2.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "3.2.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "3.2.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "3.2.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "3.2.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "3.2.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603833198,
+        "version": "3.2.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603265572,
+        "version": "3.2.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1594788383,
         "version": "3.2.1",

contracts/erc20/CHANGELOG.md

@@ -5,6 +5,38 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.2.9 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v3.2.8 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v3.2.7 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.2.6 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.2.5 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v3.2.4 - _October 28, 2020_
+
+    * Dependencies updated
+
+## v3.2.3 - _October 27, 2020_
+
+    * Dependencies updated
+
+## v3.2.2 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v3.2.1 - _July 15, 2020_
 
     * Dependencies updated

contracts/erc20/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc20",
-    "version": "3.2.1",
+    "version": "3.2.9",
     "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.7",
+        "@0x/contracts-gen": "2.0.18",
+        "@0x/contracts-test-utils": "^5.3.12",
+        "@0x/contracts-utils": "^4.6.0",
+        "@0x/dev-utils": "^4.0.1",
+        "@0x/sol-compiler": "^4.2.7",
+        "@0x/ts-doc-gen": "^0.0.28",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/types": "^3.3.0",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^6.1.0",
+        "@0x/web3-wrapper": "^7.2.8",
         "@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.11"
     },
     "publishConfig": {
         "access": "public"

contracts/erc721/CHANGELOG.json

@@ -1,4 +1,76 @@
 [
+    {
+        "timestamp": 1605763885,
+        "version": "3.1.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "3.1.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "3.1.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "3.1.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "3.1.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "3.1.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603833198,
+        "version": "3.1.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603265572,
+        "version": "3.1.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1594788383,
         "version": "3.1.7",

contracts/erc721/CHANGELOG.md

@@ -5,6 +5,38 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.1.15 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v3.1.14 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v3.1.13 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.1.12 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.1.11 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v3.1.10 - _October 28, 2020_
+
+    * Dependencies updated
+
+## v3.1.9 - _October 27, 2020_
+
+    * Dependencies updated
+
+## v3.1.8 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v3.1.7 - _July 15, 2020_
 
     * Dependencies updated

contracts/erc721/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc721",
-    "version": "3.1.7",
+    "version": "3.1.15",
     "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.7",
+        "@0x/contracts-gen": "2.0.18",
+        "@0x/contracts-test-utils": "^5.3.12",
+        "@0x/contracts-utils": "^4.6.0",
+        "@0x/dev-utils": "^4.0.1",
+        "@0x/sol-compiler": "^4.2.7",
+        "@0x/ts-doc-gen": "^0.0.28",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/types": "^3.3.0",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^6.1.0",
+        "@0x/web3-wrapper": "^7.2.8",
         "@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.11"
     },
     "publishConfig": {
         "access": "public"

contracts/exchange-forwarder/CHANGELOG.json

@@ -1,4 +1,76 @@
 [
+    {
+        "timestamp": 1605763885,
+        "version": "4.2.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "4.2.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "4.2.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "4.2.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "4.2.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "4.2.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603833198,
+        "version": "4.2.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603265572,
+        "version": "4.2.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1594788383,
         "version": "4.2.7",

contracts/exchange-forwarder/CHANGELOG.md

@@ -5,6 +5,38 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.2.15 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v4.2.14 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v4.2.13 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v4.2.12 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v4.2.11 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v4.2.10 - _October 28, 2020_
+
+    * Dependencies updated
+
+## v4.2.9 - _October 27, 2020_
+
+    * Dependencies updated
+
+## v4.2.8 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v4.2.7 - _July 15, 2020_
 
     * Dependencies updated

contracts/exchange-forwarder/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-exchange-forwarder",
-    "version": "4.2.7",
+    "version": "4.2.15",
     "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.7",
+        "@0x/contracts-asset-proxy": "^3.6.6",
+        "@0x/contracts-dev-utils": "^1.3.13",
+        "@0x/contracts-erc1155": "^2.1.15",
+        "@0x/contracts-erc20": "^3.2.9",
+        "@0x/contracts-erc721": "^3.1.15",
+        "@0x/contracts-exchange": "^3.2.15",
+        "@0x/contracts-exchange-libs": "^4.3.15",
+        "@0x/contracts-gen": "2.0.18",
+        "@0x/contracts-test-utils": "^5.3.12",
+        "@0x/contracts-utils": "^4.6.0",
+        "@0x/dev-utils": "^4.0.1",
+        "@0x/order-utils": "^10.4.7",
+        "@0x/sol-compiler": "^4.2.7",
+        "@0x/ts-doc-gen": "^0.0.28",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/types": "^3.3.0",
+        "@0x/utils": "^6.1.0",
+        "@0x/web3-wrapper": "^7.2.8",
         "@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.11",
+        "@0x/typescript-typings": "^5.1.5",
+        "ethereum-types": "^3.3.3"
     },
     "publishConfig": {
         "access": "public"

contracts/exchange-libs/CHANGELOG.json

@@ -1,4 +1,76 @@
 [
+    {
+        "timestamp": 1605763885,
+        "version": "4.3.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "4.3.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "4.3.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "4.3.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "4.3.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "4.3.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603833198,
+        "version": "4.3.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603265572,
+        "version": "4.3.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1594788383,
         "version": "4.3.7",

contracts/exchange-libs/CHANGELOG.md

@@ -5,6 +5,38 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.3.15 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v4.3.14 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v4.3.13 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v4.3.12 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v4.3.11 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v4.3.10 - _October 28, 2020_
+
+    * Dependencies updated
+
+## v4.3.9 - _October 27, 2020_
+
+    * Dependencies updated
+
+## v4.3.8 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v4.3.7 - _July 15, 2020_
 
     * Dependencies updated

contracts/exchange-libs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-exchange-libs",
-    "version": "4.3.7",
+    "version": "4.3.15",
     "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.7",
+        "@0x/contracts-gen": "2.0.18",
+        "@0x/dev-utils": "^4.0.1",
+        "@0x/sol-compiler": "^4.2.7",
+        "@0x/subproviders": "^6.1.9",
+        "@0x/ts-doc-gen": "^0.0.28",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/web3-wrapper": "^7.2.8",
         "@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.11",
+        "@0x/contracts-test-utils": "^5.3.12",
+        "@0x/contracts-utils": "^4.6.0",
+        "@0x/order-utils": "^10.4.7",
+        "@0x/types": "^3.3.0",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^6.1.0",
+        "ethereum-types": "^3.3.3"
     },
     "publishConfig": {
         "access": "public"

contracts/exchange/CHANGELOG.json

@@ -1,4 +1,76 @@
 [
+    {
+        "timestamp": 1605763885,
+        "version": "3.2.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "3.2.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "3.2.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "3.2.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "3.2.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "3.2.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603833198,
+        "version": "3.2.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603265572,
+        "version": "3.2.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1594788383,
         "version": "3.2.7",

contracts/exchange/CHANGELOG.md

@@ -5,6 +5,38 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.2.15 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v3.2.14 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v3.2.13 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.2.12 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v3.2.11 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v3.2.10 - _October 28, 2020_
+
+    * Dependencies updated
+
+## v3.2.9 - _October 27, 2020_
+
+    * Dependencies updated
+
+## v3.2.8 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v3.2.7 - _July 15, 2020_
 
     * Dependencies updated

contracts/exchange/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-exchange",
-    "version": "3.2.7",
+    "version": "3.2.15",
     "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.7",
+        "@0x/contracts-asset-proxy": "^3.6.6",
+        "@0x/contracts-exchange-libs": "^4.3.15",
+        "@0x/contracts-gen": "2.0.18",
+        "@0x/contracts-multisig": "^4.1.15",
+        "@0x/contracts-staking": "^2.0.22",
+        "@0x/contracts-test-utils": "^5.3.12",
+        "@0x/contracts-utils": "^4.6.0",
+        "@0x/dev-utils": "^4.0.1",
+        "@0x/sol-compiler": "^4.2.7",
+        "@0x/ts-doc-gen": "^0.0.28",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/types": "^3.3.0",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/web3-wrapper": "^7.2.8",
         "@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.11",
+        "@0x/contracts-dev-utils": "^1.3.13",
+        "@0x/contracts-erc1155": "^2.1.15",
+        "@0x/contracts-erc20": "^3.2.9",
+        "@0x/contracts-erc721": "^3.1.15",
+        "@0x/order-utils": "^10.4.7",
+        "@0x/utils": "^6.1.0",
         "lodash": "^4.17.11"
     },
     "publishConfig": {

contracts/extensions/CHANGELOG.json

@@ -1,4 +1,76 @@
 [
+    {
+        "timestamp": 1605763885,
+        "version": "6.2.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "6.2.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "6.2.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "6.2.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "6.2.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "6.2.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603833198,
+        "version": "6.2.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603265572,
+        "version": "6.2.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1594788383,
         "version": "6.2.1",

contracts/extensions/CHANGELOG.md

@@ -5,6 +5,38 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v6.2.9 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v6.2.8 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v6.2.7 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v6.2.6 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v6.2.5 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v6.2.4 - _October 28, 2020_
+
+    * Dependencies updated
+
+## v6.2.3 - _October 27, 2020_
+
+    * Dependencies updated
+
+## v6.2.2 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v6.2.1 - _July 15, 2020_
 
     * Dependencies updated

contracts/extensions/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-extensions",
-    "version": "6.2.1",
+    "version": "6.2.9",
     "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.7",
+        "@0x/contracts-asset-proxy": "^3.6.6",
+        "@0x/contracts-dev-utils": "^1.3.13",
+        "@0x/contracts-erc20": "^3.2.9",
+        "@0x/contracts-erc721": "^3.1.15",
+        "@0x/contracts-exchange": "^3.2.15",
+        "@0x/contracts-exchange-libs": "^4.3.15",
+        "@0x/contracts-gen": "2.0.18",
+        "@0x/contracts-utils": "^4.6.0",
+        "@0x/dev-utils": "^4.0.1",
+        "@0x/order-utils": "^10.4.7",
+        "@0x/sol-compiler": "^4.2.7",
+        "@0x/ts-doc-gen": "^0.0.28",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/types": "^3.3.0",
+        "@0x/utils": "^6.1.0",
+        "@0x/web3-wrapper": "^7.2.8",
         "@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.11",
+        "@0x/contracts-test-utils": "^5.3.12",
+        "@0x/typescript-typings": "^5.1.5",
+        "ethereum-types": "^3.3.3"
     },
     "publishConfig": {
         "access": "public"

contracts/integrations/CHANGELOG.json

@@ -1,4 +1,94 @@
 [
+    {
+        "timestamp": 1605763885,
+        "version": "2.7.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605320370,
+        "version": "2.7.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "2.7.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604620645,
+        "version": "2.7.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "2.7.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "2.7.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "2.7.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "2.7.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603833198,
+        "version": "2.7.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603487270,
+        "version": "2.7.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "2.7.0",
         "changes": [
@@ -10,7 +100,8 @@
                 "note": "Add EP RFQT + MTX tests",
                 "pr": 2692
             }
-        ]
+        ],
+        "timestamp": 1603265572
     },
     {
         "version": "2.6.0",

contracts/integrations/CHANGELOG.md

@@ -5,6 +5,51 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.7.10 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v2.7.9 - _November 14, 2020_
+
+    * Dependencies updated
+
+## v2.7.8 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v2.7.7 - _November 5, 2020_
+
+    * Dependencies updated
+
+## v2.7.6 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v2.7.5 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v2.7.4 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v2.7.3 - _October 28, 2020_
+
+    * Dependencies updated
+
+## v2.7.2 - _October 27, 2020_
+
+    * Dependencies updated
+
+## v2.7.1 - _October 23, 2020_
+
+    * Dependencies updated
+
+## 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)

contracts/integrations/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-integrations",
-    "version": "2.6.0",
+    "version": "2.7.10",
     "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.7",
+        "@0x/contract-addresses": "^5.4.0",
+        "@0x/contract-wrappers": "^13.10.1",
+        "@0x/contracts-broker": "^1.1.14",
+        "@0x/contracts-coordinator": "^3.1.15",
+        "@0x/contracts-dev-utils": "^1.3.13",
+        "@0x/contracts-exchange-forwarder": "^4.2.15",
+        "@0x/contracts-exchange-libs": "^4.3.15",
+        "@0x/contracts-extensions": "^6.2.9",
+        "@0x/contracts-gen": "2.0.18",
+        "@0x/contracts-utils": "^4.6.0",
         "@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": "^4.0.1",
+        "@0x/migrations": "^6.5.1",
+        "@0x/order-utils": "^10.4.7",
+        "@0x/sol-compiler": "^4.2.7",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/web3-wrapper": "^7.2.8",
         "@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": "^5.2.0",
+        "@0x/base-contract": "^6.2.11",
+        "@0x/contracts-asset-proxy": "^3.6.6",
+        "@0x/contracts-erc1155": "^2.1.15",
+        "@0x/contracts-erc20": "^3.2.9",
+        "@0x/contracts-erc721": "^3.1.15",
+        "@0x/contracts-exchange": "^3.2.15",
+        "@0x/contracts-multisig": "^4.1.15",
+        "@0x/contracts-staking": "^2.0.22",
+        "@0x/contracts-test-utils": "^5.3.12",
+        "@0x/contracts-zero-ex": "^0.10.0",
+        "@0x/subproviders": "^6.1.9",
+        "@0x/types": "^3.3.0",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^6.1.0",
+        "ethereum-types": "^3.3.3",
         "ethereumjs-util": "^6.2.0",
         "lodash": "^4.17.11"
     },

contracts/multisig/CHANGELOG.json

@@ -1,4 +1,76 @@
 [
+    {
+        "timestamp": 1605763885,
+        "version": "4.1.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "4.1.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "4.1.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "4.1.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "4.1.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "4.1.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603833198,
+        "version": "4.1.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603265572,
+        "version": "4.1.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1594788383,
         "version": "4.1.7",

contracts/multisig/CHANGELOG.md

@@ -5,6 +5,38 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.1.15 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v4.1.14 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v4.1.13 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v4.1.12 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v4.1.11 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v4.1.10 - _October 28, 2020_
+
+    * Dependencies updated
+
+## v4.1.9 - _October 27, 2020_
+
+    * Dependencies updated
+
+## v4.1.8 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v4.1.7 - _July 15, 2020_
 
     * Dependencies updated

contracts/multisig/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-multisig",
-    "version": "4.1.7",
+    "version": "4.1.15",
     "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.7",
+        "@0x/contracts-asset-proxy": "^3.6.6",
+        "@0x/contracts-erc20": "^3.2.9",
+        "@0x/contracts-gen": "2.0.18",
+        "@0x/contracts-test-utils": "^5.3.12",
+        "@0x/contracts-utils": "^4.6.0",
+        "@0x/dev-utils": "^4.0.1",
+        "@0x/sol-compiler": "^4.2.7",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/types": "^3.3.0",
+        "@0x/utils": "^6.1.0",
+        "@0x/web3-wrapper": "^7.2.8",
         "@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.11",
+        "@0x/typescript-typings": "^5.1.5",
+        "ethereum-types": "^3.3.3"
     },
     "publishConfig": {
         "access": "public"

contracts/staking/CHANGELOG.json

@@ -1,4 +1,76 @@
 [
+    {
+        "timestamp": 1605763885,
+        "version": "2.0.22",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "2.0.21",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "2.0.20",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "2.0.19",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "2.0.18",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "2.0.17",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603833198,
+        "version": "2.0.16",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603265572,
+        "version": "2.0.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1594788383,
         "version": "2.0.14",

contracts/staking/CHANGELOG.md

@@ -5,6 +5,38 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.0.22 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v2.0.21 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v2.0.20 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v2.0.19 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v2.0.18 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v2.0.17 - _October 28, 2020_
+
+    * Dependencies updated
+
+## v2.0.16 - _October 27, 2020_
+
+    * Dependencies updated
+
+## v2.0.15 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v2.0.14 - _July 15, 2020_
 
     * Dependencies updated

contracts/staking/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-staking",
-    "version": "2.0.14",
+    "version": "2.0.22",
     "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.7",
+        "@0x/contracts-asset-proxy": "^3.6.6",
+        "@0x/contracts-dev-utils": "^1.3.13",
+        "@0x/contracts-erc20": "^3.2.9",
+        "@0x/contracts-exchange-libs": "^4.3.15",
+        "@0x/contracts-gen": "2.0.18",
+        "@0x/contracts-utils": "^4.6.0",
+        "@0x/dev-utils": "^4.0.1",
+        "@0x/order-utils": "^10.4.7",
+        "@0x/sol-compiler": "^4.2.7",
+        "@0x/ts-doc-gen": "^0.0.28",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/types": "^3.3.0",
+        "@0x/web3-wrapper": "^7.2.8",
         "@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.11",
+        "@0x/contracts-test-utils": "^5.3.12",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^6.1.0",
+        "ethereum-types": "^3.3.3",
         "ethereumjs-util": "^5.1.1"
     },
     "publishConfig": {

contracts/test-utils/CHANGELOG.json

@@ -1,4 +1,76 @@
 [
+    {
+        "timestamp": 1605763885,
+        "version": "5.3.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "5.3.11",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "5.3.10",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "5.3.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "5.3.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "5.3.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603833198,
+        "version": "5.3.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603265572,
+        "version": "5.3.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1594788383,
         "version": "5.3.4",

contracts/test-utils/CHANGELOG.md

@@ -5,6 +5,38 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v5.3.12 - _November 19, 2020_
+
+    * Dependencies updated
+
+## v5.3.11 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v5.3.10 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v5.3.9 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v5.3.8 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v5.3.7 - _October 28, 2020_
+
+    * Dependencies updated
+
+## v5.3.6 - _October 27, 2020_
+
+    * Dependencies updated
+
+## v5.3.5 - _October 21, 2020_
+
+    * Dependencies updated
+
 ## v5.3.4 - _July 15, 2020_
 
     * Dependencies updated

contracts/test-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-test-utils",
-    "version": "5.3.4",
+    "version": "5.3.12",
     "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.7",
+        "@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.17",
+        "@0x/base-contract": "^6.2.11",
+        "@0x/contract-addresses": "^5.4.0",
+        "@0x/dev-utils": "^4.0.1",
+        "@0x/json-schemas": "^5.3.3",
+        "@0x/order-utils": "^10.4.7",
+        "@0x/sol-coverage": "^4.0.18",
+        "@0x/sol-profiler": "^4.1.8",
+        "@0x/sol-trace": "^3.0.18",
+        "@0x/subproviders": "^6.1.9",
+        "@0x/types": "^3.3.0",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^6.1.0",
+        "@0x/web3-wrapper": "^7.2.8",
         "@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",

contracts/utils/CHANGELOG.json

@@ -1,4 +1,68 @@
 [
+    {
+        "version": "4.6.0",
+        "changes": [
+            {
+                "note": "Add `uint128` functions to `LibSafeMathV06`",
+                "pr": 27
+            }
+        ],
+        "timestamp": 1605763885
+    },
+    {
+        "timestamp": 1605302002,
+        "version": "4.5.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604385937,
+        "version": "4.5.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604376968,
+        "version": "4.5.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1604355662,
+        "version": "4.5.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "4.5.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1603833198,
+        "version": "4.5.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "4.5.2",
         "changes": [
@@ -6,7 +70,8 @@
                 "note": "Add Ropsten and Rinkeby addresses to `DeploymentConstants`",
                 "pr": 2656
             }
-        ]
+        ],
+        "timestamp": 1603265572
     },
     {
         "version": "4.5.1",

contracts/utils/CHANGELOG.md

@@ -5,6 +5,38 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v4.6.0 - _November 19, 2020_
+
+    * Add `uint128` functions to `LibSafeMathV06` (#27)
+
+## v4.5.8 - _November 13, 2020_
+
+    * Dependencies updated
+
+## v4.5.7 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v4.5.6 - _November 3, 2020_
+
+    * Dependencies updated
+
+## v4.5.5 - _November 2, 2020_
+
+    * Dependencies updated
+
+## v4.5.4 - _October 28, 2020_
+
+    * Dependencies updated
+
+## v4.5.3 - _October 27, 2020_
+
+    * Dependencies updated
+
+## v4.5.2 - _October 21, 2020_
+
+    * Add Ropsten and Rinkeby addresses to `DeploymentConstants` (#2656)
+
 ## v4.5.1 - _July 15, 2020_
 
     * Reorganize `DeploymentConstants` addresses (#2628)

contracts/utils/contracts/src/DeploymentConstants.sol

@@ -56,6 +56,10 @@ 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 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 +292,32 @@ 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 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;
+    }
 }

contracts/utils/contracts/src/v06/LibSafeMathV06.sol

@@ -105,4 +105,86 @@ library LibSafeMathV06 {
     {
         return a < b ? a : b;
     }
+
+    function safeMul128(uint128 a, uint128 b)
+        internal
+        pure
+        returns (uint128)
+    {
+        if (a == 0) {
+            return 0;
+        }
+        uint128 c = a * b;
+        if (c / a != b) {
+            LibRichErrorsV06.rrevert(LibSafeMathRichErrorsV06.Uint256BinOpError(
+                LibSafeMathRichErrorsV06.BinOpErrorCodes.MULTIPLICATION_OVERFLOW,
+                a,
+                b
+            ));
+        }
+        return c;
+    }
+
+    function safeDiv128(uint128 a, uint128 b)
+        internal
+        pure
+        returns (uint128)
+    {
+        if (b == 0) {
+            LibRichErrorsV06.rrevert(LibSafeMathRichErrorsV06.Uint256BinOpError(
+                LibSafeMathRichErrorsV06.BinOpErrorCodes.DIVISION_BY_ZERO,
+                a,
+                b
+            ));
+        }
+        uint128 c = a / b;
+        return c;
+    }
+
+    function safeSub128(uint128 a, uint128 b)
+        internal
+        pure
+        returns (uint128)
+    {
+        if (b > a) {
+            LibRichErrorsV06.rrevert(LibSafeMathRichErrorsV06.Uint256BinOpError(
+                LibSafeMathRichErrorsV06.BinOpErrorCodes.SUBTRACTION_UNDERFLOW,
+                a,
+                b
+            ));
+        }
+        return a - b;
+    }
+
+    function safeAdd128(uint128 a, uint128 b)
+        internal
+        pure
+        returns (uint128)
+    {
+        uint128 c = a + b;
+        if (c < a) {
+            LibRichErrorsV06.rrevert(LibSafeMathRichErrorsV06.Uint256BinOpError(
+                LibSafeMathRichErrorsV06.BinOpErrorCodes.ADDITION_OVERFLOW,
+                a,
+                b
+            ));
+        }
+        return c;
+    }
+
+    function max128(uint128 a, uint128 b)
+        internal
+        pure
+        returns (uint128)
+    {
+        return a >= b ? a : b;
+    }
+
+    function min128(uint128 a, uint128 b)
+        internal
+        pure
+        returns (uint128)
+    {
+        return a < b ? a : b;
+    }
 }

contracts/utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-utils",
-    "version": "4.5.1",
+    "version": "4.6.0",
     "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.7",
+        "@0x/contracts-gen": "2.0.18",
+        "@0x/contracts-test-utils": "^5.3.12",
+        "@0x/dev-utils": "^4.0.1",
+        "@0x/order-utils": "^10.4.7",
+        "@0x/sol-compiler": "^4.2.7",
+        "@0x/tslint-config": "^4.1.3",
+        "@0x/types": "^3.3.0",
+        "@0x/web3-wrapper": "^7.2.8",
         "@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.11",
+        "@0x/typescript-typings": "^5.1.5",
+        "@0x/utils": "^6.1.0",
         "bn.js": "^4.11.8",
-        "ethereum-types": "^3.2.0"
+        "ethereum-types": "^3.3.3"
     },
     "publishConfig": {
         "access": "public"

contracts/zero-ex/CHANGELOG.json

@@ -1,4 +1,111 @@
 [
+    {
+        "version": "0.10.0",
+        "changes": [
+            {
+                "note": "Add `checkAllowance` flag to LibTokenSpender.spendERC20Tokens",
+                "pr": 39
+            },
+            {
+                "note": "Use new `checkAllowance` flag in LiquidityProviderFeature, TransformERC20Feature, and MetaTransactionsFeature",
+                "pr": 39
+            }
+        ],
+        "timestamp": 1605763885
+    },
+    {
+        "version": "0.9.0",
+        "changes": [
+            {
+                "note": "Rewrite the ZeroEx contract in Yul",
+                "pr": 23
+            },
+            {
+                "note": "Update LiquidityProviderFeature to use off-chain registry and sandbox",
+                "pr": 16
+            },
+            {
+                "note": "Update ILiquidityProvider interface",
+                "pr": 16
+            },
+            {
+                "note": "Update ProtocolFeeUnfunded event to emit order hash",
+                "pr": 16
+            }
+        ],
+        "timestamp": 1605302002
+    },
+    {
+        "version": "0.8.0",
+        "changes": [
+            {
+                "note": "Trust LP boughtAmount return value",
+                "pr": 29
+            }
+        ],
+        "timestamp": 1604385937
+    },
+    {
+        "version": "0.7.0",
+        "changes": [
+            {
+                "note": "Change `ProtocolFeeUnfunded` event in FQT",
+                "pr": 28
+            },
+            {
+                "note": "Use new PLP interface in FQT.",
+                "pr": 28
+            }
+        ],
+        "timestamp": 1604376968
+    },
+    {
+        "version": "0.6.0",
+        "changes": [
+            {
+                "note": "Add support for collecting protocol fees in ETH or WETH",
+                "pr": 2
+            },
+            {
+                "note": "Add `LibSignature` library",
+                "pr": 21
+            },
+            {
+                "note": "Add `LimitOrdersFeature`",
+                "pr": 27
+            }
+        ],
+        "timestamp": 1604355662
+    },
+    {
+        "timestamp": 1603851023,
+        "version": "0.5.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "version": "0.5.0",
+        "changes": [
+            {
+                "note": "Add `Swerve`, `SnowSwap`, `DODO` and `SushiSwap` into FQT",
+                "pr": 7
+            }
+        ],
+        "timestamp": 1603833198
+    },
+    {
+        "version": "0.4.0",
+        "changes": [
+            {
+                "note": "Use the exchange proxy as the primary allowance target",
+                "pr": 3
+            }
+        ],
+        "timestamp": 1603487270
+    },
     {
         "version": "0.3.0",
         "changes": [
@@ -49,8 +156,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",

contracts/zero-ex/CHANGELOG.md

@@ -5,11 +5,71 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.10.0 - _November 19, 2020_
+
+    * Add `checkAllowance` flag to LibTokenSpender.spendERC20Tokens (#39)
+    * Use new `checkAllowance` flag in LiquidityProviderFeature, TransformERC20Feature, and MetaTransactionsFeature (#39)
+
+## v0.9.0 - _November 13, 2020_
+
+    * Rewrite the ZeroEx contract in Yul (#23)
+    * Update LiquidityProviderFeature to use off-chain registry and sandbox (#16)
+    * Update ILiquidityProvider interface (#16)
+    * Update ProtocolFeeUnfunded event to emit order hash (#16)
+
+## v0.8.0 - _November 3, 2020_
+
+    * Trust LP boughtAmount return value (#29)
+
+## v0.7.0 - _November 3, 2020_
+
+    * Change `ProtocolFeeUnfunded` event in FQT (#28)
+    * Use new PLP interface in FQT. (#28)
+
+## v0.6.0 - _November 2, 2020_
+
+    * Add support for collecting protocol fees in ETH or WETH (#2)
+    * Add `LibSignature` library (#21)
+    * Add `LimitOrdersFeature` (#27)
+
+## v0.5.1 - _October 28, 2020_
+
+    * Dependencies updated
+
+## v0.5.0 - _October 27, 2020_
+
+    * Add `Swerve`, `SnowSwap`, `DODO` and `SushiSwap` into FQT (#7)
+
+## v0.4.0 - _October 23, 2020_
+
+    * Use the exchange proxy as the primary allowance target (#3)
+
+## 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_
 

contracts/zero-ex/compiler.json

@@ -19,7 +19,8 @@
                     "evm.bytecode.object",
                     "evm.bytecode.sourceMap",
                     "evm.deployedBytecode.object",
-                    "evm.deployedBytecode.sourceMap"
+                    "evm.deployedBytecode.sourceMap",
+                    "evm.methodIdentifiers"
                 ]
             }
         }

contracts/zero-ex/contracts/src/IZeroEx.sol

@@ -25,6 +25,9 @@ import "./features/ITokenSpenderFeature.sol";
 import "./features/ISignatureValidatorFeature.sol";
 import "./features/ITransformERC20Feature.sol";
 import "./features/IMetaTransactionsFeature.sol";
+import "./features/IUniswapFeature.sol";
+import "./features/ILiquidityProviderFeature.sol";
+import "./features/INativeOrdersFeature.sol";
 
 
 /// @dev Interface for a fully featured Exchange Proxy.
@@ -34,20 +37,13 @@ interface IZeroEx is
     ITokenSpenderFeature,
     ISignatureValidatorFeature,
     ITransformERC20Feature,
-    IMetaTransactionsFeature
+    IMetaTransactionsFeature,
+    IUniswapFeature,
+    ILiquidityProviderFeature,
+    INativeOrdersFeature
 {
     // solhint-disable state-visibility
 
     /// @dev Fallback for just receiving ether.
     receive() external payable;
-
-    // solhint-enable state-visibility
-
-    /// @dev Get the implementation contract of a registered function.
-    /// @param selector The function selector.
-    /// @return impl The implementation contract address.
-    function getFunctionImplementation(bytes4 selector)
-        external
-        view
-        returns (address impl);
 }

contracts/zero-ex/contracts/src/ZeroEx.sol

@@ -19,19 +19,12 @@
 pragma solidity ^0.6.5;
 pragma experimental ABIEncoderV2;
 
-import "@0x/contracts-utils/contracts/src/v06/LibBytesV06.sol";
-import "./migrations/LibBootstrap.sol";
 import "./features/BootstrapFeature.sol";
 import "./storage/LibProxyStorage.sol";
-import "./errors/LibProxyRichErrors.sol";
-
 
 /// @dev An extensible proxy contract that serves as a universal entry point for
 ///      interacting with the 0x protocol.
 contract ZeroEx {
-    // solhint-disable separate-by-one-line-in-contract,indent,var-name-mixedcase
-    using LibBytesV06 for bytes;
-
     /// @dev Construct this contract and register the `BootstrapFeature` feature.
     ///      After constructing this contract, `bootstrap()` should be called
     ///      by `bootstrap()` to seed the initial feature set.
@@ -44,48 +37,55 @@ contract ZeroEx {
             address(bootstrap);
     }
 
+
     // solhint-disable state-visibility
 
     /// @dev Forwards calls to the appropriate implementation contract.
     fallback() external payable {
-        bytes4 selector = msg.data.readBytes4(0);
-        address impl = getFunctionImplementation(selector);
-        if (impl == address(0)) {
-            _revertWithData(LibProxyRichErrors.NotImplementedError(selector));
+        // This is used in assembly below as impls_slot.
+        mapping(bytes4 => address) storage impls =
+            LibProxyStorage.getStorage().impls;
+
+        assembly {
+            let cdlen := calldatasize()
+
+            // equivalent of receive() external payable {}
+            if iszero(cdlen) {
+                return(0, 0)
+            }
+
+            // Store at 0x40, to leave 0x00-0x3F for slot calculation below.
+            calldatacopy(0x40, 0, cdlen)
+            let selector := and(mload(0x40), 0xFFFFFFFF00000000000000000000000000000000000000000000000000000000)
+
+            // Slot for impls[selector] is keccak256(selector . impls_slot).
+            mstore(0, selector)
+            mstore(0x20, impls_slot)
+            let slot := keccak256(0, 0x40)
+
+            let delegate := sload(slot)
+            if iszero(delegate) {
+                // Revert with:
+                // abi.encodeWithSelector(
+                //   bytes4(keccak256("NotImplementedError(bytes4)")),
+                //   selector)
+                mstore(0, 0x734e6e1c00000000000000000000000000000000000000000000000000000000)
+                mstore(4, selector)
+                revert(0, 0x24)
+            }
+
+            let success := delegatecall(
+                gas(),
+                delegate,
+                0x40, cdlen,
+                0, 0
+            )
+            let rdlen := returndatasize()
+            returndatacopy(0, 0, rdlen)
+            if success {
+                return(0, rdlen)
+            }
+            revert(0, rdlen)
         }
-
-        (bool success, bytes memory resultData) = impl.delegatecall(msg.data);
-        if (!success) {
-            _revertWithData(resultData);
-        }
-        _returnWithData(resultData);
-    }
-
-    /// @dev Fallback for just receiving ether.
-    receive() external payable {}
-
-    // solhint-enable state-visibility
-
-    /// @dev Get the implementation contract of a registered function.
-    /// @param selector The function selector.
-    /// @return impl The implementation contract address.
-    function getFunctionImplementation(bytes4 selector)
-        public
-        view
-        returns (address impl)
-    {
-        return LibProxyStorage.getStorage().impls[selector];
-    }
-
-    /// @dev Revert with arbitrary bytes.
-    /// @param data Revert data.
-    function _revertWithData(bytes memory data) private pure {
-        assembly { revert(add(data, 32), mload(data)) }
-    }
-
-    /// @dev Return with arbitrary bytes.
-    /// @param data Return data.
-    function _returnWithData(bytes memory data) private pure {
-        assembly { return(add(data, 32), mload(data)) }
     }
 }

contracts/zero-ex/contracts/src/errors/LibLiquidityProviderRichErrors.sol

@@ -0,0 +1,48 @@
+/*
+
+  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
+        );
+    }
+}

contracts/zero-ex/contracts/src/errors/LibNativeOrdersRichErrors.sol

@@ -0,0 +1,172 @@
+/*
+
+  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 LibNativeOrdersRichErrors {
+
+    // solhint-disable func-name-mixedcase
+
+    function ProtocolFeeRefundFailed(
+        address receiver,
+        uint256 refundAmount
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("ProtocolFeeRefundFailed(address,uint256)")),
+            receiver,
+            refundAmount
+        );
+    }
+
+    function OrderNotFillableByOriginError(
+        bytes32 orderHash,
+        address txOrigin,
+        address orderTxOrigin
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("OrderNotFillableByOriginError(bytes32,address,address)")),
+            orderHash,
+            txOrigin,
+            orderTxOrigin
+        );
+    }
+
+    function OrderNotFillableError(
+        bytes32 orderHash,
+        uint8 orderStatus
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("OrderNotFillableError(bytes32,uint8)")),
+            orderHash,
+            orderStatus
+        );
+    }
+
+    function OrderNotSignedByMakerError(
+        bytes32 orderHash,
+        address signer,
+        address maker
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("OrderNotSignedByMakerError(bytes32,address,address)")),
+            orderHash,
+            signer,
+            maker
+        );
+    }
+
+    function OrderNotFillableBySenderError(
+        bytes32 orderHash,
+        address sender,
+        address orderSender
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("OrderNotFillableBySenderError(bytes32,address,address)")),
+            orderHash,
+            sender,
+            orderSender
+        );
+    }
+
+    function OrderNotFillableByTakerError(
+        bytes32 orderHash,
+        address taker,
+        address orderTaker
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("OrderNotFillableByTakerError(bytes32,address,address)")),
+            orderHash,
+            taker,
+            orderTaker
+        );
+    }
+
+    function CancelSaltTooLowError(
+        uint256 minValidSalt,
+        uint256 oldMinValidSalt
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("CancelSaltTooLowError(uint256,uint256)")),
+            minValidSalt,
+            oldMinValidSalt
+        );
+    }
+
+    function FillOrKillFailedError(
+        bytes32 orderHash,
+        uint256 takerTokenFilledAmount,
+        uint256 takerTokenFillAmount
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("FillOrKillFailedError(bytes32,uint256,uint256)")),
+            orderHash,
+            takerTokenFilledAmount,
+            takerTokenFillAmount
+        );
+    }
+
+    function OnlyOrderMakerAllowed(
+        bytes32 orderHash,
+        address sender,
+        address maker
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("OnlyOrderMakerAllowed(bytes32,address,address)")),
+            orderHash,
+            sender,
+            maker
+        );
+    }
+}

contracts/zero-ex/contracts/src/errors/LibSignatureRichErrors.sol

@@ -26,7 +26,8 @@ library LibSignatureRichErrors {
         INVALID_LENGTH,
         UNSUPPORTED,
         ILLEGAL,
-        WRONG_SIGNER
+        WRONG_SIGNER,
+        BAD_SIGNATURE_DATA
     }
 
     // solhint-disable func-name-mixedcase
@@ -49,4 +50,19 @@ library LibSignatureRichErrors {
             signature
         );
     }
+
+    function SignatureValidationError(
+        SignatureValidationErrorCodes code,
+        bytes32 hash
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encodeWithSelector(
+            bytes4(keccak256("SignatureValidationError(uint8,bytes32)")),
+            code,
+            hash
+        );
+    }
 }

contracts/zero-ex/contracts/src/external/FeeCollector.sol

@@ -0,0 +1,65 @@
+/*
+
+  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/IEtherTokenV06.sol";
+import "@0x/contracts-utils/contracts/src/v06/AuthorizableV06.sol";
+import "../vendor/v3/IStaking.sol";
+
+/// @dev The collector contract for protocol fees
+contract FeeCollector is AuthorizableV06 {
+    /// @dev Allow ether transfers to the collector.
+    receive() external payable { }
+
+    constructor() public {
+        _addAuthorizedAddress(msg.sender);
+    }
+
+    /// @dev   Approve the staking contract and join a pool. Only an authority
+    ///        can call this.
+    /// @param weth The WETH contract.
+    /// @param staking The staking contract.
+    /// @param poolId The pool ID this contract is collecting fees for.
+    function initialize(
+        IEtherTokenV06 weth,
+        IStaking staking,
+        bytes32 poolId
+    )
+        external
+        onlyAuthorized
+    {
+        weth.approve(address(staking), type(uint256).max);
+        staking.joinStakingPoolAsMaker(poolId);
+    }
+
+    /// @dev Convert all held ether to WETH. Only an authority can call this.
+    /// @param weth The WETH contract.
+    function convertToWeth(
+        IEtherTokenV06 weth
+    )
+        external
+        onlyAuthorized
+    {
+        // Leave 1 wei behind to avoid expensive zero-->non-zero state change.
+        if (address(this).balance > 0) {
+            weth.deposit{value: address(this).balance}();
+        }
+    }
+}

contracts/zero-ex/contracts/src/external/ILiquidityProviderSandbox.sol

@@ -0,0 +1,74 @@
+/*
+
+  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;
+
+
+interface ILiquidityProviderSandbox {
+
+    /// @dev Calls `sellTokenForToken` on the given `provider` contract to
+    ///      trigger a trade.
+    /// @param provider The address of the on-chain liquidity provider.
+    /// @param inputToken The token being sold.
+    /// @param outputToken The token being bought.
+    /// @param recipient The recipient of the bought tokens.
+    /// @param minBuyAmount The minimum acceptable amount of `outputToken` to buy.
+    /// @param auxiliaryData Auxiliary data supplied to the `provider` contract.
+    function executeSellTokenForToken(
+        address provider,
+        address inputToken,
+        address outputToken,
+        address recipient,
+        uint256 minBuyAmount,
+        bytes calldata auxiliaryData
+    )
+        external;
+
+    /// @dev Calls `sellEthForToken` on the given `provider` contract to
+    ///      trigger a trade.
+    /// @param provider The address of the on-chain liquidity provider.
+    /// @param outputToken The token being bought.
+    /// @param recipient The recipient of the bought tokens.
+    /// @param minBuyAmount The minimum acceptable amount of `outputToken` to buy.
+    /// @param auxiliaryData Auxiliary data supplied to the `provider` contract.
+    function executeSellEthForToken(
+        address provider,
+        address outputToken,
+        address recipient,
+        uint256 minBuyAmount,
+        bytes calldata auxiliaryData
+    )
+        external;
+
+    /// @dev Calls `sellTokenForEth` on the given `provider` contract to
+    ///      trigger a trade.
+    /// @param provider The address of the on-chain liquidity provider.
+    /// @param inputToken The token being sold.
+    /// @param recipient The recipient of the bought tokens.
+    /// @param minBuyAmount The minimum acceptable amount of ETH to buy.
+    /// @param auxiliaryData Auxiliary data supplied to the `provider` contract.
+    function executeSellTokenForEth(
+        address provider,
+        address inputToken,
+        address recipient,
+        uint256 minBuyAmount,
+        bytes calldata auxiliaryData
+    )
+        external;
+}

contracts/zero-ex/contracts/src/external/LiquidityProviderSandbox.sol

@@ -0,0 +1,139 @@
+/*
+  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-utils/contracts/src/v06/errors/LibRichErrorsV06.sol";
+import "@0x/contracts-utils/contracts/src/v06/errors/LibOwnableRichErrorsV06.sol";
+import "../vendor/ILiquidityProvider.sol";
+import "../vendor/v3/IERC20Bridge.sol";
+import "./ILiquidityProviderSandbox.sol";
+
+
+/// @dev A permissionless contract through which the ZeroEx contract can
+///      safely trigger a trade on an external `ILiquidityProvider` contract.
+contract LiquidityProviderSandbox is
+    ILiquidityProviderSandbox
+{
+    using LibRichErrorsV06 for bytes;
+
+    /// @dev Store the owner as an immutable.
+    address public immutable owner;
+
+    constructor(address owner_)
+        public
+    {
+        owner = owner_;
+    }
+
+    /// @dev Allows only the (immutable) owner to call a function.
+    modifier onlyOwner() virtual {
+        if (msg.sender != owner) {
+            LibOwnableRichErrorsV06.OnlyOwnerError(
+                msg.sender,
+                owner
+            ).rrevert();
+        }
+        _;
+    }
+
+    /// @dev Calls `sellTokenForToken` on the given `provider` contract to
+    ///      trigger a trade.
+    /// @param provider The address of the on-chain liquidity provider.
+    /// @param inputToken The token being sold.
+    /// @param outputToken The token being bought.
+    /// @param recipient The recipient of the bought tokens.
+    /// @param minBuyAmount The minimum acceptable amount of `outputToken` to buy.
+    /// @param auxiliaryData Auxiliary data supplied to the `provider` contract.
+    function executeSellTokenForToken(
+        address provider,
+        address inputToken,
+        address outputToken,
+        address recipient,
+        uint256 minBuyAmount,
+        bytes calldata auxiliaryData
+    )
+        external
+        onlyOwner
+        override
+    {
+        try ILiquidityProvider(provider).sellTokenForToken(
+            inputToken,
+            outputToken,
+            recipient,
+            minBuyAmount,
+            auxiliaryData
+        ) {} catch {
+            IERC20Bridge(provider).bridgeTransferFrom(
+                outputToken,
+                provider,
+                recipient,
+                minBuyAmount,
+                auxiliaryData
+            );
+        }
+    }
+
+    /// @dev Calls `sellEthForToken` on the given `provider` contract to
+    ///      trigger a trade.
+    /// @param provider The address of the on-chain liquidity provider.
+    /// @param outputToken The token being bought.
+    /// @param recipient The recipient of the bought tokens.
+    /// @param minBuyAmount The minimum acceptable amount of `outputToken` to buy.
+    /// @param auxiliaryData Auxiliary data supplied to the `provider` contract.
+    function executeSellEthForToken(
+        address provider,
+        address outputToken,
+        address recipient,
+        uint256 minBuyAmount,
+        bytes calldata auxiliaryData
+    )
+        external
+        onlyOwner
+        override
+    {
+        ILiquidityProvider(provider).sellEthForToken(
+            outputToken,
+            recipient,
+            minBuyAmount,
+            auxiliaryData
+        );
+    }
+
+    /// @dev Calls `sellTokenForEth` on the given `provider` contract to
+    ///      trigger a trade.
+    /// @param provider The address of the on-chain liquidity provider.
+    /// @param inputToken The token being sold.
+    /// @param recipient The recipient of the bought tokens.
+    /// @param minBuyAmount The minimum acceptable amount of ETH to buy.
+    /// @param auxiliaryData Auxiliary data supplied to the `provider` contract.
+    function executeSellTokenForEth(
+        address provider,
+        address inputToken,
+        address recipient,
+        uint256 minBuyAmount,
+        bytes calldata auxiliaryData
+    )
+        external
+        onlyOwner
+        override
+    {
+        ILiquidityProvider(provider).sellTokenForEth(
+            inputToken,
+            payable(recipient),
+            minBuyAmount,
+            auxiliaryData
+        );
+    }
+}

contracts/zero-ex/contracts/src/features/ILiquidityProviderFeature.sol

@@ -0,0 +1,51 @@
+/*
+
+  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 {
+
+    /// @dev Sells `sellAmount` of `inputToken` to the liquidity provider
+    ///      at the given `provider` address.
+    /// @param inputToken The token being sold.
+    /// @param outputToken The token being bought.
+    /// @param provider The address of the on-chain liquidity provider
+    ///        to trade with.
+    /// @param recipient The recipient of the bought tokens. If equal to
+    ///        address(0), `msg.sender` is assumed to be the recipient.
+    /// @param sellAmount The amount of `inputToken` to sell.
+    /// @param minBuyAmount The minimum acceptable amount of `outputToken` to
+    ///        buy. Reverts if this amount is not satisfied.
+    /// @param auxiliaryData Auxiliary data supplied to the `provider` contract.
+    /// @return boughtAmount The amount of `outputToken` bought.
+    function sellToLiquidityProvider(
+        address inputToken,
+        address outputToken,
+        address payable provider,
+        address recipient,
+        uint256 sellAmount,
+        uint256 minBuyAmount,
+        bytes calldata auxiliaryData
+    )
+        external
+        payable
+        returns (uint256 boughtAmount);
+}

contracts/zero-ex/contracts/src/features/INativeOrdersFeature.sol

@@ -0,0 +1,328 @@
+/*
+
+  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 "./libs/LibSignature.sol";
+import "./libs/LibNativeOrder.sol";
+
+
+/// @dev Feature for interacting with limit orders.
+interface INativeOrdersFeature {
+
+    /// @dev Emitted whenever a `LimitOrder` is filled.
+    /// @param orderHash The canonical hash of the order.
+    /// @param maker The maker of the order.
+    /// @param taker The taker of the order.
+    /// @param feeRecipient Fee recipient of the order.
+    /// @param takerTokenFilledAmount How much taker token was filled.
+    /// @param makerTokenFilledAmount How much maker token was filled.
+    /// @param protocolFeePaid How much protocol fee was paid.
+    /// @param pool The fee pool associated with this order.
+    event LimitOrderFilled(
+        bytes32 orderHash,
+        address maker,
+        address taker,
+        address feeRecipient,
+        address makerToken,
+        address takerToken,
+        uint128 takerTokenFilledAmount,
+        uint128 makerTokenFilledAmount,
+        uint128 takerTokenFeeFilledAmount,
+        uint256 protocolFeePaid,
+        bytes32 pool
+    );
+
+    /// @dev Emitted whenever an `RfqOrder` is filled.
+    /// @param orderHash The canonical hash of the order.
+    /// @param maker The maker of the order.
+    /// @param taker The taker of the order.
+    /// @param takerTokenFilledAmount How much taker token was filled.
+    /// @param makerTokenFilledAmount How much maker token was filled.
+    /// @param protocolFeePaid How much protocol fee was paid.
+    /// @param pool The fee pool associated with this order.
+    event RfqOrderFilled(
+        bytes32 orderHash,
+        address maker,
+        address taker,
+        address makerToken,
+        address takerToken,
+        uint128 takerTokenFilledAmount,
+        uint128 makerTokenFilledAmount,
+        uint256 protocolFeePaid,
+        bytes32 pool
+    );
+
+    /// @dev Emitted whenever a limit or RFQ order is cancelled.
+    /// @param orderHash The canonical hash of the order.
+    /// @param maker The order maker.
+    event OrderCancelled(
+        bytes32 orderHash,
+        address maker
+    );
+
+    /// @dev Emitted whenever limit or RFQ orders are cancelled by pair by a maker.
+    /// @param maker The maker of the order.
+    /// @param makerToken The maker token in a pair for the orders cancelled.
+    /// @param takerToken The taker token in a pair for the orders cancelled.
+    /// @param minValidSalt The new minimum valid salt an order with this pair must
+    ///        have.
+    event PairOrdersCancelled(
+        address maker,
+        address makerToken,
+        address takerToken,
+        uint256 minValidSalt
+    );
+
+    /// @dev Transfers protocol fees from the `FeeCollector` pools into
+    ///      the staking contract.
+    /// @param poolIds Staking pool IDs
+    function transferProtocolFeesForPools(bytes32[] calldata poolIds)
+        external;
+
+    /// @dev Fill a limit order. The taker and sender will be the caller.
+    /// @param order The limit order. ETH protocol fees can be
+    ///      attached to this call. Any unspent ETH will be refunded to
+    ///      the caller.
+    /// @param signature The order signature.
+    /// @param takerTokenFillAmount Maximum taker token amount to fill this order with.
+    /// @return takerTokenFilledAmount How much maker token was filled.
+    /// @return makerTokenFilledAmount How much maker token was filled.
+    function fillLimitOrder(
+        LibNativeOrder.LimitOrder calldata order,
+        LibSignature.Signature calldata signature,
+        uint128 takerTokenFillAmount
+    )
+        external
+        payable
+        returns (uint128 takerTokenFilledAmount, uint128 makerTokenFilledAmount);
+
+    /// @dev Fill an RFQ order for up to `takerTokenFillAmount` taker tokens.
+    ///      The taker will be the caller. ETH should be attached to pay the
+    ///      protocol fee.
+    /// @param order The RFQ order.
+    /// @param signature The order signature.
+    /// @param takerTokenFillAmount Maximum taker token amount to fill this order with.
+    /// @return takerTokenFilledAmount How much maker token was filled.
+    /// @return makerTokenFilledAmount How much maker token was filled.
+    function fillRfqOrder(
+        LibNativeOrder.RfqOrder calldata order,
+        LibSignature.Signature calldata signature,
+        uint128 takerTokenFillAmount
+    )
+        external
+        payable
+        returns (uint128 takerTokenFilledAmount, uint128 makerTokenFilledAmount);
+
+    /// @dev Fill an RFQ order for exactly `takerTokenFillAmount` taker tokens.
+    ///      The taker will be the caller. ETH protocol fees can be
+    ///      attached to this call. Any unspent ETH will be refunded to
+    ///      the caller.
+    /// @param order The limit order.
+    /// @param signature The order signature.
+    /// @param takerTokenFillAmount How much taker token to fill this order with.
+    /// @return makerTokenFilledAmount How much maker token was filled.
+    function fillOrKillLimitOrder(
+        LibNativeOrder.LimitOrder calldata order,
+        LibSignature.Signature calldata signature,
+        uint128 takerTokenFillAmount
+    )
+        external
+        payable
+        returns (uint128 makerTokenFilledAmount);
+
+    /// @dev Fill an RFQ order for exactly `takerTokenFillAmount` taker tokens.
+    ///      The taker will be the caller. ETH protocol fees can be
+    ///      attached to this call. Any unspent ETH will be refunded to
+    ///      the caller.
+    /// @param order The RFQ order.
+    /// @param signature The order signature.
+    /// @param takerTokenFillAmount How much taker token to fill this order with.
+    /// @return makerTokenFilledAmount How much maker token was filled.
+    function fillOrKillRfqOrder(
+        LibNativeOrder.RfqOrder calldata order,
+        LibSignature.Signature calldata signature,
+        uint128 takerTokenFillAmount
+    )
+        external
+        payable
+        returns (uint128 makerTokenFilledAmount);
+
+    /// @dev Fill a limit order. Internal variant. ETH protocol fees can be
+    ///      attached to this call. Any unspent ETH will be refunded to
+    ///      `msg.sender` (not `sender`).
+    /// @param order The limit order.
+    /// @param signature The order signature.
+    /// @param takerTokenFillAmount Maximum taker token to fill this order with.
+    /// @param taker The order taker.
+    /// @param sender The order sender.
+    /// @return takerTokenFilledAmount How much maker token was filled.
+    /// @return makerTokenFilledAmount How much maker token was filled.
+    function _fillLimitOrder(
+        LibNativeOrder.LimitOrder calldata order,
+        LibSignature.Signature calldata signature,
+        uint128 takerTokenFillAmount,
+        address taker,
+        address sender
+    )
+        external
+        payable
+        returns (uint128 takerTokenFilledAmount, uint128 makerTokenFilledAmount);
+
+    /// @dev Fill an RFQ order. Internal variant. ETH protocol fees can be
+    ///      attached to this call. Any unspent ETH will be refunded to
+    ///      `msg.sender` (not `sender`).
+    /// @param order The RFQ order.
+    /// @param signature The order signature.
+    /// @param takerTokenFillAmount Maximum taker token to fill this order with.
+    /// @param taker The order taker.
+    /// @return takerTokenFilledAmount How much maker token was filled.
+    /// @return makerTokenFilledAmount How much maker token was filled.
+    function _fillRfqOrder(
+        LibNativeOrder.RfqOrder calldata order,
+        LibSignature.Signature calldata signature,
+        uint128 takerTokenFillAmount,
+        address taker
+    )
+        external
+        payable
+        returns (uint128 takerTokenFilledAmount, uint128 makerTokenFilledAmount);
+
+    /// @dev Cancel a single limit order. The caller must be the maker.
+    ///      Silently succeeds if the order has already been cancelled.
+    /// @param order The limit order.
+    function cancelLimitOrder(LibNativeOrder.LimitOrder calldata order)
+        external;
+
+    /// @dev Cancel a single RFQ order. The caller must be the maker.
+    ///      Silently succeeds if the order has already been cancelled.
+    /// @param order The RFQ order.
+    function cancelRfqOrder(LibNativeOrder.RfqOrder calldata order)
+        external;
+
+    /// @dev Cancel multiple limit orders. The caller must be the maker.
+    ///      Silently succeeds if the order has already been cancelled.
+    /// @param orders The limit orders.
+    function batchCancelLimitOrders(LibNativeOrder.LimitOrder[] calldata orders)
+        external;
+
+    /// @dev Cancel multiple RFQ orders. The caller must be the maker.
+    ///      Silently succeeds if the order has already been cancelled.
+    /// @param orders The RFQ orders.
+    function batchCancelRfqOrders(LibNativeOrder.RfqOrder[] calldata orders)
+        external;
+
+    /// @dev Cancel all limit orders for a given maker and pair with a salt less
+    ///      than the value provided. The caller must be the maker. Subsequent
+    ///      calls to this function with the same caller and pair require the
+    ///      new salt to be >= the old salt.
+    /// @param makerToken The maker token.
+    /// @param takerToken The taker token.
+    /// @param minValidSalt The new minimum valid salt.
+    function cancelPairLimitOrders(
+        IERC20TokenV06 makerToken,
+        IERC20TokenV06 takerToken,
+        uint256 minValidSalt
+    )
+        external;
+
+    /// @dev Cancel all limit orders for a given maker and pair with a salt less
+    ///      than the value provided. The caller must be the maker. Subsequent
+    ///      calls to this function with the same caller and pair require the
+    ///      new salt to be >= the old salt.
+    /// @param makerTokens The maker tokens.
+    /// @param takerTokens The taker tokens.
+    /// @param minValidSalts The new minimum valid salts.
+    function batchCancelPairLimitOrders(
+        IERC20TokenV06[] calldata makerTokens,
+        IERC20TokenV06[] calldata takerTokens,
+        uint256[] calldata minValidSalts
+    )
+        external;
+
+    /// @dev Cancel all RFQ orders for a given maker and pair with a salt less
+    ///      than the value provided. The caller must be the maker. Subsequent
+    ///      calls to this function with the same caller and pair require the
+    ///      new salt to be >= the old salt.
+    /// @param makerToken The maker token.
+    /// @param takerToken The taker token.
+    /// @param minValidSalt The new minimum valid salt.
+    function cancelPairRfqOrders(
+        IERC20TokenV06 makerToken,
+        IERC20TokenV06 takerToken,
+        uint256 minValidSalt
+    )
+        external;
+
+    /// @dev Cancel all RFQ orders for a given maker and pair with a salt less
+    ///      than the value provided. The caller must be the maker. Subsequent
+    ///      calls to this function with the same caller and pair require the
+    ///      new salt to be >= the old salt.
+    /// @param makerTokens The maker tokens.
+    /// @param takerTokens The taker tokens.
+    /// @param minValidSalts The new minimum valid salts.
+    function batchCancelPairRfqOrders(
+        IERC20TokenV06[] calldata makerTokens,
+        IERC20TokenV06[] calldata takerTokens,
+        uint256[] calldata minValidSalts
+    )
+        external;
+
+    /// @dev Get the order info for a limit order.
+    /// @param order The limit order.
+    /// @return orderInfo Info about the order.
+    function getLimitOrderInfo(LibNativeOrder.LimitOrder calldata order)
+        external
+        view
+        returns (LibNativeOrder.OrderInfo memory orderInfo);
+
+    /// @dev Get the order info for an RFQ order.
+    /// @param order The RFQ order.
+    /// @return orderInfo Info about the order.
+    function getRfqOrderInfo(LibNativeOrder.RfqOrder calldata order)
+        external
+        view
+        returns (LibNativeOrder.OrderInfo memory orderInfo);
+
+    /// @dev Get the canonical hash of a limit order.
+    /// @param order The limit order.
+    /// @return orderHash The order hash.
+    function getLimitOrderHash(LibNativeOrder.LimitOrder calldata order)
+        external
+        view
+        returns (bytes32 orderHash);
+
+    /// @dev Get the canonical hash of an RFQ order.
+    /// @param order The RFQ order.
+    /// @return orderHash The order hash.
+    function getRfqOrderHash(LibNativeOrder.RfqOrder calldata order)
+        external
+        view
+        returns (bytes32 orderHash);
+
+    /// @dev Get the protocol fee multiplier. This should be multiplied by the
+    ///      gas price to arrive at the required protocol fee to fill a native order.
+    /// @return multiplier The protocol fee multiplier.
+    function getProtocolFeeMultiplier()
+        external
+        view
+        returns (uint32 multiplier);
+
+}

contracts/zero-ex/contracts/src/features/ISimpleFunctionRegistryFeature.sol

@@ -57,4 +57,12 @@ interface ISimpleFunctionRegistryFeature {
         external
         view
         returns (address impl);
+
+    /// @dev Get the implementation contract of a registered function.
+    /// @param selector The function selector.
+    /// @return impl The implementation contract address.
+    function getFunctionImplementation(bytes4 selector)
+        external
+        view
+        returns (address impl);
 }

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);
+}

contracts/zero-ex/contracts/src/features/LiquidityProviderFeature.sol

@@ -0,0 +1,177 @@
+/*
+
+  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-utils/contracts/src/v06/errors/LibRichErrorsV06.sol";
+import "@0x/contracts-utils/contracts/src/v06/LibSafeMathV06.sol";
+import "../errors/LibLiquidityProviderRichErrors.sol";
+import "../external/ILiquidityProviderSandbox.sol";
+import "../external/LiquidityProviderSandbox.sol";
+import "../fixins/FixinCommon.sol";
+import "../migrations/LibMigrate.sol";
+import "./IFeature.sol";
+import "./ILiquidityProviderFeature.sol";
+import "./libs/LibTokenSpender.sol";
+
+
+contract LiquidityProviderFeature is
+    IFeature,
+    ILiquidityProviderFeature,
+    FixinCommon
+{
+    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, 1);
+
+    /// @dev ETH pseudo-token address.
+    address constant internal ETH_TOKEN_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
+    /// @dev The sandbox contract address.
+    ILiquidityProviderSandbox public immutable sandbox;
+
+    /// @dev Event for data pipeline.
+    event LiquidityProviderSwap(
+        address inputToken,
+        address outputToken,
+        uint256 inputTokenAmount,
+        uint256 outputTokenAmount,
+        address provider,
+        address recipient
+    );
+
+    constructor(LiquidityProviderSandbox sandbox_)
+        public
+        FixinCommon()
+    {
+        sandbox = sandbox_;
+    }
+
+    /// @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);
+        return LibMigrate.MIGRATE_SUCCESS;
+    }
+
+    /// @dev Sells `sellAmount` of `inputToken` to the liquidity provider
+    ///      at the given `provider` address.
+    /// @param inputToken The token being sold.
+    /// @param outputToken The token being bought.
+    /// @param provider The address of the on-chain liquidity provider
+    ///        to trade with.
+    /// @param recipient The recipient of the bought tokens. If equal to
+    ///        address(0), `msg.sender` is assumed to be the recipient.
+    /// @param sellAmount The amount of `inputToken` to sell.
+    /// @param minBuyAmount The minimum acceptable amount of `outputToken` to
+    ///        buy. Reverts if this amount is not satisfied.
+    /// @param auxiliaryData Auxiliary data supplied to the `provider` contract.
+    /// @return boughtAmount The amount of `outputToken` bought.
+    function sellToLiquidityProvider(
+        address inputToken,
+        address outputToken,
+        address payable provider,
+        address recipient,
+        uint256 sellAmount,
+        uint256 minBuyAmount,
+        bytes calldata auxiliaryData
+    )
+        external
+        override
+        payable
+        returns (uint256 boughtAmount)
+    {
+        if (recipient == address(0)) {
+            recipient = msg.sender;
+        }
+
+        if (inputToken == ETH_TOKEN_ADDRESS) {
+            provider.transfer(sellAmount);
+        } else {
+            LibTokenSpender.spendERC20Tokens(
+                IERC20TokenV06(inputToken),
+                msg.sender,
+                provider,
+                sellAmount,
+                true
+            );
+        }
+
+        if (inputToken == ETH_TOKEN_ADDRESS) {
+            uint256 balanceBefore = IERC20TokenV06(outputToken).balanceOf(recipient);
+            sandbox.executeSellEthForToken(
+                provider,
+                outputToken,
+                recipient,
+                minBuyAmount,
+                auxiliaryData
+            );
+            boughtAmount = IERC20TokenV06(outputToken).balanceOf(recipient).safeSub(balanceBefore);
+        } else if (outputToken == ETH_TOKEN_ADDRESS) {
+            uint256 balanceBefore = recipient.balance;
+            sandbox.executeSellTokenForEth(
+                provider,
+                inputToken,
+                recipient,
+                minBuyAmount,
+                auxiliaryData
+            );
+            boughtAmount = recipient.balance.safeSub(balanceBefore);
+        } else {
+            uint256 balanceBefore = IERC20TokenV06(outputToken).balanceOf(recipient);
+            sandbox.executeSellTokenForToken(
+                provider,
+                inputToken,
+                outputToken,
+                recipient,
+                minBuyAmount,
+                auxiliaryData
+            );
+            boughtAmount = IERC20TokenV06(outputToken).balanceOf(recipient).safeSub(balanceBefore);
+        }
+
+        if (boughtAmount < minBuyAmount) {
+            LibLiquidityProviderRichErrors.LiquidityProviderIncompleteSellError(
+                provider,
+                outputToken,
+                inputToken,
+                sellAmount,
+                boughtAmount,
+                minBuyAmount
+            ).rrevert();
+        }
+
+        emit LiquidityProviderSwap(
+            inputToken,
+            outputToken,
+            sellAmount,
+            boughtAmount,
+            provider,
+            recipient
+        );
+    }
+}

contracts/zero-ex/contracts/src/features/MetaTransactionsFeature.sol

@@ -32,8 +32,8 @@ import "./libs/LibSignedCallData.sol";
 import "./IMetaTransactionsFeature.sol";
 import "./ITransformERC20Feature.sol";
 import "./ISignatureValidatorFeature.sol";
-import "./ITokenSpenderFeature.sol";
 import "./IFeature.sol";
+import "./libs/LibTokenSpender.sol";
 
 
 /// @dev MetaTransactions feature.
@@ -78,7 +78,7 @@ contract MetaTransactionsFeature is
     /// @dev Name of this feature.
     string public constant override FEATURE_NAME = "MetaTransactions";
     /// @dev Version of this feature.
-    uint256 public immutable override FEATURE_VERSION = _encodeVersion(1, 0, 0);
+    uint256 public immutable override FEATURE_VERSION = _encodeVersion(1, 1, 0);
     /// @dev EIP712 typehash of the `MetaTransactionData` struct.
     bytes32 public immutable MTX_EIP712_TYPEHASH = keccak256(
         "MetaTransactionData("
@@ -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.
@@ -279,11 +279,12 @@ contract MetaTransactionsFeature is
 
         // Pay the fee to the sender.
         if (mtx.feeAmount > 0) {
-            ITokenSpenderFeature(address(this))._spendERC20Tokens(
+            LibTokenSpender.spendERC20Tokens(
                 mtx.feeToken,
-                mtx.signer, // From the signer.
-                sender, // To the sender.
-                mtx.feeAmount
+                mtx.signer,
+                sender,
+                mtx.feeAmount,
+                true
             );
         }
 
@@ -454,7 +455,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)

contracts/zero-ex/contracts/src/features/NativeOrdersFeature.sol

@@ -0,0 +1,987 @@
+/*
+
+  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 "@0x/contracts-utils/contracts/src/v06/LibMathV06.sol";
+import "../fixins/FixinCommon.sol";
+import "../fixins/FixinProtocolFees.sol";
+import "../fixins/FixinEIP712.sol";
+import "../errors/LibNativeOrdersRichErrors.sol";
+import "../migrations/LibMigrate.sol";
+import "../storage/LibNativeOrdersStorage.sol";
+import "../vendor/v3/IStaking.sol";
+import "./libs/LibTokenSpender.sol";
+import "./libs/LibSignature.sol";
+import "./libs/LibNativeOrder.sol";
+import "./INativeOrdersFeature.sol";
+import "./IFeature.sol";
+
+
+/// @dev Feature for interacting with limit orders.
+contract NativeOrdersFeature is
+    IFeature,
+    INativeOrdersFeature,
+    FixinCommon,
+    FixinProtocolFees,
+    FixinEIP712
+{
+    using LibSafeMathV06 for uint256;
+    using LibSafeMathV06 for uint128;
+    using LibRichErrorsV06 for bytes;
+
+    /// @dev Params for `_settleOrder()`.
+    struct SettleOrderInfo {
+        // Order hash.
+        bytes32 orderHash;
+        // Maker of the order.
+        address maker;
+        // Taker of the order.
+        address taker;
+        // Maker token.
+        IERC20TokenV06 makerToken;
+        // Taker token.
+        IERC20TokenV06 takerToken;
+        // Maker token amount.
+        uint128 makerAmount;
+        // Taker token amount.
+        uint128 takerAmount;
+        // Maximum taker token amount to fill.
+        uint128 takerTokenFillAmount;
+        // How much taker token amount has already been filled in this order.
+        uint128 takerTokenFilledAmount;
+    }
+
+    /// @dev Params for `_fillLimitOrderPrivate()`
+    struct FillLimitOrderPrivateParams {
+        // The limit order.
+        LibNativeOrder.LimitOrder order;
+        // The order signature.
+        LibSignature.Signature signature;
+        // Maximum taker token to fill this order with.
+        uint128 takerTokenFillAmount;
+        // The order taker.
+        address taker;
+        // The order sender.
+        address sender;
+    }
+
+    // @dev Fill results returned by `_fillLimitOrderPrivate()` and
+    ///     `_fillRfqOrderPrivate()`.
+    struct FillNativeOrderResults {
+        uint256 ethProtocolFeePaid;
+        uint128 takerTokenFilledAmount;
+        uint128 makerTokenFilledAmount;
+        uint128 takerTokenFeeFilledAmount;
+    }
+
+    /// @dev Name of this feature.
+    string public constant override FEATURE_NAME = "LimitOrders";
+    /// @dev Version of this feature.
+    uint256 public immutable override FEATURE_VERSION = _encodeVersion(1, 0, 0);
+    /// @dev Highest bit of a uint256, used to flag cancelled orders.
+    uint256 private constant HIGH_BIT = 1 << 255;
+
+    constructor(
+        address zeroExAddress,
+        IEtherTokenV06 weth,
+        IStaking staking,
+        uint32 protocolFeeMultiplier
+    )
+        public
+        FixinEIP712(zeroExAddress)
+        FixinProtocolFees(weth, staking, protocolFeeMultiplier)
+    {
+        // solhint-disable no-empty-blocks
+    }
+
+    /// @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.transferProtocolFeesForPools.selector);
+        _registerFeatureFunction(this.fillLimitOrder.selector);
+        _registerFeatureFunction(this.fillRfqOrder.selector);
+        _registerFeatureFunction(this.fillOrKillLimitOrder.selector);
+        _registerFeatureFunction(this.fillOrKillRfqOrder.selector);
+        _registerFeatureFunction(this._fillLimitOrder.selector);
+        _registerFeatureFunction(this._fillRfqOrder.selector);
+        _registerFeatureFunction(this.cancelLimitOrder.selector);
+        _registerFeatureFunction(this.cancelRfqOrder.selector);
+        _registerFeatureFunction(this.batchCancelLimitOrders.selector);
+        _registerFeatureFunction(this.batchCancelRfqOrders.selector);
+        _registerFeatureFunction(this.cancelPairLimitOrders.selector);
+        _registerFeatureFunction(this.batchCancelPairLimitOrders.selector);
+        _registerFeatureFunction(this.cancelPairRfqOrders.selector);
+        _registerFeatureFunction(this.batchCancelPairRfqOrders.selector);
+        _registerFeatureFunction(this.getLimitOrderInfo.selector);
+        _registerFeatureFunction(this.getRfqOrderInfo.selector);
+        _registerFeatureFunction(this.getLimitOrderHash.selector);
+        _registerFeatureFunction(this.getRfqOrderHash.selector);
+        _registerFeatureFunction(this.getProtocolFeeMultiplier.selector);
+        return LibMigrate.MIGRATE_SUCCESS;
+    }
+
+    /// @dev Transfers protocol fees from the `FeeCollector` pools into
+    ///      the staking contract.
+    /// @param poolIds Staking pool IDs
+    function transferProtocolFeesForPools(bytes32[] calldata poolIds)
+        external
+        override
+    {
+        for (uint256 i = 0; i < poolIds.length; ++i) {
+            _transferFeesForPool(poolIds[i]);
+        }
+    }
+
+    /// @dev Fill a limit order. The taker and sender will be the caller.
+    /// @param order The limit order. ETH protocol fees can be
+    ///      attached to this call. Any unspent ETH will be refunded to
+    ///      the caller.
+    /// @param signature The order signature.
+    /// @param takerTokenFillAmount Maximum taker token amount to fill this order with.
+    /// @return takerTokenFilledAmount How much maker token was filled.
+    /// @return makerTokenFilledAmount How much maker token was filled.
+    function fillLimitOrder(
+        LibNativeOrder.LimitOrder memory order,
+        LibSignature.Signature memory signature,
+        uint128 takerTokenFillAmount
+    )
+        public
+        override
+        payable
+        returns (uint128 takerTokenFilledAmount, uint128 makerTokenFilledAmount)
+    {
+        FillNativeOrderResults memory results =
+            _fillLimitOrderPrivate(FillLimitOrderPrivateParams({
+                order: order,
+                signature: signature,
+                takerTokenFillAmount: takerTokenFillAmount,
+                taker: msg.sender,
+                sender: msg.sender
+            }));
+        _refundExcessProtocolFeeToSender(results.ethProtocolFeePaid);
+        (takerTokenFilledAmount, makerTokenFilledAmount) = (
+            results.takerTokenFilledAmount,
+            results.makerTokenFilledAmount
+        );
+    }
+
+    /// @dev Fill an RFQ order for up to `takerTokenFillAmount` taker tokens.
+    ///      The taker will be the caller. ETH should be attached to pay the
+    ///      protocol fee.
+    /// @param order The RFQ order.
+    /// @param signature The order signature.
+    /// @param takerTokenFillAmount Maximum taker token amount to fill this order with.
+    /// @return takerTokenFilledAmount How much maker token was filled.
+    /// @return makerTokenFilledAmount How much maker token was filled.
+    function fillRfqOrder(
+        LibNativeOrder.RfqOrder memory order,
+        LibSignature.Signature memory signature,
+        uint128 takerTokenFillAmount
+    )
+        public
+        override
+        payable
+        returns (uint128 takerTokenFilledAmount, uint128 makerTokenFilledAmount)
+    {
+        FillNativeOrderResults memory results =
+            _fillRfqOrderPrivate(
+                order,
+                signature,
+                takerTokenFillAmount,
+                msg.sender
+            );
+        _refundExcessProtocolFeeToSender(results.ethProtocolFeePaid);
+        (takerTokenFilledAmount, makerTokenFilledAmount) = (
+            results.takerTokenFilledAmount,
+            results.makerTokenFilledAmount
+        );
+    }
+
+    /// @dev Fill an RFQ order for exactly `takerTokenFillAmount` taker tokens.
+    ///      The taker will be the caller. ETH protocol fees can be
+    ///      attached to this call. Any unspent ETH will be refunded to
+    ///      the caller.
+    /// @param order The limit order.
+    /// @param signature The order signature.
+    /// @param takerTokenFillAmount How much taker token to fill this order with.
+    /// @return makerTokenFilledAmount How much maker token was filled.
+    function fillOrKillLimitOrder(
+        LibNativeOrder.LimitOrder memory order,
+        LibSignature.Signature memory signature,
+        uint128 takerTokenFillAmount
+    )
+        public
+        override
+        payable
+        returns (uint128 makerTokenFilledAmount)
+    {
+        FillNativeOrderResults memory results =
+            _fillLimitOrderPrivate(FillLimitOrderPrivateParams({
+                order: order,
+                signature: signature,
+                takerTokenFillAmount: takerTokenFillAmount,
+                taker: msg.sender,
+                sender: msg.sender
+            }));
+        // Must have filled exactly the amount requested.
+        if (results.takerTokenFilledAmount < takerTokenFillAmount) {
+            LibNativeOrdersRichErrors.FillOrKillFailedError(
+                getLimitOrderHash(order),
+                results.takerTokenFilledAmount,
+                takerTokenFillAmount
+            ).rrevert();
+        }
+        _refundExcessProtocolFeeToSender(results.ethProtocolFeePaid);
+        makerTokenFilledAmount = results.makerTokenFilledAmount;
+    }
+
+    /// @dev Fill an RFQ order for exactly `takerTokenFillAmount` taker tokens.
+    ///      The taker will be the caller. ETH protocol fees can be
+    ///      attached to this call. Any unspent ETH will be refunded to
+    ///      the caller.
+    /// @param order The RFQ order.
+    /// @param signature The order signature.
+    /// @param takerTokenFillAmount How much taker token to fill this order with.
+    /// @return makerTokenFilledAmount How much maker token was filled.
+    function fillOrKillRfqOrder(
+        LibNativeOrder.RfqOrder memory order,
+        LibSignature.Signature memory signature,
+        uint128 takerTokenFillAmount
+    )
+        public
+        override
+        payable
+        returns (uint128 makerTokenFilledAmount)
+    {
+        FillNativeOrderResults memory results =
+            _fillRfqOrderPrivate(
+                order,
+                signature,
+                takerTokenFillAmount,
+                msg.sender
+            );
+        // Must have filled exactly the amount requested.
+        if (results.takerTokenFilledAmount < takerTokenFillAmount) {
+            LibNativeOrdersRichErrors.FillOrKillFailedError(
+                getRfqOrderHash(order),
+                results.takerTokenFilledAmount,
+                takerTokenFillAmount
+            ).rrevert();
+        }
+        _refundExcessProtocolFeeToSender(results.ethProtocolFeePaid);
+        makerTokenFilledAmount = results.makerTokenFilledAmount;
+    }
+
+    /// @dev Fill a limit order. Internal variant. ETH protocol fees can be
+    ///      attached to this call. Any unspent ETH will be refunded to
+    ///      `msg.sender` (not `sender`).
+    /// @param order The limit order.
+    /// @param signature The order signature.
+    /// @param takerTokenFillAmount Maximum taker token to fill this order with.
+    /// @param taker The order taker.
+    /// @param sender The order sender.
+    /// @return takerTokenFilledAmount How much maker token was filled.
+    /// @return makerTokenFilledAmount How much maker token was filled.
+    function _fillLimitOrder(
+        LibNativeOrder.LimitOrder memory order,
+        LibSignature.Signature memory signature,
+        uint128 takerTokenFillAmount,
+        address taker,
+        address sender
+    )
+        public
+        override
+        payable
+        onlySelf
+        returns (uint128 takerTokenFilledAmount, uint128 makerTokenFilledAmount)
+    {
+        FillNativeOrderResults memory results =
+            _fillLimitOrderPrivate(FillLimitOrderPrivateParams({
+                order: order,
+                signature: signature,
+                takerTokenFillAmount: takerTokenFillAmount,
+                taker: taker,
+                sender: sender
+            }));
+        _refundExcessProtocolFeeToSender(results.ethProtocolFeePaid);
+        (takerTokenFilledAmount, makerTokenFilledAmount) = (
+            results.takerTokenFilledAmount,
+            results.makerTokenFilledAmount
+        );
+    }
+
+    /// @dev Fill an RFQ order. Internal variant. ETH protocol fees can be
+    ///      attached to this call. Any unspent ETH will be refunded to
+    ///      `msg.sender` (not `sender`).
+    /// @param order The RFQ order.
+    /// @param signature The order signature.
+    /// @param takerTokenFillAmount Maximum taker token to fill this order with.
+    /// @param taker The order taker.
+    /// @return takerTokenFilledAmount How much maker token was filled.
+    /// @return makerTokenFilledAmount How much maker token was filled.
+    function _fillRfqOrder(
+        LibNativeOrder.RfqOrder memory order,
+        LibSignature.Signature memory signature,
+        uint128 takerTokenFillAmount,
+        address taker
+    )
+        public
+        override
+        payable
+        onlySelf
+        returns (uint128 takerTokenFilledAmount, uint128 makerTokenFilledAmount)
+    {
+        FillNativeOrderResults memory results =
+            _fillRfqOrderPrivate(
+                order,
+                signature,
+                takerTokenFillAmount,
+                taker
+            );
+        _refundExcessProtocolFeeToSender(results.ethProtocolFeePaid);
+        (takerTokenFilledAmount, makerTokenFilledAmount) = (
+            results.takerTokenFilledAmount,
+            results.makerTokenFilledAmount
+        );
+    }
+
+    /// @dev Cancel a single limit order. The caller must be the maker.
+    ///      Silently succeeds if the order has already been cancelled.
+    /// @param order The limit order.
+    function cancelLimitOrder(LibNativeOrder.LimitOrder memory order)
+        public
+        override
+    {
+        bytes32 orderHash = getLimitOrderHash(order);
+        if (msg.sender != order.maker) {
+            LibNativeOrdersRichErrors.OnlyOrderMakerAllowed(
+                orderHash,
+                msg.sender,
+                order.maker
+            ).rrevert();
+        }
+        _cancelOrderHash(orderHash, order.maker);
+    }
+
+    /// @dev Cancel a single RFQ order. The caller must be the maker.
+    ///      Silently succeeds if the order has already been cancelled.
+    /// @param order The RFQ order.
+    function cancelRfqOrder(LibNativeOrder.RfqOrder memory order)
+        public
+        override
+    {
+        bytes32 orderHash = getRfqOrderHash(order);
+        if (msg.sender != order.maker) {
+            LibNativeOrdersRichErrors.OnlyOrderMakerAllowed(
+                orderHash,
+                msg.sender,
+                order.maker
+            ).rrevert();
+        }
+        _cancelOrderHash(orderHash, order.maker);
+    }
+
+    /// @dev Cancel multiple limit orders. The caller must be the maker.
+    ///      Silently succeeds if the order has already been cancelled.
+    /// @param orders The limit orders.
+    function batchCancelLimitOrders(LibNativeOrder.LimitOrder[] memory orders)
+        public
+        override
+    {
+        for (uint256 i = 0; i < orders.length; ++i) {
+            cancelLimitOrder(orders[i]);
+        }
+    }
+
+    /// @dev Cancel multiple RFQ orders. The caller must be the maker.
+    ///      Silently succeeds if the order has already been cancelled.
+    /// @param orders The RFQ orders.
+    function batchCancelRfqOrders(LibNativeOrder.RfqOrder[] memory orders)
+        public
+        override
+    {
+        for (uint256 i = 0; i < orders.length; ++i) {
+            cancelRfqOrder(orders[i]);
+        }
+    }
+
+    /// @dev Cancel all limit orders for a given maker and pair with a salt less
+    ///      than the value provided. The caller must be the maker. Subsequent
+    ///      calls to this function with the same caller and pair require the
+    ///      new salt to be >= the old salt.
+    /// @param makerToken The maker token.
+    /// @param takerToken The taker token.
+    /// @param minValidSalt The new minimum valid salt.
+    function cancelPairLimitOrders(
+        IERC20TokenV06 makerToken,
+        IERC20TokenV06 takerToken,
+        uint256 minValidSalt
+    )
+        public
+        override
+    {
+        LibNativeOrdersStorage.Storage storage stor =
+            LibNativeOrdersStorage.getStorage();
+
+        uint256 oldMinValidSalt =
+            stor.limitOrdersMakerToMakerTokenToTakerTokenToMinValidOrderSalt
+                [msg.sender]
+                [address(makerToken)]
+                [address(takerToken)];
+
+        // New min salt must >= the old one.
+        if (oldMinValidSalt > minValidSalt) {
+            LibNativeOrdersRichErrors.
+                CancelSaltTooLowError(minValidSalt, oldMinValidSalt)
+                    .rrevert();
+        }
+
+        stor.limitOrdersMakerToMakerTokenToTakerTokenToMinValidOrderSalt
+            [msg.sender]
+            [address(makerToken)]
+            [address(takerToken)] = minValidSalt;
+
+        emit PairOrdersCancelled(
+            msg.sender,
+            address(makerToken),
+            address(takerToken),
+            minValidSalt
+        );
+    }
+
+    /// @dev Cancel all limit orders for a given maker and pair with a salt less
+    ///      than the value provided. The caller must be the maker. Subsequent
+    ///      calls to this function with the same caller and pair require the
+    ///      new salt to be >= the old salt.
+    /// @param makerTokens The maker tokens.
+    /// @param takerTokens The taker tokens.
+    /// @param minValidSalts The new minimum valid salts.
+    function batchCancelPairLimitOrders(
+        IERC20TokenV06[] memory makerTokens,
+        IERC20TokenV06[] memory takerTokens,
+        uint256[] memory minValidSalts
+    )
+        public
+        override
+    {
+        require(
+            makerTokens.length == takerTokens.length &&
+            makerTokens.length == minValidSalts.length,
+            "LimitOrdersFeature/MISMATCHED_PAIR_ORDERS_ARRAY_LENGTHS"
+        );
+
+        for (uint256 i = 0; i < makerTokens.length; ++i) {
+            cancelPairLimitOrders(
+                makerTokens[i],
+                takerTokens[i],
+                minValidSalts[i]
+            );
+        }
+    }
+
+    /// @dev Cancel all RFQ orders for a given maker and pair with a salt less
+    ///      than the value provided. The caller must be the maker. Subsequent
+    ///      calls to this function with the same caller and pair require the
+    ///      new salt to be >= the old salt.
+    /// @param makerToken The maker token.
+    /// @param takerToken The taker token.
+    /// @param minValidSalt The new minimum valid salt.
+    function cancelPairRfqOrders(
+        IERC20TokenV06 makerToken,
+        IERC20TokenV06 takerToken,
+        uint256 minValidSalt
+    )
+        public
+        override
+    {
+        LibNativeOrdersStorage.Storage storage stor =
+            LibNativeOrdersStorage.getStorage();
+
+        uint256 oldMinValidSalt =
+            stor.rfqOrdersMakerToMakerTokenToTakerTokenToMinValidOrderSalt
+                [msg.sender]
+                [address(makerToken)]
+                [address(takerToken)];
+
+        // New min salt must >= the old one.
+        if (oldMinValidSalt > minValidSalt) {
+            LibNativeOrdersRichErrors.
+                CancelSaltTooLowError(minValidSalt, oldMinValidSalt)
+                    .rrevert();
+        }
+
+        stor.rfqOrdersMakerToMakerTokenToTakerTokenToMinValidOrderSalt
+            [msg.sender]
+            [address(makerToken)]
+            [address(takerToken)] = minValidSalt;
+
+        emit PairOrdersCancelled(
+            msg.sender,
+            address(makerToken),
+            address(takerToken),
+            minValidSalt
+        );
+    }
+
+    /// @dev Cancel all RFQ orders for a given maker and pair with a salt less
+    ///      than the value provided. The caller must be the maker. Subsequent
+    ///      calls to this function with the same caller and pair require the
+    ///      new salt to be >= the old salt.
+    /// @param makerTokens The maker tokens.
+    /// @param takerTokens The taker tokens.
+    /// @param minValidSalts The new minimum valid salts.
+    function batchCancelPairRfqOrders(
+        IERC20TokenV06[] memory makerTokens,
+        IERC20TokenV06[] memory takerTokens,
+        uint256[] memory minValidSalts
+    )
+        public
+        override
+    {
+        require(
+            makerTokens.length == takerTokens.length &&
+            makerTokens.length == minValidSalts.length,
+            "LimitOrdersFeature/MISMATCHED_PAIR_ORDERS_ARRAY_LENGTHS"
+        );
+
+        for (uint256 i = 0; i < makerTokens.length; ++i) {
+            cancelPairRfqOrders(
+                makerTokens[i],
+                takerTokens[i],
+                minValidSalts[i]
+            );
+        }
+    }
+
+    /// @dev Get the order info for a limit order.
+    /// @param order The limit order.
+    /// @return orderInfo Info about the order.
+    function getLimitOrderInfo(LibNativeOrder.LimitOrder memory order)
+        public
+        override
+        view
+        returns (LibNativeOrder.OrderInfo memory orderInfo)
+    {
+        // Recover maker and compute order hash.
+        orderInfo.orderHash = getLimitOrderHash(order);
+        uint256 minValidSalt = LibNativeOrdersStorage.getStorage()
+            .limitOrdersMakerToMakerTokenToTakerTokenToMinValidOrderSalt
+                [order.maker]
+                [address(order.makerToken)]
+                [address(order.takerToken)];
+        _populateCommonOrderInfoFields(
+            orderInfo,
+            order.takerAmount,
+            order.expiry,
+            order.salt,
+            minValidSalt
+        );
+    }
+
+    /// @dev Get the order info for an RFQ order.
+    /// @param order The RFQ order.
+    /// @return orderInfo Info about the order.
+    function getRfqOrderInfo(LibNativeOrder.RfqOrder memory order)
+        public
+        override
+        view
+        returns (LibNativeOrder.OrderInfo memory orderInfo)
+    {
+        // Recover maker and compute order hash.
+        orderInfo.orderHash = getRfqOrderHash(order);
+        uint256 minValidSalt = LibNativeOrdersStorage.getStorage()
+            .rfqOrdersMakerToMakerTokenToTakerTokenToMinValidOrderSalt
+                [order.maker]
+                [address(order.makerToken)]
+                [address(order.takerToken)];
+        _populateCommonOrderInfoFields(
+            orderInfo,
+            order.takerAmount,
+            order.expiry,
+            order.salt,
+            minValidSalt
+        );
+    }
+
+    /// @dev Get the canonical hash of a limit order.
+    /// @param order The limit order.
+    /// @return orderHash The order hash.
+    function getLimitOrderHash(LibNativeOrder.LimitOrder memory order)
+        public
+        override
+        view
+        returns (bytes32 orderHash)
+    {
+        return _getEIP712Hash(
+            LibNativeOrder.getLimitOrderStructHash(order)
+        );
+    }
+
+    /// @dev Get the canonical hash of an RFQ order.
+    /// @param order The RFQ order.
+    /// @return orderHash The order hash.
+    function getRfqOrderHash(LibNativeOrder.RfqOrder memory order)
+        public
+        override
+        view
+        returns (bytes32 orderHash)
+    {
+        return _getEIP712Hash(
+            LibNativeOrder.getRfqOrderStructHash(order)
+        );
+    }
+
+    /// @dev Get the protocol fee multiplier. This should be multiplied by the
+    ///      gas price to arrive at the required protocol fee to fill a native order.
+    /// @return multiplier The protocol fee multiplier.
+    function getProtocolFeeMultiplier()
+        external
+        override
+        view
+        returns (uint32 multiplier)
+    {
+        return PROTOCOL_FEE_MULTIPLIER;
+    }
+
+    /// @dev Populate `status` and `takerTokenFilledAmount` fields in
+    ///      `orderInfo`, which use the same code path for both limit and
+    ///      RFQ orders.
+    /// @param orderInfo `OrderInfo` with `orderHash` and `maker` filled.
+    /// @param takerAmount The order's taker token amount..
+    /// @param expiry The order's expiry.
+    /// @param salt The order's salt.
+    /// @param salt The minimum valid salt for the maker and pair combination.
+    function _populateCommonOrderInfoFields(
+        LibNativeOrder.OrderInfo memory orderInfo,
+        uint128 takerAmount,
+        uint64 expiry,
+        uint256 salt,
+        uint256 minValidSalt
+    )
+        private
+        view
+    {
+        LibNativeOrdersStorage.Storage storage stor =
+            LibNativeOrdersStorage.getStorage();
+
+        // Get the filled and direct cancel state.
+        {
+            // The high bit of the raw taker token filled amount will be set
+            // if the order was cancelled.
+            uint256 rawTakerTokenFilledAmount =
+                stor.orderHashToTakerTokenFilledAmount[orderInfo.orderHash];
+            orderInfo.takerTokenFilledAmount = uint128(rawTakerTokenFilledAmount);
+            if (orderInfo.takerTokenFilledAmount >= takerAmount) {
+                orderInfo.status = LibNativeOrder.OrderStatus.FILLED;
+                return;
+            }
+            if (rawTakerTokenFilledAmount & HIGH_BIT != 0) {
+                orderInfo.status = LibNativeOrder.OrderStatus.CANCELLED;
+                return;
+            }
+        }
+
+        // Check for expiration.
+        if (expiry <= uint64(block.timestamp)) {
+            orderInfo.status = LibNativeOrder.OrderStatus.EXPIRED;
+            return;
+        }
+
+        // Check if the order was cancelled by salt.
+        if (minValidSalt > salt) {
+            orderInfo.status = LibNativeOrder.OrderStatus.CANCELLED;
+            return;
+        }
+        orderInfo.status = LibNativeOrder.OrderStatus.FILLABLE;
+    }
+
+    /// @dev Cancel a limit or RFQ order directly by its order hash.
+    /// @param orderHash The order's order hash.
+    /// @param maker The order's maker.
+    function _cancelOrderHash(bytes32 orderHash, address maker)
+        private
+    {
+        LibNativeOrdersStorage.Storage storage stor =
+            LibNativeOrdersStorage.getStorage();
+        // Set the high bit on the raw taker token fill amount to indicate
+        // a cancel. It's OK to cancel twice.
+        stor.orderHashToTakerTokenFilledAmount[orderHash] |= HIGH_BIT;
+
+        emit OrderCancelled(orderHash, msg.sender);
+    }
+
+    /// @dev Fill a limit order. Private variant. Does not refund protocol fees.
+    /// @param params Function params.
+    /// @return results Results of the fill.
+    function _fillLimitOrderPrivate(FillLimitOrderPrivateParams memory params)
+        private
+        returns (FillNativeOrderResults memory results)
+    {
+        LibNativeOrder.OrderInfo memory orderInfo = getLimitOrderInfo(params.order);
+
+        // Must be fillable.
+        if (orderInfo.status != LibNativeOrder.OrderStatus.FILLABLE) {
+            LibNativeOrdersRichErrors.OrderNotFillableError(
+                orderInfo.orderHash,
+                uint8(orderInfo.status)
+            ).rrevert();
+        }
+
+        // Must be fillable by the taker.
+        if (params.order.taker != address(0) && params.order.taker != params.taker) {
+            LibNativeOrdersRichErrors.OrderNotFillableByTakerError(
+                orderInfo.orderHash,
+                params.taker,
+                params.order.taker
+            ).rrevert();
+        }
+
+        // Must be fillable by the sender.
+        if (params.order.sender != address(0) && params.order.sender != params.sender) {
+            LibNativeOrdersRichErrors.OrderNotFillableBySenderError(
+                orderInfo.orderHash,
+                params.sender,
+                params.order.sender
+            ).rrevert();
+        }
+
+        // Signature must be valid for the order.
+        {
+            address signer = LibSignature.getSignerOfHash(
+                orderInfo.orderHash,
+                params.signature
+            );
+            if (signer != params.order.maker) {
+                LibNativeOrdersRichErrors.OrderNotSignedByMakerError(
+                    orderInfo.orderHash,
+                    signer,
+                    params.order.maker
+                ).rrevert();
+            }
+        }
+
+        // Pay the protocol fee.
+        results.ethProtocolFeePaid = _collectProtocolFee(params.order.pool);
+
+        // Settle between the maker and taker.
+        (results.takerTokenFilledAmount, results.makerTokenFilledAmount) = _settleOrder(
+            SettleOrderInfo({
+                orderHash: orderInfo.orderHash,
+                maker: params.order.maker,
+                taker: params.taker,
+                makerToken: IERC20TokenV06(params.order.makerToken),
+                takerToken: IERC20TokenV06(params.order.takerToken),
+                makerAmount: params.order.makerAmount,
+                takerAmount: params.order.takerAmount,
+                takerTokenFillAmount: params.takerTokenFillAmount,
+                takerTokenFilledAmount: orderInfo.takerTokenFilledAmount
+            })
+        );
+
+        // Pay the fee recipient.
+        if (params.order.takerTokenFeeAmount > 0) {
+            results.takerTokenFeeFilledAmount = uint128(LibMathV06.getPartialAmountFloor(
+                results.takerTokenFilledAmount,
+                params.order.takerAmount,
+                params.order.takerTokenFeeAmount
+            ));
+            LibTokenSpender.spendERC20Tokens(
+                params.order.takerToken,
+                params.taker,
+                params.order.feeRecipient,
+                uint256(results.takerTokenFeeFilledAmount),
+                false
+            );
+        }
+
+        emit LimitOrderFilled(
+            orderInfo.orderHash,
+            params.order.maker,
+            params.taker,
+            params.order.feeRecipient,
+            address(params.order.makerToken),
+            address(params.order.takerToken),
+            results.takerTokenFilledAmount,
+            results.makerTokenFilledAmount,
+            results.takerTokenFeeFilledAmount,
+            results.ethProtocolFeePaid,
+            params.order.pool
+        );
+    }
+
+    /// @dev Fill an RFQ order. Private variant. Does not refund protocol fees.
+    /// @param order The RFQ order.
+    /// @param signature The order signature.
+    /// @param takerTokenFillAmount Maximum taker token to fill this order with.
+    /// @param taker The order taker.
+    /// @return results Results of the fill.
+    function _fillRfqOrderPrivate(
+        LibNativeOrder.RfqOrder memory order,
+        LibSignature.Signature memory signature,
+        uint128 takerTokenFillAmount,
+        address taker
+    )
+        private
+        returns (FillNativeOrderResults memory results)
+    {
+        LibNativeOrder.OrderInfo memory orderInfo = getRfqOrderInfo(order);
+
+        // Must be fillable.
+        if (orderInfo.status != LibNativeOrder.OrderStatus.FILLABLE) {
+            LibNativeOrdersRichErrors.OrderNotFillableError(
+                orderInfo.orderHash,
+                uint8(orderInfo.status)
+            ).rrevert();
+        }
+
+        // Must be fillable by the tx.origin.
+        if (order.txOrigin != address(0) && order.txOrigin != tx.origin) {
+            LibNativeOrdersRichErrors.OrderNotFillableByOriginError(
+                orderInfo.orderHash,
+                tx.origin,
+                order.txOrigin
+            ).rrevert();
+        }
+
+        // Signature must be valid for the order.
+        {
+            address signer = LibSignature.getSignerOfHash(orderInfo.orderHash, signature);
+            if (signer != order.maker) {
+                LibNativeOrdersRichErrors.OrderNotSignedByMakerError(
+                    orderInfo.orderHash,
+                    signer,
+                    order.maker
+                ).rrevert();
+            }
+        }
+
+        // Pay the protocol fee.
+        results.ethProtocolFeePaid = _collectProtocolFee(order.pool);
+
+        // Settle between the maker and taker.
+        (results.takerTokenFilledAmount, results.makerTokenFilledAmount) = _settleOrder(
+            SettleOrderInfo({
+                orderHash: orderInfo.orderHash,
+                maker: order.maker,
+                taker: taker,
+                makerToken: IERC20TokenV06(order.makerToken),
+                takerToken: IERC20TokenV06(order.takerToken),
+                makerAmount: order.makerAmount,
+                takerAmount: order.takerAmount,
+                takerTokenFillAmount: takerTokenFillAmount,
+                takerTokenFilledAmount: orderInfo.takerTokenFilledAmount
+            })
+        );
+
+        emit RfqOrderFilled(
+            orderInfo.orderHash,
+            order.maker,
+            taker,
+            address(order.makerToken),
+            address(order.takerToken),
+            results.takerTokenFilledAmount,
+            results.makerTokenFilledAmount,
+            results.ethProtocolFeePaid,
+            order.pool
+        );
+    }
+
+    /// @dev Settle the trade between an order's maker and taker.
+    /// @param settleInfo Information needed to execute the settlement.
+    /// @return takerTokenFilledAmount How much taker token was filled.
+    /// @return makerTokenFilledAmount How much maker token was filled.
+    function _settleOrder(SettleOrderInfo memory settleInfo)
+        private
+        returns (uint128 takerTokenFilledAmount, uint128 makerTokenFilledAmount)
+    {
+        // Clamp the taker token fill amount to the fillable amount.
+        takerTokenFilledAmount = LibSafeMathV06.min128(
+            settleInfo.takerTokenFillAmount,
+            settleInfo.takerAmount.safeSub128(settleInfo.takerTokenFilledAmount)
+        );
+        // Compute the maker token amount.
+        // This should never overflow because the values are all clamped to
+        // (2^128-1).
+        makerTokenFilledAmount = uint128(LibMathV06.getPartialAmountFloor(
+            uint256(takerTokenFilledAmount),
+            uint256(settleInfo.takerAmount),
+            uint256(settleInfo.makerAmount)
+        ));
+
+        if (takerTokenFilledAmount == 0 || makerTokenFilledAmount == 0) {
+            // Nothing to do.
+            return (0, 0);
+        }
+
+        // Update filled state for the order.
+        LibNativeOrdersStorage
+            .getStorage()
+            .orderHashToTakerTokenFilledAmount[settleInfo.orderHash] =
+            // OK to overwrite the whole word because we shouldn't get to this
+            // function if the order is cancelled.
+                settleInfo.takerTokenFilledAmount.safeAdd128(takerTokenFilledAmount);
+
+        // Transfer taker -> maker.
+        LibTokenSpender.spendERC20Tokens(
+            settleInfo.takerToken,
+            settleInfo.taker,
+            settleInfo.maker,
+            takerTokenFilledAmount,
+            false
+        );
+
+        // Transfer maker -> taker.
+        LibTokenSpender.spendERC20Tokens(
+            settleInfo.makerToken,
+            settleInfo.maker,
+            settleInfo.taker,
+            makerTokenFilledAmount,
+            false
+        );
+    }
+
+    /// @dev Refund any leftover protocol fees in `msg.value` to `msg.sender`.
+    /// @param ethProtocolFeePaid How much ETH was paid in protocol fees.
+    function _refundExcessProtocolFeeToSender(uint256 ethProtocolFeePaid)
+        private
+    {
+        if (msg.value > ethProtocolFeePaid && msg.sender != address(this)) {
+            uint256 refundAmount = msg.value.safeSub(ethProtocolFeePaid);
+            (bool success,) = msg
+                .sender
+                .call{value: refundAmount}("");
+            if (!success) {
+                LibNativeOrdersRichErrors.ProtocolFeeRefundFailed(
+                    msg.sender,
+                    refundAmount
+                ).rrevert();
+            }
+        }
+    }
+}

contracts/zero-ex/contracts/src/features/SimpleFunctionRegistryFeature.sol

@@ -56,6 +56,7 @@ contract SimpleFunctionRegistryFeature is
         // Register getters.
         _extend(this.getRollbackLength.selector, _implementation);
         _extend(this.getRollbackEntryAtIndex.selector, _implementation);
+        _extend(this.getFunctionImplementation.selector, _implementation);
         return LibBootstrap.BOOTSTRAP_SUCCESS;
     }
 
@@ -151,6 +152,18 @@ contract SimpleFunctionRegistryFeature is
         return LibSimpleFunctionRegistryStorage.getStorage().implHistory[selector][idx];
     }
 
+    /// @dev Get the implementation contract of a registered function.
+    /// @param selector The function selector.
+    /// @return impl The implementation contract address.
+    function getFunctionImplementation(bytes4 selector)
+        external
+        override
+        view
+        returns (address impl)
+    {
+        return LibProxyStorage.getStorage().impls[selector];
+    }
+
     /// @dev Register or replace a function.
     /// @param selector The function selector.
     /// @param impl The implementation contract for the function.

contracts/zero-ex/contracts/src/features/TransformERC20Feature.sol

@@ -33,9 +33,9 @@ import "../transformers/IERC20Transformer.sol";
 import "../transformers/LibERC20Transformer.sol";
 import "./libs/LibSignedCallData.sol";
 import "./ITransformERC20Feature.sol";
-import "./ITokenSpenderFeature.sol";
 import "./IFeature.sol";
 import "./ISignatureValidatorFeature.sol";
+import "./libs/LibTokenSpender.sol";
 
 
 /// @dev Feature to composably transform between ERC20 tokens.
@@ -58,7 +58,7 @@ contract TransformERC20Feature is
     /// @dev Name of this feature.
     string public constant override FEATURE_NAME = "TransformERC20";
     /// @dev Version of this feature.
-    uint256 public immutable override FEATURE_VERSION = _encodeVersion(1, 2, 0);
+    uint256 public immutable override FEATURE_VERSION = _encodeVersion(1, 3, 1);
 
     /// @dev Initialize and register this feature.
     ///      Should be delegatecalled by `Migrate.migrate()`.
@@ -211,8 +211,10 @@ contract TransformERC20Feature is
         // If the input token amount is -1, transform the taker's entire
         // spendable balance.
         if (args.inputTokenAmount == uint256(-1)) {
-            args.inputTokenAmount = ITokenSpenderFeature(address(this))
-                .getSpendableERC20BalanceOf(args.inputToken, args.taker);
+            args.inputTokenAmount = LibTokenSpender.getSpendableERC20BalanceOf(
+                args.inputToken,
+                args.taker
+            );
         }
 
         TransformERC20PrivateState memory state;
@@ -315,11 +317,12 @@ contract TransformERC20Feature is
         // Transfer input tokens.
         if (!LibERC20Transformer.isTokenETH(inputToken)) {
             // Token is not ETH, so pull ERC20 tokens.
-            ITokenSpenderFeature(address(this))._spendERC20Tokens(
+            LibTokenSpender.spendERC20Tokens(
                 inputToken,
                 from,
                 to,
-                amount
+                amount,
+                true
             );
         } else if (msg.value < amount) {
              // Token is ETH, so the caller must attach enough ETH to the call.

contracts/zero-ex/contracts/src/features/UniswapFeature.sol

@@ -0,0 +1,398 @@
+/*
+
+  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, 1, 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.
+                            mstore(0xB00, TRANSFER_FROM_CALL_SELECTOR_32)
+                            mstore(0xB04, caller())
+                            mstore(0xB24, pair)
+                            mstore(0xB44, sellAmount)
+
+                            // Copy only the first 32 bytes of return data. We
+                            // only care about reading a boolean in the success
+                            // case, and we discard the return data in the
+                            // failure case.
+                            let success := call(gas(), sellToken, 0, 0xB00, 0x64, 0xC00, 0x20)
+
+                            let rdsize := returndatasize()
+
+                            // Check for ERC20 success. ERC20 tokens should
+                            // return a boolean, but some return nothing or
+                            // extra data. We accept 0-length return data as
+                            // success, or at least 32 bytes that starts with
+                            // a 32-byte boolean true.
+                            success := and(
+                                success,                         // call itself succeeded
+                                or(
+                                    iszero(rdsize),              // no return data, or
+                                    and(
+                                        iszero(lt(rdsize, 32)),  // at least 32 bytes
+                                        eq(mload(0xC00), 1)      // starts with uint256(1)
+                                    )
+                                )
+                            )
+
+                            if iszero(success) {
+                                // Try to fall back to the allowance target.
+                                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");
+    }
+}

contracts/zero-ex/contracts/src/features/libs/LibNativeOrder.sol

@@ -0,0 +1,213 @@
+/*
+
+  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 A library for common native order operations.
+library LibNativeOrder {
+
+    enum OrderStatus {
+        INVALID,
+        FILLABLE,
+        FILLED,
+        CANCELLED,
+        EXPIRED
+    }
+
+    /// @dev A standard OTC or OO limit order.
+    struct LimitOrder {
+        IERC20TokenV06 makerToken;
+        IERC20TokenV06 takerToken;
+        uint128 makerAmount;
+        uint128 takerAmount;
+        uint128 takerTokenFeeAmount;
+        address maker;
+        address taker;
+        address sender;
+        address feeRecipient;
+        bytes32 pool;
+        uint64 expiry;
+        uint256 salt;
+    }
+
+    /// @dev An RFQ limit order.
+    struct RfqOrder {
+        IERC20TokenV06 makerToken;
+        IERC20TokenV06 takerToken;
+        uint128 makerAmount;
+        uint128 takerAmount;
+        address maker;
+        address txOrigin;
+        bytes32 pool;
+        uint64 expiry;
+        uint256 salt;
+    }
+
+    /// @dev Info on a limit or RFQ order.
+    struct OrderInfo {
+        bytes32 orderHash;
+        OrderStatus status;
+        uint128 takerTokenFilledAmount;
+    }
+
+    uint256 private constant UINT_128_MASK = (1 << 128) - 1;
+    uint256 private constant UINT_64_MASK = (1 << 64) - 1;
+    uint256 private constant ADDRESS_MASK = (1 << 160) - 1;
+
+    // The type hash for limit orders, which is:
+    // keccak256(abi.encodePacked(
+    //     "LimitOrder(",
+    //       "address makerToken,",
+    //       "address takerToken,",
+    //       "uint128 makerAmount,",
+    //       "uint128 takerAmount,",
+    //       "uint128 takerTokenFeeAmount,",
+    //       "address maker,",
+    //       "address taker,",
+    //       "address sender,",
+    //       "address feeRecipient,",
+    //       "bytes32 pool,",
+    //       "uint64 expiry,",
+    //       "uint256 salt"
+    //     ")"
+    // ))
+    uint256 private constant _LIMIT_ORDER_TYPEHASH =
+        0xce918627cb55462ddbb85e73de69a8b322f2bc88f4507c52fcad6d4c33c29d49;
+
+    // The type hash for RFQ orders, which is:
+    // keccak256(abi.encodePacked(
+    //     "RfqOrder(",
+    //       "address makerToken,",
+    //       "address takerToken,",
+    //       "uint128 makerAmount,",
+    //       "uint128 takerAmount,",
+    //       "address maker,",
+    //       "address txOrigin,",
+    //       "bytes32 pool,",
+    //       "uint64 expiry,",
+    //       "uint256 salt"
+    //     ")"
+    // ))
+    uint256 private constant _RFQ_ORDER_TYPEHASH =
+        0xc6b3034376598bc7f28b05e81db7ed88486dcdb6b4a6c7300353fffc5f31f382;
+
+    /// @dev Get the struct hash of a limit order.
+    /// @param order The limit order.
+    /// @return structHash The struct hash of the order.
+    function getLimitOrderStructHash(LimitOrder memory order)
+        internal
+        pure
+        returns (bytes32 structHash)
+    {
+        // The struct hash is:
+        // keccak256(abi.encode(
+        //   TYPE_HASH,
+        //   order.makerToken,
+        //   order.takerToken,
+        //   order.makerAmount,
+        //   order.takerAmount,
+        //   order.takerTokenFeeAmount,
+        //   order.maker,
+        //   order.taker,
+        //   order.sender,
+        //   order.feeRecipient,
+        //   order.pool,
+        //   order.expiry,
+        //   order.salt,
+        // ))
+        assembly {
+            let mem := mload(0x40)
+            mstore(mem, _LIMIT_ORDER_TYPEHASH)
+            // order.makerToken;
+            mstore(add(mem, 0x20), and(ADDRESS_MASK, mload(order)))
+            // order.takerToken;
+            mstore(add(mem, 0x40), and(ADDRESS_MASK, mload(add(order, 0x20))))
+            // order.makerAmount;
+            mstore(add(mem, 0x60), and(UINT_128_MASK, mload(add(order, 0x40))))
+            // order.takerAmount;
+            mstore(add(mem, 0x80), and(UINT_128_MASK, mload(add(order, 0x60))))
+            // order.takerTokenFeeAmount;
+            mstore(add(mem, 0xA0), and(UINT_128_MASK, mload(add(order, 0x80))))
+            // order.maker;
+            mstore(add(mem, 0xC0), and(ADDRESS_MASK, mload(add(order, 0xA0))))
+            // order.taker;
+            mstore(add(mem, 0xE0), and(ADDRESS_MASK, mload(add(order, 0xC0))))
+            // order.sender;
+            mstore(add(mem, 0x100), and(ADDRESS_MASK, mload(add(order, 0xE0))))
+            // order.feeRecipient;
+            mstore(add(mem, 0x120), and(ADDRESS_MASK, mload(add(order, 0x100))))
+            // order.pool;
+            mstore(add(mem, 0x140), mload(add(order, 0x120)))
+            // order.expiry;
+            mstore(add(mem, 0x160), and(UINT_64_MASK, mload(add(order, 0x140))))
+            // order.salt;
+            mstore(add(mem, 0x180), mload(add(order, 0x160)))
+            structHash := keccak256(mem, 0x1A0)
+        }
+    }
+
+    /// @dev Get the struct hash of a RFQ order.
+    /// @param order The RFQ order.
+    /// @return structHash The struct hash of the order.
+    function getRfqOrderStructHash(RfqOrder memory order)
+        internal
+        pure
+        returns (bytes32 structHash)
+    {
+        // The struct hash is:
+        // keccak256(abi.encode(
+        //   TYPE_HASH,
+        //   order.makerToken,
+        //   order.takerToken,
+        //   order.makerAmount,
+        //   order.takerAmount,
+        //   order.maker,
+        //   order.txOrigin,
+        //   order.pool,
+        //   order.expiry,
+        //   order.salt,
+        // ))
+        assembly {
+            let mem := mload(0x40)
+            mstore(mem, _RFQ_ORDER_TYPEHASH)
+            // order.makerToken;
+            mstore(add(mem, 0x20), and(ADDRESS_MASK, mload(order)))
+            // order.takerToken;
+            mstore(add(mem, 0x40), and(ADDRESS_MASK, mload(add(order, 0x20))))
+            // order.makerAmount;
+            mstore(add(mem, 0x60), and(UINT_128_MASK, mload(add(order, 0x40))))
+            // order.takerAmount;
+            mstore(add(mem, 0x80), and(UINT_128_MASK, mload(add(order, 0x60))))
+            // order.maker;
+            mstore(add(mem, 0xA0), and(ADDRESS_MASK, mload(add(order, 0x80))))
+            // order.txOrigin;
+            mstore(add(mem, 0xC0), and(ADDRESS_MASK, mload(add(order, 0xA0))))
+            // order.pool;
+            mstore(add(mem, 0xE0), mload(add(order, 0xC0)))
+            // order.expiry;
+            mstore(add(mem, 0x100), and(UINT_64_MASK, mload(add(order, 0xE0))))
+            // order.salt;
+            mstore(add(mem, 0x120), mload(add(order, 0x100)))
+            structHash := keccak256(mem, 0x140)
+        }
+    }
+}

contracts/zero-ex/contracts/src/features/libs/LibSignature.sol

@@ -0,0 +1,151 @@
+/*
+
+  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-utils/contracts/src/v06/errors/LibRichErrorsV06.sol";
+import "../../errors/LibSignatureRichErrors.sol";
+
+
+/// @dev A library for validating signatures.
+library LibSignature {
+    using LibRichErrorsV06 for bytes;
+
+    // '\x19Ethereum Signed Message:\n32\x00\x00\x00\x00' in a word.
+    uint256 private constant ETH_SIGN_HASH_PREFIX =
+        0x19457468657265756d205369676e6564204d6573736167653a0a333200000000;
+    /// @dev Exclusive upper limit on ECDSA signatures 'R' values.
+    ///      The valid range is given by fig (282) of the yellow paper.
+    uint256 private constant ECDSA_SIGNATURE_R_LIMIT =
+        uint256(0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141);
+    /// @dev Exclusive upper limit on ECDSA signatures 'S' values.
+    ///      The valid range is given by fig (283) of the yellow paper.
+    uint256 private constant ECDSA_SIGNATURE_S_LIMIT = ECDSA_SIGNATURE_R_LIMIT / 2 + 1;
+
+   /// @dev Allowed signature types.
+    enum SignatureType {
+        ILLEGAL,
+        INVALID,
+        EIP712,
+        ETHSIGN
+    }
+
+    /// @dev Encoded EC signature.
+    struct Signature {
+        // How to validate the signature.
+        SignatureType signatureType;
+        // EC Signature data.
+        uint8 v;
+        // EC Signature data.
+        bytes32 r;
+        // EC Signature data.
+        bytes32 s;
+    }
+
+    /// @dev Retrieve the signer of a signature.
+    ///      Throws if the signature can't be validated.
+    /// @param hash The hash that was signed.
+    /// @param signature The signature.
+    /// @return recovered The recovered signer address.
+    function getSignerOfHash(
+        bytes32 hash,
+        Signature memory signature
+    )
+        internal
+        pure
+        returns (address recovered)
+    {
+        // Ensure this is a signature type that can be validated against a hash.
+        _validateHashCompatibleSignature(hash, signature);
+
+        if (signature.signatureType == SignatureType.EIP712) {
+            // Signed using EIP712
+            recovered = ecrecover(
+                hash,
+                signature.v,
+                signature.r,
+                signature.s
+            );
+        } else if (signature.signatureType == SignatureType.ETHSIGN) {
+            // Signed using `eth_sign`
+            // Need to hash `hash` with "\x19Ethereum Signed Message:\n32" prefix
+            // in packed encoding.
+            bytes32 ethSignHash;
+            assembly {
+                // Use scratch space
+                mstore(0, ETH_SIGN_HASH_PREFIX) // length of 28 bytes
+                mstore(28, hash) // length of 32 bytes
+                ethSignHash := keccak256(0, 60)
+            }
+            recovered = ecrecover(
+                ethSignHash,
+                signature.v,
+                signature.r,
+                signature.s
+            );
+        }
+        // `recovered` can be null if the signature values are out of range.
+        if (recovered == address(0)) {
+            LibSignatureRichErrors.SignatureValidationError(
+                LibSignatureRichErrors.SignatureValidationErrorCodes.BAD_SIGNATURE_DATA,
+                hash
+            ).rrevert();
+        }
+    }
+
+    /// @dev Validates that a signature is compatible with a hash signee.
+    /// @param hash The hash that was signed.
+    /// @param signature The signature.
+    function _validateHashCompatibleSignature(
+        bytes32 hash,
+        Signature memory signature
+    )
+        private
+        pure
+    {
+        // Ensure the r and s are within malleability limits.
+        if (uint256(signature.r) >= ECDSA_SIGNATURE_R_LIMIT ||
+            uint256(signature.s) >= ECDSA_SIGNATURE_S_LIMIT)
+        {
+            LibSignatureRichErrors.SignatureValidationError(
+                LibSignatureRichErrors.SignatureValidationErrorCodes.BAD_SIGNATURE_DATA,
+                hash
+            ).rrevert();
+        }
+
+        // Always illegal signature.
+        if (signature.signatureType == SignatureType.ILLEGAL) {
+            LibSignatureRichErrors.SignatureValidationError(
+                LibSignatureRichErrors.SignatureValidationErrorCodes.ILLEGAL,
+                hash
+            ).rrevert();
+        }
+
+        // Always invalid.
+        if (signature.signatureType == SignatureType.INVALID) {
+            LibSignatureRichErrors.SignatureValidationError(
+                LibSignatureRichErrors.SignatureValidationErrorCodes.ALWAYS_INVALID,
+                hash
+            ).rrevert();
+        }
+
+        // Solidity should check that the signature type is within enum range for us
+        // when abi-decoding.
+    }
+}

contracts/zero-ex/contracts/src/features/libs/LibTokenSpender.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.6.5;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-erc20/contracts/src/v06/IERC20TokenV06.sol";
+import "@0x/contracts-utils/contracts/src/v06/LibSafeMathV06.sol";
+import "../../errors/LibSpenderRichErrors.sol";
+import "../ITokenSpenderFeature.sol";
+
+library LibTokenSpender {
+    using LibRichErrorsV06 for bytes;
+
+    // Mask of the lower 20 bytes of a bytes32.
+    uint256 constant private ADDRESS_MASK = 0x000000000000000000000000ffffffffffffffffffffffffffffffffffffffff;
+
+    /// @dev Transfers ERC20 tokens from `owner` to `to`.
+    /// @param token The token to spend.
+    /// @param owner The owner of the tokens.
+    /// @param to The recipient of the tokens.
+    /// @param amount The amount of `token` to transfer.
+    /// @param checkAllowance Whether or not to check the owner's allowance
+    ///        prior to attempting the transfer.
+    function spendERC20Tokens(
+        IERC20TokenV06 token,
+        address owner,
+        address to,
+        uint256 amount,
+        bool checkAllowance
+    )
+        internal
+    {
+        bool success;
+        bytes memory revertData;
+
+        require(address(token) != address(this), "LibTokenSpender/CANNOT_INVOKE_SELF");
+
+        if (checkAllowance) {
+            // If the owner doesn't have a sufficient allowance set on `address(this)`,
+            // try the old AllowanceTarget.
+            if (token.allowance(owner, address(this)) < amount) {
+                return ITokenSpenderFeature(address(this))._spendERC20Tokens(
+                    token,
+                    owner,
+                    to,
+                    amount
+                );
+            }
+        }
+
+        assembly {
+            let ptr := mload(0x40) // free memory pointer
+
+            // selector for transferFrom(address,address,uint256)
+            mstore(ptr, 0x23b872dd00000000000000000000000000000000000000000000000000000000)
+            mstore(add(ptr, 0x04), and(owner, ADDRESS_MASK))
+            mstore(add(ptr, 0x24), and(to, ADDRESS_MASK))
+            mstore(add(ptr, 0x44), amount)
+
+            success := call(gas(), and(token, ADDRESS_MASK), 0, ptr, 0x64, 0, 0)
+
+            let rdsize := returndatasize()
+
+            returndatacopy(add(ptr, 0x20), 0, rdsize) // reuse memory
+
+            // Check for ERC20 success. ERC20 tokens should return a boolean,
+            // but some don't. We accept 0-length return data as success, or at
+            // least 32 bytes that starts with a 32-byte boolean true.
+            success := and(
+                success,                             // call itself succeeded
+                or(
+                    iszero(rdsize),                  // no return data, or
+                    and(
+                        iszero(lt(rdsize, 32)),      // at least 32 bytes
+                        eq(mload(add(ptr, 0x20)), 1) // starts with uint256(1)
+                    )
+                )
+            )
+
+            if iszero(success) {
+                // revertData is a bytes, so length-prefixed data
+                mstore(ptr, rdsize)
+                revertData := ptr
+
+                // update free memory pointer (ptr + 32-byte length + return data)
+                mstore(0x40, add(add(ptr, 0x20), rdsize))
+            }
+        }
+
+        if (!success) {
+            // Try the old AllowanceTarget.
+            try ITokenSpenderFeature(address(this))._spendERC20Tokens(
+                    token,
+                    owner,
+                    to,
+                    amount
+                ) {
+            } catch {
+                // Bubble up the first error message. (In general, the fallback to the
+                // allowance target is opportunistic. We ignore the specific error
+                // message if it fails.)
+                LibSpenderRichErrors.SpenderERC20TransferFromFailedError(
+                    address(token),
+                    owner,
+                    to,
+                    amount,
+                    revertData
+                ).rrevert();
+            }
+        }
+    }
+
+    /// @dev Gets the maximum amount of an ERC20 token `token` that can be
+    ///      pulled from `owner` by this address.
+    /// @param token The token to spend.
+    /// @param owner The owner of the tokens.
+    /// @return amount The amount of tokens that can be pulled.
+    function getSpendableERC20BalanceOf(
+        IERC20TokenV06 token,
+        address owner
+    )
+        internal
+        view
+        returns (uint256)
+    {
+        return LibSafeMathV06.min256(
+            token.allowance(owner, address(this)),
+            token.balanceOf(owner)
+        );
+    }
+}

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);
     }
 }