diff --git a/.circleci/config.yml b/.circleci/config.yml index 1cf665cce7..897fca3c0d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,358 +1,350 @@ version: 2 jobs: - build: - resource_class: medium+ - docker: - - image: circleci/node:9 - environment: - CONTRACTS_COMMIT_HASH: '9ed05f5' - working_directory: ~/repo - steps: - - checkout - - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV - - run: - name: install-yarn - command: sudo npm install --global yarn@1.9.4 - - run: - name: yarn - command: yarn --frozen-lockfile install || yarn --frozen-lockfile install - - run: yarn build:ci:no_website - - save_cache: - key: repo-{{ .Environment.CIRCLE_SHA1 }} - paths: - - ~/repo - build-website: - resource_class: medium+ - docker: - - image: circleci/node:9 - working_directory: ~/repo - steps: - - restore_cache: - keys: - - repo-{{ .Environment.CIRCLE_SHA1 }} - - run: cd packages/website && yarn build - test-contracts-ganache: - docker: - - image: circleci/node:9 - working_directory: ~/repo - steps: - - restore_cache: - keys: - - repo-{{ .Environment.CIRCLE_SHA1 }} - - run: yarn wsrun test:circleci contracts - test-contracts-geth: - docker: - - image: circleci/node:9 - - image: 0xorg/devnet - working_directory: ~/repo - steps: - - restore_cache: - keys: - - repo-{{ .Environment.CIRCLE_SHA1 }} - # HACK(albrow): we need to sleep 10 seconds to ensure the devnet is - # initialized - - run: sleep 10 && TEST_PROVIDER=geth yarn wsrun test contracts - test-publish: - resource_class: medium+ - docker: - - image: circleci/node:9 - - image: 0xorg/verdaccio - working_directory: ~/repo - steps: - - restore_cache: - keys: - - repo-{{ .Environment.CIRCLE_SHA1 }} - - run: yarn test:publish:circleci - test-doc-generation: - docker: - - image: circleci/node:9 - working_directory: ~/repo - steps: - - restore_cache: - keys: - - repo-{{ .Environment.CIRCLE_SHA1 }} - - run: yarn test:generate_docs:circleci - test-rest: - docker: - - image: circleci/node:9 - working_directory: ~/repo - steps: - - restore_cache: - keys: - - repo-{{ .Environment.CIRCLE_SHA1 }} - - run: yarn wsrun test:circleci @0xproject/abi-gen - - run: yarn wsrun test:circleci @0xproject/assert - - run: yarn wsrun test:circleci @0xproject/base-contract - - run: yarn wsrun test:circleci @0xproject/connect - - run: yarn wsrun test:circleci @0xproject/contract-wrappers - - run: yarn wsrun test:circleci @0xproject/dev-utils - - run: yarn wsrun test:circleci @0xproject/json-schemas - - run: yarn wsrun test:circleci @0xproject/metacoin - - run: yarn wsrun test:circleci @0xproject/order-utils - - run: yarn wsrun test:circleci @0xproject/order-watcher - - run: yarn wsrun test:circleci @0xproject/sol-compiler - - run: yarn wsrun test:circleci @0xproject/sol-cov - - run: yarn wsrun test:circleci @0xproject/sol-doc - - run: yarn wsrun test:circleci @0xproject/sra-report - - run: yarn wsrun test:circleci @0xproject/subproviders - - run: yarn wsrun test:circleci @0xproject/web3-wrapper - - run: yarn wsrun test:circleci @0xproject/utils - - run: yarn wsrun test:circleci @0xproject/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-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 - - save_cache: - key: coverage-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }} - paths: - - ~/repo/packages/contract-wrappers/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-metacoin-{{ .Environment.CIRCLE_SHA1 }} - paths: - - ~/repo/packages/metacoin/coverage/lcov.info - - save_cache: - key: coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }} - paths: - - ~/repo/packages/order-utils/coverage/lcov.info - - save_cache: - key: coverage-order-watcher-{{ .Environment.CIRCLE_SHA1 }} - paths: - - ~/repo/packages/order-watcher/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-cov-{{ .Environment.CIRCLE_SHA1 }} - paths: - - ~/repo/packages/sol-cov/coverage/lcov.info - - save_cache: - key: coverage-sol-doc-{{ .Environment.CIRCLE_SHA1 }} - paths: - - ~/repo/packages/sol-doc/coverage/lcov.info - - save_cache: - key: coverage-sra-report-{{ .Environment.CIRCLE_SHA1 }} - paths: - - ~/repo/packages/sra-report/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: circleci/python - steps: - - checkout - - run: sudo chown -R circleci:circleci /usr/local/bin - - run: sudo chown -R circleci:circleci /usr/local/lib/python3.7/site-packages - - restore_cache: - key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }} - - run: - command: | - cd python-packages/order_utils - python -m ensurepip - python -m pip install -e .[dev] - - save_cache: - key: deps9-{{ .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 - coverage run setup.py test - - save_cache: - key: coverage-python-order-utils-{{ .Environment.CIRCLE_SHA1 }} - paths: - - ~/repo/python-packages/order_utils/.coverage - test-rest-python: - working_directory: ~/repo - docker: - - image: circleci/python - steps: - - checkout - - run: sudo chown -R circleci:circleci /usr/local/bin - - run: sudo chown -R circleci:circleci /usr/local/lib/python3.7/site-packages - - restore_cache: - key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }} - - run: - command: | - cd python-packages/order_utils - python -m ensurepip - python -m pip install -e .[dev] - - save_cache: - key: deps9-{{ .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: circleci/python - steps: - - checkout - - run: sudo chown -R circleci:circleci /usr/local/bin - - run: sudo chown -R circleci:circleci /usr/local/lib/python3.7/site-packages - - restore_cache: - key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }} - - run: - command: | - cd python-packages/order_utils - python -m ensurepip - python -m pip install -e .[dev] - - save_cache: - key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }} - paths: - - "/usr/local/bin" - - "/usr/local/lib/python3.7/site-packages" - - run: - command: | - cd python-packages/order_utils - python setup.py lint - static-tests: - working_directory: ~/repo - docker: - - image: circleci/node:9 - steps: - - restore_cache: - keys: - - repo-{{ .Environment.CIRCLE_SHA1 }} - - run: yarn lerna run lint - - run: yarn prettier:ci - - run: cd packages/0x.js && yarn build:umd:prod - - run: yarn bundlewatch - submit-coverage: - docker: - - image: circleci/node:9 - 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-base-contract-{{ .Environment.CIRCLE_SHA1 }} - - restore_cache: - keys: - - coverage-connect-{{ .Environment.CIRCLE_SHA1 }} - - restore_cache: - keys: - - coverage-contract-wrappers-{{ .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-metacoin-{{ .Environment.CIRCLE_SHA1 }} - - restore_cache: - keys: - - coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }} - - restore_cache: - keys: - - coverage-order-watcher-{{ .Environment.CIRCLE_SHA1 }} - - restore_cache: - keys: - - coverage-sol-compiler-{{ .Environment.CIRCLE_SHA1 }} - - restore_cache: - keys: - - coverage-sol-cov-{{ .Environment.CIRCLE_SHA1 }} - - restore_cache: - keys: - - coverage-sol-doc-{{ .Environment.CIRCLE_SHA1 }} - - restore_cache: - keys: - - coverage-sra-report-{{ .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-order-utils-{{ .Environment.CIRCLE_SHA1 }} - - run: yarn report_coverage + build: + resource_class: medium+ + docker: + - image: circleci/node:9 + environment: + CONTRACTS_COMMIT_HASH: '9ed05f5' + working_directory: ~/repo + steps: + - checkout + - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV + - run: + name: install-yarn + command: sudo npm install --global yarn@1.9.4 + - run: + name: yarn + command: yarn --frozen-lockfile install || yarn --frozen-lockfile install + - run: yarn build:ci:no_website + - save_cache: + key: repo-{{ .Environment.CIRCLE_SHA1 }} + paths: + - ~/repo + build-website: + resource_class: medium+ + docker: + - image: circleci/node:9 + working_directory: ~/repo + steps: + - restore_cache: + keys: + - repo-{{ .Environment.CIRCLE_SHA1 }} + - run: cd packages/website && yarn build + test-contracts-ganache: + docker: + - image: circleci/node:9 + working_directory: ~/repo + steps: + - restore_cache: + keys: + - repo-{{ .Environment.CIRCLE_SHA1 }} + - run: yarn wsrun test:circleci contracts + test-contracts-geth: + docker: + - image: circleci/node:9 + - image: 0xorg/devnet + working_directory: ~/repo + steps: + - restore_cache: + keys: + - repo-{{ .Environment.CIRCLE_SHA1 }} + # HACK(albrow): we need to sleep 10 seconds to ensure the devnet is + # initialized + - run: sleep 10 && TEST_PROVIDER=geth yarn wsrun test contracts + test-publish: + resource_class: medium+ + docker: + - image: circleci/node:9 + - image: 0xorg/verdaccio + working_directory: ~/repo + steps: + - restore_cache: + keys: + - repo-{{ .Environment.CIRCLE_SHA1 }} + - run: yarn test:publish:circleci + test-doc-generation: + docker: + - image: circleci/node:9 + working_directory: ~/repo + steps: + - restore_cache: + keys: + - repo-{{ .Environment.CIRCLE_SHA1 }} + - run: yarn test:generate_docs:circleci + test-rest: + docker: + - image: circleci/node:9 + working_directory: ~/repo + steps: + - restore_cache: + keys: + - repo-{{ .Environment.CIRCLE_SHA1 }} + - run: yarn wsrun test:circleci @0x/abi-gen + - 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 + - run: yarn wsrun test:circleci @0x/dev-utils + - run: yarn wsrun test:circleci @0x/json-schemas + - run: yarn wsrun test:circleci @0x/metacoin + - run: yarn wsrun test:circleci @0x/order-utils + - run: yarn wsrun test:circleci @0x/order-watcher + - run: yarn wsrun test:circleci @0x/sol-compiler + - run: yarn wsrun test:circleci @0x/sol-cov + - 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-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 + - save_cache: + key: coverage-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }} + paths: + - ~/repo/packages/contract-wrappers/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-metacoin-{{ .Environment.CIRCLE_SHA1 }} + paths: + - ~/repo/packages/metacoin/coverage/lcov.info + - save_cache: + key: coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }} + paths: + - ~/repo/packages/order-utils/coverage/lcov.info + - save_cache: + key: coverage-order-watcher-{{ .Environment.CIRCLE_SHA1 }} + paths: + - ~/repo/packages/order-watcher/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-cov-{{ .Environment.CIRCLE_SHA1 }} + paths: + - ~/repo/packages/sol-cov/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: circleci/python + steps: + - checkout + - run: sudo chown -R circleci:circleci /usr/local/bin + - run: sudo chown -R circleci:circleci /usr/local/lib/python3.7/site-packages + - restore_cache: + key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }} + - run: + command: | + cd python-packages/order_utils + python -m ensurepip + python -m pip install -e .[dev] + - save_cache: + key: deps9-{{ .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 + coverage run setup.py test + - save_cache: + key: coverage-python-order-utils-{{ .Environment.CIRCLE_SHA1 }} + paths: + - ~/repo/python-packages/order_utils/.coverage + test-rest-python: + working_directory: ~/repo + docker: + - image: circleci/python + steps: + - checkout + - run: sudo chown -R circleci:circleci /usr/local/bin + - run: sudo chown -R circleci:circleci /usr/local/lib/python3.7/site-packages + - restore_cache: + key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }} + - run: + command: | + cd python-packages/order_utils + python -m ensurepip + python -m pip install -e .[dev] + - save_cache: + key: deps9-{{ .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: circleci/python + steps: + - checkout + - run: sudo chown -R circleci:circleci /usr/local/bin + - run: sudo chown -R circleci:circleci /usr/local/lib/python3.7/site-packages + - restore_cache: + key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }} + - run: + command: | + cd python-packages/order_utils + python -m ensurepip + python -m pip install -e .[dev] + - save_cache: + key: deps9-{{ .Branch }}-{{ .Environment.CIRCLE_SHA1 }} + paths: + - '/usr/local/bin' + - '/usr/local/lib/python3.7/site-packages' + - run: + command: | + cd python-packages/order_utils + python setup.py lint + static-tests: + working_directory: ~/repo + docker: + - image: circleci/node:9 + steps: + - restore_cache: + keys: + - repo-{{ .Environment.CIRCLE_SHA1 }} + - run: yarn lerna run lint + - run: yarn prettier:ci + - run: cd packages/0x.js && yarn build:umd:prod + - run: yarn bundlewatch + submit-coverage: + docker: + - image: circleci/node:9 + 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-base-contract-{{ .Environment.CIRCLE_SHA1 }} + - restore_cache: + keys: + - coverage-connect-{{ .Environment.CIRCLE_SHA1 }} + - restore_cache: + keys: + - coverage-contract-wrappers-{{ .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-metacoin-{{ .Environment.CIRCLE_SHA1 }} + - restore_cache: + keys: + - coverage-order-utils-{{ .Environment.CIRCLE_SHA1 }} + - restore_cache: + keys: + - coverage-order-watcher-{{ .Environment.CIRCLE_SHA1 }} + - restore_cache: + keys: + - coverage-sol-compiler-{{ .Environment.CIRCLE_SHA1 }} + - restore_cache: + keys: + - coverage-sol-cov-{{ .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-order-utils-{{ .Environment.CIRCLE_SHA1 }} + - run: yarn report_coverage workflows: - version: 2 - main: - jobs: - - build - - build-website: - requires: + version: 2 + main: + jobs: - build - - test-contracts-ganache: - requires: - - build - - test-contracts-geth: - requires: - - build - - test-rest: - requires: - - build - - static-tests: - requires: - - build - - test-publish: - requires: - - build - - test-doc-generation: - requires: - - build - - submit-coverage: - requires: - - test-rest + - build-website: + requires: + - build + - test-contracts-ganache: + requires: + - build + - test-contracts-geth: + requires: + - build + - test-rest: + requires: + - build + - static-tests: + requires: + - build + - test-publish: + requires: + - build + - test-doc-generation: + requires: + - build + - submit-coverage: + requires: + - test-rest + - test-python - test-python - - test-python - - static-tests-python - # skip python tox run for now, as we don't yet have multiple test environments to support. - #- test-rest-python + - static-tests-python + # skip python tox run for now, as we don't yet have multiple test environments to support. + #- test-rest-python diff --git a/.gitattributes b/.gitattributes index b786d1f1de..f885b01276 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,7 @@ *.sol linguist-language=Solidity # Automatically collapse generated files in GitHub. +*.svg linguist-generated packages/contract-artifacts/artifacts/*json linguist-generated packages/abi-gen-wrappers/wrappers/*.ts liguist-generated + diff --git a/README.md b/README.md index d850d5703a..0be459d813 100644 --- a/README.md +++ b/README.md @@ -20,39 +20,38 @@ If you're developing on 0x now or are interested in using 0x infrastructure in t ### Published 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) | A Javascript library for interacting with the 0x protocol | -| [`@0xproject/abi-gen`](/packages/abi-gen) | [![npm](https://img.shields.io/npm/v/@0xproject/abi-gen.svg)](https://www.npmjs.com/package/@0xproject/abi-gen) | Tool to generate TS wrappers from smart contract ABIs | -| [`@0xproject/assert`](/packages/assert) | [![npm](https://img.shields.io/npm/v/@0xproject/assert.svg)](https://www.npmjs.com/package/@0xproject/assert) | Type and schema assertions used by our packages | -| [`@0xproject/asset-buyer`](/packages/asset-buyer) | [![npm](https://img.shields.io/npm/v/@0xproject/asset-buyer.svg)](https://www.npmjs.com/package/@0xproject/asset-buyer) | Convenience package for discovering and buying assets with Ether. | -| [`@0xproject/base-contract`](/packages/base-contract) | [![npm](https://img.shields.io/npm/v/@0xproject/base-contract.svg)](https://www.npmjs.com/package/@0xproject/base-contract) | BaseContract used by auto-generated `abi-gen` wrapper contracts | -| [`@0xproject/connect`](/packages/connect) | [![npm](https://img.shields.io/npm/v/@0xproject/connect.svg)](https://www.npmjs.com/package/@0xproject/connect) | A Javascript library for interacting with the Standard Relayer API | -| [`@0xproject/dev-utils`](/packages/dev-utils) | [![npm](https://img.shields.io/npm/v/@0xproject/dev-utils.svg)](https://www.npmjs.com/package/@0xproject/dev-utils) | Dev utils to be shared across 0x projects and packages | -| [`@0xproject/json-schemas`](/packages/json-schemas) | [![npm](https://img.shields.io/npm/v/@0xproject/json-schemas.svg)](https://www.npmjs.com/package/@0xproject/json-schemas) | 0x-related json schemas | -| [`@0xproject/monorepo-scripts`](/packages/monorepo-scripts) | [![npm](https://img.shields.io/npm/v/@0xproject/monorepo-scripts.svg)](https://www.npmjs.com/package/@0xproject/monorepo-scripts) | Monorepo scripts | -| [`@0xproject/order-utils`](/packages/order-utils) | [![npm](https://img.shields.io/npm/v/@0xproject/order-utils.svg)](https://www.npmjs.com/package/@0xproject/order-utils) | A set of utilities for generating, parsing, signing and validating 0x orders. | -| [`@0xproject/react-docs`](/packages/react-docs) | [![npm](https://img.shields.io/npm/v/@0xproject/react-docs.svg)](https://www.npmjs.com/package/@0xproject/react-docs) | React documentation component for rendering TypeDoc & Doxity generated JSON | -| [`@0xproject/react-shared`](/packages/react-shared) | [![npm](https://img.shields.io/npm/v/@0xproject/react-shared.svg)](https://www.npmjs.com/package/@0xproject/react-shared) | 0x shared react components | -| [`@0xproject/sol-compiler`](/packages/sol-compiler) | [![npm](https://img.shields.io/npm/v/@0xproject/sol-compiler.svg)](https://www.npmjs.com/package/@0xproject/sol-compiler) | A thin wrapper around Solc.js that outputs artifacts, resolves imports, only re-compiles when needed, and other niceties. | -| [`@0xproject/sol-cov`](/packages/sol-cov) | [![npm](https://img.shields.io/npm/v/@0xproject/sol-cov.svg)](https://www.npmjs.com/package/@0xproject/sol-cov) | Solidity test coverage tool | -| [`@0xproject/sra-spec`](/packages/sra-spec) | [![npm](https://img.shields.io/npm/v/@0xproject/sra-spec.svg)](https://www.npmjs.com/package/@0xproject/sra-spec) | OpenAPI specification for the standard relayer API | -| [`@0xproject/sra-report`](/packages/sra-report) | [![npm](https://img.shields.io/npm/v/@0xproject/sra-report.svg)](https://www.npmjs.com/package/@0xproject/sra-report) | Generate reports for standard relayer API compliance | -| [`@0xproject/subproviders`](/packages/subproviders) | [![npm](https://img.shields.io/npm/v/@0xproject/subproviders.svg)](https://www.npmjs.com/package/@0xproject/subproviders) | Useful web3 subproviders (e.g LedgerSubprovider) | -| [`@0xproject/tslint-config`](/packages/tslint-config) | [![npm](https://img.shields.io/npm/v/@0xproject/tslint-config.svg)](https://www.npmjs.com/package/@0xproject/tslint-config) | Custom 0x development TSLint rules | -| [`@0xproject/types`](/packages/types) | [![npm](https://img.shields.io/npm/v/@0xproject/types.svg)](https://www.npmjs.com/package/@0xproject/types) | Shared type declarations | -| [`@0xproject/typescript-typings`](/packages/typescript-typings) | [![npm](https://img.shields.io/npm/v/@0xproject/typescript-typings.svg)](https://www.npmjs.com/package/@0xproject/typescript-typings) | Repository of types for external packages | -| [`@0xproject/utils`](/packages/utils) | [![npm](https://img.shields.io/npm/v/@0xproject/utils.svg)](https://www.npmjs.com/package/@0xproject/utils) | Shared utilities | -| [`@0xproject/web3-wrapper`](/packages/web3-wrapper) | [![npm](https://img.shields.io/npm/v/@0xproject/web3-wrapper.svg)](https://www.npmjs.com/package/@0xproject/web3-wrapper) | Web3 wrapper | +| 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) | A Javascript library for interacting with the 0x protocol | +| [`@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/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/asset-buyer`](/packages/asset-buyer) | [![npm](https://img.shields.io/npm/v/@0x/asset-buyer.svg)](https://www.npmjs.com/package/@0x/asset-buyer) | Convenience package for discovering and buying assets with Ether. | +| [`@0x/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/connect`](/packages/connect) | [![npm](https://img.shields.io/npm/v/@0x/connect.svg)](https://www.npmjs.com/package/@0x/connect) | A Javascript library for interacting with the Standard Relayer API | +| [`@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 projects and packages | +| [`@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/monorepo-scripts`](/packages/monorepo-scripts) | [![npm](https://img.shields.io/npm/v/@0x/monorepo-scripts.svg)](https://www.npmjs.com/package/@0x/monorepo-scripts) | Monorepo scripts | +| [`@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/react-docs`](/packages/react-docs) | [![npm](https://img.shields.io/npm/v/@0x/react-docs.svg)](https://www.npmjs.com/package/@0x/react-docs) | React documentation component for rendering TypeDoc & Doxity generated JSON | +| [`@0x/react-shared`](/packages/react-shared) | [![npm](https://img.shields.io/npm/v/@0x/react-shared.svg)](https://www.npmjs.com/package/@0x/react-shared) | 0x shared react components | +| [`@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 thin wrapper around Solc.js that outputs artifacts, resolves imports, only re-compiles when needed, and other niceties. | +| [`@0x/sol-cov`](/packages/sol-cov) | [![npm](https://img.shields.io/npm/v/@0x/sol-cov.svg)](https://www.npmjs.com/package/@0x/sol-cov) | Solidity test coverage tool | +| [`@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/subproviders`](/packages/subproviders) | [![npm](https://img.shields.io/npm/v/@0x/subproviders.svg)](https://www.npmjs.com/package/@0x/subproviders) | Useful web3 subproviders (e.g LedgerSubprovider) | +| [`@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 0x development TSLint rules | +| [`@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/web3-wrapper`](/packages/web3-wrapper) | [![npm](https://img.shields.io/npm/v/@0x/web3-wrapper.svg)](https://www.npmjs.com/package/@0x/web3-wrapper) | Web3 wrapper | ### Private Packages -| Package | Description | -| --------------------------------------------------------------- | ---------------------------------------------------------------- | -| [`@0xproject/contracts`](/packages/contracts) | 0x solidity smart contracts & tests | -| [`@0xproject/react-docs-example`](/packages/react-docs-example) | Example documentation site created with `@0xproject/react-docs` | -| [`@0xproject/testnet-faucets`](/packages/testnet-faucets) | A faucet micro-service that dispenses test ERC20 tokens or Ether | -| [`@0xproject/website`](/packages/website) | 0x website & Portal DApp | +| Package | Description | +| -------------------------------------------------------- | ---------------------------------------------------------------- | +| [`@0x/contracts`](/packages/contracts) | 0x solidity smart contracts & tests | +| [`@0x/react-docs-example`](/packages/react-docs-example) | Example documentation site created with `@0x/react-docs` | +| [`@0x/testnet-faucets`](/packages/testnet-faucets) | A faucet micro-service that dispenses test ERC20 tokens or Ether | +| [`@0x/website`](/packages/website) | 0x website & Portal DApp | ## Usage @@ -71,10 +70,10 @@ Dedicated documentation pages: Node version >= 6.12 is required. Most of the packages require additional typings for external dependencies. -You can include those by prepending the `@0xproject/typescript-typings` package to your [`typeRoots`](http://www.typescriptlang.org/docs/handbook/tsconfig-json.html) config. +You can include those by prepending the `@0x/typescript-typings` package to your [`typeRoots`](http://www.typescriptlang.org/docs/handbook/tsconfig-json.html) config. ```json -"typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"], +"typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"], ``` ## Contributing @@ -104,7 +103,7 @@ yarn build To build a specific package: ```bash -PKG=@0xproject/web3-wrapper yarn build +PKG=@0x/web3-wrapper yarn build ``` ### Watch @@ -121,7 +120,7 @@ To watch a specific package and all it's dependent packages: PKG=[NPM_PACKAGE_NAME] yarn watch e.g -PKG=@0xproject/web3-wrapper yarn watch +PKG=@0x/web3-wrapper yarn watch ``` ### Clean @@ -177,5 +176,5 @@ yarn test Run a specific package's test: ```bash -PKG=@0xproject/web3-wrapper yarn test +PKG=@0x/web3-wrapper yarn test ``` diff --git a/package.json b/package.json index 9785cd6729..c786e7f19c 100644 --- a/package.json +++ b/package.json @@ -23,9 +23,9 @@ "wsrun": "wsrun", "lerna": "lerna", "build": "wsrun build $PKG --fast-exit -r --stages", - "build:no_website": "wsrun build $PKG --fast-exit -r --stages --exclude @0xproject/website", - "build:ci:no_website": "wsrun build:ci $PKG --fast-exit -r --stages --exclude @0xproject/website", - "build:monorepo_scripts": "PKG=@0xproject/monorepo-scripts yarn build", + "build:no_website": "wsrun build $PKG --fast-exit -r --stages --exclude @0x/website", + "build:ci:no_website": "wsrun build:ci $PKG --fast-exit -r --stages --exclude @0x/website", + "build:monorepo_scripts": "PKG=@0x/monorepo-scripts yarn build", "build:ts": "tsc -b", "watch:ts": "tsc -b -w", "clean": "wsrun clean $PKG --fast-exit -r --parallel", @@ -42,7 +42,7 @@ "mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic", "packagesWithDocPages": "0x.js connect json-schemas subproviders web3-wrapper contract-wrappers order-utils order-watcher sol-compiler sol-cov ethereum-types asset-buyer" }, - "bundlewatch" : { + "bundlewatch": { "files": [ { "path": "packages/0x.js/_bundles/index.min.js", @@ -54,18 +54,22 @@ } ], "ci": { - "trackBranches": ["master", "development"], + "trackBranches": [ + "master", + "development" + ], "repoBranchBase": "development" } }, "devDependencies": { "@0x-lerna-fork/lerna": "3.0.0-beta.25", + "@0xproject/npm-cli-login": "^0.0.11", "async-child-process": "^1.1.1", "bundlewatch": "^0.2.1", "coveralls": "^3.0.0", "ganache-cli": "6.1.8", "lcov-result-merger": "^3.0.0", - "@0xproject/npm-cli-login": "^0.0.11", + "lerna": "^3.0.0-beta.25", "npm-run-all": "^4.1.2", "prettier": "^1.11.1", "source-map-support": "^0.5.6", diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json index 98791139fb..a404ed481a 100644 --- a/packages/0x.js/CHANGELOG.json +++ b/packages/0x.js/CHANGELOG.json @@ -29,7 +29,8 @@ "note": "Export new `AssetData` type from types", "pr": 1131 } - ] + ], + "timestamp": 1539871071 }, { "version": "1.0.8", diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md index 27702413d6..939ada5191 100644 --- a/packages/0x.js/CHANGELOG.md +++ b/packages/0x.js/CHANGELOG.md @@ -5,6 +5,15 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.0 - _October 18, 2018_ + + * Add support for `eth_signTypedData`. (#1102) + * Added `MetamaskSubprovider` to handle inconsistencies in Metamask's signing JSON RPC endpoints. (#1102) + * Removed `SignerType` (including `SignerType.Metamask`). Please use the `MetamaskSubprovider` to wrap `web3.currentProvider`. (#1102) + * Updated to use new modularized artifacts and the latest version of @0xproject/contract-wrappers (#1105) + * Make web3-provider-engine types a 'dependency' so it's available to users of the library (#1105) + * Export new `AssetData` type from types (#1131) + ## v1.0.8 - _October 4, 2018_ * Dependencies updated @@ -49,7 +58,7 @@ CHANGELOG * Re-organize the exported interface of 0x.js. Remove the `ZeroEx` class, and instead export the same exports as `0x.js`'s sub-packages: `@0xproject/contract-wrappers`, `@0xproject/order-utils` and `@0xproject/order-watcher` (#963) -## v1.0.1-rc.3 - _August 13, 2018_ +## v1.0.1-rc.3 - _August 14, 2018_ * Dependencies updated * Update ecSignOrderHashAsync to return the signature as a string for immediate use in contracts (#914) diff --git a/packages/0x.js/README.md b/packages/0x.js/README.md index 3290373247..5b7a2308cb 100644 --- a/packages/0x.js/README.md +++ b/packages/0x.js/README.md @@ -33,7 +33,7 @@ If your project is in [TypeScript](https://www.typescriptlang.org/), add the fol ```json "compilerOptions": { - "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"], + "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"], } ``` diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index c439c8af32..56999d3e5f 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -1,6 +1,6 @@ { "name": "0x.js", - "version": "1.0.8", + "version": "2.0.0", "engines": { "node": ">=6.12" }, @@ -42,13 +42,12 @@ }, "license": "Apache-2.0", "devDependencies": { - "@0xproject/contract-addresses": "^1.0.0", - "@0xproject/abi-gen": "^1.0.13", - "@0xproject/abi-gen-wrappers": "^1.0.0", - "@0xproject/dev-utils": "^1.0.12", - "@0xproject/migrations": "^1.0.14", - "@0xproject/monorepo-scripts": "^1.0.11", - "@0xproject/tslint-config": "^1.0.8", + "@0x/abi-gen": "^1.0.14", + "@0x/abi-gen-wrappers": "^1.0.1", + "@0x/contract-addresses": "^1.0.1", + "@0x/dev-utils": "^1.0.13", + "@0x/migrations": "^2.0.0", + "@0x/tslint-config": "^1.0.9", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", "@types/node": "*", @@ -74,18 +73,18 @@ "webpack": "^4.20.2" }, "dependencies": { - "@0xproject/assert": "^1.0.13", - "@0xproject/base-contract": "^3.0.1", - "@0xproject/contract-wrappers": "^2.0.2", - "@0xproject/order-utils": "^1.0.7", - "@0xproject/order-watcher": "^2.1.1", - "@0xproject/subproviders": "^2.0.7", - "@0xproject/types": "^1.1.4", - "@0xproject/typescript-typings": "^3.0.2", - "@0xproject/utils": "^2.0.2", - "@0xproject/web3-wrapper": "^3.0.3", + "@0x/assert": "^1.0.14", + "@0x/base-contract": "^3.0.2", + "@0x/contract-wrappers": "^3.0.0", + "@0x/order-utils": "^2.0.0", + "@0x/order-watcher": "^2.2.0", + "@0x/subproviders": "^2.1.0", + "@0x/types": "^1.2.0", + "@0x/typescript-typings": "^3.0.3", + "@0x/utils": "^2.0.3", + "@0x/web3-wrapper": "^3.1.0", "@types/web3-provider-engine": "^14.0.0", - "ethereum-types": "^1.0.11", + "ethereum-types": "^1.1.1", "ethers": "~4.0.4", "lodash": "^4.17.5", "web3-provider-engine": "14.0.6" diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts index 2fcfb5ce7c..2df360b963 100644 --- a/packages/0x.js/src/index.ts +++ b/packages/0x.js/src/index.ts @@ -1,6 +1,6 @@ -export { ContractAddresses } from '@0xproject/contract-addresses'; +export { ContractAddresses } from '@0x/contract-addresses'; -export { assetDataUtils, signatureUtils, generatePseudoRandomSalt, orderHashUtils } from '@0xproject/order-utils'; +export { assetDataUtils, signatureUtils, generatePseudoRandomSalt, orderHashUtils } from '@0x/order-utils'; export { ContractWrappers, @@ -27,7 +27,7 @@ export { OrderAndTraderInfo, TraderInfo, ValidateOrderFillableOpts, -} from '@0xproject/contract-wrappers'; +} from '@0x/contract-wrappers'; export { WETH9Events, @@ -52,9 +52,9 @@ export { ExchangeCancelEventArgs, ExchangeEventArgs, ExchangeEvents, -} from '@0xproject/abi-gen-wrappers'; +} from '@0x/abi-gen-wrappers'; -export { OrderWatcher, OnOrderStateChangeCallback, OrderWatcherConfig } from '@0xproject/order-watcher'; +export { OrderWatcher, OnOrderStateChangeCallback, OrderWatcherConfig } from '@0x/order-watcher'; export import Web3ProviderEngine = require('web3-provider-engine'); @@ -64,11 +64,11 @@ export { JSONRPCRequestPayloadWithMethod, ErrorCallback, MetamaskSubprovider, -} from '@0xproject/subproviders'; +} from '@0x/subproviders'; -export { AbiDecoder } from '@0xproject/utils'; +export { AbiDecoder } from '@0x/utils'; -export { BigNumber } from '@0xproject/utils'; +export { BigNumber } from '@0x/utils'; export { ExchangeContractErrs, @@ -85,7 +85,7 @@ export { SignatureType, OrderRelevantState, Stats, -} from '@0xproject/types'; +} from '@0x/types'; export { BlockParamLiteral, diff --git a/packages/0x.js/tslint.json b/packages/0x.js/tslint.json index ffaefe83a6..dd9053357e 100644 --- a/packages/0x.js/tslint.json +++ b/packages/0x.js/tslint.json @@ -1,3 +1,3 @@ { - "extends": ["@0xproject/tslint-config"] + "extends": ["@0x/tslint-config"] } diff --git a/packages/abi-gen-wrappers/CHANGELOG.json b/packages/abi-gen-wrappers/CHANGELOG.json index d91ad0b36e..211d79d26d 100644 --- a/packages/abi-gen-wrappers/CHANGELOG.json +++ b/packages/abi-gen-wrappers/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1539871071, + "version": "1.0.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "1.0.0", "changes": [ diff --git a/packages/abi-gen-wrappers/CHANGELOG.md b/packages/abi-gen-wrappers/CHANGELOG.md new file mode 100644 index 0000000000..df72b112c5 --- /dev/null +++ b/packages/abi-gen-wrappers/CHANGELOG.md @@ -0,0 +1,14 @@ + + +CHANGELOG + +## v1.0.1 - _October 18, 2018_ + + * Dependencies updated + +## v1.0.0 - _Invalid date_ + + * Initial release (#1105) diff --git a/packages/abi-gen-wrappers/README.md b/packages/abi-gen-wrappers/README.md index f904f9af89..bcf58ae067 100644 --- a/packages/abi-gen-wrappers/README.md +++ b/packages/abi-gen-wrappers/README.md @@ -1,29 +1,29 @@ -## @0xproject/abi-gen-wrappers +## @0x/abi-gen-wrappers -Low-level 0x smart contract wrappers generated using @0xproject/abi-gen. These +Low-level 0x smart contract wrappers generated using @0x/abi-gen. These low-level wrappers are imported by other packages in the 0x monorepo and application developers are not expected to import this package directly. You may also be interested in the -[@0xproject/contract-wrappers](../contract-wrappers/README.md) package which +[@0x/contract-wrappers](../contract-wrappers/README.md) package which includes some higher-level features. ## Installation ```bash -yarn add @0xproject/abi-gen-wrappers +yarn add @0x/abi-gen-wrappers ``` **Import** ```typescript -import * as wrappers from '@0xproject/abi-gen-wrappers'; +import * as wrappers from '@0x/abi-gen-wrappers'; ``` or ```javascript -var wrappers = require('@0xproject/abi-gen-wrappers'); +var wrappers = require('@0x/abi-gen-wrappers'); ``` ## Contributing @@ -51,7 +51,7 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/abi-gen-wrappers yarn build +PKG=@0x/abi-gen-wrappers yarn build ``` ### Clean diff --git a/packages/abi-gen-wrappers/package.json b/packages/abi-gen-wrappers/package.json index a660d30154..313cc339d1 100644 --- a/packages/abi-gen-wrappers/package.json +++ b/packages/abi-gen-wrappers/package.json @@ -1,10 +1,10 @@ { - "name": "@0xproject/abi-gen-wrappers", - "version": "1.0.0", + "name": "@0x/abi-gen-wrappers", + "version": "1.0.1", "engines": { "node": ">=6.12" }, - "description": "Low-level 0x smart contract wrappers generated using @0xproject/abi-gen", + "description": "Low-level 0x smart contract wrappers generated using @0x/abi-gen", "main": "lib/src/index.js", "directories": { "test": "test" @@ -12,6 +12,7 @@ "scripts": { "build": "yarn pre_build && tsc -b", "build:ci": "yarn build", + "lint": "tslint --project .", "pre_build": "yarn generate_contract_wrappers", "clean": "shx rm -rf lib wrappers", "generate_contract_wrappers": "abi-gen --abis ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated-wrappers --backend ethers" @@ -29,11 +30,17 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen-wrappers/README.md", "devDependencies": { - "@0xproject/abi-gen": "^1.0.12", + "@0x/abi-gen": "^1.0.14", + "@0x/tslint-config": "^1.0.9", + "@0x/utils": "^2.0.3", + "@0x/web3-wrapper": "^3.1.0", + "ethereum-types": "^1.1.1", + "ethers": "~4.0.4", + "lodash": "^4.17.5", "shx": "^0.2.2" }, "dependencies": { - "@0xproject/base-contract": "^3.0.1" + "@0x/base-contract": "^3.0.2" }, "publishConfig": { "access": "public" diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts b/packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts index 464f803053..8ca70e0264 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts @@ -1,10 +1,10 @@ // tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace class-name // tslint:disable:no-unused-variable // tslint:disable:no-unbound-method -import { BaseContract } from '@0xproject/base-contract'; +import { BaseContract } from '@0x/base-contract'; import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types'; -import { BigNumber, classUtils, logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber, classUtils, logUtils } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as ethers from 'ethers'; import * as _ from 'lodash'; // tslint:enable:no-unused-variable diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc20_token.ts b/packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc20_token.ts index f8ba30cb14..1efeeed0ae 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc20_token.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc20_token.ts @@ -1,10 +1,10 @@ // tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace class-name // tslint:disable:no-unused-variable // tslint:disable:no-unbound-method -import { BaseContract } from '@0xproject/base-contract'; +import { BaseContract } from '@0x/base-contract'; import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types'; -import { BigNumber, classUtils, logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber, classUtils, logUtils } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as ethers from 'ethers'; import * as _ from 'lodash'; // tslint:enable:no-unused-variable diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc721_token.ts b/packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc721_token.ts index ec56448fcc..cc5f9679ff 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc721_token.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/dummy_erc721_token.ts @@ -1,10 +1,10 @@ // tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace class-name // tslint:disable:no-unused-variable // tslint:disable:no-unbound-method -import { BaseContract } from '@0xproject/base-contract'; +import { BaseContract } from '@0x/base-contract'; import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types'; -import { BigNumber, classUtils, logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber, classUtils, logUtils } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as ethers from 'ethers'; import * as _ from 'lodash'; // tslint:enable:no-unused-variable diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts b/packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts index 0130faec5a..ab207b38e3 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts @@ -1,10 +1,10 @@ // tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace class-name // tslint:disable:no-unused-variable // tslint:disable:no-unbound-method -import { BaseContract } from '@0xproject/base-contract'; +import { BaseContract } from '@0x/base-contract'; import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types'; -import { BigNumber, classUtils, logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber, classUtils, logUtils } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as ethers from 'ethers'; import * as _ from 'lodash'; // tslint:enable:no-unused-variable diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts b/packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts index 5a51561d7a..8ee563b7ef 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts @@ -1,10 +1,10 @@ // tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace class-name // tslint:disable:no-unused-variable // tslint:disable:no-unbound-method -import { BaseContract } from '@0xproject/base-contract'; +import { BaseContract } from '@0x/base-contract'; import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types'; -import { BigNumber, classUtils, logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber, classUtils, logUtils } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as ethers from 'ethers'; import * as _ from 'lodash'; // tslint:enable:no-unused-variable diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/erc721_proxy.ts b/packages/abi-gen-wrappers/src/generated-wrappers/erc721_proxy.ts index 97c9ed0bcc..691c555786 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/erc721_proxy.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/erc721_proxy.ts @@ -1,10 +1,10 @@ // tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace class-name // tslint:disable:no-unused-variable // tslint:disable:no-unbound-method -import { BaseContract } from '@0xproject/base-contract'; +import { BaseContract } from '@0x/base-contract'; import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types'; -import { BigNumber, classUtils, logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber, classUtils, logUtils } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as ethers from 'ethers'; import * as _ from 'lodash'; // tslint:enable:no-unused-variable diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/erc721_token.ts b/packages/abi-gen-wrappers/src/generated-wrappers/erc721_token.ts index 0e25c97b8a..d1a2d5670c 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/erc721_token.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/erc721_token.ts @@ -1,10 +1,10 @@ // tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace class-name // tslint:disable:no-unused-variable // tslint:disable:no-unbound-method -import { BaseContract } from '@0xproject/base-contract'; +import { BaseContract } from '@0x/base-contract'; import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types'; -import { BigNumber, classUtils, logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber, classUtils, logUtils } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as ethers from 'ethers'; import * as _ from 'lodash'; // tslint:enable:no-unused-variable diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts b/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts index 869ad6f105..ffd4980556 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts @@ -1,10 +1,10 @@ // tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace class-name // tslint:disable:no-unused-variable // tslint:disable:no-unbound-method -import { BaseContract } from '@0xproject/base-contract'; +import { BaseContract } from '@0x/base-contract'; import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types'; -import { BigNumber, classUtils, logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber, classUtils, logUtils } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as ethers from 'ethers'; import * as _ from 'lodash'; // tslint:enable:no-unused-variable diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts b/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts index afcf902345..80bbc52c78 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts @@ -1,10 +1,10 @@ // tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace class-name // tslint:disable:no-unused-variable // tslint:disable:no-unbound-method -import { BaseContract } from '@0xproject/base-contract'; +import { BaseContract } from '@0x/base-contract'; import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types'; -import { BigNumber, classUtils, logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber, classUtils, logUtils } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as ethers from 'ethers'; import * as _ from 'lodash'; // tslint:enable:no-unused-variable diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/i_validator.ts b/packages/abi-gen-wrappers/src/generated-wrappers/i_validator.ts index ff5160680e..203a66b6db 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/i_validator.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/i_validator.ts @@ -1,10 +1,10 @@ // tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace class-name // tslint:disable:no-unused-variable // tslint:disable:no-unbound-method -import { BaseContract } from '@0xproject/base-contract'; +import { BaseContract } from '@0x/base-contract'; import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types'; -import { BigNumber, classUtils, logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber, classUtils, logUtils } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as ethers from 'ethers'; import * as _ from 'lodash'; // tslint:enable:no-unused-variable diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/i_wallet.ts b/packages/abi-gen-wrappers/src/generated-wrappers/i_wallet.ts index a9a56ad14e..99809a0490 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/i_wallet.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/i_wallet.ts @@ -1,10 +1,10 @@ // tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace class-name // tslint:disable:no-unused-variable // tslint:disable:no-unbound-method -import { BaseContract } from '@0xproject/base-contract'; +import { BaseContract } from '@0x/base-contract'; import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types'; -import { BigNumber, classUtils, logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber, classUtils, logUtils } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as ethers from 'ethers'; import * as _ from 'lodash'; // tslint:enable:no-unused-variable diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/order_validator.ts b/packages/abi-gen-wrappers/src/generated-wrappers/order_validator.ts index 6be61656b1..38233af3f3 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/order_validator.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/order_validator.ts @@ -1,10 +1,10 @@ // tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace class-name // tslint:disable:no-unused-variable // tslint:disable:no-unbound-method -import { BaseContract } from '@0xproject/base-contract'; +import { BaseContract } from '@0x/base-contract'; import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types'; -import { BigNumber, classUtils, logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber, classUtils, logUtils } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as ethers from 'ethers'; import * as _ from 'lodash'; // tslint:enable:no-unused-variable diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts b/packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts index b65cf9e9e8..86d1031db5 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/weth9.ts @@ -1,10 +1,10 @@ // tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace class-name // tslint:disable:no-unused-variable // tslint:disable:no-unbound-method -import { BaseContract } from '@0xproject/base-contract'; +import { BaseContract } from '@0x/base-contract'; import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types'; -import { BigNumber, classUtils, logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber, classUtils, logUtils } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as ethers from 'ethers'; import * as _ from 'lodash'; // tslint:enable:no-unused-variable diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/zrx_token.ts b/packages/abi-gen-wrappers/src/generated-wrappers/zrx_token.ts index 818509972a..98079e77b8 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/zrx_token.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/zrx_token.ts @@ -1,10 +1,10 @@ // tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace class-name // tslint:disable:no-unused-variable // tslint:disable:no-unbound-method -import { BaseContract } from '@0xproject/base-contract'; +import { BaseContract } from '@0x/base-contract'; import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types'; -import { BigNumber, classUtils, logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber, classUtils, logUtils } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as ethers from 'ethers'; import * as _ from 'lodash'; // tslint:enable:no-unused-variable diff --git a/packages/abi-gen-wrappers/tslint.json b/packages/abi-gen-wrappers/tslint.json new file mode 100644 index 0000000000..dd9053357e --- /dev/null +++ b/packages/abi-gen-wrappers/tslint.json @@ -0,0 +1,3 @@ +{ + "extends": ["@0x/tslint-config"] +} diff --git a/packages/abi-gen/CHANGELOG.json b/packages/abi-gen/CHANGELOG.json index d5e0f94695..4bec241836 100644 --- a/packages/abi-gen/CHANGELOG.json +++ b/packages/abi-gen/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1539871071, + "version": "1.0.14", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "1.0.13", "changes": [ diff --git a/packages/abi-gen/CHANGELOG.md b/packages/abi-gen/CHANGELOG.md index ed955a0519..61c4d84874 100644 --- a/packages/abi-gen/CHANGELOG.md +++ b/packages/abi-gen/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.14 - _October 18, 2018_ + + * Dependencies updated + ## v1.0.13 - _October 4, 2018_ * Dependencies updated @@ -37,7 +41,7 @@ CHANGELOG * Dependencies updated -## v1.0.5 - _August 13, 2018_ +## v1.0.5 - _August 14, 2018_ * Dependencies updated diff --git a/packages/abi-gen/README.md b/packages/abi-gen/README.md index b6dd37cd1a..20b9d4f308 100644 --- a/packages/abi-gen/README.md +++ b/packages/abi-gen/README.md @@ -8,7 +8,7 @@ You can write your custom handlebars templates which will allow you to seamlessl ## Installation -`yarn add -g @0xproject/abi-gen` +`yarn add -g @0x/abi-gen` ## Usage @@ -82,13 +82,13 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/abi-gen yarn build +PKG=@0x/abi-gen yarn build ``` Or continuously rebuild on change: ```bash -PKG=@0xproject/abi-gen yarn watch +PKG=@0x/abi-gen yarn watch ``` ### Clean diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index bd8c2e7492..f32bb3a317 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -1,6 +1,6 @@ { - "name": "@0xproject/abi-gen", - "version": "1.0.13", + "name": "@0x/abi-gen", + "version": "1.0.14", "engines": { "node": ">=6.12" }, @@ -31,10 +31,10 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/abi-gen/README.md", "dependencies": { - "@0xproject/typescript-typings": "^3.0.2", - "@0xproject/utils": "^2.0.2", + "@0x/typescript-typings": "^3.0.3", + "@0x/utils": "^2.0.3", "chalk": "^2.3.0", - "ethereum-types": "^1.0.11", + "ethereum-types": "^1.1.1", "glob": "^7.1.2", "handlebars": "^4.0.11", "lodash": "^4.17.5", @@ -45,7 +45,7 @@ "yargs": "^10.0.3" }, "devDependencies": { - "@0xproject/tslint-config": "^1.0.8", + "@0x/tslint-config": "^1.0.9", "@types/glob": "5.0.35", "@types/handlebars": "^4.0.36", "@types/mkdirp": "^0.5.1", diff --git a/packages/abi-gen/src/index.ts b/packages/abi-gen/src/index.ts index f5283b97a7..5bad920cab 100644 --- a/packages/abi-gen/src/index.ts +++ b/packages/abi-gen/src/index.ts @@ -1,6 +1,6 @@ #!/usr/bin/env node -import { abiUtils, logUtils } from '@0xproject/utils'; +import { abiUtils, logUtils } from '@0x/utils'; import chalk from 'chalk'; import { AbiDefinition, ConstructorAbi, EventAbi, MethodAbi } from 'ethereum-types'; import { sync as globSync } from 'glob'; diff --git a/packages/abi-gen/tslint.json b/packages/abi-gen/tslint.json index ffaefe83a6..dd9053357e 100644 --- a/packages/abi-gen/tslint.json +++ b/packages/abi-gen/tslint.json @@ -1,3 +1,3 @@ { - "extends": ["@0xproject/tslint-config"] + "extends": ["@0x/tslint-config"] } diff --git a/packages/assert/CHANGELOG.json b/packages/assert/CHANGELOG.json index ec84f099e5..f5a77103ba 100644 --- a/packages/assert/CHANGELOG.json +++ b/packages/assert/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1539871071, + "version": "1.0.14", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "1.0.13", "changes": [ diff --git a/packages/assert/CHANGELOG.md b/packages/assert/CHANGELOG.md index b9f097c4eb..78b5da851b 100644 --- a/packages/assert/CHANGELOG.md +++ b/packages/assert/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.14 - _October 18, 2018_ + + * Dependencies updated + ## v1.0.13 - _October 4, 2018_ * Dependencies updated @@ -37,7 +41,7 @@ CHANGELOG * Dependencies updated -## v1.0.5 - _August 13, 2018_ +## v1.0.5 - _August 14, 2018_ * Dependencies updated diff --git a/packages/assert/README.md b/packages/assert/README.md index 1f2139d478..647586f15e 100644 --- a/packages/assert/README.md +++ b/packages/assert/README.md @@ -1,17 +1,17 @@ -## @0xproject/assert +## @0x/assert Standard type and schema assertions to be used across all 0x projects and packages ## Installation ```bash -yarn add @0xproject/assert +yarn add @0x/assert ``` ## Usage ```typescript -import { assert } from '@0xproject/assert'; +import { assert } from '@0x/assert'; assert.isValidBaseUnitAmount('baseUnitAmount', baseUnitAmount); ``` @@ -20,7 +20,7 @@ If your project is in [TypeScript](https://www.typescriptlang.org/), add the fol ```json "compilerOptions": { - "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"], + "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"], } ``` @@ -49,13 +49,13 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/assert yarn build +PKG=@0x/assert yarn build ``` Or continuously rebuild on change: ```bash -PKG=@0xproject/assert yarn watch +PKG=@0x/assert yarn watch ``` ### Clean diff --git a/packages/assert/package.json b/packages/assert/package.json index 3cd09e307c..37af8979df 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -1,6 +1,6 @@ { - "name": "@0xproject/assert", - "version": "1.0.13", + "name": "@0x/assert", + "version": "1.0.14", "engines": { "node": ">=6.12" }, @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/assert/README.md", "devDependencies": { - "@0xproject/tslint-config": "^1.0.8", + "@0x/tslint-config": "^1.0.9", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", "@types/valid-url": "^1.0.2", @@ -44,9 +44,9 @@ "typescript": "3.0.1" }, "dependencies": { - "@0xproject/json-schemas": "^1.0.7", - "@0xproject/typescript-typings": "^3.0.2", - "@0xproject/utils": "^2.0.2", + "@0x/json-schemas": "^2.0.0", + "@0x/typescript-typings": "^3.0.3", + "@0x/utils": "^2.0.3", "lodash": "^4.17.5", "valid-url": "^1.0.9" }, diff --git a/packages/assert/src/index.ts b/packages/assert/src/index.ts index ccf2c9ad8d..2d28d51e1d 100644 --- a/packages/assert/src/index.ts +++ b/packages/assert/src/index.ts @@ -1,5 +1,5 @@ -import { Schema, SchemaValidator } from '@0xproject/json-schemas'; -import { addressUtils, BigNumber } from '@0xproject/utils'; +import { Schema, SchemaValidator } from '@0x/json-schemas'; +import { addressUtils, BigNumber } from '@0x/utils'; import * as _ from 'lodash'; import * as validUrl from 'valid-url'; diff --git a/packages/assert/test/assert_test.ts b/packages/assert/test/assert_test.ts index cbbfe39dba..9266496ac0 100644 --- a/packages/assert/test/assert_test.ts +++ b/packages/assert/test/assert_test.ts @@ -1,5 +1,5 @@ -import { schemas } from '@0xproject/json-schemas'; -import { BigNumber } from '@0xproject/utils'; +import { schemas } from '@0x/json-schemas'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import * as dirtyChai from 'dirty-chai'; import 'mocha'; diff --git a/packages/assert/tslint.json b/packages/assert/tslint.json index ffaefe83a6..dd9053357e 100644 --- a/packages/assert/tslint.json +++ b/packages/assert/tslint.json @@ -1,3 +1,3 @@ { - "extends": ["@0xproject/tslint-config"] + "extends": ["@0x/tslint-config"] } diff --git a/packages/asset-buyer/CHANGELOG.json b/packages/asset-buyer/CHANGELOG.json index e556612355..5ebe2aa24c 100644 --- a/packages/asset-buyer/CHANGELOG.json +++ b/packages/asset-buyer/CHANGELOG.json @@ -26,7 +26,8 @@ "note": "Add missing types to public interface", "pr": 1139 } - ] + ], + "timestamp": 1539871071 }, { "version": "2.0.0", diff --git a/packages/asset-buyer/CHANGELOG.md b/packages/asset-buyer/CHANGELOG.md index 65d190a2d9..8845e7041c 100644 --- a/packages/asset-buyer/CHANGELOG.md +++ b/packages/asset-buyer/CHANGELOG.md @@ -5,6 +5,15 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.1.0 - _October 18, 2018_ + + * Add `gasLimit` and `gasPrice` as optional properties on `BuyQuoteExecutionOpts` + * Export `BuyQuoteInfo` type (#1131) + * Updated to use new modularized artifacts and the latest version of @0xproject/contract-wrappers (#1105) + * Add `gasLimit` and `gasPrice` as optional properties on `BuyQuoteExecutionOpts` (#1116) + * Add `docs:json` command to package.json (#1139) + * Add missing types to public interface (#1139) + ## v2.0.0 - _October 4, 2018_ * Expand AssetBuyer to work with multiple assets at once (#1086) diff --git a/packages/asset-buyer/README.md b/packages/asset-buyer/README.md index 81c7e1e858..383a3836af 100644 --- a/packages/asset-buyer/README.md +++ b/packages/asset-buyer/README.md @@ -1,4 +1,4 @@ -## @0xproject/asset-buyer +## @0x/asset-buyer **Warning: In Beta, has not been extensively tested.** @@ -9,26 +9,26 @@ In its more advanced and useful form, it integrates with the [Standard Relayer A ## Installation ```bash -yarn add @0xproject/asset-buyer +yarn add @0x/asset-buyer ``` **Import** ```typescript -import { AssetBuyer } from '@0xproject/asset-buyer'; +import { AssetBuyer } from '@0x/asset-buyer'; ``` or ```javascript -var AssetBuyer = require('@0xproject/asset-buyer').AssetBuyer; +var AssetBuyer = require('@0x/asset-buyer').AssetBuyer; ``` If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`: ```json "compilerOptions": { - "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"], + "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"], } ``` @@ -57,13 +57,13 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/asset-buyer yarn build +PKG=@0x/asset-buyer yarn build ``` Or continuously rebuild on change: ```bash -PKG=@0xproject/asset-buyer yarn watch +PKG=@0x/asset-buyer yarn watch ``` ### Clean diff --git a/packages/asset-buyer/package.json b/packages/asset-buyer/package.json index 850fce873a..e4b4d19c0d 100644 --- a/packages/asset-buyer/package.json +++ b/packages/asset-buyer/package.json @@ -1,6 +1,6 @@ { - "name": "@0xproject/asset-buyer", - "version": "2.0.0", + "name": "@0x/asset-buyer", + "version": "2.1.0", "engines": { "node": ">=6.12" }, @@ -36,21 +36,21 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/asset-buyer/README.md", "dependencies": { - "@0xproject/assert": "^1.0.13", - "@0xproject/connect": "^3.0.1", - "@0xproject/contract-wrappers": "^2.0.2", - "@0xproject/json-schemas": "^1.0.7", - "@0xproject/order-utils": "^1.0.7", - "@0xproject/subproviders": "^2.0.7", - "@0xproject/types": "^1.1.4", - "@0xproject/typescript-typings": "^3.0.2", - "@0xproject/utils": "^2.0.2", - "@0xproject/web3-wrapper": "^3.0.3", - "ethereum-types": "^1.0.11", + "@0x/assert": "^1.0.14", + "@0x/connect": "^3.0.2", + "@0x/contract-wrappers": "^3.0.0", + "@0x/json-schemas": "^2.0.0", + "@0x/order-utils": "^2.0.0", + "@0x/subproviders": "^2.1.0", + "@0x/types": "^1.2.0", + "@0x/typescript-typings": "^3.0.3", + "@0x/utils": "^2.0.3", + "@0x/web3-wrapper": "^3.1.0", + "ethereum-types": "^1.1.1", "lodash": "^4.17.10" }, "devDependencies": { - "@0xproject/tslint-config": "^1.0.8", + "@0x/tslint-config": "^1.0.9", "@types/lodash": "^4.14.116", "@types/mocha": "^2.2.42", "@types/node": "*", diff --git a/packages/asset-buyer/src/asset_buyer.ts b/packages/asset-buyer/src/asset_buyer.ts index 4739e5a294..2fe8f6debf 100644 --- a/packages/asset-buyer/src/asset_buyer.ts +++ b/packages/asset-buyer/src/asset_buyer.ts @@ -1,9 +1,9 @@ -import { ContractWrappers } from '@0xproject/contract-wrappers'; -import { schemas } from '@0xproject/json-schemas'; -import { SignedOrder } from '@0xproject/order-utils'; -import { ObjectMap } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { ContractWrappers } from '@0x/contract-wrappers'; +import { schemas } from '@0x/json-schemas'; +import { SignedOrder } from '@0x/order-utils'; +import { ObjectMap } from '@0x/types'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { Provider } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/asset-buyer/src/constants.ts b/packages/asset-buyer/src/constants.ts index e095dee06b..55effdb23d 100644 --- a/packages/asset-buyer/src/constants.ts +++ b/packages/asset-buyer/src/constants.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; import { AssetBuyerOpts, BuyQuoteExecutionOpts, BuyQuoteRequestOpts } from './types'; diff --git a/packages/asset-buyer/src/index.ts b/packages/asset-buyer/src/index.ts index 9ac3c0b8ae..8418edb424 100644 --- a/packages/asset-buyer/src/index.ts +++ b/packages/asset-buyer/src/index.ts @@ -5,8 +5,8 @@ export { JSONRPCErrorCallback, Provider, } from 'ethereum-types'; -export { SignedOrder } from '@0xproject/types'; -export { BigNumber } from '@0xproject/utils'; +export { SignedOrder } from '@0x/types'; +export { BigNumber } from '@0x/utils'; export { AssetBuyer } from './asset_buyer'; export { BasicOrderProvider } from './order_providers/basic_order_provider'; diff --git a/packages/asset-buyer/src/order_providers/basic_order_provider.ts b/packages/asset-buyer/src/order_providers/basic_order_provider.ts index 9bb2d90acd..68406f19b9 100644 --- a/packages/asset-buyer/src/order_providers/basic_order_provider.ts +++ b/packages/asset-buyer/src/order_providers/basic_order_provider.ts @@ -1,5 +1,5 @@ -import { schemas } from '@0xproject/json-schemas'; -import { SignedOrder } from '@0xproject/types'; +import { schemas } from '@0x/json-schemas'; +import { SignedOrder } from '@0x/types'; import * as _ from 'lodash'; import { OrderProvider, OrderProviderRequest, OrderProviderResponse } from '../types'; diff --git a/packages/asset-buyer/src/order_providers/standard_relayer_api_order_provider.ts b/packages/asset-buyer/src/order_providers/standard_relayer_api_order_provider.ts index 31942c25ba..91682b089a 100644 --- a/packages/asset-buyer/src/order_providers/standard_relayer_api_order_provider.ts +++ b/packages/asset-buyer/src/order_providers/standard_relayer_api_order_provider.ts @@ -1,5 +1,5 @@ -import { HttpClient } from '@0xproject/connect'; -import { APIOrder, OrderbookResponse } from '@0xproject/types'; +import { HttpClient } from '@0x/connect'; +import { APIOrder, OrderbookResponse } from '@0x/types'; import * as _ from 'lodash'; import { diff --git a/packages/asset-buyer/src/types.ts b/packages/asset-buyer/src/types.ts index 6218f4ba40..0d8e732d70 100644 --- a/packages/asset-buyer/src/types.ts +++ b/packages/asset-buyer/src/types.ts @@ -1,5 +1,5 @@ -import { SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; /** * makerAssetData: The assetData representing the desired makerAsset. diff --git a/packages/asset-buyer/src/utils/assert.ts b/packages/asset-buyer/src/utils/assert.ts index d43b71fee9..e8cb7f7637 100644 --- a/packages/asset-buyer/src/utils/assert.ts +++ b/packages/asset-buyer/src/utils/assert.ts @@ -1,6 +1,6 @@ -import { assert as sharedAssert } from '@0xproject/assert'; -import { schemas } from '@0xproject/json-schemas'; -import { SignedOrder } from '@0xproject/types'; +import { assert as sharedAssert } from '@0x/assert'; +import { schemas } from '@0x/json-schemas'; +import { SignedOrder } from '@0x/types'; import * as _ from 'lodash'; import { BuyQuote, BuyQuoteInfo, OrderProvider, OrderProviderRequest } from '../types'; diff --git a/packages/asset-buyer/src/utils/asset_data_utils.ts b/packages/asset-buyer/src/utils/asset_data_utils.ts index f54462a230..70f6469020 100644 --- a/packages/asset-buyer/src/utils/asset_data_utils.ts +++ b/packages/asset-buyer/src/utils/asset_data_utils.ts @@ -1,5 +1,5 @@ -import { ContractWrappers } from '@0xproject/contract-wrappers'; -import { assetDataUtils as sharedAssetDataUtils } from '@0xproject/order-utils'; +import { ContractWrappers } from '@0x/contract-wrappers'; +import { assetDataUtils as sharedAssetDataUtils } from '@0x/order-utils'; import * as _ from 'lodash'; export const assetDataUtils = { diff --git a/packages/asset-buyer/src/utils/buy_quote_calculator.ts b/packages/asset-buyer/src/utils/buy_quote_calculator.ts index a1d334eef0..b0cb4a5477 100644 --- a/packages/asset-buyer/src/utils/buy_quote_calculator.ts +++ b/packages/asset-buyer/src/utils/buy_quote_calculator.ts @@ -1,5 +1,5 @@ -import { marketUtils, rateUtils } from '@0xproject/order-utils'; -import { BigNumber } from '@0xproject/utils'; +import { marketUtils, rateUtils } from '@0x/order-utils'; +import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; import { constants } from '../constants'; diff --git a/packages/asset-buyer/src/utils/order_provider_response_processor.ts b/packages/asset-buyer/src/utils/order_provider_response_processor.ts index 74eec162d5..81464d9451 100644 --- a/packages/asset-buyer/src/utils/order_provider_response_processor.ts +++ b/packages/asset-buyer/src/utils/order_provider_response_processor.ts @@ -1,8 +1,8 @@ -import { OrderAndTraderInfo, OrderStatus, OrderValidatorWrapper } from '@0xproject/contract-wrappers'; -import { sortingUtils } from '@0xproject/order-utils'; -import { RemainingFillableCalculator } from '@0xproject/order-utils/lib/src/remaining_fillable_calculator'; -import { SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { OrderAndTraderInfo, OrderStatus, OrderValidatorWrapper } from '@0x/contract-wrappers'; +import { sortingUtils } from '@0x/order-utils'; +import { RemainingFillableCalculator } from '@0x/order-utils/lib/src/remaining_fillable_calculator'; +import { SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; import { constants } from '../constants'; diff --git a/packages/asset-buyer/src/utils/order_utils.ts b/packages/asset-buyer/src/utils/order_utils.ts index cfc13a8a1c..ff47eb7c5e 100644 --- a/packages/asset-buyer/src/utils/order_utils.ts +++ b/packages/asset-buyer/src/utils/order_utils.ts @@ -1,5 +1,5 @@ -import { SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import { constants } from '../constants'; diff --git a/packages/asset-buyer/test/buy_quote_calculator_test.ts b/packages/asset-buyer/test/buy_quote_calculator_test.ts index fda6958cdf..0f516a0f71 100644 --- a/packages/asset-buyer/test/buy_quote_calculator_test.ts +++ b/packages/asset-buyer/test/buy_quote_calculator_test.ts @@ -1,5 +1,5 @@ -import { orderFactory } from '@0xproject/order-utils/lib/src/order_factory'; -import { BigNumber } from '@0xproject/utils'; +import { orderFactory } from '@0x/order-utils/lib/src/order_factory'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import * as _ from 'lodash'; import 'mocha'; diff --git a/packages/asset-buyer/tslint.json b/packages/asset-buyer/tslint.json index ffaefe83a6..dd9053357e 100644 --- a/packages/asset-buyer/tslint.json +++ b/packages/asset-buyer/tslint.json @@ -1,3 +1,3 @@ { - "extends": ["@0xproject/tslint-config"] + "extends": ["@0x/tslint-config"] } diff --git a/packages/base-contract/CHANGELOG.json b/packages/base-contract/CHANGELOG.json index eca1717d5d..166c044087 100644 --- a/packages/base-contract/CHANGELOG.json +++ b/packages/base-contract/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1539871071, + "version": "3.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "3.0.1", "changes": [ diff --git a/packages/base-contract/CHANGELOG.md b/packages/base-contract/CHANGELOG.md index 114cac90f0..2981b5ef82 100644 --- a/packages/base-contract/CHANGELOG.md +++ b/packages/base-contract/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.2 - _October 18, 2018_ + + * Dependencies updated + ## v3.0.1 - _October 4, 2018_ * Dependencies updated @@ -38,7 +42,7 @@ CHANGELOG * Dependencies updated -## v2.0.0-rc.1 - _August 13, 2018_ +## v2.0.0-rc.1 - _August 14, 2018_ * Added strict encoding/decoding checks for sendTransaction and call (#915) diff --git a/packages/base-contract/README.md b/packages/base-contract/README.md index 4f2426c2e7..b6ea05b740 100644 --- a/packages/base-contract/README.md +++ b/packages/base-contract/README.md @@ -1,25 +1,25 @@ -## @0xproject/base-contract +## @0x/base-contract BaseContract to derive all auto-generated wrappers from ## Installation ```bash -yarn add @0xproject/base-contract +yarn add @0x/base-contract ``` If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`: ```json "compilerOptions": { - "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"], + "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"], } ``` ## Usage ```javascript -import { BaseContract } from '@0xproject/base-contract'; +import { BaseContract } from '@0x/base-contract'; ``` ## Contributing @@ -47,13 +47,13 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/base-contract yarn build +PKG=@0x/base-contract yarn build ``` Or continuously rebuild on change: ```bash -PKG=@0xproject/base-contract yarn watch +PKG=@0x/base-contract yarn watch ``` ### Lint diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index 3758dd1a7a..676e8aab94 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -1,6 +1,6 @@ { - "name": "@0xproject/base-contract", - "version": "3.0.1", + "name": "@0x/base-contract", + "version": "3.0.2", "engines": { "node": ">=6.12" }, @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/base-contract/README.md", "devDependencies": { - "@0xproject/tslint-config": "^1.0.8", + "@0x/tslint-config": "^1.0.9", "@types/lodash": "4.14.104", "chai": "^4.0.1", "make-promises-safe": "^1.1.0", @@ -40,10 +40,10 @@ "typescript": "3.0.1" }, "dependencies": { - "@0xproject/typescript-typings": "^3.0.2", - "@0xproject/utils": "^2.0.2", - "@0xproject/web3-wrapper": "^3.0.3", - "ethereum-types": "^1.0.11", + "@0x/typescript-typings": "^3.0.3", + "@0x/utils": "^2.0.3", + "@0x/web3-wrapper": "^3.1.0", + "ethereum-types": "^1.1.1", "ethers": "~4.0.4", "lodash": "^4.17.5" }, diff --git a/packages/base-contract/src/index.ts b/packages/base-contract/src/index.ts index 73550ffd4e..fbb8478b70 100644 --- a/packages/base-contract/src/index.ts +++ b/packages/base-contract/src/index.ts @@ -1,5 +1,5 @@ -import { abiUtils, BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { abiUtils, BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { AbiDefinition, AbiType, diff --git a/packages/base-contract/test/utils_test.ts b/packages/base-contract/test/utils_test.ts index c083704f4b..0608b72a25 100644 --- a/packages/base-contract/test/utils_test.ts +++ b/packages/base-contract/test/utils_test.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import 'mocha'; diff --git a/packages/base-contract/tslint.json b/packages/base-contract/tslint.json index ffaefe83a6..dd9053357e 100644 --- a/packages/base-contract/tslint.json +++ b/packages/base-contract/tslint.json @@ -1,3 +1,3 @@ { - "extends": ["@0xproject/tslint-config"] + "extends": ["@0x/tslint-config"] } diff --git a/packages/connect/CHANGELOG.json b/packages/connect/CHANGELOG.json index 04488504da..3412831d5a 100644 --- a/packages/connect/CHANGELOG.json +++ b/packages/connect/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1539871071, + "version": "3.0.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "3.0.1", "changes": [ diff --git a/packages/connect/CHANGELOG.md b/packages/connect/CHANGELOG.md index 16e35a0d54..d20b5a5f7e 100644 --- a/packages/connect/CHANGELOG.md +++ b/packages/connect/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.2 - _October 18, 2018_ + + * Dependencies updated + ## v3.0.1 - _October 4, 2018_ * Dependencies updated @@ -42,7 +46,7 @@ CHANGELOG * Updated for SRA v2 (#974) * Stopped exporting `Order` type (#924) -## v1.0.5 - _August 13, 2018_ +## v1.0.5 - _August 14, 2018_ * Dependencies updated diff --git a/packages/connect/README.md b/packages/connect/README.md index 9d8cb92156..6d3ee66a02 100644 --- a/packages/connect/README.md +++ b/packages/connect/README.md @@ -1,18 +1,18 @@ -## @0xproject/connect +## @0x/connect This repository contains a Javascript library that makes it easy to interact with Relayers that conform to the [Standard Relayer API](https://github.com/0xProject/standard-relayer-api) ## Installation ```bash -yarn add @0xproject/connect +yarn add @0x/connect ``` If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`: ```json "compilerOptions": { - "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"], + "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"], } ``` @@ -46,13 +46,13 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/connect yarn build +PKG=@0x/connect yarn build ``` Or continuously rebuild on change: ```bash -PKG=@0xproject/connect yarn watch +PKG=@0x/connect yarn watch ``` ### Clean diff --git a/packages/connect/package.json b/packages/connect/package.json index 591db0f833..95b1bbd7da 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -1,6 +1,6 @@ { - "name": "@0xproject/connect", - "version": "3.0.1", + "name": "@0x/connect", + "version": "3.0.2", "engines": { "node": ">=6.12" }, @@ -44,12 +44,12 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/connect/README.md", "dependencies": { - "@0xproject/assert": "^1.0.13", - "@0xproject/json-schemas": "^1.0.7", - "@0xproject/order-utils": "^1.0.7", - "@0xproject/types": "^1.1.4", - "@0xproject/typescript-typings": "^3.0.2", - "@0xproject/utils": "^2.0.2", + "@0x/assert": "^1.0.14", + "@0x/json-schemas": "^2.0.0", + "@0x/order-utils": "^2.0.0", + "@0x/types": "^1.2.0", + "@0x/typescript-typings": "^3.0.3", + "@0x/utils": "^2.0.3", "lodash": "^4.17.5", "query-string": "^5.0.1", "sinon": "^4.0.0", @@ -57,7 +57,7 @@ "websocket": "^1.0.25" }, "devDependencies": { - "@0xproject/tslint-config": "^1.0.8", + "@0x/tslint-config": "^1.0.9", "@types/fetch-mock": "^6.0.3", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", diff --git a/packages/connect/src/http_client.ts b/packages/connect/src/http_client.ts index bbd0d20426..b6c031fa83 100644 --- a/packages/connect/src/http_client.ts +++ b/packages/connect/src/http_client.ts @@ -1,5 +1,5 @@ -import { assert } from '@0xproject/assert'; -import { schemas } from '@0xproject/json-schemas'; +import { assert } from '@0x/assert'; +import { schemas } from '@0x/json-schemas'; import { APIOrder, AssetPairsRequestOpts, @@ -14,8 +14,8 @@ import { PagedRequestOpts, RequestOpts, SignedOrder, -} from '@0xproject/types'; -import { fetchAsync } from '@0xproject/utils'; +} from '@0x/types'; +import { fetchAsync } from '@0x/utils'; import * as _ from 'lodash'; import * as queryString from 'query-string'; diff --git a/packages/connect/src/index.ts b/packages/connect/src/index.ts index 0ec5a0f681..f319d63cb2 100644 --- a/packages/connect/src/index.ts +++ b/packages/connect/src/index.ts @@ -17,4 +17,4 @@ export { PaginatedCollection, RequestOpts, SignedOrder, -} from '@0xproject/types'; +} from '@0x/types'; diff --git a/packages/connect/src/types.ts b/packages/connect/src/types.ts index 4bb0ae534a..08a4506ac4 100644 --- a/packages/connect/src/types.ts +++ b/packages/connect/src/types.ts @@ -12,7 +12,7 @@ import { PagedRequestOpts, PaginatedCollection, SignedOrder, -} from '@0xproject/types'; +} from '@0x/types'; export interface Client { getAssetPairsAsync: ( diff --git a/packages/connect/src/utils/assert.ts b/packages/connect/src/utils/assert.ts index 4e2202d2ef..de7536ffe5 100644 --- a/packages/connect/src/utils/assert.ts +++ b/packages/connect/src/utils/assert.ts @@ -1,11 +1,11 @@ -import { assert as sharedAssert } from '@0xproject/assert'; +import { assert as sharedAssert } from '@0x/assert'; // HACK: We need those two unused imports because they're actually used by sharedAssert which gets injected here // tslint:disable-next-line:no-unused-variable -import { Schema, schemas } from '@0xproject/json-schemas'; +import { Schema, schemas } from '@0x/json-schemas'; // tslint:disable-next-line:no-unused-variable -import { ECSignature } from '@0xproject/types'; +import { ECSignature } from '@0x/types'; // tslint:disable-next-line:no-unused-variable -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; export const assert = { diff --git a/packages/connect/src/utils/orders_channel_message_parser.ts b/packages/connect/src/utils/orders_channel_message_parser.ts index 943d7802e4..1306a74b19 100644 --- a/packages/connect/src/utils/orders_channel_message_parser.ts +++ b/packages/connect/src/utils/orders_channel_message_parser.ts @@ -1,8 +1,8 @@ -import { assert } from '@0xproject/assert'; -import { schemas } from '@0xproject/json-schemas'; +import { assert } from '@0x/assert'; +import { schemas } from '@0x/json-schemas'; import * as _ from 'lodash'; -import { OrdersChannelMessage, OrdersChannelMessageTypes } from '@0xproject/types'; +import { OrdersChannelMessage, OrdersChannelMessageTypes } from '@0x/types'; import { relayerResponseJsonParsers } from './relayer_response_json_parsers'; diff --git a/packages/connect/src/utils/relayer_response_json_parsers.ts b/packages/connect/src/utils/relayer_response_json_parsers.ts index 356e2dde6a..2b1a658d1c 100644 --- a/packages/connect/src/utils/relayer_response_json_parsers.ts +++ b/packages/connect/src/utils/relayer_response_json_parsers.ts @@ -1,6 +1,6 @@ -import { assert } from '@0xproject/assert'; -import { schemas } from '@0xproject/json-schemas'; -import { orderParsingUtils } from '@0xproject/order-utils'; +import { assert } from '@0x/assert'; +import { schemas } from '@0x/json-schemas'; +import { orderParsingUtils } from '@0x/order-utils'; import { APIOrder, @@ -9,7 +9,7 @@ import { OrderbookResponse, OrderConfigResponse, OrdersResponse, -} from '@0xproject/types'; +} from '@0x/types'; import { typeConverters } from './type_converters'; diff --git a/packages/connect/src/utils/type_converters.ts b/packages/connect/src/utils/type_converters.ts index 99760cf744..b262a516b2 100644 --- a/packages/connect/src/utils/type_converters.ts +++ b/packages/connect/src/utils/type_converters.ts @@ -1,7 +1,7 @@ -import { orderParsingUtils } from '@0xproject/order-utils'; +import { orderParsingUtils } from '@0x/order-utils'; import * as _ from 'lodash'; -import { APIOrder } from '@0xproject/types'; +import { APIOrder } from '@0x/types'; export const typeConverters = { convertOrderbookStringFieldsToBigNumber(orderbook: any): any { diff --git a/packages/connect/src/ws_orders_channel.ts b/packages/connect/src/ws_orders_channel.ts index bf5e8508d8..70a357c618 100644 --- a/packages/connect/src/ws_orders_channel.ts +++ b/packages/connect/src/ws_orders_channel.ts @@ -1,4 +1,4 @@ -import { OrdersChannelMessageTypes, OrdersChannelSubscriptionOpts } from '@0xproject/types'; +import { OrdersChannelMessageTypes, OrdersChannelSubscriptionOpts } from '@0x/types'; import * as _ from 'lodash'; import { v4 as uuid } from 'uuid'; import * as WebSocket from 'websocket'; diff --git a/packages/connect/test/fixtures/standard_relayer_api/asset_pairs.ts b/packages/connect/test/fixtures/standard_relayer_api/asset_pairs.ts index 27216e4214..3ceeffdc86 100644 --- a/packages/connect/test/fixtures/standard_relayer_api/asset_pairs.ts +++ b/packages/connect/test/fixtures/standard_relayer_api/asset_pairs.ts @@ -1,6 +1,6 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; -import { AssetPairsResponse } from '@0xproject/types'; +import { AssetPairsResponse } from '@0x/types'; export const assetDataPairsResponse: AssetPairsResponse = { total: 43, diff --git a/packages/connect/test/fixtures/standard_relayer_api/fee_recipients.ts b/packages/connect/test/fixtures/standard_relayer_api/fee_recipients.ts index 6f544e9d36..694433128f 100644 --- a/packages/connect/test/fixtures/standard_relayer_api/fee_recipients.ts +++ b/packages/connect/test/fixtures/standard_relayer_api/fee_recipients.ts @@ -1,4 +1,4 @@ -import { FeeRecipientsResponse } from '@0xproject/types'; +import { FeeRecipientsResponse } from '@0x/types'; export const feeRecipientsResponse: FeeRecipientsResponse = { total: 3, diff --git a/packages/connect/test/fixtures/standard_relayer_api/order/0xabc67323774bdbd24d94f977fa9ac94a50f016026fd13f42990861238897721f.ts b/packages/connect/test/fixtures/standard_relayer_api/order/0xabc67323774bdbd24d94f977fa9ac94a50f016026fd13f42990861238897721f.ts index c8a669b3b5..3d2fbdba87 100644 --- a/packages/connect/test/fixtures/standard_relayer_api/order/0xabc67323774bdbd24d94f977fa9ac94a50f016026fd13f42990861238897721f.ts +++ b/packages/connect/test/fixtures/standard_relayer_api/order/0xabc67323774bdbd24d94f977fa9ac94a50f016026fd13f42990861238897721f.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; export const orderResponse = { order: { diff --git a/packages/connect/test/fixtures/standard_relayer_api/order_config.ts b/packages/connect/test/fixtures/standard_relayer_api/order_config.ts index 56a4ac5500..2290c39c0b 100644 --- a/packages/connect/test/fixtures/standard_relayer_api/order_config.ts +++ b/packages/connect/test/fixtures/standard_relayer_api/order_config.ts @@ -1,6 +1,6 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; -import { OrderConfigResponse } from '@0xproject/types'; +import { OrderConfigResponse } from '@0x/types'; export const orderConfigResponse: OrderConfigResponse = { senderAddress: '0xa2b31dacf30a9c50ca473337c01d8a201ae33e32', diff --git a/packages/connect/test/fixtures/standard_relayer_api/orderbook.ts b/packages/connect/test/fixtures/standard_relayer_api/orderbook.ts index 21d51da742..de2d4eaeac 100644 --- a/packages/connect/test/fixtures/standard_relayer_api/orderbook.ts +++ b/packages/connect/test/fixtures/standard_relayer_api/orderbook.ts @@ -1,6 +1,6 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; -import { OrderbookResponse } from '@0xproject/types'; +import { OrderbookResponse } from '@0x/types'; export const orderbookResponse: OrderbookResponse = { bids: { diff --git a/packages/connect/test/fixtures/standard_relayer_api/orders.ts b/packages/connect/test/fixtures/standard_relayer_api/orders.ts index fb85990d07..ed1f588dfc 100644 --- a/packages/connect/test/fixtures/standard_relayer_api/orders.ts +++ b/packages/connect/test/fixtures/standard_relayer_api/orders.ts @@ -1,6 +1,6 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; -import { OrdersResponse } from '@0xproject/types'; +import { OrdersResponse } from '@0x/types'; export const ordersResponse: OrdersResponse = { total: 984, diff --git a/packages/connect/test/http_client_test.ts b/packages/connect/test/http_client_test.ts index e9fc9372e5..f799ca8494 100644 --- a/packages/connect/test/http_client_test.ts +++ b/packages/connect/test/http_client_test.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; import * as dirtyChai from 'dirty-chai'; diff --git a/packages/connect/tslint.json b/packages/connect/tslint.json index ffaefe83a6..dd9053357e 100644 --- a/packages/connect/tslint.json +++ b/packages/connect/tslint.json @@ -1,3 +1,3 @@ { - "extends": ["@0xproject/tslint-config"] + "extends": ["@0x/tslint-config"] } diff --git a/packages/contract-addresses/CHANGELOG.json b/packages/contract-addresses/CHANGELOG.json index d91ad0b36e..c2b44ede83 100644 --- a/packages/contract-addresses/CHANGELOG.json +++ b/packages/contract-addresses/CHANGELOG.json @@ -1,11 +1,20 @@ [ { - "version": "1.0.0", + "version": "1.0.1", "changes": [ { "pr": 1105, "note": "Initial release" } + ], + "timestamp": 1539871071 + }, + { + "version": "1.0.0", + "changes": [ + { + "note": "Unpublished Package" + } ] } ] diff --git a/packages/contract-addresses/CHANGELOG.md b/packages/contract-addresses/CHANGELOG.md new file mode 100644 index 0000000000..82c22f2e45 --- /dev/null +++ b/packages/contract-addresses/CHANGELOG.md @@ -0,0 +1,14 @@ + + +CHANGELOG + +## v1.0.1 - _October 18, 2018_ + + * Initial release (#1105) + +## v1.0.0 - _Invalid date_ + + * Unpublished Package diff --git a/packages/contract-addresses/README.md b/packages/contract-addresses/README.md index 6c615c4226..a4040cb54b 100644 --- a/packages/contract-addresses/README.md +++ b/packages/contract-addresses/README.md @@ -1,4 +1,4 @@ -## @0xproject/contract-addresses +## @0x/contract-addresses A tiny utility library for getting known deployed contract addresses for a particular network. @@ -6,20 +6,19 @@ particular network. ## Installation ```bash -yarn add @0xproject/contract-addresses +yarn add @0x/contract-addresses ``` **Import** ```typescript -import { getContractAddressesForNetworkOrThrow } from '@0xproject/contract-addresses'; +import { getContractAddressesForNetworkOrThrow } from '@0x/contract-addresses'; ``` or ```javascript -var getContractAddressesForNetworkOrThrow = require('@0xproject/contract-addresses') - .getContractAddressesForNetworkOrThrow; +var getContractAddressesForNetworkOrThrow = require('@0x/contract-addresses').getContractAddressesForNetworkOrThrow; ``` ## Contributing @@ -47,7 +46,7 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/contract-addresses yarn build +PKG=@0x/contract-addresses yarn build ``` ### Clean diff --git a/packages/contract-addresses/package.json b/packages/contract-addresses/package.json index 60642224fc..3136d571b5 100644 --- a/packages/contract-addresses/package.json +++ b/packages/contract-addresses/package.json @@ -1,6 +1,6 @@ { - "name": "@0xproject/contract-addresses", - "version": "1.0.0", + "name": "@0x/contract-addresses", + "version": "1.0.1", "engines": { "node": ">=6.12" }, @@ -25,8 +25,8 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/contract-addresses/README.md", "devDependencies": { "@types/lodash": "4.14.104", - "typescript": "3.0.1", - "shx": "^0.2.2" + "shx": "^0.2.2", + "typescript": "3.0.1" }, "dependencies": { "lodash": "^4.17.5" diff --git a/packages/contract-addresses/tslint.json b/packages/contract-addresses/tslint.json index ffaefe83a6..dd9053357e 100644 --- a/packages/contract-addresses/tslint.json +++ b/packages/contract-addresses/tslint.json @@ -1,3 +1,3 @@ { - "extends": ["@0xproject/tslint-config"] + "extends": ["@0x/tslint-config"] } diff --git a/packages/contract-artifacts/CHANGELOG.json b/packages/contract-artifacts/CHANGELOG.json index d91ad0b36e..c2b44ede83 100644 --- a/packages/contract-artifacts/CHANGELOG.json +++ b/packages/contract-artifacts/CHANGELOG.json @@ -1,11 +1,20 @@ [ { - "version": "1.0.0", + "version": "1.0.1", "changes": [ { "pr": 1105, "note": "Initial release" } + ], + "timestamp": 1539871071 + }, + { + "version": "1.0.0", + "changes": [ + { + "note": "Unpublished Package" + } ] } ] diff --git a/packages/contract-artifacts/CHANGELOG.md b/packages/contract-artifacts/CHANGELOG.md new file mode 100644 index 0000000000..82c22f2e45 --- /dev/null +++ b/packages/contract-artifacts/CHANGELOG.md @@ -0,0 +1,14 @@ + + +CHANGELOG + +## v1.0.1 - _October 18, 2018_ + + * Initial release (#1105) + +## v1.0.0 - _Invalid date_ + + * Unpublished Package diff --git a/packages/contract-artifacts/README.md b/packages/contract-artifacts/README.md index f8901266d1..5a382c3081 100644 --- a/packages/contract-artifacts/README.md +++ b/packages/contract-artifacts/README.md @@ -1,23 +1,23 @@ -## @0xproject/contract-artifacts +## @0x/contract-artifacts Smart contract compilation artifacts for the latest version of the 0x Protocol. ## Installation ```bash -yarn add @0xproject/contract-artifacts +yarn add @0x/contract-artifacts ``` **Import** ```typescript -import * as artifacts from '@0xproject/contract-artifacts'; +import * as artifacts from '@0x/contract-artifacts'; ``` or ```javascript -var artifacts = require('@0xproject/contract-artifacts'); +var artifacts = require('@0x/contract-artifacts'); ``` ## Contributing @@ -45,7 +45,7 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/contract-artifacts yarn build +PKG=@0x/contract-artifacts yarn build ``` ### Clean diff --git a/packages/contract-artifacts/package.json b/packages/contract-artifacts/package.json index 3e16966952..53f5d3c478 100644 --- a/packages/contract-artifacts/package.json +++ b/packages/contract-artifacts/package.json @@ -1,6 +1,6 @@ { - "name": "@0xproject/contract-artifacts", - "version": "1.0.0", + "name": "@0x/contract-artifacts", + "version": "1.0.1", "engines": { "node": ">=6.12" }, @@ -24,8 +24,8 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/contract-artifacts/README.md", "devDependencies": { - "typescript": "3.0.1", - "shx": "^0.2.2" + "shx": "^0.2.2", + "typescript": "3.0.1" }, "publishConfig": { "access": "public" diff --git a/packages/contract-artifacts/tslint.json b/packages/contract-artifacts/tslint.json index ffaefe83a6..dd9053357e 100644 --- a/packages/contract-artifacts/tslint.json +++ b/packages/contract-artifacts/tslint.json @@ -1,3 +1,3 @@ { - "extends": ["@0xproject/tslint-config"] + "extends": ["@0x/tslint-config"] } diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json index 9bb5e5fc5a..f66be3f0af 100644 --- a/packages/contract-wrappers/CHANGELOG.json +++ b/packages/contract-wrappers/CHANGELOG.json @@ -38,7 +38,8 @@ "Removed ContractNotFound errors. Checking for this error was somewhat ineffecient. Relevant methods/functions now return the default error from web3-wrapper, which we feel provides enough information.", "pr": 1105 } - ] + ], + "timestamp": 1539871071 }, { "version": "2.0.2", diff --git a/packages/contract-wrappers/CHANGELOG.md b/packages/contract-wrappers/CHANGELOG.md index 60675ddbe6..6f30058314 100644 --- a/packages/contract-wrappers/CHANGELOG.md +++ b/packages/contract-wrappers/CHANGELOG.md @@ -5,6 +5,17 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.0.0 - _October 18, 2018_ + + * Add optional validation to the forwarder wrapper methods + * Updated to use new modularized artifacts. (#1105) + * Top-level `ContractWrappers` class has a new optional `contractAddresses` parameter. (#1105) + * Default contract addresses are no longer stored in artifacts and are instead loaded from the `@0xproject/contract-addresses` package. (#1105) + * Most contract addresses are now defined at instantiation time and are available as properties (e.g., `exchangeWrapper.address`) instead of methods (e.g., `exchangeWrapper.getContractAddress()`). (#1105) + * Removed `setProvider` method in top-level `ContractWrapper` class and added new `unsubscribeAll` method. (#1105) + * Some properties and methods have been renamed. For example, some methods that previously could throw no longer can, and so their names have been updated accordingly. (#1105) + * Removed ContractNotFound errors. Checking for this error was somewhat ineffecient. Relevant methods/functions now return the default error from web3-wrapper, which we feel provides enough information. (#1105) + ## v2.0.2 - _October 4, 2018_ * Dependencies updated @@ -51,7 +62,7 @@ CHANGELOG * Remove superfluous exported types: `ContractEvent`, `Token`, `OrderFillRequest`, `ContractEventArgs`, `LogEvent`, `OnOrderStateChangeCallback`, `ECSignature`, `OrderStateValid`, `OrderStateInvalid`, `OrderState`, `FilterObject`, `TransactionReceipt` & `TransactionReceiptWithDecodedLogs` (#924) * Added Transaction Encoder for use with 0x Exchange executeTransaction (#975) -## v1.0.1-rc.3 - _August 13, 2018_ +## v1.0.1-rc.3 - _August 14, 2018_ * Added strict encoding/decoding checks for sendTransaction and call (#915) * Add ForwarderWrapper (#934) diff --git a/packages/contract-wrappers/README.md b/packages/contract-wrappers/README.md index 6153f798eb..36f2f48fb4 100644 --- a/packages/contract-wrappers/README.md +++ b/packages/contract-wrappers/README.md @@ -1,4 +1,4 @@ -## @0xproject/contract-wrappers +## @0x/contract-wrappers Smart TS wrappers for 0x smart contracts. The wrappers have simplified interfaces, perform client-side validation on transactions and throw helpful error messages. @@ -9,20 +9,20 @@ Smart TS wrappers for 0x smart contracts. The wrappers have simplified interface **Install** ```bash -npm install @0xproject/contract-wrappers --save +npm install @0x/contract-wrappers --save ``` **Import** ```javascript -import { ContractWrappers } from '@0xproject/contract-wrappers'; +import { ContractWrappers } from '@0x/contract-wrappers'; ``` If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`: ```json "compilerOptions": { - "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"], + "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"], } ``` @@ -51,13 +51,13 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/contract-wrappers yarn build +PKG=@0x/contract-wrappers yarn build ``` Or continuously rebuild on change: ```bash -PKG=@0xproject/contract-wrappers yarn watch +PKG=@0x/contract-wrappers yarn watch ``` ```bash diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index ef19057cd8..d427bb6281 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -1,6 +1,6 @@ { - "name": "@0xproject/contract-wrappers", - "version": "2.0.2", + "name": "@0x/contract-wrappers", + "version": "3.0.0", "description": "Smart TS wrappers for 0x smart contracts", "keywords": [ "0xproject", @@ -37,10 +37,10 @@ "node": ">=6.0.0" }, "devDependencies": { - "@0xproject/dev-utils": "^1.0.12", - "@0xproject/migrations": "^1.0.14", - "@0xproject/subproviders": "^2.0.7", - "@0xproject/tslint-config": "^1.0.8", + "@0x/dev-utils": "^1.0.13", + "@0x/migrations": "^2.0.0", + "@0x/subproviders": "^2.1.0", + "@0x/tslint-config": "^1.0.9", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", "@types/node": "*", @@ -65,18 +65,18 @@ "web3-provider-engine": "14.0.6" }, "dependencies": { - "@0xproject/abi-gen-wrappers": "^1.0.0", - "@0xproject/assert": "^1.0.13", - "@0xproject/contract-addresses": "^1.0.0", - "@0xproject/contract-artifacts": "^1.0.0", - "@0xproject/fill-scenarios": "^1.0.7", - "@0xproject/json-schemas": "^1.0.7", - "@0xproject/order-utils": "^1.0.7", - "@0xproject/types": "^1.1.4", - "@0xproject/typescript-typings": "^3.0.2", - "@0xproject/utils": "^2.0.2", - "@0xproject/web3-wrapper": "^3.0.3", - "ethereum-types": "^1.0.11", + "@0x/abi-gen-wrappers": "^1.0.1", + "@0x/assert": "^1.0.14", + "@0x/contract-addresses": "^1.0.1", + "@0x/contract-artifacts": "^1.0.1", + "@0x/fill-scenarios": "^1.0.8", + "@0x/json-schemas": "^2.0.0", + "@0x/order-utils": "^2.0.0", + "@0x/types": "^1.2.0", + "@0x/typescript-typings": "^3.0.3", + "@0x/utils": "^2.0.3", + "@0x/web3-wrapper": "^3.1.0", + "ethereum-types": "^1.1.1", "ethereumjs-blockstream": "6.0.0", "ethereumjs-util": "^5.1.1", "ethers": "~4.0.4", diff --git a/packages/contract-wrappers/src/abstract/abstract_balance_and_proxy_allowance_lazy_store.ts b/packages/contract-wrappers/src/abstract/abstract_balance_and_proxy_allowance_lazy_store.ts index 1f139f1efa..b095c8e79f 100644 --- a/packages/contract-wrappers/src/abstract/abstract_balance_and_proxy_allowance_lazy_store.ts +++ b/packages/contract-wrappers/src/abstract/abstract_balance_and_proxy_allowance_lazy_store.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; export abstract class AbstractBalanceAndProxyAllowanceLazyStore { public abstract async getBalanceAsync(tokenAddress: string, userAddress: string): Promise; diff --git a/packages/contract-wrappers/src/contract_wrappers.ts b/packages/contract-wrappers/src/contract_wrappers.ts index 36381c623f..0c535bd5cb 100644 --- a/packages/contract-wrappers/src/contract_wrappers.ts +++ b/packages/contract-wrappers/src/contract_wrappers.ts @@ -7,8 +7,8 @@ import { Forwarder, OrderValidator, WETH9, -} from '@0xproject/contract-artifacts'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +} from '@0x/contract-artifacts'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { Provider } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts index e03e4188b3..7b11f35bc0 100644 --- a/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts +++ b/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts @@ -1,5 +1,5 @@ -import { AbiDecoder, intervalUtils, logUtils } from '@0xproject/utils'; -import { marshaller, Web3Wrapper } from '@0xproject/web3-wrapper'; +import { AbiDecoder, intervalUtils, logUtils } from '@0x/utils'; +import { marshaller, Web3Wrapper } from '@0x/web3-wrapper'; import { BlockParamLiteral, ContractAbi, diff --git a/packages/contract-wrappers/src/contract_wrappers/erc20_proxy_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/erc20_proxy_wrapper.ts index e59b2c20b7..adf8c76142 100644 --- a/packages/contract-wrappers/src/contract_wrappers/erc20_proxy_wrapper.ts +++ b/packages/contract-wrappers/src/contract_wrappers/erc20_proxy_wrapper.ts @@ -1,7 +1,7 @@ -import { ERC20ProxyContract } from '@0xproject/abi-gen-wrappers'; -import { ERC20Proxy } from '@0xproject/contract-artifacts'; -import { AssetProxyId } from '@0xproject/types'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { ERC20ProxyContract } from '@0x/abi-gen-wrappers'; +import { ERC20Proxy } from '@0x/contract-artifacts'; +import { AssetProxyId } from '@0x/types'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { ContractAbi } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/contract-wrappers/src/contract_wrappers/erc20_token_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/erc20_token_wrapper.ts index 192eaf0a77..f5fc63b424 100644 --- a/packages/contract-wrappers/src/contract_wrappers/erc20_token_wrapper.ts +++ b/packages/contract-wrappers/src/contract_wrappers/erc20_token_wrapper.ts @@ -1,8 +1,8 @@ -import { ERC20TokenContract, ERC20TokenEventArgs, ERC20TokenEvents } from '@0xproject/abi-gen-wrappers'; -import { ERC20Token } from '@0xproject/contract-artifacts'; -import { schemas } from '@0xproject/json-schemas'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { ERC20TokenContract, ERC20TokenEventArgs, ERC20TokenEvents } from '@0x/abi-gen-wrappers'; +import { ERC20Token } from '@0x/contract-artifacts'; +import { schemas } from '@0x/json-schemas'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { ContractAbi, LogWithDecodedArgs } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/contract-wrappers/src/contract_wrappers/erc721_proxy_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/erc721_proxy_wrapper.ts index adee3e3abd..9f3a6930b8 100644 --- a/packages/contract-wrappers/src/contract_wrappers/erc721_proxy_wrapper.ts +++ b/packages/contract-wrappers/src/contract_wrappers/erc721_proxy_wrapper.ts @@ -1,7 +1,7 @@ -import { ERC721ProxyContract } from '@0xproject/abi-gen-wrappers'; -import { ERC721Proxy } from '@0xproject/contract-artifacts'; -import { AssetProxyId } from '@0xproject/types'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { ERC721ProxyContract } from '@0x/abi-gen-wrappers'; +import { ERC721Proxy } from '@0x/contract-artifacts'; +import { AssetProxyId } from '@0x/types'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { ContractAbi } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/contract-wrappers/src/contract_wrappers/erc721_token_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/erc721_token_wrapper.ts index d92d7087c3..1c4b61c0bb 100644 --- a/packages/contract-wrappers/src/contract_wrappers/erc721_token_wrapper.ts +++ b/packages/contract-wrappers/src/contract_wrappers/erc721_token_wrapper.ts @@ -1,8 +1,8 @@ -import { ERC721TokenContract, ERC721TokenEventArgs, ERC721TokenEvents } from '@0xproject/abi-gen-wrappers'; -import { ERC721Token } from '@0xproject/contract-artifacts'; -import { schemas } from '@0xproject/json-schemas'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { ERC721TokenContract, ERC721TokenEventArgs, ERC721TokenEvents } from '@0x/abi-gen-wrappers'; +import { ERC721Token } from '@0x/contract-artifacts'; +import { schemas } from '@0x/json-schemas'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { ContractAbi, LogWithDecodedArgs } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/contract-wrappers/src/contract_wrappers/ether_token_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/ether_token_wrapper.ts index d5775208e1..d4a08da866 100644 --- a/packages/contract-wrappers/src/contract_wrappers/ether_token_wrapper.ts +++ b/packages/contract-wrappers/src/contract_wrappers/ether_token_wrapper.ts @@ -1,8 +1,8 @@ -import { WETH9Contract, WETH9EventArgs, WETH9Events } from '@0xproject/abi-gen-wrappers'; -import { WETH9 } from '@0xproject/contract-artifacts'; -import { schemas } from '@0xproject/json-schemas'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { WETH9Contract, WETH9EventArgs, WETH9Events } from '@0x/abi-gen-wrappers'; +import { WETH9 } from '@0x/contract-artifacts'; +import { schemas } from '@0x/json-schemas'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { ContractAbi, LogWithDecodedArgs } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts index 9063e0e409..907d25aa00 100644 --- a/packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts +++ b/packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts @@ -1,15 +1,15 @@ -import { ExchangeContract, ExchangeEventArgs, ExchangeEvents } from '@0xproject/abi-gen-wrappers'; -import { Exchange } from '@0xproject/contract-artifacts'; -import { schemas } from '@0xproject/json-schemas'; +import { ExchangeContract, ExchangeEventArgs, ExchangeEvents } from '@0x/abi-gen-wrappers'; +import { Exchange } from '@0x/contract-artifacts'; +import { schemas } from '@0x/json-schemas'; import { assetDataUtils, BalanceAndProxyAllowanceLazyStore, ExchangeTransferSimulator, OrderValidationUtils, -} from '@0xproject/order-utils'; -import { AssetProxyId, Order, SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +} from '@0x/order-utils'; +import { AssetProxyId, Order, SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { BlockParamLiteral, ContractAbi, LogWithDecodedArgs } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/contract-wrappers/src/contract_wrappers/forwarder_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/forwarder_wrapper.ts index b6fc071ea6..9463a6849a 100644 --- a/packages/contract-wrappers/src/contract_wrappers/forwarder_wrapper.ts +++ b/packages/contract-wrappers/src/contract_wrappers/forwarder_wrapper.ts @@ -1,9 +1,9 @@ -import { ForwarderContract } from '@0xproject/abi-gen-wrappers'; -import { Forwarder } from '@0xproject/contract-artifacts'; -import { schemas } from '@0xproject/json-schemas'; -import { AssetProxyId, SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { ForwarderContract } from '@0x/abi-gen-wrappers'; +import { Forwarder } from '@0x/contract-artifacts'; +import { schemas } from '@0x/json-schemas'; +import { AssetProxyId, SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { ContractAbi } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/contract-wrappers/src/contract_wrappers/order_validator_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/order_validator_wrapper.ts index 2ae1a158bd..c186e080e0 100644 --- a/packages/contract-wrappers/src/contract_wrappers/order_validator_wrapper.ts +++ b/packages/contract-wrappers/src/contract_wrappers/order_validator_wrapper.ts @@ -1,9 +1,9 @@ -import { OrderValidatorContract } from '@0xproject/abi-gen-wrappers'; -import { OrderValidator } from '@0xproject/contract-artifacts'; -import { schemas } from '@0xproject/json-schemas'; -import { SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { OrderValidatorContract } from '@0x/abi-gen-wrappers'; +import { OrderValidator } from '@0x/contract-artifacts'; +import { schemas } from '@0x/json-schemas'; +import { SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { ContractAbi } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/contract-wrappers/src/fetchers/asset_balance_and_proxy_allowance_fetcher.ts b/packages/contract-wrappers/src/fetchers/asset_balance_and_proxy_allowance_fetcher.ts index 023cd5ac3b..d10cffe572 100644 --- a/packages/contract-wrappers/src/fetchers/asset_balance_and_proxy_allowance_fetcher.ts +++ b/packages/contract-wrappers/src/fetchers/asset_balance_and_proxy_allowance_fetcher.ts @@ -1,7 +1,7 @@ // tslint:disable:no-unnecessary-type-assertion -import { AbstractBalanceAndProxyAllowanceFetcher, assetDataUtils } from '@0xproject/order-utils'; -import { AssetProxyId, ERC20AssetData, ERC721AssetData } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { AbstractBalanceAndProxyAllowanceFetcher, assetDataUtils } from '@0x/order-utils'; +import { AssetProxyId, ERC20AssetData, ERC721AssetData } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import { BlockParamLiteral } from 'ethereum-types'; import { ERC20TokenWrapper } from '../contract_wrappers/erc20_token_wrapper'; diff --git a/packages/contract-wrappers/src/fetchers/order_filled_cancelled_fetcher.ts b/packages/contract-wrappers/src/fetchers/order_filled_cancelled_fetcher.ts index 7a252aed32..acf7038fac 100644 --- a/packages/contract-wrappers/src/fetchers/order_filled_cancelled_fetcher.ts +++ b/packages/contract-wrappers/src/fetchers/order_filled_cancelled_fetcher.ts @@ -1,6 +1,6 @@ // tslint:disable:no-unnecessary-type-assertion -import { AbstractOrderFilledCancelledFetcher } from '@0xproject/order-utils'; -import { BigNumber } from '@0xproject/utils'; +import { AbstractOrderFilledCancelledFetcher } from '@0x/order-utils'; +import { BigNumber } from '@0x/utils'; import { BlockParamLiteral } from 'ethereum-types'; import { ExchangeWrapper } from '../contract_wrappers/exchange_wrapper'; diff --git a/packages/contract-wrappers/src/index.ts b/packages/contract-wrappers/src/index.ts index f248281534..a38bd122b7 100644 --- a/packages/contract-wrappers/src/index.ts +++ b/packages/contract-wrappers/src/index.ts @@ -1,4 +1,4 @@ -export { ContractAddresses } from '@0xproject/contract-addresses'; +export { ContractAddresses } from '@0x/contract-addresses'; export { WETH9Events, @@ -23,7 +23,7 @@ export { ExchangeCancelEventArgs, ExchangeEventArgs, ExchangeEvents, -} from '@0xproject/abi-gen-wrappers'; +} from '@0x/abi-gen-wrappers'; export { ContractWrappers } from './contract_wrappers'; export { ERC20TokenWrapper } from './contract_wrappers/erc20_token_wrapper'; @@ -55,7 +55,7 @@ export { ValidateOrderFillableOpts, } from './types'; -export { Order, SignedOrder, AssetProxyId } from '@0xproject/types'; +export { Order, SignedOrder, AssetProxyId } from '@0x/types'; export { BlockParamLiteral, @@ -81,7 +81,7 @@ export { StateMutability, } from 'ethereum-types'; -export { AbstractBalanceAndProxyAllowanceFetcher, AbstractOrderFilledCancelledFetcher } from '@0xproject/order-utils'; +export { AbstractBalanceAndProxyAllowanceFetcher, AbstractOrderFilledCancelledFetcher } from '@0x/order-utils'; export { AssetBalanceAndProxyAllowanceFetcher } from './fetchers/asset_balance_and_proxy_allowance_fetcher'; export { OrderFilledCancelledFetcher } from './fetchers/order_filled_cancelled_fetcher'; diff --git a/packages/contract-wrappers/src/types.ts b/packages/contract-wrappers/src/types.ts index 895a47cc1b..60750179f8 100644 --- a/packages/contract-wrappers/src/types.ts +++ b/packages/contract-wrappers/src/types.ts @@ -7,10 +7,10 @@ import { ExchangeEvents, WETH9EventArgs, WETH9Events, -} from '@0xproject/abi-gen-wrappers'; -import { ContractAddresses } from '@0xproject/contract-addresses'; -import { OrderState, SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +} from '@0x/abi-gen-wrappers'; +import { ContractAddresses } from '@0x/contract-addresses'; +import { OrderState, SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import { BlockParam, ContractEventArg, DecodedLogArgs, LogEntryEvent, LogWithDecodedArgs } from 'ethereum-types'; diff --git a/packages/contract-wrappers/src/utils/assert.ts b/packages/contract-wrappers/src/utils/assert.ts index 30726c5463..3f02ed0524 100644 --- a/packages/contract-wrappers/src/utils/assert.ts +++ b/packages/contract-wrappers/src/utils/assert.ts @@ -1,10 +1,10 @@ -import { assert as sharedAssert } from '@0xproject/assert'; +import { assert as sharedAssert } from '@0x/assert'; // HACK: We need those two unused imports because they're actually used by sharedAssert which gets injected here -import { Schema } from '@0xproject/json-schemas'; // tslint:disable-line:no-unused-variable -import { assetDataUtils, signatureUtils } from '@0xproject/order-utils'; -import { Order } from '@0xproject/types'; // tslint:disable-line:no-unused-variable -import { BigNumber } from '@0xproject/utils'; // tslint:disable-line:no-unused-variable -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { Schema } from '@0x/json-schemas'; // tslint:disable-line:no-unused-variable +import { assetDataUtils, signatureUtils } from '@0x/order-utils'; +import { Order } from '@0x/types'; // tslint:disable-line:no-unused-variable +import { BigNumber } from '@0x/utils'; // tslint:disable-line:no-unused-variable +import { Web3Wrapper } from '@0x/web3-wrapper'; import { Provider } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/contract-wrappers/src/utils/calldata_optimization_utils.ts b/packages/contract-wrappers/src/utils/calldata_optimization_utils.ts index 3172cf5315..bee7acaa7c 100644 --- a/packages/contract-wrappers/src/utils/calldata_optimization_utils.ts +++ b/packages/contract-wrappers/src/utils/calldata_optimization_utils.ts @@ -1,4 +1,4 @@ -import { SignedOrder } from '@0xproject/types'; +import { SignedOrder } from '@0x/types'; import * as _ from 'lodash'; import { constants } from './constants'; diff --git a/packages/contract-wrappers/src/utils/constants.ts b/packages/contract-wrappers/src/utils/constants.ts index 78441decf7..9ff61f62af 100644 --- a/packages/contract-wrappers/src/utils/constants.ts +++ b/packages/contract-wrappers/src/utils/constants.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; export const constants = { NULL_ADDRESS: '0x0000000000000000000000000000000000000000', diff --git a/packages/contract-wrappers/src/utils/contract_addresses.ts b/packages/contract-wrappers/src/utils/contract_addresses.ts index 98967c52da..dc156e0171 100644 --- a/packages/contract-wrappers/src/utils/contract_addresses.ts +++ b/packages/contract-wrappers/src/utils/contract_addresses.ts @@ -1,4 +1,4 @@ -import { ContractAddresses, getContractAddressesForNetworkOrThrow, NetworkId } from '@0xproject/contract-addresses'; +import { ContractAddresses, getContractAddressesForNetworkOrThrow, NetworkId } from '@0x/contract-addresses'; import * as _ from 'lodash'; /** diff --git a/packages/contract-wrappers/src/utils/exchange_transfer_simulator.ts b/packages/contract-wrappers/src/utils/exchange_transfer_simulator.ts index a7c4a238f5..f374d509b5 100644 --- a/packages/contract-wrappers/src/utils/exchange_transfer_simulator.ts +++ b/packages/contract-wrappers/src/utils/exchange_transfer_simulator.ts @@ -1,5 +1,5 @@ -import { ExchangeContractErrs } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { ExchangeContractErrs } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import { AbstractBalanceAndProxyAllowanceLazyStore } from '../abstract/abstract_balance_and_proxy_allowance_lazy_store'; import { TradeSide, TransferType } from '../types'; diff --git a/packages/contract-wrappers/src/utils/transaction_encoder.ts b/packages/contract-wrappers/src/utils/transaction_encoder.ts index d179fa07e0..0cf08a8fe6 100644 --- a/packages/contract-wrappers/src/utils/transaction_encoder.ts +++ b/packages/contract-wrappers/src/utils/transaction_encoder.ts @@ -1,9 +1,9 @@ -import { ExchangeContract } from '@0xproject/abi-gen-wrappers'; +import { ExchangeContract } from '@0x/abi-gen-wrappers'; -import { schemas } from '@0xproject/json-schemas'; -import { eip712Utils } from '@0xproject/order-utils'; -import { Order, SignedOrder } from '@0xproject/types'; -import { BigNumber, signTypedDataUtils } from '@0xproject/utils'; +import { schemas } from '@0x/json-schemas'; +import { eip712Utils } from '@0x/order-utils'; +import { Order, SignedOrder } from '@0x/types'; +import { BigNumber, signTypedDataUtils } from '@0x/utils'; import _ = require('lodash'); import { assert } from './assert'; diff --git a/packages/contract-wrappers/src/utils/utils.ts b/packages/contract-wrappers/src/utils/utils.ts index f7949ec34d..fbacdaa285 100644 --- a/packages/contract-wrappers/src/utils/utils.ts +++ b/packages/contract-wrappers/src/utils/utils.ts @@ -1,5 +1,5 @@ -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { constants } from './constants'; diff --git a/packages/contract-wrappers/test/calldata_optimization_utils_test.ts b/packages/contract-wrappers/test/calldata_optimization_utils_test.ts index 94e55bffa7..6cb8a669e3 100644 --- a/packages/contract-wrappers/test/calldata_optimization_utils_test.ts +++ b/packages/contract-wrappers/test/calldata_optimization_utils_test.ts @@ -1,4 +1,4 @@ -import { orderFactory } from '@0xproject/order-utils/lib/src/order_factory'; +import { orderFactory } from '@0x/order-utils/lib/src/order_factory'; import * as chai from 'chai'; import * as _ from 'lodash'; import 'mocha'; diff --git a/packages/contract-wrappers/test/erc20_wrapper_test.ts b/packages/contract-wrappers/test/erc20_wrapper_test.ts index c065f4d635..15d3a9ead3 100644 --- a/packages/contract-wrappers/test/erc20_wrapper_test.ts +++ b/packages/contract-wrappers/test/erc20_wrapper_test.ts @@ -1,8 +1,8 @@ -import { ContractAddresses } from '@0xproject/contract-addresses'; -import { BlockchainLifecycle, callbackErrorReporter } from '@0xproject/dev-utils'; -import { EmptyWalletSubprovider, Web3ProviderEngine } from '@0xproject/subproviders'; -import { DoneCallback } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { ContractAddresses } from '@0x/contract-addresses'; +import { BlockchainLifecycle, callbackErrorReporter } from '@0x/dev-utils'; +import { EmptyWalletSubprovider, Web3ProviderEngine } from '@0x/subproviders'; +import { DoneCallback } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import { Provider } from 'ethereum-types'; import 'mocha'; diff --git a/packages/contract-wrappers/test/erc721_wrapper_test.ts b/packages/contract-wrappers/test/erc721_wrapper_test.ts index 1efbb37c7c..a7f1e4c411 100644 --- a/packages/contract-wrappers/test/erc721_wrapper_test.ts +++ b/packages/contract-wrappers/test/erc721_wrapper_test.ts @@ -1,7 +1,7 @@ -import { BlockchainLifecycle, callbackErrorReporter } from '@0xproject/dev-utils'; -import { EmptyWalletSubprovider, Web3ProviderEngine } from '@0xproject/subproviders'; -import { DoneCallback } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { BlockchainLifecycle, callbackErrorReporter } from '@0x/dev-utils'; +import { EmptyWalletSubprovider, Web3ProviderEngine } from '@0x/subproviders'; +import { DoneCallback } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import { Provider } from 'ethereum-types'; import 'mocha'; diff --git a/packages/contract-wrappers/test/ether_token_wrapper_test.ts b/packages/contract-wrappers/test/ether_token_wrapper_test.ts index 74d030e1da..e3efef19db 100644 --- a/packages/contract-wrappers/test/ether_token_wrapper_test.ts +++ b/packages/contract-wrappers/test/ether_token_wrapper_test.ts @@ -1,8 +1,8 @@ -import { ContractAddresses } from '@0xproject/contract-addresses'; -import { BlockchainLifecycle, callbackErrorReporter } from '@0xproject/dev-utils'; -import { DoneCallback } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { ContractAddresses } from '@0x/contract-addresses'; +import { BlockchainLifecycle, callbackErrorReporter } from '@0x/dev-utils'; +import { DoneCallback } from '@0x/types'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import 'mocha'; diff --git a/packages/contract-wrappers/test/exchange_wrapper_test.ts b/packages/contract-wrappers/test/exchange_wrapper_test.ts index 4d01763498..0e537bd834 100644 --- a/packages/contract-wrappers/test/exchange_wrapper_test.ts +++ b/packages/contract-wrappers/test/exchange_wrapper_test.ts @@ -1,8 +1,8 @@ -import { BlockchainLifecycle, callbackErrorReporter } from '@0xproject/dev-utils'; -import { FillScenarios } from '@0xproject/fill-scenarios'; -import { assetDataUtils, orderHashUtils } from '@0xproject/order-utils'; -import { DoneCallback, SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { BlockchainLifecycle, callbackErrorReporter } from '@0x/dev-utils'; +import { FillScenarios } from '@0x/fill-scenarios'; +import { assetDataUtils, orderHashUtils } from '@0x/order-utils'; +import { DoneCallback, SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import { BlockParamLiteral } from 'ethereum-types'; import 'mocha'; diff --git a/packages/contract-wrappers/test/forwarder_wrapper_test.ts b/packages/contract-wrappers/test/forwarder_wrapper_test.ts index 730658884b..ff4ff8b67a 100644 --- a/packages/contract-wrappers/test/forwarder_wrapper_test.ts +++ b/packages/contract-wrappers/test/forwarder_wrapper_test.ts @@ -1,8 +1,8 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { FillScenarios } from '@0xproject/fill-scenarios'; -import { assetDataUtils } from '@0xproject/order-utils'; -import { SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { FillScenarios } from '@0x/fill-scenarios'; +import { assetDataUtils } from '@0x/order-utils'; +import { SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import 'mocha'; diff --git a/packages/contract-wrappers/test/order_validator_wrapper_test.ts b/packages/contract-wrappers/test/order_validator_wrapper_test.ts index 636aa9a500..da3f99e724 100644 --- a/packages/contract-wrappers/test/order_validator_wrapper_test.ts +++ b/packages/contract-wrappers/test/order_validator_wrapper_test.ts @@ -1,9 +1,9 @@ -import { ContractAddresses } from '@0xproject/contract-addresses'; -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { FillScenarios } from '@0xproject/fill-scenarios'; -import { assetDataUtils } from '@0xproject/order-utils'; -import { SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { ContractAddresses } from '@0x/contract-addresses'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { FillScenarios } from '@0x/fill-scenarios'; +import { assetDataUtils } from '@0x/order-utils'; +import { SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import * as _ from 'lodash'; import 'mocha'; diff --git a/packages/contract-wrappers/test/revert_validation_test.ts b/packages/contract-wrappers/test/revert_validation_test.ts index f5f8be6c37..efd5dd61f1 100644 --- a/packages/contract-wrappers/test/revert_validation_test.ts +++ b/packages/contract-wrappers/test/revert_validation_test.ts @@ -1,10 +1,10 @@ -import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-utils'; -import { FillScenarios } from '@0xproject/fill-scenarios'; -import { runMigrationsAsync } from '@0xproject/migrations'; -import { assetDataUtils } from '@0xproject/order-utils'; -import { SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BlockchainLifecycle, devConstants, web3Factory } from '@0x/dev-utils'; +import { FillScenarios } from '@0x/fill-scenarios'; +import { runMigrationsAsync } from '@0x/migrations'; +import { assetDataUtils } from '@0x/order-utils'; +import { SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import 'mocha'; diff --git a/packages/contract-wrappers/test/subscription_test.ts b/packages/contract-wrappers/test/subscription_test.ts index 40921bce8d..0fa6af40d1 100644 --- a/packages/contract-wrappers/test/subscription_test.ts +++ b/packages/contract-wrappers/test/subscription_test.ts @@ -1,5 +1,5 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { DoneCallback } from '@0xproject/types'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { DoneCallback } from '@0x/types'; import * as _ from 'lodash'; import 'mocha'; import * as Sinon from 'sinon'; diff --git a/packages/contract-wrappers/test/transaction_encoder_test.ts b/packages/contract-wrappers/test/transaction_encoder_test.ts index 300f2a3302..ef9eb2cf3c 100644 --- a/packages/contract-wrappers/test/transaction_encoder_test.ts +++ b/packages/contract-wrappers/test/transaction_encoder_test.ts @@ -1,8 +1,8 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { FillScenarios } from '@0xproject/fill-scenarios'; -import { assetDataUtils, generatePseudoRandomSalt, orderHashUtils, signatureUtils } from '@0xproject/order-utils'; -import { SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { FillScenarios } from '@0x/fill-scenarios'; +import { assetDataUtils, generatePseudoRandomSalt, orderHashUtils, signatureUtils } from '@0x/order-utils'; +import { SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import 'mocha'; import { ContractWrappers } from '../src'; diff --git a/packages/contract-wrappers/test/utils/constants.ts b/packages/contract-wrappers/test/utils/constants.ts index f38728b77f..ca6c574e4f 100644 --- a/packages/contract-wrappers/test/utils/constants.ts +++ b/packages/contract-wrappers/test/utils/constants.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; export const constants = { NULL_ADDRESS: '0x0000000000000000000000000000000000000000', diff --git a/packages/contract-wrappers/test/utils/migrate.ts b/packages/contract-wrappers/test/utils/migrate.ts index 53319a3836..665ce0faaa 100644 --- a/packages/contract-wrappers/test/utils/migrate.ts +++ b/packages/contract-wrappers/test/utils/migrate.ts @@ -1,6 +1,6 @@ -import { ContractAddresses } from '@0xproject/contract-addresses'; -import { devConstants } from '@0xproject/dev-utils'; -import { runMigrationsOnceAsync } from '@0xproject/migrations'; +import { ContractAddresses } from '@0x/contract-addresses'; +import { devConstants } from '@0x/dev-utils'; +import { runMigrationsOnceAsync } from '@0x/migrations'; import { provider } from './web3_wrapper'; diff --git a/packages/contract-wrappers/test/utils/token_utils.ts b/packages/contract-wrappers/test/utils/token_utils.ts index c9e1e74347..f8a88637f9 100644 --- a/packages/contract-wrappers/test/utils/token_utils.ts +++ b/packages/contract-wrappers/test/utils/token_utils.ts @@ -1,7 +1,7 @@ -import { DummyERC721TokenContract } from '@0xproject/abi-gen-wrappers'; -import { DummyERC721Token } from '@0xproject/contract-artifacts'; -import { generatePseudoRandomSalt } from '@0xproject/order-utils'; -import { BigNumber } from '@0xproject/utils'; +import { DummyERC721TokenContract } from '@0x/abi-gen-wrappers'; +import { DummyERC721Token } from '@0x/contract-artifacts'; +import { generatePseudoRandomSalt } from '@0x/order-utils'; +import { BigNumber } from '@0x/utils'; import { provider, txDefaults, web3Wrapper } from './web3_wrapper'; diff --git a/packages/contract-wrappers/test/utils/web3_wrapper.ts b/packages/contract-wrappers/test/utils/web3_wrapper.ts index 02c8c59188..4e86ebeba2 100644 --- a/packages/contract-wrappers/test/utils/web3_wrapper.ts +++ b/packages/contract-wrappers/test/utils/web3_wrapper.ts @@ -1,5 +1,5 @@ -import { devConstants, web3Factory } from '@0xproject/dev-utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { devConstants, web3Factory } from '@0x/dev-utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { Provider } from 'ethereum-types'; const txDefaults = { diff --git a/packages/contract-wrappers/tslint.json b/packages/contract-wrappers/tslint.json index ffaefe83a6..dd9053357e 100644 --- a/packages/contract-wrappers/tslint.json +++ b/packages/contract-wrappers/tslint.json @@ -1,3 +1,3 @@ { - "extends": ["@0xproject/tslint-config"] + "extends": ["@0x/tslint-config"] } diff --git a/packages/contract_templates/README.md b/packages/contract_templates/README.md index e5f4b09d11..c6cc3b1b38 100644 --- a/packages/contract_templates/README.md +++ b/packages/contract_templates/README.md @@ -2,7 +2,7 @@ These templates are used with [abi-gen](https://github.com/0xProject/0x-monorepo To successfully compile the generated TypeScript contract wrappers, you must: -* Install the packages on which the main contract template directly depends: `yarn add @0xproject/base-contract @0xproject/sol-compiler @0xproject/utils @0xproject/web3-wrapper ethereum-types ethers lodash` +* Install the packages on which the main contract template directly depends: `yarn add @0x/base-contract @0x/sol-compiler @0x/utils @0x/web3-wrapper ethereum-types ethers lodash` * Install the packages on which the main contract template *in*directly depends: `yarn add @types/lodash` * Ensure that your TypeScript configuration includes the following: @@ -10,7 +10,7 @@ To successfully compile the generated TypeScript contract wrappers, you must: "compilerOptions": { "lib": ["ES2015"], "typeRoots": [ - "node_modules/@0xproject/typescript-typings/types", + "node_modules/@0x/typescript-typings/types", "node_modules/@types" ] } diff --git a/packages/contract_templates/contract.handlebars b/packages/contract_templates/contract.handlebars index 41e5c86305..9c1952ed4b 100644 --- a/packages/contract_templates/contract.handlebars +++ b/packages/contract_templates/contract.handlebars @@ -1,10 +1,10 @@ // tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace class-name // tslint:disable:no-unused-variable // tslint:disable:no-unbound-method -import { BaseContract } from '@0xproject/base-contract'; +import { BaseContract } from '@0x/base-contract'; import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types'; -import { BigNumber, classUtils, logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber, classUtils, logUtils } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as ethers from 'ethers'; import * as _ from 'lodash'; // tslint:enable:no-unused-variable diff --git a/packages/contracts/README.md b/packages/contracts/README.md index 33cbdae261..11579cf476 100644 --- a/packages/contracts/README.md +++ b/packages/contracts/README.md @@ -107,7 +107,7 @@ TEST_PROVIDER=geth yarn test ###### Code coverage -In order to see the Solidity code coverage output generated by `@0xproject/sol-cov`, run: +In order to see the Solidity code coverage output generated by `@0x/sol-cov`, run: ``` yarn test:coverage diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 33ae3db9ab..3a5f12c740 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "contracts", - "version": "2.1.49", + "version": "2.1.50", "engines": { "node": ">=6.12" }, @@ -45,12 +45,12 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts/README.md", "devDependencies": { - "@0xproject/abi-gen": "^1.0.13", - "@0xproject/dev-utils": "^1.0.12", - "@0xproject/sol-compiler": "^1.1.7", - "@0xproject/sol-cov": "^2.1.7", - "@0xproject/subproviders": "^2.0.7", - "@0xproject/tslint-config": "^1.0.8", + "@0x/abi-gen": "^1.0.14", + "@0x/dev-utils": "^1.0.13", + "@0x/sol-compiler": "^1.1.8", + "@0x/sol-cov": "^2.1.8", + "@0x/subproviders": "^2.1.0", + "@0x/tslint-config": "^1.0.9", "@types/bn.js": "^4.11.0", "@types/ethereumjs-abi": "^0.6.0", "@types/lodash": "4.14.104", @@ -71,15 +71,15 @@ "yargs": "^10.0.3" }, "dependencies": { - "@0xproject/base-contract": "^3.0.1", - "@0xproject/order-utils": "^1.0.7", - "@0xproject/types": "^1.1.4", - "@0xproject/typescript-typings": "^3.0.2", - "@0xproject/utils": "^2.0.2", - "@0xproject/web3-wrapper": "^3.0.3", + "@0x/base-contract": "^3.0.2", + "@0x/order-utils": "^2.0.0", + "@0x/types": "^1.2.0", + "@0x/typescript-typings": "^3.0.3", + "@0x/utils": "^2.0.3", + "@0x/web3-wrapper": "^3.1.0", "@types/js-combinatorics": "^0.5.29", "bn.js": "^4.11.8", - "ethereum-types": "^1.0.11", + "ethereum-types": "^1.1.1", "ethereumjs-abi": "0.6.5", "ethereumjs-util": "^5.1.1", "ethers": "~4.0.4", diff --git a/packages/contracts/test/asset_proxy/authorizable.ts b/packages/contracts/test/asset_proxy/authorizable.ts index a37a865fe0..e21af9b81a 100644 --- a/packages/contracts/test/asset_proxy/authorizable.ts +++ b/packages/contracts/test/asset_proxy/authorizable.ts @@ -1,6 +1,6 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { RevertReason } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { RevertReason } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import * as _ from 'lodash'; diff --git a/packages/contracts/test/asset_proxy/proxies.ts b/packages/contracts/test/asset_proxy/proxies.ts index a46a580d1b..b8305993ee 100644 --- a/packages/contracts/test/asset_proxy/proxies.ts +++ b/packages/contracts/test/asset_proxy/proxies.ts @@ -1,7 +1,7 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { assetDataUtils } from '@0xproject/order-utils'; -import { RevertReason } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { assetDataUtils } from '@0x/order-utils'; +import { RevertReason } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import * as _ from 'lodash'; diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts index a47240efc3..fc8dc5346a 100644 --- a/packages/contracts/test/exchange/core.ts +++ b/packages/contracts/test/exchange/core.ts @@ -1,8 +1,8 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { assetDataUtils, orderHashUtils } from '@0xproject/order-utils'; -import { RevertReason, SignatureType, SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { assetDataUtils, orderHashUtils } from '@0x/order-utils'; +import { RevertReason, SignatureType, SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import { LogWithDecodedArgs } from 'ethereum-types'; import ethUtil = require('ethereumjs-util'); diff --git a/packages/contracts/test/exchange/dispatcher.ts b/packages/contracts/test/exchange/dispatcher.ts index 2967ed4e8e..3d3aa42c26 100644 --- a/packages/contracts/test/exchange/dispatcher.ts +++ b/packages/contracts/test/exchange/dispatcher.ts @@ -1,7 +1,7 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { assetDataUtils } from '@0xproject/order-utils'; -import { AssetProxyId, RevertReason } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { assetDataUtils } from '@0x/order-utils'; +import { AssetProxyId, RevertReason } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import { LogWithDecodedArgs } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/contracts/test/exchange/fill_order.ts b/packages/contracts/test/exchange/fill_order.ts index b1e08324f5..37efaad2b2 100644 --- a/packages/contracts/test/exchange/fill_order.ts +++ b/packages/contracts/test/exchange/fill_order.ts @@ -1,4 +1,4 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; +import { BlockchainLifecycle } from '@0x/dev-utils'; import * as _ from 'lodash'; import { chaiSetup } from '../utils/chai_setup'; diff --git a/packages/contracts/test/exchange/internal.ts b/packages/contracts/test/exchange/internal.ts index a1a14d56c1..109be29c68 100644 --- a/packages/contracts/test/exchange/internal.ts +++ b/packages/contracts/test/exchange/internal.ts @@ -1,6 +1,6 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { Order, RevertReason, SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { Order, RevertReason, SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import * as _ from 'lodash'; diff --git a/packages/contracts/test/exchange/libs.ts b/packages/contracts/test/exchange/libs.ts index 9d5aebcd23..503ef0e0fe 100644 --- a/packages/contracts/test/exchange/libs.ts +++ b/packages/contracts/test/exchange/libs.ts @@ -1,7 +1,7 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { assetDataUtils, orderHashUtils } from '@0xproject/order-utils'; -import { SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { assetDataUtils, orderHashUtils } from '@0x/order-utils'; +import { SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import { TestConstantsContract } from '../../generated-wrappers/test_constants'; diff --git a/packages/contracts/test/exchange/match_orders.ts b/packages/contracts/test/exchange/match_orders.ts index d20b6227fe..eea9992d9b 100644 --- a/packages/contracts/test/exchange/match_orders.ts +++ b/packages/contracts/test/exchange/match_orders.ts @@ -1,8 +1,8 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { assetDataUtils } from '@0xproject/order-utils'; -import { RevertReason } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { assetDataUtils } from '@0x/order-utils'; +import { RevertReason } from '@0x/types'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import * as _ from 'lodash'; diff --git a/packages/contracts/test/exchange/signature_validator.ts b/packages/contracts/test/exchange/signature_validator.ts index 6b9cc87f49..756c727668 100644 --- a/packages/contracts/test/exchange/signature_validator.ts +++ b/packages/contracts/test/exchange/signature_validator.ts @@ -1,6 +1,6 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { assetDataUtils, orderHashUtils, signatureUtils } from '@0xproject/order-utils'; -import { RevertReason, SignatureType, SignedOrder } from '@0xproject/types'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { assetDataUtils, orderHashUtils, signatureUtils } from '@0x/order-utils'; +import { RevertReason, SignatureType, SignedOrder } from '@0x/types'; import * as chai from 'chai'; import { LogWithDecodedArgs } from 'ethereum-types'; import ethUtil = require('ethereumjs-util'); diff --git a/packages/contracts/test/exchange/transactions.ts b/packages/contracts/test/exchange/transactions.ts index c440770c1e..1b5eef295b 100644 --- a/packages/contracts/test/exchange/transactions.ts +++ b/packages/contracts/test/exchange/transactions.ts @@ -1,7 +1,7 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { assetDataUtils, generatePseudoRandomSalt } from '@0xproject/order-utils'; -import { OrderWithoutExchangeAddress, RevertReason, SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { assetDataUtils, generatePseudoRandomSalt } from '@0x/order-utils'; +import { OrderWithoutExchangeAddress, RevertReason, SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import * as _ from 'lodash'; diff --git a/packages/contracts/test/exchange/wrapper.ts b/packages/contracts/test/exchange/wrapper.ts index 1ddb018ba1..6b660aac5e 100644 --- a/packages/contracts/test/exchange/wrapper.ts +++ b/packages/contracts/test/exchange/wrapper.ts @@ -1,8 +1,8 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { assetDataUtils, orderHashUtils } from '@0xproject/order-utils'; -import { RevertReason, SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { assetDataUtils, orderHashUtils } from '@0x/order-utils'; +import { RevertReason, SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import * as _ from 'lodash'; diff --git a/packages/contracts/test/extensions/forwarder.ts b/packages/contracts/test/extensions/forwarder.ts index f6d1303b05..b76624fa9e 100644 --- a/packages/contracts/test/extensions/forwarder.ts +++ b/packages/contracts/test/extensions/forwarder.ts @@ -1,8 +1,8 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { assetDataUtils } from '@0xproject/order-utils'; -import { RevertReason, SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { assetDataUtils } from '@0x/order-utils'; +import { RevertReason, SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import { TransactionReceiptWithDecodedLogs } from 'ethereum-types'; diff --git a/packages/contracts/test/extensions/order_validator.ts b/packages/contracts/test/extensions/order_validator.ts index 5c01de020c..37bd1b0e23 100644 --- a/packages/contracts/test/extensions/order_validator.ts +++ b/packages/contracts/test/extensions/order_validator.ts @@ -1,7 +1,7 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { assetDataUtils, orderHashUtils } from '@0xproject/order-utils'; -import { SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { assetDataUtils, orderHashUtils } from '@0x/order-utils'; +import { SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import * as _ from 'lodash'; diff --git a/packages/contracts/test/global_hooks.ts b/packages/contracts/test/global_hooks.ts index cf7c52efd2..2e9ac9e21a 100644 --- a/packages/contracts/test/global_hooks.ts +++ b/packages/contracts/test/global_hooks.ts @@ -1,4 +1,4 @@ -import { env, EnvVars } from '@0xproject/dev-utils'; +import { env, EnvVars } from '@0x/dev-utils'; import { coverage } from './utils/coverage'; import { profiler } from './utils/profiler'; diff --git a/packages/contracts/test/libraries/lib_bytes.ts b/packages/contracts/test/libraries/lib_bytes.ts index 8e8ed7edef..b1a389f00f 100644 --- a/packages/contracts/test/libraries/lib_bytes.ts +++ b/packages/contracts/test/libraries/lib_bytes.ts @@ -1,7 +1,7 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { generatePseudoRandomSalt } from '@0xproject/order-utils'; -import { RevertReason } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { generatePseudoRandomSalt } from '@0x/order-utils'; +import { RevertReason } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import BN = require('bn.js'); import * as chai from 'chai'; import ethUtil = require('ethereumjs-util'); diff --git a/packages/contracts/test/multisig/asset_proxy_owner.ts b/packages/contracts/test/multisig/asset_proxy_owner.ts index d866b392e7..087152316f 100644 --- a/packages/contracts/test/multisig/asset_proxy_owner.ts +++ b/packages/contracts/test/multisig/asset_proxy_owner.ts @@ -1,6 +1,6 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { RevertReason } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { RevertReason } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import { LogWithDecodedArgs } from 'ethereum-types'; diff --git a/packages/contracts/test/multisig/multi_sig_with_time_lock.ts b/packages/contracts/test/multisig/multi_sig_with_time_lock.ts index 60787ac504..1c0cb05152 100644 --- a/packages/contracts/test/multisig/multi_sig_with_time_lock.ts +++ b/packages/contracts/test/multisig/multi_sig_with_time_lock.ts @@ -1,6 +1,6 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { RevertReason } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { RevertReason } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import { LogWithDecodedArgs } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/contracts/test/tokens/erc721_token.ts b/packages/contracts/test/tokens/erc721_token.ts index fe10e060a1..72407748f8 100644 --- a/packages/contracts/test/tokens/erc721_token.ts +++ b/packages/contracts/test/tokens/erc721_token.ts @@ -1,6 +1,6 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { RevertReason } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { RevertReason } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import { LogWithDecodedArgs } from 'ethereum-types'; diff --git a/packages/contracts/test/tokens/unlimited_allowance_token.ts b/packages/contracts/test/tokens/unlimited_allowance_token.ts index ec00e43ab6..ea5a50522a 100644 --- a/packages/contracts/test/tokens/unlimited_allowance_token.ts +++ b/packages/contracts/test/tokens/unlimited_allowance_token.ts @@ -1,6 +1,6 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { RevertReason } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { RevertReason } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import { DummyERC20TokenContract } from '../../generated-wrappers/dummy_erc20_token'; diff --git a/packages/contracts/test/tokens/weth9.ts b/packages/contracts/test/tokens/weth9.ts index 25463ac626..9a31dc3f29 100644 --- a/packages/contracts/test/tokens/weth9.ts +++ b/packages/contracts/test/tokens/weth9.ts @@ -1,6 +1,6 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import { WETH9Contract } from '../../generated-wrappers/weth9'; diff --git a/packages/contracts/test/tokens/zrx_token.ts b/packages/contracts/test/tokens/zrx_token.ts index 8881aca771..cab62c205e 100644 --- a/packages/contracts/test/tokens/zrx_token.ts +++ b/packages/contracts/test/tokens/zrx_token.ts @@ -1,6 +1,6 @@ -import { BlockchainLifecycle } from '@0xproject/dev-utils'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BlockchainLifecycle } from '@0x/dev-utils'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import { ZRXTokenContract } from '../../generated-wrappers/zrx_token'; diff --git a/packages/contracts/test/tutorials/arbitrage.ts b/packages/contracts/test/tutorials/arbitrage.ts index 6851483ccb..78e0bc2382 100644 --- a/packages/contracts/test/tutorials/arbitrage.ts +++ b/packages/contracts/test/tutorials/arbitrage.ts @@ -1,8 +1,8 @@ // import { ECSignature, SignedOrder, ZeroEx } from '0x.js'; -// import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-utils'; +// import { BlockchainLifecycle, devConstants, web3Factory } from '@0x/dev-utils'; // import { ExchangeContractErrs } from 'ethereum-types'; -// import { BigNumber } from '@0xproject/utils'; -// import { Web3Wrapper } from '@0xproject/web3-wrapper'; +// import { BigNumber } from '@0x/utils'; +// import { Web3Wrapper } from '@0x/web3-wrapper'; // import * as chai from 'chai'; // import ethUtil = require('ethereumjs-util'); // import * as Web3 from 'web3'; diff --git a/packages/contracts/test/utils/address_utils.ts b/packages/contracts/test/utils/address_utils.ts index 3cf8ec786b..634da0c164 100644 --- a/packages/contracts/test/utils/address_utils.ts +++ b/packages/contracts/test/utils/address_utils.ts @@ -1,5 +1,5 @@ -import { generatePseudoRandomSalt } from '@0xproject/order-utils'; -import { crypto } from '@0xproject/order-utils/lib/src/crypto'; +import { generatePseudoRandomSalt } from '@0x/order-utils'; +import { crypto } from '@0x/order-utils/lib/src/crypto'; export const addressUtils = { generatePseudoRandomAddress(): string { diff --git a/packages/contracts/test/utils/assertions.ts b/packages/contracts/test/utils/assertions.ts index 3361a751a9..5b1cedfccc 100644 --- a/packages/contracts/test/utils/assertions.ts +++ b/packages/contracts/test/utils/assertions.ts @@ -1,6 +1,6 @@ -import { RevertReason } from '@0xproject/types'; -import { logUtils } from '@0xproject/utils'; -import { NodeType } from '@0xproject/web3-wrapper'; +import { RevertReason } from '@0x/types'; +import { logUtils } from '@0x/utils'; +import { NodeType } from '@0x/web3-wrapper'; import * as chai from 'chai'; import { TransactionReceipt, TransactionReceiptStatus, TransactionReceiptWithDecodedLogs } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/contracts/test/utils/asset_wrapper.ts b/packages/contracts/test/utils/asset_wrapper.ts index e3a4800c60..4e76960663 100644 --- a/packages/contracts/test/utils/asset_wrapper.ts +++ b/packages/contracts/test/utils/asset_wrapper.ts @@ -1,6 +1,6 @@ -import { assetDataUtils } from '@0xproject/order-utils'; -import { AssetProxyId } from '@0xproject/types'; -import { BigNumber, errorUtils } from '@0xproject/utils'; +import { assetDataUtils } from '@0x/order-utils'; +import { AssetProxyId } from '@0x/types'; +import { BigNumber, errorUtils } from '@0x/utils'; import * as _ from 'lodash'; import { AbstractAssetWrapper } from './abstract_asset_wrapper'; diff --git a/packages/contracts/test/utils/combinatorial_utils.ts b/packages/contracts/test/utils/combinatorial_utils.ts index d72b41f8a9..bb1b55b4dd 100644 --- a/packages/contracts/test/utils/combinatorial_utils.ts +++ b/packages/contracts/test/utils/combinatorial_utils.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; import * as combinatorics from 'js-combinatorics'; import { testWithReferenceFuncAsync } from './test_with_reference'; diff --git a/packages/contracts/test/utils/constants.ts b/packages/contracts/test/utils/constants.ts index b9ba8ccb9d..cd21330e9d 100644 --- a/packages/contracts/test/utils/constants.ts +++ b/packages/contracts/test/utils/constants.ts @@ -1,5 +1,5 @@ -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as ethUtil from 'ethereumjs-util'; import * as _ from 'lodash'; diff --git a/packages/contracts/test/utils/coverage.ts b/packages/contracts/test/utils/coverage.ts index de29a3eccb..5becfa1b65 100644 --- a/packages/contracts/test/utils/coverage.ts +++ b/packages/contracts/test/utils/coverage.ts @@ -1,5 +1,5 @@ -import { devConstants } from '@0xproject/dev-utils'; -import { CoverageSubprovider, SolCompilerArtifactAdapter } from '@0xproject/sol-cov'; +import { devConstants } from '@0x/dev-utils'; +import { CoverageSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-cov'; import * as _ from 'lodash'; let coverageSubprovider: CoverageSubprovider; diff --git a/packages/contracts/test/utils/erc20_wrapper.ts b/packages/contracts/test/utils/erc20_wrapper.ts index 05eaed52b3..c281a2abfa 100644 --- a/packages/contracts/test/utils/erc20_wrapper.ts +++ b/packages/contracts/test/utils/erc20_wrapper.ts @@ -1,6 +1,6 @@ -import { assetDataUtils } from '@0xproject/order-utils'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { assetDataUtils } from '@0x/order-utils'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { Provider } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/contracts/test/utils/erc721_wrapper.ts b/packages/contracts/test/utils/erc721_wrapper.ts index cdc8f4af6b..3ef4e701d2 100644 --- a/packages/contracts/test/utils/erc721_wrapper.ts +++ b/packages/contracts/test/utils/erc721_wrapper.ts @@ -1,6 +1,6 @@ -import { generatePseudoRandomSalt } from '@0xproject/order-utils'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { generatePseudoRandomSalt } from '@0x/order-utils'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { Provider } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/contracts/test/utils/exchange_wrapper.ts b/packages/contracts/test/utils/exchange_wrapper.ts index 00014f6603..29dba690a8 100644 --- a/packages/contracts/test/utils/exchange_wrapper.ts +++ b/packages/contracts/test/utils/exchange_wrapper.ts @@ -1,6 +1,6 @@ -import { SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types'; import { ExchangeContract } from '../../generated-wrappers/exchange'; diff --git a/packages/contracts/test/utils/fill_order_combinatorial_utils.ts b/packages/contracts/test/utils/fill_order_combinatorial_utils.ts index f7c35c4698..81bb33318f 100644 --- a/packages/contracts/test/utils/fill_order_combinatorial_utils.ts +++ b/packages/contracts/test/utils/fill_order_combinatorial_utils.ts @@ -5,10 +5,10 @@ import { orderHashUtils, OrderStateUtils, OrderValidationUtils, -} from '@0xproject/order-utils'; -import { AssetProxyId, RevertReason, SignatureType, SignedOrder } from '@0xproject/types'; -import { BigNumber, errorUtils, logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +} from '@0x/order-utils'; +import { AssetProxyId, RevertReason, SignatureType, SignedOrder } from '@0x/types'; +import { BigNumber, errorUtils, logUtils } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import { LogWithDecodedArgs, Provider, TxData } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/contracts/test/utils/formatters.ts b/packages/contracts/test/utils/formatters.ts index 32e4787d68..813eb45dbd 100644 --- a/packages/contracts/test/utils/formatters.ts +++ b/packages/contracts/test/utils/formatters.ts @@ -1,5 +1,5 @@ -import { SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; import { constants } from './constants'; diff --git a/packages/contracts/test/utils/forwarder_wrapper.ts b/packages/contracts/test/utils/forwarder_wrapper.ts index 07527bc2eb..f1a64d47dd 100644 --- a/packages/contracts/test/utils/forwarder_wrapper.ts +++ b/packages/contracts/test/utils/forwarder_wrapper.ts @@ -1,6 +1,6 @@ -import { SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { Provider, TransactionReceiptWithDecodedLogs, TxDataPayable } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/contracts/test/utils/log_decoder.ts b/packages/contracts/test/utils/log_decoder.ts index 10ddbdcba5..05b0a92048 100644 --- a/packages/contracts/test/utils/log_decoder.ts +++ b/packages/contracts/test/utils/log_decoder.ts @@ -1,5 +1,5 @@ -import { AbiDecoder, BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { AbiDecoder, BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { AbiDefinition, ContractArtifact, diff --git a/packages/contracts/test/utils/match_order_tester.ts b/packages/contracts/test/utils/match_order_tester.ts index e0c55b8349..6c2c849596 100644 --- a/packages/contracts/test/utils/match_order_tester.ts +++ b/packages/contracts/test/utils/match_order_tester.ts @@ -1,6 +1,6 @@ -import { assetDataUtils, orderHashUtils } from '@0xproject/order-utils'; -import { AssetProxyId, SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { assetDataUtils, orderHashUtils } from '@0x/order-utils'; +import { AssetProxyId, SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import * as _ from 'lodash'; diff --git a/packages/contracts/test/utils/multi_sig_wrapper.ts b/packages/contracts/test/utils/multi_sig_wrapper.ts index 953d1004ef..74fd3b4d6c 100644 --- a/packages/contracts/test/utils/multi_sig_wrapper.ts +++ b/packages/contracts/test/utils/multi_sig_wrapper.ts @@ -1,5 +1,5 @@ -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/contracts/test/utils/order_factory.ts b/packages/contracts/test/utils/order_factory.ts index 63a8936959..2449d1a8ab 100644 --- a/packages/contracts/test/utils/order_factory.ts +++ b/packages/contracts/test/utils/order_factory.ts @@ -1,6 +1,6 @@ -import { generatePseudoRandomSalt, orderHashUtils } from '@0xproject/order-utils'; -import { Order, SignatureType, SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { generatePseudoRandomSalt, orderHashUtils } from '@0x/order-utils'; +import { Order, SignatureType, SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import { getLatestBlockTimestampAsync } from './block_timestamp'; import { constants } from './constants'; diff --git a/packages/contracts/test/utils/order_factory_from_scenario.ts b/packages/contracts/test/utils/order_factory_from_scenario.ts index 2ffb2d620d..60c8606c48 100644 --- a/packages/contracts/test/utils/order_factory_from_scenario.ts +++ b/packages/contracts/test/utils/order_factory_from_scenario.ts @@ -1,6 +1,6 @@ -import { assetDataUtils, generatePseudoRandomSalt } from '@0xproject/order-utils'; -import { Order } from '@0xproject/types'; -import { BigNumber, errorUtils } from '@0xproject/utils'; +import { assetDataUtils, generatePseudoRandomSalt } from '@0x/order-utils'; +import { Order } from '@0x/types'; +import { BigNumber, errorUtils } from '@0x/utils'; import { DummyERC721TokenContract } from '../../generated-wrappers/dummy_erc721_token'; diff --git a/packages/contracts/test/utils/order_utils.ts b/packages/contracts/test/utils/order_utils.ts index 444e27c447..4f7a340110 100644 --- a/packages/contracts/test/utils/order_utils.ts +++ b/packages/contracts/test/utils/order_utils.ts @@ -1,5 +1,5 @@ -import { OrderWithoutExchangeAddress, SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { OrderWithoutExchangeAddress, SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import { constants } from './constants'; import { CancelOrder, MatchOrder } from './types'; diff --git a/packages/contracts/test/utils/profiler.ts b/packages/contracts/test/utils/profiler.ts index 85ee24f22a..2c7c1d66c0 100644 --- a/packages/contracts/test/utils/profiler.ts +++ b/packages/contracts/test/utils/profiler.ts @@ -1,5 +1,5 @@ -import { devConstants } from '@0xproject/dev-utils'; -import { ProfilerSubprovider, SolCompilerArtifactAdapter } from '@0xproject/sol-cov'; +import { devConstants } from '@0x/dev-utils'; +import { ProfilerSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-cov'; import * as _ from 'lodash'; let profilerSubprovider: ProfilerSubprovider; diff --git a/packages/contracts/test/utils/revert_trace.ts b/packages/contracts/test/utils/revert_trace.ts index 0bf8384bcc..3f74fd28b8 100644 --- a/packages/contracts/test/utils/revert_trace.ts +++ b/packages/contracts/test/utils/revert_trace.ts @@ -1,5 +1,5 @@ -import { devConstants } from '@0xproject/dev-utils'; -import { RevertTraceSubprovider, SolCompilerArtifactAdapter } from '@0xproject/sol-cov'; +import { devConstants } from '@0x/dev-utils'; +import { RevertTraceSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-cov'; import * as _ from 'lodash'; let revertTraceSubprovider: RevertTraceSubprovider; diff --git a/packages/contracts/test/utils/signing_utils.ts b/packages/contracts/test/utils/signing_utils.ts index 9c711c72c8..21f864bfab 100644 --- a/packages/contracts/test/utils/signing_utils.ts +++ b/packages/contracts/test/utils/signing_utils.ts @@ -1,4 +1,4 @@ -import { SignatureType } from '@0xproject/types'; +import { SignatureType } from '@0x/types'; import * as ethUtil from 'ethereumjs-util'; export const signingUtils = { diff --git a/packages/contracts/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts b/packages/contracts/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts index 598ee6d290..64b7dedbe2 100644 --- a/packages/contracts/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts +++ b/packages/contracts/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts @@ -1,5 +1,5 @@ -import { AbstractBalanceAndProxyAllowanceFetcher } from '@0xproject/order-utils'; -import { BigNumber } from '@0xproject/utils'; +import { AbstractBalanceAndProxyAllowanceFetcher } from '@0x/order-utils'; +import { BigNumber } from '@0x/utils'; import { AssetWrapper } from './asset_wrapper'; diff --git a/packages/contracts/test/utils/simple_order_filled_cancelled_fetcher.ts b/packages/contracts/test/utils/simple_order_filled_cancelled_fetcher.ts index ed69ecc63f..5f5575c7bd 100644 --- a/packages/contracts/test/utils/simple_order_filled_cancelled_fetcher.ts +++ b/packages/contracts/test/utils/simple_order_filled_cancelled_fetcher.ts @@ -1,5 +1,5 @@ -import { AbstractOrderFilledCancelledFetcher } from '@0xproject/order-utils'; -import { BigNumber } from '@0xproject/utils'; +import { AbstractOrderFilledCancelledFetcher } from '@0x/order-utils'; +import { BigNumber } from '@0x/utils'; import { ExchangeWrapper } from './exchange_wrapper'; diff --git a/packages/contracts/test/utils/transaction_factory.ts b/packages/contracts/test/utils/transaction_factory.ts index 9ed4c5a31d..dbab3ade4b 100644 --- a/packages/contracts/test/utils/transaction_factory.ts +++ b/packages/contracts/test/utils/transaction_factory.ts @@ -1,6 +1,6 @@ -import { eip712Utils, generatePseudoRandomSalt } from '@0xproject/order-utils'; -import { SignatureType } from '@0xproject/types'; -import { signTypedDataUtils } from '@0xproject/utils'; +import { eip712Utils, generatePseudoRandomSalt } from '@0x/order-utils'; +import { SignatureType } from '@0x/types'; +import { signTypedDataUtils } from '@0x/utils'; import * as ethUtil from 'ethereumjs-util'; import { signingUtils } from './signing_utils'; diff --git a/packages/contracts/test/utils/type_encoding_utils.ts b/packages/contracts/test/utils/type_encoding_utils.ts index 75307b9bd9..bfd9c9ef54 100644 --- a/packages/contracts/test/utils/type_encoding_utils.ts +++ b/packages/contracts/test/utils/type_encoding_utils.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; import BN = require('bn.js'); import ethUtil = require('ethereumjs-util'); diff --git a/packages/contracts/test/utils/types.ts b/packages/contracts/test/utils/types.ts index 598fb53930..9fc9e1570d 100644 --- a/packages/contracts/test/utils/types.ts +++ b/packages/contracts/test/utils/types.ts @@ -1,5 +1,5 @@ -import { OrderWithoutExchangeAddress } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { OrderWithoutExchangeAddress } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import { AbiDefinition } from 'ethereum-types'; export interface ERC20BalancesByOwner { diff --git a/packages/contracts/test/utils/web3_wrapper.ts b/packages/contracts/test/utils/web3_wrapper.ts index d1cd3d3871..f7b1a732a7 100644 --- a/packages/contracts/test/utils/web3_wrapper.ts +++ b/packages/contracts/test/utils/web3_wrapper.ts @@ -1,7 +1,7 @@ -import { devConstants, env, EnvVars, web3Factory } from '@0xproject/dev-utils'; -import { prependSubprovider, Web3ProviderEngine } from '@0xproject/subproviders'; -import { logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { devConstants, env, EnvVars, web3Factory } from '@0x/dev-utils'; +import { prependSubprovider, Web3ProviderEngine } from '@0x/subproviders'; +import { logUtils } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as _ from 'lodash'; import { coverage } from './coverage'; diff --git a/packages/contracts/tslint.json b/packages/contracts/tslint.json index 1ab924e471..1bb3ac2a22 100644 --- a/packages/contracts/tslint.json +++ b/packages/contracts/tslint.json @@ -1,5 +1,5 @@ { - "extends": ["@0xproject/tslint-config"], + "extends": ["@0x/tslint-config"], "rules": { "custom-no-magic-numbers": false } diff --git a/packages/dev-tools-pages/README.md b/packages/dev-tools-pages/README.md index 39fe70a25e..cbc459be76 100644 --- a/packages/dev-tools-pages/README.md +++ b/packages/dev-tools-pages/README.md @@ -19,7 +19,7 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/dev-tools-pages yarn build +PKG=@0x/dev-tools-pages yarn build ``` Note: Ignore the `WARNING in asset size limit` and `WARNING in entrypoint size limit` warnings. diff --git a/packages/dev-tools-pages/package.json b/packages/dev-tools-pages/package.json index f732605444..3563b4bef9 100644 --- a/packages/dev-tools-pages/package.json +++ b/packages/dev-tools-pages/package.json @@ -1,6 +1,6 @@ { - "name": "@0xproject/dev-tools-pages", - "version": "0.0.1", + "name": "@0x/dev-tools-pages", + "version": "0.0.2", "engines": { "node": ">=6.12" }, @@ -16,7 +16,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@0xproject/react-shared": "^1.0.15", + "@0x/react-shared": "^1.0.17", "basscss": "^8.0.3", "bowser": "^1.9.3", "less": "^2.7.2", diff --git a/packages/dev-tools-pages/ts/components/ui/text.tsx b/packages/dev-tools-pages/ts/components/ui/text.tsx index 8e314beaef..b4a61457f2 100644 --- a/packages/dev-tools-pages/ts/components/ui/text.tsx +++ b/packages/dev-tools-pages/ts/components/ui/text.tsx @@ -1,4 +1,4 @@ -import { colors } from '@0xproject/react-shared'; +import { colors } from '@0x/react-shared'; import { darken } from 'polished'; import * as React from 'react'; import styled from 'styled-components'; diff --git a/packages/dev-tools-pages/tslint.json b/packages/dev-tools-pages/tslint.json index b55ffe90f4..50f5be4f69 100644 --- a/packages/dev-tools-pages/tslint.json +++ b/packages/dev-tools-pages/tslint.json @@ -1,5 +1,5 @@ { - "extends": ["@0xproject/tslint-config"], + "extends": ["@0x/tslint-config"], "rules": { "no-implicit-dependencies": false, "no-object-literal-type-assertion": false, diff --git a/packages/dev-utils/CHANGELOG.json b/packages/dev-utils/CHANGELOG.json index b9bd7d0800..fd5a8d446f 100644 --- a/packages/dev-utils/CHANGELOG.json +++ b/packages/dev-utils/CHANGELOG.json @@ -6,7 +6,8 @@ "note": "Make web3-provider-engine types a 'dependency' so it's available to users of the library", "pr": 1105 } - ] + ], + "timestamp": 1539871071 }, { "version": "1.0.12", diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md index 00301d9c90..a6b60884e4 100644 --- a/packages/dev-utils/CHANGELOG.md +++ b/packages/dev-utils/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.13 - _October 18, 2018_ + + * Make web3-provider-engine types a 'dependency' so it's available to users of the library (#1105) + ## v1.0.12 - _October 4, 2018_ * Dependencies updated @@ -37,7 +41,7 @@ CHANGELOG * Dependencies updated -## v1.0.4 - _August 13, 2018_ +## v1.0.4 - _August 14, 2018_ * Dependencies updated diff --git a/packages/dev-utils/README.md b/packages/dev-utils/README.md index 1c3bd3a3ff..73b0b8816b 100644 --- a/packages/dev-utils/README.md +++ b/packages/dev-utils/README.md @@ -16,14 +16,14 @@ Boolean env variables should be either `true` or `false`. Defaults to `false` if ## Install ```bash -yarn add @0xproject/dev-utils +yarn add @0x/dev-utils ``` If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`: ```json "compilerOptions": { - "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"], + "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"], } ``` @@ -52,13 +52,13 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/dev-utils yarn build +PKG=@0x/dev-utils yarn build ``` Or continuously rebuild on change: ```bash -PKG=@0xproject/dev-utils yarn watch +PKG=@0x/dev-utils yarn watch ``` ### Clean diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 9d054e6bf7..d1b1efc878 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -1,6 +1,6 @@ { - "name": "@0xproject/dev-utils", - "version": "1.0.12", + "name": "@0x/dev-utils", + "version": "1.0.13", "engines": { "node": ">=6.12" }, @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/dev-utils/README.md", "devDependencies": { - "@0xproject/tslint-config": "^1.0.8", + "@0x/tslint-config": "^1.0.9", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", "make-promises-safe": "^1.1.0", @@ -41,14 +41,14 @@ "typescript": "3.0.1" }, "dependencies": { - "@0xproject/subproviders": "^2.0.7", - "@0xproject/types": "^1.1.4", - "@0xproject/typescript-typings": "^3.0.2", - "@0xproject/utils": "^2.0.2", - "@0xproject/web3-wrapper": "^3.0.3", + "@0x/subproviders": "^2.1.0", + "@0x/types": "^1.2.0", + "@0x/typescript-typings": "^3.0.3", + "@0x/utils": "^2.0.3", + "@0x/web3-wrapper": "^3.1.0", "@types/web3-provider-engine": "^14.0.0", "chai": "^4.0.1", - "ethereum-types": "^1.0.11", + "ethereum-types": "^1.1.1", "lodash": "^4.17.5" }, "publishConfig": { diff --git a/packages/dev-utils/src/blockchain_lifecycle.ts b/packages/dev-utils/src/blockchain_lifecycle.ts index a48cb08564..e9687787fe 100644 --- a/packages/dev-utils/src/blockchain_lifecycle.ts +++ b/packages/dev-utils/src/blockchain_lifecycle.ts @@ -1,5 +1,5 @@ -import { logUtils } from '@0xproject/utils'; -import { NodeType, Web3Wrapper } from '@0xproject/web3-wrapper'; +import { logUtils } from '@0x/utils'; +import { NodeType, Web3Wrapper } from '@0x/web3-wrapper'; import * as _ from 'lodash'; // HACK(albrow): 🐉 We have to do this so that debug.setHead works correctly. diff --git a/packages/dev-utils/src/callback_error_reporter.ts b/packages/dev-utils/src/callback_error_reporter.ts index e69ce1c05d..b993bf22a3 100644 --- a/packages/dev-utils/src/callback_error_reporter.ts +++ b/packages/dev-utils/src/callback_error_reporter.ts @@ -1,7 +1,7 @@ import * as chai from 'chai'; import * as _ from 'lodash'; -import { DoneCallback } from '@0xproject/types'; +import { DoneCallback } from '@0x/types'; const expect = chai.expect; diff --git a/packages/dev-utils/src/web3_factory.ts b/packages/dev-utils/src/web3_factory.ts index 7c86d3df47..b22bcc88ba 100644 --- a/packages/dev-utils/src/web3_factory.ts +++ b/packages/dev-utils/src/web3_factory.ts @@ -4,7 +4,7 @@ import { GanacheSubprovider, RPCSubprovider, Web3ProviderEngine, -} from '@0xproject/subproviders'; +} from '@0x/subproviders'; import * as fs from 'fs'; import * as _ from 'lodash'; diff --git a/packages/dev-utils/test/blockchain_lifecycle_test.ts b/packages/dev-utils/test/blockchain_lifecycle_test.ts index 7d5e15fbee..d7e54f0e8c 100644 --- a/packages/dev-utils/test/blockchain_lifecycle_test.ts +++ b/packages/dev-utils/test/blockchain_lifecycle_test.ts @@ -1,4 +1,4 @@ -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import 'mocha'; diff --git a/packages/dev-utils/test/rpc_test.ts b/packages/dev-utils/test/rpc_test.ts index dfbc0f7b2e..f8cea45807 100644 --- a/packages/dev-utils/test/rpc_test.ts +++ b/packages/dev-utils/test/rpc_test.ts @@ -1,4 +1,4 @@ -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import { BlockParamLiteral } from 'ethereum-types'; import 'mocha'; diff --git a/packages/dev-utils/tslint.json b/packages/dev-utils/tslint.json index 015dce8510..631f46bcaa 100644 --- a/packages/dev-utils/tslint.json +++ b/packages/dev-utils/tslint.json @@ -1,5 +1,5 @@ { - "extends": ["@0xproject/tslint-config"], + "extends": ["@0x/tslint-config"], "rules": { "completed-docs": false } diff --git a/packages/ethereum-types/CHANGELOG.json b/packages/ethereum-types/CHANGELOG.json index 60fb8c806f..b042c45886 100644 --- a/packages/ethereum-types/CHANGELOG.json +++ b/packages/ethereum-types/CHANGELOG.json @@ -1,11 +1,20 @@ [ { - "version": "1.1.0", + "version": "1.1.1", "changes": [ { "note": "Add `JSONRPCResponseError` and error field on `JSONRPCResponsePayload`.", "pr": 1102 } + ], + "timestamp": 1539871071 + }, + { + "version": "1.1.0", + "changes": [ + { + "note": "Unpublished package." + } ] }, { diff --git a/packages/ethereum-types/CHANGELOG.md b/packages/ethereum-types/CHANGELOG.md index 6e19659640..73ea542048 100644 --- a/packages/ethereum-types/CHANGELOG.md +++ b/packages/ethereum-types/CHANGELOG.md @@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.1.1 - _October 18, 2018_ + + * Add `JSONRPCResponseError` and error field on `JSONRPCResponsePayload`. (#1102) + +## v1.1.0 - _Invalid date_ + + * Unpublished package. + ## v1.0.11 - _October 4, 2018_ * Dependencies updated @@ -33,7 +41,7 @@ CHANGELOG * Dependencies updated -## v1.0.4 - _August 13, 2018_ +## v1.0.4 - _August 14, 2018_ * Dependencies updated @@ -55,6 +63,6 @@ CHANGELOG * Add `TransactionReceiptStatus` type (#812) * Add Artifact types: `CompilerSettings`, `CompilerOptions`, `OutputField` (#924) -## v0.0.2 - _May 31, 2018_ +## v0.0.2 - _June 1, 2018_ * Initial publish (#642) diff --git a/packages/ethereum-types/package.json b/packages/ethereum-types/package.json index 954b047e7e..d24e39dfdc 100644 --- a/packages/ethereum-types/package.json +++ b/packages/ethereum-types/package.json @@ -1,6 +1,6 @@ { "name": "ethereum-types", - "version": "1.0.11", + "version": "1.1.1", "engines": { "node": ">=6.12" }, @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/ethereum-types/README.md", "devDependencies": { - "@0xproject/tslint-config": "^1.0.8", + "@0x/tslint-config": "^1.0.9", "make-promises-safe": "^1.1.0", "shx": "^0.2.2", "tslint": "5.11.0", diff --git a/packages/ethereum-types/tslint.json b/packages/ethereum-types/tslint.json index ffaefe83a6..dd9053357e 100644 --- a/packages/ethereum-types/tslint.json +++ b/packages/ethereum-types/tslint.json @@ -1,3 +1,3 @@ { - "extends": ["@0xproject/tslint-config"] + "extends": ["@0x/tslint-config"] } diff --git a/packages/fill-scenarios/CHANGELOG.json b/packages/fill-scenarios/CHANGELOG.json index f8a2eab70a..b9840957ef 100644 --- a/packages/fill-scenarios/CHANGELOG.json +++ b/packages/fill-scenarios/CHANGELOG.json @@ -6,7 +6,8 @@ "note": "Updated to use new @0xproject/contract-artifacts and @0xproject/abi-gen-wrappers packages", "pr": 1105 } - ] + ], + "timestamp": 1539871071 }, { "version": "1.0.7", diff --git a/packages/fill-scenarios/CHANGELOG.md b/packages/fill-scenarios/CHANGELOG.md index bf6fcf13e1..20ef1322c1 100644 --- a/packages/fill-scenarios/CHANGELOG.md +++ b/packages/fill-scenarios/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.8 - _October 18, 2018_ + + * Updated to use new @0xproject/contract-artifacts and @0xproject/abi-gen-wrappers packages (#1105) + ## v1.0.7 - _October 4, 2018_ * Dependencies updated @@ -41,7 +45,7 @@ CHANGELOG * Dependencies updated -## v1.0.1-rc.3 - _August 13, 2018_ +## v1.0.1-rc.3 - _August 14, 2018_ * Updated to use latest orderFactory interface, fixed `feeRecipient` spelling error in public interface (#936) * Dependencies updated diff --git a/packages/fill-scenarios/README.md b/packages/fill-scenarios/README.md index 67df0941f5..794b70e56a 100644 --- a/packages/fill-scenarios/README.md +++ b/packages/fill-scenarios/README.md @@ -1,18 +1,18 @@ -## @0xproject/fill-scenarios +## @0x/fill-scenarios 0x order fill scenario generator ## Installation ```bash -yarn add @0xproject/fill-scenarios +yarn add @0x/fill-scenarios ``` If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`: ```json "compilerOptions": { - "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"], + "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"], } ``` @@ -41,13 +41,13 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/fill-scenarios yarn build +PKG=@0x/fill-scenarios yarn build ``` Or continuously rebuild on change: ```bash -PKG=@0xproject/fill-scenarios yarn watch +PKG=@0x/fill-scenarios yarn watch ``` ### Clean diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index fc30f11dcb..0e1303259b 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -1,6 +1,6 @@ { - "name": "@0xproject/fill-scenarios", - "version": "1.0.7", + "name": "@0x/fill-scenarios", + "version": "1.0.8", "description": "0x order fill scenario generator", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -20,7 +20,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/fill-scenarios/README.md", "devDependencies": { - "@0xproject/tslint-config": "^1.0.8", + "@0x/tslint-config": "^1.0.9", "@types/lodash": "4.14.104", "make-promises-safe": "^1.1.0", "shx": "^0.2.2", @@ -28,15 +28,15 @@ "typescript": "3.0.1" }, "dependencies": { - "@0xproject/abi-gen-wrappers": "^1.0.0", - "@0xproject/base-contract": "^3.0.1", - "@0xproject/contract-artifacts": "^1.0.0", - "@0xproject/order-utils": "^1.0.7", - "@0xproject/types": "^1.1.4", - "@0xproject/typescript-typings": "^3.0.2", - "@0xproject/utils": "^2.0.2", - "@0xproject/web3-wrapper": "^3.0.3", - "ethereum-types": "^1.0.11", + "@0x/abi-gen-wrappers": "^1.0.1", + "@0x/base-contract": "^3.0.2", + "@0x/contract-artifacts": "^1.0.1", + "@0x/order-utils": "^2.0.0", + "@0x/types": "^1.2.0", + "@0x/typescript-typings": "^3.0.3", + "@0x/utils": "^2.0.3", + "@0x/web3-wrapper": "^3.1.0", + "ethereum-types": "^1.1.1", "ethers": "~4.0.4", "lodash": "^4.17.5" }, diff --git a/packages/fill-scenarios/src/fill_scenarios.ts b/packages/fill-scenarios/src/fill_scenarios.ts index 131828e8d9..0154bcd0a6 100644 --- a/packages/fill-scenarios/src/fill_scenarios.ts +++ b/packages/fill-scenarios/src/fill_scenarios.ts @@ -1,10 +1,10 @@ -import { DummyERC20TokenContract, DummyERC721TokenContract, ExchangeContract } from '@0xproject/abi-gen-wrappers'; -import * as artifacts from '@0xproject/contract-artifacts'; -import { assetDataUtils } from '@0xproject/order-utils'; -import { orderFactory } from '@0xproject/order-utils/lib/src/order_factory'; -import { AssetProxyId, ERC721AssetData, OrderWithoutExchangeAddress, SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { DummyERC20TokenContract, DummyERC721TokenContract, ExchangeContract } from '@0x/abi-gen-wrappers'; +import * as artifacts from '@0x/contract-artifacts'; +import { assetDataUtils } from '@0x/order-utils'; +import { orderFactory } from '@0x/order-utils/lib/src/order_factory'; +import { AssetProxyId, ERC721AssetData, OrderWithoutExchangeAddress, SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { Provider } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/fill-scenarios/tslint.json b/packages/fill-scenarios/tslint.json index ffaefe83a6..dd9053357e 100644 --- a/packages/fill-scenarios/tslint.json +++ b/packages/fill-scenarios/tslint.json @@ -1,3 +1,3 @@ { - "extends": ["@0xproject/tslint-config"] + "extends": ["@0x/tslint-config"] } diff --git a/packages/instant/README.md b/packages/instant/README.md index 25aca9d3b5..55b4404e72 100644 --- a/packages/instant/README.md +++ b/packages/instant/README.md @@ -1,9 +1,9 @@ -## @0xproject/instant +## @0x/instant ## Installation ```bash -yarn add @0xproject/instant +yarn add @0x/instant ``` **Import** @@ -11,20 +11,20 @@ yarn add @0xproject/instant **CommonJS module** ```typescript -import { ZeroExInstant } from '@0xproject/instant'; +import { ZeroExInstant } from '@0x/instant'; ``` or ```javascript -var ZeroExInstant = require('@0xproject/instant').ZeroExInstant; +var ZeroExInstant = require('@0x/instant').ZeroExInstant; ``` If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`: ```json "compilerOptions": { - "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"], + "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"], } ``` @@ -71,13 +71,13 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/instant yarn build +PKG=@0x/instant yarn build ``` Or continuously rebuild on change: ```bash -PKG=@0xproject/instant yarn watch +PKG=@0x/instant yarn watch ``` ### Clean diff --git a/packages/instant/package.json b/packages/instant/package.json index ec5cbebb44..e5c4ee12d2 100644 --- a/packages/instant/package.json +++ b/packages/instant/package.json @@ -1,6 +1,6 @@ { - "name": "@0xproject/instant", - "version": "0.0.2", + "name": "@0x/instant", + "version": "0.0.3", "engines": { "node": ">=6.12" }, @@ -43,24 +43,25 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/instant/README.md", "dependencies": { - "@0xproject/asset-buyer": "^2.0.0", - "@0xproject/order-utils": "^1.0.7", - "@0xproject/types": "^1.1.4", - "@0xproject/typescript-typings": "^2.0.2", - "@0xproject/utils": "^2.0.2", - "@0xproject/web3-wrapper": "^3.0.3", - "ethereum-types": "^1.0.11", + "@0x/asset-buyer": "^2.1.0", + "@0x/order-utils": "^2.0.0", + "@0x/types": "^1.2.0", + "@0x/typescript-typings": "^3.0.3", + "@0x/utils": "^2.0.3", + "@0x/web3-wrapper": "^3.1.0", + "ethereum-types": "^1.1.1", "lodash": "^4.17.10", "polished": "^2.2.0", "react": "^16.5.2", "react-dom": "^16.5.2", "react-redux": "^5.0.7", "redux": "^4.0.0", + "redux-devtools-extension": "^2.13.5", "styled-components": "^3.4.9", "ts-optchain": "^0.1.1" }, "devDependencies": { - "@0xproject/tslint-config": "^1.0.8", + "@0x/tslint-config": "^1.0.9", "@types/enzyme": "^3.1.14", "@types/enzyme-adapter-react-16": "^1.0.3", "@types/jest": "^23.3.5", diff --git a/packages/instant/src/components/amount_input.tsx b/packages/instant/src/components/amount_input.tsx index 7644f5f677..c89fb05add 100644 --- a/packages/instant/src/components/amount_input.tsx +++ b/packages/instant/src/components/amount_input.tsx @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; import * as React from 'react'; diff --git a/packages/instant/src/components/animations/slide_animations.tsx b/packages/instant/src/components/animations/slide_animations.tsx new file mode 100644 index 0000000000..1f10a2ed6c --- /dev/null +++ b/packages/instant/src/components/animations/slide_animations.tsx @@ -0,0 +1,54 @@ +import * as React from 'react'; + +import { keyframes, styled } from '../../style/theme'; + +const slideKeyframeGenerator = (fromY: string, toY: string) => keyframes` + from { + position: relative; + top: ${fromY}; + } + + to { + position: relative; + top: ${toY}; + } +`; + +export interface SlideAnimationProps { + keyframes: string; + animationType: string; + animationDirection?: string; +} + +export const SlideAnimation = + styled.div < + SlideAnimationProps > + ` + animation-name: ${props => props.keyframes}; + animation-duration: 0.3s; + animation-timing-function: ${props => props.animationType}; + animation-delay: 0s; + animation-iteration-count: 1; + animation-fill-mode: ${props => props.animationDirection || 'none'}; + position: relative; +`; + +export interface SlideAnimationComponentProps { + downY: string; +} + +export const SlideUpAnimation: React.StatelessComponent = props => ( + + {props.children} + +); + +export const SlideDownAnimation: React.StatelessComponent = props => ( + + {props.children} + +); diff --git a/packages/instant/src/components/animations/slide_up_and_down_animation.tsx b/packages/instant/src/components/animations/slide_up_and_down_animation.tsx deleted file mode 100644 index 9c18e09336..0000000000 --- a/packages/instant/src/components/animations/slide_up_and_down_animation.tsx +++ /dev/null @@ -1,96 +0,0 @@ -import * as React from 'react'; - -import { keyframes, styled } from '../../style/theme'; - -const slideKeyframeGenerator = (fromY: string, toY: string) => keyframes` - from { - position: relative; - top: ${fromY}; - } - - to { - position: relative; - top: ${toY}; - } -`; - -export interface SlideAnimationProps { - keyframes: string; - animationType: string; - animationDirection?: string; -} - -export const SlideAnimation = - styled.div < - SlideAnimationProps > - ` - animation-name: ${props => props.keyframes}; - animation-duration: 0.3s; - animation-timing-function: ${props => props.animationType}; - animation-delay: 0s; - animation-iteration-count: 1; - animation-fill-mode: ${props => props.animationDirection || 'none'}; - position: relative; -`; - -export interface SlideAnimationComponentProps { - downY: string; -} - -export const SlideUpAnimationComponent: React.StatelessComponent = props => ( - - {props.children} - -); - -export const SlideDownAnimationComponent: React.StatelessComponent = props => ( - - {props.children} - -); - -export interface SlideUpAndDownAnimationProps extends SlideAnimationComponentProps { - delayMs: number; -} - -enum SlideState { - Up = 'up', - Down = 'down', -} -interface SlideUpAndDownState { - slideState: SlideState; -} - -export class SlideUpAndDownAnimation extends React.Component { - public state = { - slideState: SlideState.Up, - }; - - private _timeoutId?: number; - public render(): React.ReactNode { - return this._renderSlide(); - } - public componentDidMount(): void { - this._timeoutId = window.setTimeout(() => { - this.setState({ - slideState: SlideState.Down, - }); - }, this.props.delayMs); - - return; - } - public componentWillUnmount(): void { - if (this._timeoutId) { - window.clearTimeout(this._timeoutId); - } - } - private _renderSlide(): React.ReactNode { - const SlideComponent = this.state.slideState === 'up' ? SlideUpAnimationComponent : SlideDownAnimationComponent; - - return {this.props.children}; - } -} diff --git a/packages/instant/src/components/asset_amount_input.tsx b/packages/instant/src/components/asset_amount_input.tsx index 9f4b5861a3..c03ef1cf35 100644 --- a/packages/instant/src/components/asset_amount_input.tsx +++ b/packages/instant/src/components/asset_amount_input.tsx @@ -1,10 +1,10 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; import * as React from 'react'; -import { oc } from 'ts-optchain'; import { ColorOption } from '../style/theme'; import { ERC20Asset } from '../types'; +import { assetUtils } from '../util/asset'; import { util } from '../util/util'; import { AmountInput, AmountInputProps } from './amount_input'; @@ -27,7 +27,7 @@ export class AssetAmountInput extends React.Component { - {oc(asset).metaData.symbol()} + {assetUtils.bestNameForAsset(asset)} diff --git a/packages/instant/src/components/buy_button.tsx b/packages/instant/src/components/buy_button.tsx index 191426be1a..3ef7c1f5c5 100644 --- a/packages/instant/src/components/buy_button.tsx +++ b/packages/instant/src/components/buy_button.tsx @@ -1,4 +1,4 @@ -import { AssetBuyer, BuyQuote } from '@0xproject/asset-buyer'; +import { AssetBuyer, BuyQuote } from '@0x/asset-buyer'; import * as _ from 'lodash'; import * as React from 'react'; diff --git a/packages/instant/src/components/instant_heading.tsx b/packages/instant/src/components/instant_heading.tsx index 492c1b2c0f..a36d35a934 100644 --- a/packages/instant/src/components/instant_heading.tsx +++ b/packages/instant/src/components/instant_heading.tsx @@ -1,9 +1,10 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; import * as React from 'react'; import { SelectedAssetAmountInput } from '../containers/selected_asset_amount_input'; import { ColorOption } from '../style/theme'; +import { AsyncProcessState } from '../types'; import { format } from '../util/format'; import { Container, Flex, Text } from './ui'; @@ -12,20 +13,45 @@ export interface InstantHeadingProps { selectedAssetAmount?: BigNumber; totalEthBaseAmount?: BigNumber; ethUsdPrice?: BigNumber; + quoteState: AsyncProcessState; } -const displaytotalEthBaseAmount = ({ selectedAssetAmount, totalEthBaseAmount }: InstantHeadingProps): string => { +const Placeholder = () => ( + + — + +); +const displaytotalEthBaseAmount = ({ + selectedAssetAmount, + totalEthBaseAmount, +}: InstantHeadingProps): React.ReactNode => { if (_.isUndefined(selectedAssetAmount)) { return '0 ETH'; } - return format.ethBaseAmount(totalEthBaseAmount, 4, '...loading'); + return format.ethBaseAmount(totalEthBaseAmount, 4, ); }; -const displayUsdAmount = ({ totalEthBaseAmount, selectedAssetAmount, ethUsdPrice }: InstantHeadingProps): string => { +const displayUsdAmount = ({ + totalEthBaseAmount, + selectedAssetAmount, + ethUsdPrice, +}: InstantHeadingProps): React.ReactNode => { if (_.isUndefined(selectedAssetAmount)) { return '$0.00'; } - return format.ethBaseAmountInUsd(totalEthBaseAmount, ethUsdPrice, 2, '...loading'); + return format.ethBaseAmountInUsd(totalEthBaseAmount, ethUsdPrice, 2, ); +}; + +const loadingOrAmount = (quoteState: AsyncProcessState, amount: React.ReactNode): React.ReactNode => { + if (quoteState === AsyncProcessState.PENDING) { + return ( + + …loading + + ); + } else { + return amount; + } }; export const InstantHeading: React.StatelessComponent = props => ( @@ -47,11 +73,11 @@ export const InstantHeading: React.StatelessComponent = pro - {displaytotalEthBaseAmount(props)} + {loadingOrAmount(props.quoteState, displaytotalEthBaseAmount(props))} - {displayUsdAmount(props)} + {loadingOrAmount(props.quoteState, displayUsdAmount(props))} diff --git a/packages/instant/src/components/order_details.tsx b/packages/instant/src/components/order_details.tsx index a15ff411b2..ad4a87714f 100644 --- a/packages/instant/src/components/order_details.tsx +++ b/packages/instant/src/components/order_details.tsx @@ -1,5 +1,5 @@ -import { BuyQuoteInfo } from '@0xproject/asset-buyer'; -import { BigNumber } from '@0xproject/utils'; +import { BuyQuoteInfo } from '@0x/asset-buyer'; +import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; import * as React from 'react'; import { oc } from 'ts-optchain'; diff --git a/packages/instant/src/components/sliding_error.tsx b/packages/instant/src/components/sliding_error.tsx index 0237fb7e9d..3865a87976 100644 --- a/packages/instant/src/components/sliding_error.tsx +++ b/packages/instant/src/components/sliding_error.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { ColorOption } from '../style/theme'; -import { SlideUpAndDownAnimation } from './animations/slide_up_and_down_animation'; +import { SlideDownAnimation, SlideUpAnimation } from './animations/slide_animations'; import { Container, Text } from './ui'; @@ -20,8 +20,8 @@ export const Error: React.StatelessComponent = props => ( borderRadius="6px" marginBottom="10px" > - - {props.icon} + + {props.icon} {props.message} @@ -29,8 +29,16 @@ export const Error: React.StatelessComponent = props => ( ); -export const SlidingError: React.StatelessComponent = props => ( - - - -); +export type SlidingDirection = 'up' | 'down'; +export interface SlidingErrorProps extends ErrorProps { + direction: SlidingDirection; +} +export const SlidingError: React.StatelessComponent = props => { + const AnimationComponent = props.direction === 'up' ? SlideUpAnimation : SlideDownAnimation; + + return ( + + + + ); +}; diff --git a/packages/instant/src/components/zero_ex_instant.tsx b/packages/instant/src/components/zero_ex_instant.tsx index cc7b0ecb8d..5b75a7556f 100644 --- a/packages/instant/src/components/zero_ex_instant.tsx +++ b/packages/instant/src/components/zero_ex_instant.tsx @@ -1,5 +1,5 @@ -import { AssetBuyer } from '@0xproject/asset-buyer'; -import { ObjectMap } from '@0xproject/types'; +import { AssetBuyer } from '@0x/asset-buyer'; +import { ObjectMap } from '@0x/types'; import * as React from 'react'; import { Provider } from 'react-redux'; diff --git a/packages/instant/src/components/zero_ex_instant_container.tsx b/packages/instant/src/components/zero_ex_instant_container.tsx index 51f9dc63ec..cf918d8901 100644 --- a/packages/instant/src/components/zero_ex_instant_container.tsx +++ b/packages/instant/src/components/zero_ex_instant_container.tsx @@ -1,6 +1,7 @@ import * as React from 'react'; import { LatestBuyQuoteOrderDetails } from '../containers/latest_buy_quote_order_details'; +import { LatestError } from '../containers/latest_error'; import { SelectedAssetBuyButton } from '../containers/selected_asset_buy_button'; import { SelectedAssetInstantHeading } from '../containers/selected_asset_instant_heading'; @@ -12,6 +13,9 @@ export interface ZeroExInstantContainerProps {} export const ZeroExInstantContainer: React.StatelessComponent = props => ( + + + = props => { + if (!props.latestError) { + return
; + } + const { icon, message } = errorUtil.errorDescription(props.latestError, props.asset); + return ; +}; + +interface ConnectedState { + asset?: Asset; + latestError?: any; + slidingDirection: 'down' | 'up'; +} +export interface LatestErrorProps {} +const mapStateToProps = (state: State, _ownProps: LatestErrorProps): ConnectedState => ({ + asset: state.selectedAsset, + latestError: state.latestError, + slidingDirection: state.latestErrorDisplay === LatestErrorDisplay.Present ? 'up' : 'down', +}); + +export const LatestError = connect(mapStateToProps)(LatestErrorComponent); diff --git a/packages/instant/src/containers/selected_asset_amount_input.ts b/packages/instant/src/containers/selected_asset_amount_input.ts index b75a22a0e7..6cd39b855d 100644 --- a/packages/instant/src/containers/selected_asset_amount_input.ts +++ b/packages/instant/src/containers/selected_asset_amount_input.ts @@ -1,7 +1,7 @@ -import { AssetBuyer } from '@0xproject/asset-buyer'; -import { AssetProxyId } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { AssetBuyer, BuyQuote } from '@0x/asset-buyer'; +import { AssetProxyId } from '@0x/types'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as _ from 'lodash'; import * as React from 'react'; import { connect } from 'react-redux'; @@ -11,6 +11,7 @@ import { Action, actions } from '../redux/actions'; import { State } from '../redux/reducer'; import { ColorOption } from '../style/theme'; import { AsyncProcessState, ERC20Asset } from '../types'; +import { errorUtil } from '../util/error'; import { AssetAmountInput } from '../components/asset_amount_input'; @@ -39,7 +40,7 @@ type FinalProps = ConnectedProps & SelectedAssetAmountInputProps; const mapStateToProps = (state: State, _ownProps: SelectedAssetAmountInputProps): ConnectedState => { const selectedAsset = state.selectedAsset; - if (_.isUndefined(selectedAsset) || selectedAsset.assetProxyId !== AssetProxyId.ERC20) { + if (_.isUndefined(selectedAsset) || selectedAsset.metaData.assetProxyId !== AssetProxyId.ERC20) { return { value: state.selectedAssetAmount, }; @@ -52,22 +53,27 @@ const mapStateToProps = (state: State, _ownProps: SelectedAssetAmountInputProps) }; const updateBuyQuoteAsync = async ( + assetBuyer: AssetBuyer, dispatch: Dispatch, - assetBuyer?: AssetBuyer, - asset?: ERC20Asset, - assetAmount?: BigNumber, + asset: ERC20Asset, + assetAmount: BigNumber, ): Promise => { - if ( - _.isUndefined(assetBuyer) || - _.isUndefined(assetAmount) || - _.isUndefined(asset) || - _.isUndefined(asset.metaData) - ) { - return; - } // get a new buy quote. const baseUnitValue = Web3Wrapper.toBaseUnitAmount(assetAmount, asset.metaData.decimals); - const newBuyQuote = await assetBuyer.getBuyQuoteAsync(asset.assetData, baseUnitValue); + + // mark quote as pending + dispatch(actions.updateBuyQuoteStatePending()); + + let newBuyQuote: BuyQuote | undefined; + try { + newBuyQuote = await assetBuyer.getBuyQuoteAsync(asset.assetData, baseUnitValue); + } catch (error) { + dispatch(actions.updateBuyQuoteStateFailure()); + errorUtil.errorFlasher.flashNewError(dispatch, error); + return; + } + // We have a successful new buy quote + errorUtil.errorFlasher.clearError(dispatch); // invalidate the last buy quote. dispatch(actions.updateLatestBuyQuote(newBuyQuote)); }; @@ -84,9 +90,14 @@ const mapDispatchToProps = ( // invalidate the last buy quote. dispatch(actions.updateLatestBuyQuote(undefined)); // reset our buy state - dispatch(actions.updateSelectedAssetBuyState(AsyncProcessState.NONE)); - // tslint:disable-next-line:no-floating-promises - debouncedUpdateBuyQuoteAsync(dispatch, assetBuyer, asset, value); + dispatch(actions.updatebuyOrderState(AsyncProcessState.NONE)); + + if (!_.isUndefined(value) && !_.isUndefined(asset) && !_.isUndefined(assetBuyer)) { + // even if it's debounced, give them the illusion it's loading + dispatch(actions.updateBuyQuoteStatePending()); + // tslint:disable-next-line:no-floating-promises + debouncedUpdateBuyQuoteAsync(assetBuyer, dispatch, asset, value); + } }, }); diff --git a/packages/instant/src/containers/selected_asset_buy_button.ts b/packages/instant/src/containers/selected_asset_buy_button.ts index 4118932b29..99f9713217 100644 --- a/packages/instant/src/containers/selected_asset_buy_button.ts +++ b/packages/instant/src/containers/selected_asset_buy_button.ts @@ -1,4 +1,4 @@ -import { AssetBuyer, BuyQuote } from '@0xproject/asset-buyer'; +import { AssetBuyer, BuyQuote } from '@0x/asset-buyer'; import * as _ from 'lodash'; import * as React from 'react'; import { connect } from 'react-redux'; @@ -41,14 +41,14 @@ const textForState = (state: AsyncProcessState): string => { const mapStateToProps = (state: State, _ownProps: SelectedAssetBuyButtonProps): ConnectedState => ({ assetBuyer: state.assetBuyer, - text: textForState(state.selectedAssetBuyState), + text: textForState(state.buyOrderState), buyQuote: state.latestBuyQuote, }); const mapDispatchToProps = (dispatch: Dispatch, ownProps: SelectedAssetBuyButtonProps): ConnectedDispatch => ({ - onClick: buyQuote => dispatch(actions.updateSelectedAssetBuyState(AsyncProcessState.PENDING)), - onBuySuccess: buyQuote => dispatch(actions.updateSelectedAssetBuyState(AsyncProcessState.SUCCESS)), - onBuyFailure: buyQuote => dispatch(actions.updateSelectedAssetBuyState(AsyncProcessState.FAILURE)), + onClick: buyQuote => dispatch(actions.updatebuyOrderState(AsyncProcessState.PENDING)), + onBuySuccess: buyQuote => dispatch(actions.updatebuyOrderState(AsyncProcessState.SUCCESS)), + onBuyFailure: buyQuote => dispatch(actions.updatebuyOrderState(AsyncProcessState.FAILURE)), }); export const SelectedAssetBuyButton: React.ComponentClass = connect( diff --git a/packages/instant/src/containers/selected_asset_instant_heading.ts b/packages/instant/src/containers/selected_asset_instant_heading.ts index c97cfe11ab..0509db5dac 100644 --- a/packages/instant/src/containers/selected_asset_instant_heading.ts +++ b/packages/instant/src/containers/selected_asset_instant_heading.ts @@ -1,10 +1,11 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; import * as React from 'react'; import { connect } from 'react-redux'; import { oc } from 'ts-optchain'; import { State } from '../redux/reducer'; +import { AsyncProcessState } from '../types'; import { InstantHeading } from '../components/instant_heading'; @@ -14,12 +15,14 @@ interface ConnectedState { selectedAssetAmount?: BigNumber; totalEthBaseAmount?: BigNumber; ethUsdPrice?: BigNumber; + quoteState: AsyncProcessState; } const mapStateToProps = (state: State, _ownProps: InstantHeadingProps): ConnectedState => ({ selectedAssetAmount: state.selectedAssetAmount, totalEthBaseAmount: oc(state).latestBuyQuote.worstCaseQuoteInfo.totalEthAmount(), ethUsdPrice: state.ethUsdPrice, + quoteState: state.quoteState, }); export const SelectedAssetInstantHeading: React.ComponentClass = connect(mapStateToProps)( diff --git a/packages/instant/src/data/asset_meta_data_map.ts b/packages/instant/src/data/asset_meta_data_map.ts index 7d83865f1e..3a820a0c48 100644 --- a/packages/instant/src/data/asset_meta_data_map.ts +++ b/packages/instant/src/data/asset_meta_data_map.ts @@ -1,4 +1,4 @@ -import { AssetProxyId, ObjectMap } from '@0xproject/types'; +import { AssetProxyId, ObjectMap } from '@0x/types'; import { AssetMetaData } from '../types'; diff --git a/packages/instant/src/redux/actions.ts b/packages/instant/src/redux/actions.ts index fe055b75f2..bc75ce66c7 100644 --- a/packages/instant/src/redux/actions.ts +++ b/packages/instant/src/redux/actions.ts @@ -1,5 +1,5 @@ -import { BuyQuote } from '@0xproject/asset-buyer'; -import { BigNumber } from '@0xproject/utils'; +import { BuyQuote } from '@0x/asset-buyer'; +import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; import { ActionsUnion, AsyncProcessState } from '../types'; @@ -26,13 +26,23 @@ export enum ActionTypes { UPDATE_SELECTED_ASSET_BUY_STATE = 'UPDATE_SELECTED_ASSET_BUY_STATE', UPDATE_LATEST_BUY_QUOTE = 'UPDATE_LATEST_BUY_QUOTE', UPDATE_SELECTED_ASSET = 'UPDATE_SELECTED_ASSET', + UPDATE_BUY_QUOTE_STATE_PENDING = 'UPDATE_BUY_QUOTE_STATE_PENDING', + UPDATE_BUY_QUOTE_STATE_FAILURE = 'UPDATE_BUY_QUOTE_STATE_FAILURE', + SET_ERROR = 'SET_ERROR', + HIDE_ERROR = 'HIDE_ERROR', + CLEAR_ERROR = 'CLEAR_ERROR', } export const actions = { updateEthUsdPrice: (price?: BigNumber) => createAction(ActionTypes.UPDATE_ETH_USD_PRICE, price), updateSelectedAssetAmount: (amount?: BigNumber) => createAction(ActionTypes.UPDATE_SELECTED_ASSET_AMOUNT, amount), - updateSelectedAssetBuyState: (buyState: AsyncProcessState) => + updatebuyOrderState: (buyState: AsyncProcessState) => createAction(ActionTypes.UPDATE_SELECTED_ASSET_BUY_STATE, buyState), updateLatestBuyQuote: (buyQuote?: BuyQuote) => createAction(ActionTypes.UPDATE_LATEST_BUY_QUOTE, buyQuote), updateSelectedAsset: (assetData?: string) => createAction(ActionTypes.UPDATE_SELECTED_ASSET, assetData), + updateBuyQuoteStatePending: () => createAction(ActionTypes.UPDATE_BUY_QUOTE_STATE_PENDING), + updateBuyQuoteStateFailure: () => createAction(ActionTypes.UPDATE_BUY_QUOTE_STATE_FAILURE), + setError: (error?: any) => createAction(ActionTypes.SET_ERROR, error), + hideError: () => createAction(ActionTypes.HIDE_ERROR), + clearError: () => createAction(ActionTypes.CLEAR_ERROR), }; diff --git a/packages/instant/src/redux/reducer.ts b/packages/instant/src/redux/reducer.ts index 9922131b49..657bd0e402 100644 --- a/packages/instant/src/redux/reducer.ts +++ b/packages/instant/src/redux/reducer.ts @@ -1,6 +1,6 @@ -import { AssetBuyer, BuyQuote } from '@0xproject/asset-buyer'; -import { ObjectMap } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { AssetBuyer, BuyQuote } from '@0x/asset-buyer'; +import { ObjectMap } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; import { Asset, AssetMetaData, AsyncProcessState } from '../types'; @@ -8,22 +8,32 @@ import { assetUtils } from '../util/asset'; import { Action, ActionTypes } from './actions'; +export enum LatestErrorDisplay { + Present, + Hidden, +} export interface State { assetBuyer?: AssetBuyer; assetMetaDataMap: ObjectMap; selectedAsset?: Asset; selectedAssetAmount?: BigNumber; - selectedAssetBuyState: AsyncProcessState; + buyOrderState: AsyncProcessState; ethUsdPrice?: BigNumber; latestBuyQuote?: BuyQuote; + quoteState: AsyncProcessState; + latestError?: any; + latestErrorDisplay: LatestErrorDisplay; } export const INITIAL_STATE: State = { selectedAssetAmount: undefined, assetMetaDataMap: {}, - selectedAssetBuyState: AsyncProcessState.NONE, + buyOrderState: AsyncProcessState.NONE, ethUsdPrice: undefined, latestBuyQuote: undefined, + latestError: undefined, + latestErrorDisplay: LatestErrorDisplay.Hidden, + quoteState: AsyncProcessState.NONE, }; // TODO: Figure out why there is an INITIAL_STATE key in the store... @@ -43,11 +53,41 @@ export const reducer = (state: State = INITIAL_STATE, action: Action): State => return { ...state, latestBuyQuote: action.data, + quoteState: AsyncProcessState.SUCCESS, + }; + case ActionTypes.UPDATE_BUY_QUOTE_STATE_PENDING: + return { + ...state, + latestBuyQuote: undefined, + quoteState: AsyncProcessState.PENDING, + }; + case ActionTypes.UPDATE_BUY_QUOTE_STATE_FAILURE: + return { + ...state, + latestBuyQuote: undefined, + quoteState: AsyncProcessState.FAILURE, }; case ActionTypes.UPDATE_SELECTED_ASSET_BUY_STATE: return { ...state, - selectedAssetBuyState: action.data, + buyOrderState: action.data, + }; + case ActionTypes.SET_ERROR: + return { + ...state, + latestError: action.data, + latestErrorDisplay: LatestErrorDisplay.Present, + }; + case ActionTypes.HIDE_ERROR: + return { + ...state, + latestErrorDisplay: LatestErrorDisplay.Hidden, + }; + case ActionTypes.CLEAR_ERROR: + return { + ...state, + latestError: undefined, + latestErrorDisplay: LatestErrorDisplay.Hidden, }; case ActionTypes.UPDATE_SELECTED_ASSET: const newSelectedAssetData = action.data; diff --git a/packages/instant/src/redux/store.ts b/packages/instant/src/redux/store.ts index fc943f1be1..505234299f 100644 --- a/packages/instant/src/redux/store.ts +++ b/packages/instant/src/redux/store.ts @@ -1,5 +1,6 @@ import * as _ from 'lodash'; import { createStore, Store as ReduxStore } from 'redux'; +import { devToolsEnhancer } from 'redux-devtools-extension/developmentOnly'; import { INITIAL_STATE, reducer, State } from './reducer'; @@ -11,6 +12,7 @@ export const store = { INITIAL_STATE, ...withState, }; - return createStore(reducer, allInitialState); + return createStore(reducer, allInitialState, devToolsEnhancer({})); }, }; + diff --git a/packages/instant/src/style/util.ts b/packages/instant/src/style/util.ts index c9df0f8343..3e38c4a7de 100644 --- a/packages/instant/src/style/util.ts +++ b/packages/instant/src/style/util.ts @@ -1,4 +1,4 @@ -import { ObjectMap } from '@0xproject/types'; +import { ObjectMap } from '@0x/types'; import * as _ from 'lodash'; export const cssRuleIfExists = (props: ObjectMap, rule: string): string => { diff --git a/packages/instant/src/types.ts b/packages/instant/src/types.ts index 867605573c..0454bceeac 100644 --- a/packages/instant/src/types.ts +++ b/packages/instant/src/types.ts @@ -1,11 +1,11 @@ -import { AssetProxyId, ObjectMap } from '@0xproject/types'; +import { AssetProxyId, ObjectMap } from '@0x/types'; // Reusable export enum AsyncProcessState { - NONE, - PENDING, - SUCCESS, - FAILURE, + NONE = 'None', + PENDING = 'Pending', + SUCCESS = 'Success', + FAILURE = 'Failure', } export type FunctionType = (...args: any[]) => any; @@ -29,18 +29,15 @@ export interface ERC721AssetMetaData { export type AssetMetaData = ERC20AssetMetaData | ERC721AssetMetaData; export interface ERC20Asset { - assetProxyId: AssetProxyId.ERC20; assetData: string; metaData: ERC20AssetMetaData; } export interface ERC721Asset { - assetProxyId: AssetProxyId.ERC721; assetData: string; metaData: ERC721AssetMetaData; } export interface Asset { - assetProxyId: AssetProxyId; assetData: string; metaData: AssetMetaData; } diff --git a/packages/instant/src/util/asset.ts b/packages/instant/src/util/asset.ts index ec22276aef..edeac0da3c 100644 --- a/packages/instant/src/util/asset.ts +++ b/packages/instant/src/util/asset.ts @@ -1,5 +1,5 @@ -import { assetDataUtils } from '@0xproject/order-utils'; -import { AssetProxyId, ObjectMap } from '@0xproject/types'; +import { assetDataUtils } from '@0x/order-utils'; +import { AssetProxyId, ObjectMap } from '@0x/types'; import * as _ from 'lodash'; import { assetDataNetworkMapping } from '../data/asset_data_network_mapping'; @@ -8,7 +8,6 @@ import { Asset, AssetMetaData, Network, ZeroExInstantError } from '../types'; export const assetUtils = { createAssetFromAssetData: (assetData: string, assetMetaDataMap: ObjectMap): Asset => { return { - assetProxyId: assetDataUtils.decodeAssetProxyId(assetData), assetData, metaData: assetUtils.getMetaDataOrThrow(assetData, assetMetaDataMap), }; @@ -31,4 +30,18 @@ export const assetUtils = { } return metaData; }, + bestNameForAsset: (asset?: Asset, defaultName: string = '???'): string => { + if (_.isUndefined(asset)) { + return defaultName; + } + const metaData = asset.metaData; + switch (metaData.assetProxyId) { + case AssetProxyId.ERC20: + return metaData.symbol; + case AssetProxyId.ERC721: + return metaData.name; + default: + return defaultName; + } + }, }; diff --git a/packages/instant/src/util/coinbase_api.ts b/packages/instant/src/util/coinbase_api.ts index 94a5d3c80d..080421f985 100644 --- a/packages/instant/src/util/coinbase_api.ts +++ b/packages/instant/src/util/coinbase_api.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; const baseEndpoint = 'https://api.coinbase.com/v2'; export const coinbaseApi = { diff --git a/packages/instant/src/util/error.ts b/packages/instant/src/util/error.ts new file mode 100644 index 0000000000..40fd24c7e5 --- /dev/null +++ b/packages/instant/src/util/error.ts @@ -0,0 +1,64 @@ +import { AssetBuyerError } from '@0x/asset-buyer'; +import { Dispatch } from 'redux'; + +import { Action, actions } from '../redux/actions'; +import { Asset } from '../types'; + +import { assetUtils } from './asset'; + +class ErrorFlasher { + private _timeoutId?: number; + public flashNewError(dispatch: Dispatch, error: any, delayMs: number = 7000): void { + this._clearTimeout(); + + // dispatch new message + dispatch(actions.setError(error)); + + this._timeoutId = window.setTimeout(() => { + dispatch(actions.hideError()); + }, delayMs); + } + public clearError(dispatch: Dispatch): void { + this._clearTimeout(); + dispatch(actions.hideError()); + } + private _clearTimeout(): void { + if (this._timeoutId) { + window.clearTimeout(this._timeoutId); + } + } +} + +const humanReadableMessageForError = (error: Error, asset?: Asset): string | undefined => { + const hasInsufficientLiquidity = + error.message === AssetBuyerError.InsufficientAssetLiquidity || + error.message === AssetBuyerError.InsufficientZrxLiquidity; + if (hasInsufficientLiquidity) { + const assetName = assetUtils.bestNameForAsset(asset, 'of this asset'); + return `Not enough ${assetName} available`; + } + + if ( + error.message === AssetBuyerError.StandardRelayerApiError || + error.message.startsWith(AssetBuyerError.AssetUnavailable) + ) { + const assetName = assetUtils.bestNameForAsset(asset, 'This asset'); + return `${assetName} is currently unavailable`; + } + + return undefined; +}; + +export const errorUtil = { + errorFlasher: new ErrorFlasher(), + errorDescription: (error?: any, asset?: Asset): { icon: string; message: string } => { + let bestMessage: string | undefined; + if (error instanceof Error) { + bestMessage = humanReadableMessageForError(error, asset); + } + return { + icon: '😢', + message: bestMessage || 'Something went wrong...', + }; + }, +}; diff --git a/packages/instant/src/util/format.ts b/packages/instant/src/util/format.ts index b62c968fb4..8482b1526f 100644 --- a/packages/instant/src/util/format.ts +++ b/packages/instant/src/util/format.ts @@ -1,18 +1,26 @@ -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as _ from 'lodash'; import { ethDecimals } from '../constants'; export const format = { - ethBaseAmount: (ethBaseAmount?: BigNumber, decimalPlaces: number = 4, defaultText: string = '0 ETH'): string => { + ethBaseAmount: ( + ethBaseAmount?: BigNumber, + decimalPlaces: number = 4, + defaultText: React.ReactNode = '0 ETH', + ): React.ReactNode => { if (_.isUndefined(ethBaseAmount)) { return defaultText; } const ethUnitAmount = Web3Wrapper.toUnitAmount(ethBaseAmount, ethDecimals); return format.ethUnitAmount(ethUnitAmount, decimalPlaces); }, - ethUnitAmount: (ethUnitAmount?: BigNumber, decimalPlaces: number = 4, defaultText: string = '0 ETH'): string => { + ethUnitAmount: ( + ethUnitAmount?: BigNumber, + decimalPlaces: number = 4, + defaultText: React.ReactNode = '0 ETH', + ): React.ReactNode => { if (_.isUndefined(ethUnitAmount)) { return defaultText; } @@ -23,8 +31,8 @@ export const format = { ethBaseAmount?: BigNumber, ethUsdPrice?: BigNumber, decimalPlaces: number = 2, - defaultText: string = '$0.00', - ): string => { + defaultText: React.ReactNode = '$0.00', + ): React.ReactNode => { if (_.isUndefined(ethBaseAmount) || _.isUndefined(ethUsdPrice)) { return defaultText; } @@ -35,8 +43,8 @@ export const format = { ethUnitAmount?: BigNumber, ethUsdPrice?: BigNumber, decimalPlaces: number = 2, - defaultText: string = '$0.00', - ): string => { + defaultText: React.ReactNode = '$0.00', + ): React.ReactNode => { if (_.isUndefined(ethUnitAmount) || _.isUndefined(ethUsdPrice)) { return defaultText; } diff --git a/packages/instant/src/util/web3_wrapper.ts b/packages/instant/src/util/web3_wrapper.ts index d7e43521ff..24dcd90760 100644 --- a/packages/instant/src/util/web3_wrapper.ts +++ b/packages/instant/src/util/web3_wrapper.ts @@ -1,4 +1,4 @@ -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { getProvider } from './provider'; diff --git a/packages/instant/test/util/error.test.ts b/packages/instant/test/util/error.test.ts new file mode 100644 index 0000000000..b009db91ad --- /dev/null +++ b/packages/instant/test/util/error.test.ts @@ -0,0 +1,56 @@ +import { AssetBuyerError } from '@0x/asset-buyer'; +import { AssetProxyId } from '@0x/types'; + +import { Asset } from '../../src/types'; +import { errorUtil } from '../../src/util/error'; + +const ZRX_ASSET_DATA = '0xf47261b0000000000000000000000000e41d2489571d322189246dafa5ebde1f4699f498'; +const ZRX_ASSET: Asset = { + assetData: ZRX_ASSET_DATA, + metaData: { + assetProxyId: AssetProxyId.ERC20, + symbol: 'zrx', + decimals: 18, + }, +}; + +describe('errorUtil', () => { + describe('errorFlasher', () => { + it('should return error and asset name for InsufficientAssetLiquidity', () => { + const insufficientAssetError = new Error(AssetBuyerError.InsufficientAssetLiquidity); + expect(errorUtil.errorDescription(insufficientAssetError, ZRX_ASSET).message).toEqual( + 'Not enough ZRX available', + ); + }); + it('should return error default name for InsufficientAssetLiquidity', () => { + const insufficientZrxError = new Error(AssetBuyerError.InsufficientZrxLiquidity); + expect(errorUtil.errorDescription(insufficientZrxError).message).toEqual( + 'Not enough of this asset available', + ); + }); + it('should return asset name for InsufficientAssetLiquidity', () => { + const insufficientZrxError = new Error(AssetBuyerError.InsufficientZrxLiquidity); + expect(errorUtil.errorDescription(insufficientZrxError, ZRX_ASSET).message).toEqual( + 'Not enough ZRX available', + ); + }); + it('should return unavailable error and asset name for StandardRelayerApiError', () => { + const standardRelayerError = new Error(AssetBuyerError.StandardRelayerApiError); + expect(errorUtil.errorDescription(standardRelayerError, ZRX_ASSET).message).toEqual( + 'ZRX is currently unavailable', + ); + }); + it('should return error for AssetUnavailable error', () => { + const assetUnavailableError = new Error(`${AssetBuyerError.AssetUnavailable}: For assetData ${ZRX_ASSET}`); + expect(errorUtil.errorDescription(assetUnavailableError, ZRX_ASSET).message).toEqual( + 'ZRX is currently unavailable', + ); + }); + it('should return default for AssetUnavailable error', () => { + const assetUnavailableError = new Error(`${AssetBuyerError.AssetUnavailable}: For assetData xyz`); + expect(errorUtil.errorDescription(assetUnavailableError, ZRX_ASSET).message).toEqual( + 'This asset is currently unavailable', + ); + }); + }); +}); diff --git a/packages/instant/test/util/format.test.ts b/packages/instant/test/util/format.test.ts index 073b86b19a..141df9275c 100644 --- a/packages/instant/test/util/format.test.ts +++ b/packages/instant/test/util/format.test.ts @@ -1,5 +1,5 @@ -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { ethDecimals } from '../../src/constants'; import { format } from '../../src/util/format'; diff --git a/packages/instant/tslint.json b/packages/instant/tslint.json index f71532e5d1..abe874a6d4 100644 --- a/packages/instant/tslint.json +++ b/packages/instant/tslint.json @@ -1,5 +1,5 @@ { - "extends": ["@0xproject/tslint-config"], + "extends": ["@0x/tslint-config"], "rules": { "custom-no-magic-numbers": false, "semicolon": [true, "always", "ignore-bound-class-methods"] diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json index 08e74b6dbb..8a88df6e2f 100644 --- a/packages/json-schemas/CHANGELOG.json +++ b/packages/json-schemas/CHANGELOG.json @@ -7,7 +7,8 @@ "Convert all schemas to JSON files so that they can be used with `json-schema` implemenations in other programming languages.", "pr": 1145 } - ] + ], + "timestamp": 1539871071 }, { "timestamp": 1538693146, diff --git a/packages/json-schemas/CHANGELOG.md b/packages/json-schemas/CHANGELOG.md index d9813053fb..21efe1be0d 100644 --- a/packages/json-schemas/CHANGELOG.md +++ b/packages/json-schemas/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.0 - _October 18, 2018_ + + * Convert all schemas to JSON files so that they can be used with `json-schema` implemenations in other programming languages. (#1145) + ## v1.0.7 - _October 4, 2018_ * Dependencies updated @@ -41,7 +45,7 @@ CHANGELOG * Update incorrect relayer api fee recipients response schema (#974) -## v1.0.1-rc.4 - _August 13, 2018_ +## v1.0.1-rc.4 - _August 14, 2018_ * Allow for additional properties in txData schema (#938) * Change hexSchema to match `0x` (#937) diff --git a/packages/json-schemas/README.md b/packages/json-schemas/README.md index ab57833be7..f50382f4b8 100644 --- a/packages/json-schemas/README.md +++ b/packages/json-schemas/README.md @@ -1,4 +1,4 @@ -## @0xproject/json-schemas +## @0x/json-schemas Contains 0x-related json schemas @@ -7,26 +7,26 @@ Contains 0x-related json schemas ## Installation ```bash -yarn add @0xproject/json-schemas +yarn add @0x/json-schemas ``` **Import** ```typescript -import { SchemaValidator, ValidatorResult, schemas } from '@0xproject/json-schemas'; +import { SchemaValidator, ValidatorResult, schemas } from '@0x/json-schemas'; ``` or ```javascript -var schemas = require('@0xproject/json-schemas').schemas; +var schemas = require('@0x/json-schemas').schemas; ``` If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`: ```json "compilerOptions": { - "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"], + "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"], } ``` @@ -55,13 +55,13 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/json-schemas yarn build +PKG=@0x/json-schemas yarn build ``` Or continuously rebuild on change: ```bash -PKG=@0xproject/json-schemas yarn watch +PKG=@0x/json-schemas yarn watch ``` ### Clean diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index 20d2e48cef..97cf607c1b 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -1,6 +1,6 @@ { - "name": "@0xproject/json-schemas", - "version": "1.0.7", + "name": "@0x/json-schemas", + "version": "2.0.0", "engines": { "node": ">=6.12" }, @@ -39,14 +39,14 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/json-schemas/README.md", "dependencies": { - "@0xproject/typescript-typings": "^3.0.2", + "@0x/typescript-typings": "^3.0.3", "@types/node": "*", "jsonschema": "^1.2.0", "lodash.values": "^4.3.0" }, "devDependencies": { - "@0xproject/tslint-config": "^1.0.8", - "@0xproject/utils": "^2.0.2", + "@0x/tslint-config": "^1.0.9", + "@0x/utils": "^2.0.3", "@types/lodash.foreach": "^4.5.3", "@types/lodash.values": "^4.3.3", "@types/mocha": "^2.2.42", diff --git a/packages/json-schemas/test/schema_test.ts b/packages/json-schemas/test/schema_test.ts index 4e0f66ef5e..795261ef2b 100644 --- a/packages/json-schemas/test/schema_test.ts +++ b/packages/json-schemas/test/schema_test.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import * as dirtyChai from 'dirty-chai'; import forEach = require('lodash.foreach'); diff --git a/packages/json-schemas/tslint.json b/packages/json-schemas/tslint.json index ffaefe83a6..dd9053357e 100644 --- a/packages/json-schemas/tslint.json +++ b/packages/json-schemas/tslint.json @@ -1,3 +1,3 @@ { - "extends": ["@0xproject/tslint-config"] + "extends": ["@0x/tslint-config"] } diff --git a/packages/metacoin/README.md b/packages/metacoin/README.md index 15816cc67d..4f9609dde5 100644 --- a/packages/metacoin/README.md +++ b/packages/metacoin/README.md @@ -1,4 +1,4 @@ -## @0xproject/metacoin +## @0x/metacoin This is an example project that demonstrates how the many Ethereum dev tools developed by 0x can be used in any Solidity/TS project. It supports: @@ -35,13 +35,13 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/metacoin yarn build +PKG=@0x/metacoin yarn build ``` Or continuously rebuild on change: ```bash -PKG=@0xproject/metacoin yarn watch +PKG=@0x/metacoin yarn watch ``` ### Clean diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index 58fc0b8480..04bdeba4ce 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -1,6 +1,6 @@ { - "name": "@0xproject/metacoin", - "version": "0.0.23", + "name": "@0x/metacoin", + "version": "0.0.24", "engines": { "node": ">=6.12" }, @@ -29,25 +29,25 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "@0xproject/abi-gen": "^1.0.13", - "@0xproject/base-contract": "^3.0.1", - "@0xproject/sol-cov": "^2.1.7", - "@0xproject/subproviders": "^2.0.7", - "@0xproject/tslint-config": "^1.0.8", - "@0xproject/types": "^1.1.4", - "@0xproject/typescript-typings": "^3.0.2", - "@0xproject/utils": "^2.0.2", - "@0xproject/web3-wrapper": "^3.0.3", + "@0x/abi-gen": "^1.0.14", + "@0x/base-contract": "^3.0.2", + "@0x/sol-cov": "^2.1.8", + "@0x/subproviders": "^2.1.0", + "@0x/tslint-config": "^1.0.9", + "@0x/types": "^1.2.0", + "@0x/typescript-typings": "^3.0.3", + "@0x/utils": "^2.0.3", + "@0x/web3-wrapper": "^3.1.0", "@types/mocha": "^5.2.2", "copyfiles": "^2.0.0", - "ethereum-types": "^1.0.11", + "ethereum-types": "^1.1.1", "ethers": "~4.0.4", "lodash": "^4.17.5", "run-s": "^0.0.0" }, "devDependencies": { - "@0xproject/dev-utils": "^1.0.12", - "@0xproject/sol-compiler": "^1.1.7", + "@0x/dev-utils": "^1.0.13", + "@0x/sol-compiler": "^1.1.8", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", "chai-bignumber": "^2.0.1", diff --git a/packages/metacoin/test/global_hooks.ts b/packages/metacoin/test/global_hooks.ts index 7328531e42..437061b460 100644 --- a/packages/metacoin/test/global_hooks.ts +++ b/packages/metacoin/test/global_hooks.ts @@ -1,4 +1,4 @@ -import { env, EnvVars } from '@0xproject/dev-utils'; +import { env, EnvVars } from '@0x/dev-utils'; import { coverage } from './utils/coverage'; import { profiler } from './utils/profiler'; diff --git a/packages/metacoin/test/metacoin_test.ts b/packages/metacoin/test/metacoin_test.ts index 6c16a2d395..a8ba85814f 100644 --- a/packages/metacoin/test/metacoin_test.ts +++ b/packages/metacoin/test/metacoin_test.ts @@ -1,5 +1,5 @@ -import { BlockchainLifecycle, devConstants } from '@0xproject/dev-utils'; -import { BigNumber } from '@0xproject/utils'; +import { BlockchainLifecycle, devConstants } from '@0x/dev-utils'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import { ContractArtifact, LogWithDecodedArgs } from 'ethereum-types'; diff --git a/packages/metacoin/test/utils/config.ts b/packages/metacoin/test/utils/config.ts index c26fe5f258..05f524d527 100644 --- a/packages/metacoin/test/utils/config.ts +++ b/packages/metacoin/test/utils/config.ts @@ -1,4 +1,4 @@ -import { devConstants } from '@0xproject/dev-utils'; +import { devConstants } from '@0x/dev-utils'; export const config = { networkId: 50, diff --git a/packages/metacoin/test/utils/coverage.ts b/packages/metacoin/test/utils/coverage.ts index 945afb0a75..31275a1632 100644 --- a/packages/metacoin/test/utils/coverage.ts +++ b/packages/metacoin/test/utils/coverage.ts @@ -1,5 +1,5 @@ -import { devConstants } from '@0xproject/dev-utils'; -import { CoverageSubprovider, SolCompilerArtifactAdapter } from '@0xproject/sol-cov'; +import { devConstants } from '@0x/dev-utils'; +import { CoverageSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-cov'; import * as _ from 'lodash'; import { config } from './config'; diff --git a/packages/metacoin/test/utils/profiler.ts b/packages/metacoin/test/utils/profiler.ts index 7013374519..e7c373d200 100644 --- a/packages/metacoin/test/utils/profiler.ts +++ b/packages/metacoin/test/utils/profiler.ts @@ -1,5 +1,5 @@ -import { devConstants } from '@0xproject/dev-utils'; -import { ProfilerSubprovider, SolCompilerArtifactAdapter } from '@0xproject/sol-cov'; +import { devConstants } from '@0x/dev-utils'; +import { ProfilerSubprovider, SolCompilerArtifactAdapter } from '@0x/sol-cov'; import * as _ from 'lodash'; import { config } from './config'; diff --git a/packages/metacoin/test/utils/web3_wrapper.ts b/packages/metacoin/test/utils/web3_wrapper.ts index 36bd6343ff..258cf560f6 100644 --- a/packages/metacoin/test/utils/web3_wrapper.ts +++ b/packages/metacoin/test/utils/web3_wrapper.ts @@ -1,7 +1,7 @@ -import { env, EnvVars } from '@0xproject/dev-utils'; -import { GanacheSubprovider, prependSubprovider, RPCSubprovider, Web3ProviderEngine } from '@0xproject/subproviders'; -import { errorUtils, logUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { env, EnvVars } from '@0x/dev-utils'; +import { GanacheSubprovider, prependSubprovider, RPCSubprovider, Web3ProviderEngine } from '@0x/subproviders'; +import { errorUtils, logUtils } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as fs from 'fs'; import { config } from './config'; diff --git a/packages/metacoin/tsconfig.json b/packages/metacoin/tsconfig.json index 3065396ffd..163465cf52 100644 --- a/packages/metacoin/tsconfig.json +++ b/packages/metacoin/tsconfig.json @@ -5,10 +5,10 @@ "rootDir": ".", "typeRoots": [ "comment: for building within 0x-monorepo:", - "../../node_modules/@0xproject/typescript-typings/types", + "../../node_modules/@0x/typescript-typings/types", "../../node_modules/@types", "comment: for building in an isolated environment:", - "node_modules/@0xproject/typescript-typings/types", + "node_modules/@0x/typescript-typings/types", "node_modules/@types" ] }, diff --git a/packages/metacoin/tslint.json b/packages/metacoin/tslint.json index ffaefe83a6..dd9053357e 100644 --- a/packages/metacoin/tslint.json +++ b/packages/metacoin/tslint.json @@ -1,3 +1,3 @@ { - "extends": ["@0xproject/tslint-config"] + "extends": ["@0x/tslint-config"] } diff --git a/packages/migrations/CHANGELOG.json b/packages/migrations/CHANGELOG.json index 6c1959a7e3..6d93feb1e1 100644 --- a/packages/migrations/CHANGELOG.json +++ b/packages/migrations/CHANGELOG.json @@ -7,7 +7,8 @@ "Contract artifacts have been moved to the new @0xproject/contract-artifacts package. v1 migrations have been removed. `runMigrationsAsync` returns the addresses of the contracts that were deployed.", "pr": 1105 } - ] + ], + "timestamp": 1539871071 }, { "version": "1.0.14", diff --git a/packages/migrations/CHANGELOG.md b/packages/migrations/CHANGELOG.md index 81f9fabe3c..8d33469724 100644 --- a/packages/migrations/CHANGELOG.md +++ b/packages/migrations/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.0 - _October 18, 2018_ + + * Contract artifacts have been moved to the new @0xproject/contract-artifacts package. v1 migrations have been removed. `runMigrationsAsync` returns the addresses of the contracts that were deployed. (#1105) + ## v1.0.14 - _October 4, 2018_ * Dependencies updated @@ -45,7 +49,7 @@ CHANGELOG * Dependencies updated -## v1.0.4 - _August 13, 2018_ +## v1.0.4 - _August 14, 2018_ * Dependencies updated diff --git a/packages/migrations/README.md b/packages/migrations/README.md index f4715cfa1f..926654cd81 100644 --- a/packages/migrations/README.md +++ b/packages/migrations/README.md @@ -27,13 +27,13 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/migrations yarn build +PKG=@0x/migrations yarn build ``` Or continuously rebuild on change: ```bash -PKG=@0xproject/migrations yarn watch +PKG=@0x/migrations yarn watch ``` ### Clean diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 44737e227e..353697bfca 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -1,6 +1,6 @@ { - "name": "@0xproject/migrations", - "version": "1.0.14", + "name": "@0x/migrations", + "version": "2.0.0", "engines": { "node": ">=6.12" }, @@ -17,9 +17,9 @@ }, "license": "Apache-2.0", "devDependencies": { - "@0xproject/dev-utils": "^1.0.12", - "@0xproject/tslint-config": "^1.0.8", - "@0xproject/types": "^1.1.4", + "@0x/dev-utils": "^1.0.13", + "@0x/tslint-config": "^1.0.9", + "@0x/types": "^1.2.0", "@types/yargs": "^10.0.0", "make-promises-safe": "^1.1.0", "npm-run-all": "^4.1.2", @@ -29,18 +29,18 @@ "yargs": "^10.0.3" }, "dependencies": { - "@0xproject/abi-gen-wrappers": "^1.0.0", - "@0xproject/base-contract": "^3.0.1", - "@0xproject/contract-addresses": "^1.0.0", - "@0xproject/contract-artifacts": "^1.0.0", - "@0xproject/order-utils": "^1.0.7", - "@0xproject/sol-compiler": "^1.1.7", - "@0xproject/subproviders": "^2.0.7", - "@0xproject/typescript-typings": "^3.0.2", - "@0xproject/utils": "^2.0.2", - "@0xproject/web3-wrapper": "^3.0.3", + "@0x/abi-gen-wrappers": "^1.0.1", + "@0x/base-contract": "^3.0.2", + "@0x/contract-addresses": "^1.0.1", + "@0x/contract-artifacts": "^1.0.1", + "@0x/order-utils": "^2.0.0", + "@0x/sol-compiler": "^1.1.8", + "@0x/subproviders": "^2.1.0", + "@0x/typescript-typings": "^3.0.3", + "@0x/utils": "^2.0.3", + "@0x/web3-wrapper": "^3.1.0", "@ledgerhq/hw-app-eth": "^4.3.0", - "ethereum-types": "^1.0.11", + "ethereum-types": "^1.1.1", "ethers": "~4.0.4", "lodash": "^4.17.5" }, diff --git a/packages/migrations/src/migrate.ts b/packages/migrations/src/migrate.ts index 27f36ba348..d7a76d2f88 100644 --- a/packages/migrations/src/migrate.ts +++ b/packages/migrations/src/migrate.ts @@ -1,6 +1,6 @@ #!/usr/bin/env node -import { devConstants, web3Factory } from '@0xproject/dev-utils'; -import { logUtils } from '@0xproject/utils'; +import { devConstants, web3Factory } from '@0x/dev-utils'; +import { logUtils } from '@0x/utils'; import { Provider } from 'ethereum-types'; import { runMigrationsAsync } from './migration'; diff --git a/packages/migrations/src/migration.ts b/packages/migrations/src/migration.ts index 0ee5b69756..86c76a54bc 100644 --- a/packages/migrations/src/migration.ts +++ b/packages/migrations/src/migration.ts @@ -1,9 +1,9 @@ -import * as wrappers from '@0xproject/abi-gen-wrappers'; -import { ContractAddresses } from '@0xproject/contract-addresses'; -import * as artifacts from '@0xproject/contract-artifacts'; -import { assetDataUtils } from '@0xproject/order-utils'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import * as wrappers from '@0x/abi-gen-wrappers'; +import { ContractAddresses } from '@0x/contract-addresses'; +import * as artifacts from '@0x/contract-artifacts'; +import { assetDataUtils } from '@0x/order-utils'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { Provider, TxData } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/migrations/src/types.ts b/packages/migrations/src/types.ts index 65f685797a..87e66f3566 100644 --- a/packages/migrations/src/types.ts +++ b/packages/migrations/src/types.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; export interface ERC20Token { address?: string; diff --git a/packages/migrations/src/utils/constants.ts b/packages/migrations/src/utils/constants.ts index 63898ac022..8b16a0520b 100644 --- a/packages/migrations/src/utils/constants.ts +++ b/packages/migrations/src/utils/constants.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; export const constants = { ASSET_PROXY_OWNER_OWNERS: [ diff --git a/packages/migrations/src/utils/provider_factory.ts b/packages/migrations/src/utils/provider_factory.ts index e7e00a039b..8017b672a1 100644 --- a/packages/migrations/src/utils/provider_factory.ts +++ b/packages/migrations/src/utils/provider_factory.ts @@ -1,4 +1,4 @@ -import { LedgerEthereumClient, LedgerSubprovider, RPCSubprovider, Web3ProviderEngine } from '@0xproject/subproviders'; +import { LedgerEthereumClient, LedgerSubprovider, RPCSubprovider, Web3ProviderEngine } from '@0x/subproviders'; import Eth from '@ledgerhq/hw-app-eth'; // tslint:disable:no-implicit-dependencies import TransportNodeHid from '@ledgerhq/hw-transport-node-hid'; diff --git a/packages/migrations/src/utils/token_info.ts b/packages/migrations/src/utils/token_info.ts index 200f948965..6e0411f603 100644 --- a/packages/migrations/src/utils/token_info.ts +++ b/packages/migrations/src/utils/token_info.ts @@ -1,4 +1,4 @@ -import { BigNumber, NULL_BYTES } from '@0xproject/utils'; +import { BigNumber, NULL_BYTES } from '@0x/utils'; import { ERC20Token, ERC721Token } from '../types'; diff --git a/packages/migrations/tslint.json b/packages/migrations/tslint.json index ffaefe83a6..dd9053357e 100644 --- a/packages/migrations/tslint.json +++ b/packages/migrations/tslint.json @@ -1,3 +1,3 @@ { - "extends": ["@0xproject/tslint-config"] + "extends": ["@0x/tslint-config"] } diff --git a/packages/monorepo-scripts/README.md b/packages/monorepo-scripts/README.md index d979e27dcc..0673098b5c 100644 --- a/packages/monorepo-scripts/README.md +++ b/packages/monorepo-scripts/README.md @@ -47,13 +47,13 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/monorepo-scripts yarn build +PKG=@0x/monorepo-scripts yarn build ``` Or continuously rebuild on change: ```bash -PKG=@0xproject/monorepo-scripts yarn watch +PKG=@0x/monorepo-scripts yarn watch ``` ### Clean diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json index 57e8bc1473..ba5f9ca6ae 100644 --- a/packages/monorepo-scripts/package.json +++ b/packages/monorepo-scripts/package.json @@ -1,7 +1,7 @@ { "private": true, - "name": "@0xproject/monorepo-scripts", - "version": "1.0.11", + "name": "@0x/monorepo-scripts", + "version": "1.0.12", "engines": { "node": ">=6.12" }, diff --git a/packages/monorepo-scripts/src/doc_gen_configs.ts b/packages/monorepo-scripts/src/doc_gen_configs.ts index b5a36376aa..0aaf5a6a5e 100644 --- a/packages/monorepo-scripts/src/doc_gen_configs.ts +++ b/packages/monorepo-scripts/src/doc_gen_configs.ts @@ -16,8 +16,14 @@ export const docGenConfigs: DocGenConfigs = { Schema: 'https://github.com/tdegrunt/jsonschema/blob/5c2edd4baba149964aec0f23c87ad12c25a50dfb/lib/index.d.ts#L49', Uint8Array: 'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Uint8Array', + // HACK: CI can handle these without the namespace but some local setups (Jacob) require the namespace prefix + // This is duplicated until we can discover the source of the issue. GanacheOpts: 'https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/ganache-core/index.d.ts#L8', keystore: 'https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/eth-lightwallet/index.d.ts#L36', + 'Ganache.GanacheOpts': + 'https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/ganache-core/index.d.ts#L8', + 'lightwallet.keystore': + 'https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/eth-lightwallet/index.d.ts#L36', }, // If a 0x package re-exports an external package, we should add a link to it's exported items here EXTERNAL_EXPORT_TO_LINK: { diff --git a/packages/monorepo-scripts/src/find_unused_dependencies.ts b/packages/monorepo-scripts/src/find_unused_dependencies.ts index 4bb4b7dc58..42b4b78901 100644 --- a/packages/monorepo-scripts/src/find_unused_dependencies.ts +++ b/packages/monorepo-scripts/src/find_unused_dependencies.ts @@ -7,7 +7,7 @@ import { constants } from './constants'; import { utils } from './utils/utils'; // For some reason, `depcheck` hangs on some packages. Add them here. -const IGNORE_PACKAGES = ['@0xproject/sol-compiler']; +const IGNORE_PACKAGES = ['@0x/sol-compiler']; (async () => { utils.log('*** NOTE: Not all deps listed here are actually not required. ***'); diff --git a/packages/monorepo-scripts/src/publish.ts b/packages/monorepo-scripts/src/publish.ts index 646818c58d..b7131e69e9 100644 --- a/packages/monorepo-scripts/src/publish.ts +++ b/packages/monorepo-scripts/src/publish.ts @@ -18,7 +18,7 @@ import { DocGenerateAndUploadUtils } from './utils/doc_generate_and_upload_utils import { publishReleaseNotesAsync } from './utils/github_release_utils'; import { utils } from './utils/utils'; -const NPM_NAMESPACE = '@0xproject/'; +const NPM_NAMESPACE = '@0x/'; const TODAYS_TIMESTAMP = moment().unix(); async function confirmAsync(message: string): Promise { @@ -35,6 +35,10 @@ async function confirmAsync(message: string): Promise { // Fetch public, updated Lerna packages const shouldIncludePrivate = true; const allUpdatedPackages = await utils.getUpdatedPackagesAsync(shouldIncludePrivate); + if (_.isEmpty(allUpdatedPackages)) { + utils.log('No packages need publishing'); + process.exit(0); + } const packagesWithDocs = getPackagesWithDocs(allUpdatedPackages); if (!configs.IS_LOCAL_PUBLISH) { @@ -96,7 +100,7 @@ function getPackagesWithDocs(allUpdatedPackages: Package[]): Package[] { const packagesWithDocPages = packagesWithDocPagesStringIfExist.split(' '); const updatedPackagesWithDocPages: Package[] = []; _.each(allUpdatedPackages, pkg => { - const nameWithoutPrefix = pkg.packageJson.name.replace('@0xproject/', ''); + const nameWithoutPrefix = pkg.packageJson.name.replace('@0x/', ''); if (_.includes(packagesWithDocPages, nameWithoutPrefix)) { updatedPackagesWithDocPages.push(pkg); } @@ -110,7 +114,7 @@ async function generateAndUploadDocJsonsAsync( shouldUploadDocs: boolean, ): Promise { for (const pkg of packagesWithDocs) { - const nameWithoutPrefix = pkg.packageJson.name.replace('@0xproject/', ''); + const nameWithoutPrefix = pkg.packageJson.name.replace('@0x/', ''); const docGenerateAndUploadUtils = new DocGenerateAndUploadUtils(nameWithoutPrefix, isStaging, shouldUploadDocs); await docGenerateAndUploadUtils.generateAndUploadDocsAsync(); } @@ -130,7 +134,7 @@ async function confirmDocPagesRenderAsync(packagesWithDocs: Package[]): Promise< _.each(packagesWithDocs, pkg => { const name = pkg.packageJson.name; - const nameWithoutPrefix = _.startsWith(name, NPM_NAMESPACE) ? name.split('@0xproject/')[1] : name; + const nameWithoutPrefix = _.startsWith(name, NPM_NAMESPACE) ? name.split('@0x/')[1] : name; const link = `${constants.stagingWebsite}/docs/${nameWithoutPrefix}`; // tslint:disable-next-line:no-floating-promises opn(link); diff --git a/packages/monorepo-scripts/src/publish_release_notes.ts b/packages/monorepo-scripts/src/publish_release_notes.ts index 6090498e08..297eb3d504 100644 --- a/packages/monorepo-scripts/src/publish_release_notes.ts +++ b/packages/monorepo-scripts/src/publish_release_notes.ts @@ -15,7 +15,7 @@ const args = yargs 'Space-separated list of packages to generated release notes for. If not supplied, it does all `Lerna updated` packages.', type: 'string', }) - .example('$0 --isDryRun true --packages "0x.js @0xproject/web3-wrapper"', 'Full usage example').argv; + .example('$0 --isDryRun true --packages "0x.js @0x/web3-wrapper"', 'Full usage example').argv; (async () => { const isDryRun = args.isDryRun; diff --git a/packages/monorepo-scripts/src/test_installation.ts b/packages/monorepo-scripts/src/test_installation.ts index a642498acc..96875d0f9c 100644 --- a/packages/monorepo-scripts/src/test_installation.ts +++ b/packages/monorepo-scripts/src/test_installation.ts @@ -12,12 +12,7 @@ import { Package } from './types'; import { utils } from './utils/utils'; // Packages might not be runnable if they are command-line tools or only run in browsers. -const UNRUNNABLE_PACKAGES = [ - '@0xproject/abi-gen', - '@0xproject/sra-report', - '@0xproject/react-shared', - '@0xproject/react-docs', -]; +const UNRUNNABLE_PACKAGES = ['@0x/abi-gen', '@0x/react-shared', '@0x/react-docs']; const mkdirpAsync = promisify(mkdirp); const rimrafAsync = promisify(rimraf); @@ -121,7 +116,7 @@ async function testInstallPackageAsync( await writeFileAsync(indexFilePath, `import * as Package from '${packageName}';\nconsole.log(Package);\n`); const tsConfig = { compilerOptions: { - typeRoots: ['node_modules/@0xproject/typescript-typings/types', 'node_modules/@types'], + typeRoots: ['node_modules/@0x/typescript-typings/types', 'node_modules/@types'], module: 'commonjs', target: 'es5', lib: ['es2017', 'dom'], diff --git a/packages/monorepo-scripts/src/utils/doc_generate_and_upload_utils.ts b/packages/monorepo-scripts/src/utils/doc_generate_and_upload_utils.ts index 547b65eeb7..1a4294e9c2 100644 --- a/packages/monorepo-scripts/src/utils/doc_generate_and_upload_utils.ts +++ b/packages/monorepo-scripts/src/utils/doc_generate_and_upload_utils.ts @@ -402,7 +402,7 @@ export class DocGenerateAndUploadUtils { sanitizedExportPathToExportPath[sanitizedExportPath] = exportPath; return sanitizedExportPath; } - const monorepoPrefix = '@0xproject/'; + const monorepoPrefix = '@0x/'; if (_.startsWith(exportPath, monorepoPrefix)) { const sanitizedExportPath = exportPath.split(monorepoPrefix)[1]; sanitizedExportPathToExportPath[sanitizedExportPath] = exportPath; @@ -478,7 +478,7 @@ export class DocGenerateAndUploadUtils { }); }); - // @0xproject/types & ethereum-types are examples of packages where their index.ts exports types + // @0x/types & ethereum-types are examples of packages where their index.ts exports types // directly, meaning no internal paths will exist to follow. Other packages also have direct exports // in their index.ts, so we always add it to the source files passed to TypeDoc if (typeDocSourceIncludes.size === 0) { diff --git a/packages/monorepo-scripts/src/utils/github_release_utils.ts b/packages/monorepo-scripts/src/utils/github_release_utils.ts index 0f3485de05..43c52ec2d8 100644 --- a/packages/monorepo-scripts/src/utils/github_release_utils.ts +++ b/packages/monorepo-scripts/src/utils/github_release_utils.ts @@ -93,7 +93,7 @@ function adjustAssetPaths(assets: string[]): string[] { } function getReleaseNotesForPackage(packageName: string, version: string): string { - const packageNameWithoutNamespace = packageName.replace('@0xproject/', ''); + const packageNameWithoutNamespace = packageName.replace('@0x/', ''); const changelogJSONPath = path.join( constants.monorepoRootPath, 'packages', diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index 9bf16ef2a5..22af2412b2 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -19,7 +19,8 @@ "note": "Use `AssetData` union type for function return values.", "pr": 1131 } - ] + ], + "timestamp": 1539871071 }, { "version": "1.0.7", diff --git a/packages/order-utils/CHANGELOG.md b/packages/order-utils/CHANGELOG.md index 24598883aa..afd5c4adc0 100644 --- a/packages/order-utils/CHANGELOG.md +++ b/packages/order-utils/CHANGELOG.md @@ -5,6 +5,13 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.0 - _October 18, 2018_ + + * Added `ecSignOrderAsync` to first sign an order using `eth_signTypedData` and fallback to `eth_sign`. (#1102) + * Added `ecSignTypedDataOrderAsync` to sign an order exclusively using `eth_signTypedData`. (#1102) + * Rename `ecSignOrderHashAsync` to `ecSignHashAsync` removing `SignerType` parameter. (#1102) + * Use `AssetData` union type for function return values. (#1131) + ## v1.0.7 - _October 4, 2018_ * Dependencies updated @@ -52,7 +59,7 @@ CHANGELOG * Make `sortFeeOrdersByFeeAdjustedRate` in `sortingUtils` generic (#997) * Update `findFeeOrdersThatCoverFeesForTargetOrders` to round the the nearest integer when calculating required fees (#997) -## v1.0.1-rc.3 - _August 13, 2018_ +## v1.0.1-rc.3 - _August 14, 2018_ * Update ecSignOrderHashAsync to return signature string with signature type byte. Removes messagePrefixOpts. (#914) * Added a synchronous `createOrder` method in `orderFactory`, updated public interfaces to support some optional parameters (#936) diff --git a/packages/order-utils/README.md b/packages/order-utils/README.md index 33df1d4b00..4a82870987 100644 --- a/packages/order-utils/README.md +++ b/packages/order-utils/README.md @@ -1,4 +1,4 @@ -## @0xproject/order-utils +## @0x/order-utils 0x order-related utilities for those developing on top of 0x protocol. @@ -7,14 +7,14 @@ ## Installation ```bash -yarn add @0xproject/order-utils +yarn add @0x/order-utils ``` If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`: ```json "compilerOptions": { - "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"], + "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"], } ``` @@ -43,13 +43,13 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/order-utils yarn build +PKG=@0x/order-utils yarn build ``` Or continuously rebuild on change: ```bash -PKG=@0xproject/order-utils yarn watch +PKG=@0x/order-utils yarn watch ``` ### Clean diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 09eef849f7..69f14a79e5 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -1,6 +1,6 @@ { - "name": "@0xproject/order-utils", - "version": "1.0.7", + "name": "@0x/order-utils", + "version": "2.0.0", "engines": { "node": ">=6.12" }, @@ -35,8 +35,8 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md", "devDependencies": { - "@0xproject/dev-utils": "^1.0.12", - "@0xproject/tslint-config": "^1.0.8", + "@0x/dev-utils": "^1.0.13", + "@0x/tslint-config": "^1.0.9", "@types/bn.js": "^4.11.0", "@types/lodash": "4.14.104", "chai": "^4.0.1", @@ -53,18 +53,18 @@ "typescript": "3.0.1" }, "dependencies": { - "@0xproject/abi-gen-wrappers": "^1.0.0", - "@0xproject/assert": "^1.0.13", - "@0xproject/base-contract": "^3.0.1", - "@0xproject/contract-artifacts": "^1.0.0", - "@0xproject/json-schemas": "^1.0.7", - "@0xproject/types": "^1.1.4", - "@0xproject/typescript-typings": "^3.0.2", - "@0xproject/utils": "^2.0.2", - "@0xproject/web3-wrapper": "^3.0.3", + "@0x/abi-gen-wrappers": "^1.0.1", + "@0x/assert": "^1.0.14", + "@0x/base-contract": "^3.0.2", + "@0x/contract-artifacts": "^1.0.1", + "@0x/json-schemas": "^2.0.0", + "@0x/types": "^1.2.0", + "@0x/typescript-typings": "^3.0.3", + "@0x/utils": "^2.0.3", + "@0x/web3-wrapper": "^3.1.0", "@types/node": "*", "bn.js": "^4.11.8", - "ethereum-types": "^1.0.11", + "ethereum-types": "^1.1.1", "ethereumjs-abi": "0.6.5", "ethereumjs-util": "^5.1.1", "ethers": "~4.0.4", diff --git a/packages/order-utils/src/abstract/abstract_balance_and_proxy_allowance_fetcher.ts b/packages/order-utils/src/abstract/abstract_balance_and_proxy_allowance_fetcher.ts index c7f06abad0..13fbf17366 100644 --- a/packages/order-utils/src/abstract/abstract_balance_and_proxy_allowance_fetcher.ts +++ b/packages/order-utils/src/abstract/abstract_balance_and_proxy_allowance_fetcher.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; /** * An abstract class to be implemented in order to use OrderStateUtils. The class that diff --git a/packages/order-utils/src/abstract/abstract_balance_and_proxy_allowance_lazy_store.ts b/packages/order-utils/src/abstract/abstract_balance_and_proxy_allowance_lazy_store.ts index 38e08b7fe5..0a73e92bd6 100644 --- a/packages/order-utils/src/abstract/abstract_balance_and_proxy_allowance_lazy_store.ts +++ b/packages/order-utils/src/abstract/abstract_balance_and_proxy_allowance_lazy_store.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; export abstract class AbstractBalanceAndProxyAllowanceLazyStore { public abstract async getBalanceAsync(assetData: string, userAddress: string): Promise; diff --git a/packages/order-utils/src/abstract/abstract_order_filled_cancelled_fetcher.ts b/packages/order-utils/src/abstract/abstract_order_filled_cancelled_fetcher.ts index fbc1c4718d..de096b7d9e 100644 --- a/packages/order-utils/src/abstract/abstract_order_filled_cancelled_fetcher.ts +++ b/packages/order-utils/src/abstract/abstract_order_filled_cancelled_fetcher.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; /** * An abstract class to be implemented in order to use OrderStateUtils. The class that diff --git a/packages/order-utils/src/abstract/abstract_order_filled_cancelled_lazy_store.ts b/packages/order-utils/src/abstract/abstract_order_filled_cancelled_lazy_store.ts index 617bcb224e..d9e66db067 100644 --- a/packages/order-utils/src/abstract/abstract_order_filled_cancelled_lazy_store.ts +++ b/packages/order-utils/src/abstract/abstract_order_filled_cancelled_lazy_store.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; export abstract class AbstractOrderFilledCancelledLazyStore { public abstract async getFilledTakerAmountAsync(orderHash: string): Promise; diff --git a/packages/order-utils/src/assert.ts b/packages/order-utils/src/assert.ts index f8db7ac63b..2f73f58c43 100644 --- a/packages/order-utils/src/assert.ts +++ b/packages/order-utils/src/assert.ts @@ -1,10 +1,10 @@ -import { assert as sharedAssert } from '@0xproject/assert'; +import { assert as sharedAssert } from '@0x/assert'; // HACK: We need those two unused imports because they're actually used by sharedAssert which gets injected here // tslint:disable:no-unused-variable -import { Schema } from '@0xproject/json-schemas'; -import { ECSignature, SignatureType } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { Schema } from '@0x/json-schemas'; +import { ECSignature, SignatureType } from '@0x/types'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; // tslint:enable:no-unused-variable import * as _ from 'lodash'; diff --git a/packages/order-utils/src/asset_data_utils.ts b/packages/order-utils/src/asset_data_utils.ts index 12c11bce9e..9bbef3a239 100644 --- a/packages/order-utils/src/asset_data_utils.ts +++ b/packages/order-utils/src/asset_data_utils.ts @@ -1,5 +1,5 @@ -import { AssetData, AssetProxyId, ERC20AssetData, ERC721AssetData } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { AssetData, AssetProxyId, ERC20AssetData, ERC721AssetData } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import ethAbi = require('ethereumjs-abi'); import ethUtil = require('ethereumjs-util'); diff --git a/packages/order-utils/src/constants.ts b/packages/order-utils/src/constants.ts index 7de20a6964..10029dcc38 100644 --- a/packages/order-utils/src/constants.ts +++ b/packages/order-utils/src/constants.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; export const constants = { NULL_ADDRESS: '0x0000000000000000000000000000000000000000', diff --git a/packages/order-utils/src/eip712_utils.ts b/packages/order-utils/src/eip712_utils.ts index 56f736500b..385fda9893 100644 --- a/packages/order-utils/src/eip712_utils.ts +++ b/packages/order-utils/src/eip712_utils.ts @@ -1,6 +1,6 @@ -import { assert } from '@0xproject/assert'; -import { schemas } from '@0xproject/json-schemas'; -import { EIP712Object, EIP712TypedData, EIP712Types, Order, ZeroExTransaction } from '@0xproject/types'; +import { assert } from '@0x/assert'; +import { schemas } from '@0x/json-schemas'; +import { EIP712Object, EIP712TypedData, EIP712Types, Order, ZeroExTransaction } from '@0x/types'; import * as _ from 'lodash'; import { constants } from './constants'; diff --git a/packages/order-utils/src/exchange_transfer_simulator.ts b/packages/order-utils/src/exchange_transfer_simulator.ts index 81c849c641..7a38b35dfb 100644 --- a/packages/order-utils/src/exchange_transfer_simulator.ts +++ b/packages/order-utils/src/exchange_transfer_simulator.ts @@ -1,5 +1,5 @@ -import { ExchangeContractErrs } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { ExchangeContractErrs } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import { AbstractBalanceAndProxyAllowanceLazyStore } from './abstract/abstract_balance_and_proxy_allowance_lazy_store'; import { constants } from './constants'; diff --git a/packages/order-utils/src/index.ts b/packages/order-utils/src/index.ts index a356a1d447..e70d43efb9 100644 --- a/packages/order-utils/src/index.ts +++ b/packages/order-utils/src/index.ts @@ -18,7 +18,6 @@ export { ExchangeTransferSimulator } from './exchange_transfer_simulator'; export { BalanceAndProxyAllowanceLazyStore } from './store/balance_and_proxy_allowance_lazy_store'; export { OrderFilledCancelledLazyStore } from './store/order_filled_cancelled_lazy_store'; -export { constants } from './constants'; export { eip712Utils } from './eip712_utils'; export { @@ -49,7 +48,7 @@ export { EIP712Object, EIP712ObjectValue, ZeroExTransaction, -} from '@0xproject/types'; +} from '@0x/types'; export { OrderError, TradeSide, diff --git a/packages/order-utils/src/market_utils.ts b/packages/order-utils/src/market_utils.ts index ed6af7d857..fa32f14133 100644 --- a/packages/order-utils/src/market_utils.ts +++ b/packages/order-utils/src/market_utils.ts @@ -1,6 +1,6 @@ -import { schemas } from '@0xproject/json-schemas'; -import { Order } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { schemas } from '@0x/json-schemas'; +import { Order } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; import { assert } from './assert'; diff --git a/packages/order-utils/src/order_factory.ts b/packages/order-utils/src/order_factory.ts index 0f0cd6046d..f7b855bfbd 100644 --- a/packages/order-utils/src/order_factory.ts +++ b/packages/order-utils/src/order_factory.ts @@ -1,5 +1,5 @@ -import { Order, SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { Order, SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import { Provider } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/order-utils/src/order_hash.ts b/packages/order-utils/src/order_hash.ts index b523a3523d..c8e9be71e3 100644 --- a/packages/order-utils/src/order_hash.ts +++ b/packages/order-utils/src/order_hash.ts @@ -1,6 +1,6 @@ -import { schemas, SchemaValidator } from '@0xproject/json-schemas'; -import { Order, SignedOrder } from '@0xproject/types'; -import { signTypedDataUtils } from '@0xproject/utils'; +import { schemas, SchemaValidator } from '@0x/json-schemas'; +import { Order, SignedOrder } from '@0x/types'; +import { signTypedDataUtils } from '@0x/utils'; import * as _ from 'lodash'; import { assert } from './assert'; diff --git a/packages/order-utils/src/order_state_utils.ts b/packages/order-utils/src/order_state_utils.ts index 9b21ef6e96..159aeeb091 100644 --- a/packages/order-utils/src/order_state_utils.ts +++ b/packages/order-utils/src/order_state_utils.ts @@ -5,8 +5,8 @@ import { OrderStateInvalid, OrderStateValid, SignedOrder, -} from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +} from '@0x/types'; +import { BigNumber } from '@0x/utils'; import { AbstractBalanceAndProxyAllowanceFetcher } from './abstract/abstract_balance_and_proxy_allowance_fetcher'; import { AbstractOrderFilledCancelledFetcher } from './abstract/abstract_order_filled_cancelled_fetcher'; diff --git a/packages/order-utils/src/order_validation_utils.ts b/packages/order-utils/src/order_validation_utils.ts index 8227fb07c6..a40069f63b 100644 --- a/packages/order-utils/src/order_validation_utils.ts +++ b/packages/order-utils/src/order_validation_utils.ts @@ -1,5 +1,5 @@ -import { RevertReason, SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { RevertReason, SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import { Provider } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/order-utils/src/parsing_utils.ts b/packages/order-utils/src/parsing_utils.ts index 232c54b7b5..98c6899fef 100644 --- a/packages/order-utils/src/parsing_utils.ts +++ b/packages/order-utils/src/parsing_utils.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; export const orderParsingUtils = { diff --git a/packages/order-utils/src/rate_utils.ts b/packages/order-utils/src/rate_utils.ts index c9ca72c599..416e00c67b 100644 --- a/packages/order-utils/src/rate_utils.ts +++ b/packages/order-utils/src/rate_utils.ts @@ -1,6 +1,6 @@ -import { schemas } from '@0xproject/json-schemas'; -import { Order } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { schemas } from '@0x/json-schemas'; +import { Order } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import { assert } from './assert'; import { constants } from './constants'; diff --git a/packages/order-utils/src/remaining_fillable_calculator.ts b/packages/order-utils/src/remaining_fillable_calculator.ts index 7022aa9792..052eafa1d5 100644 --- a/packages/order-utils/src/remaining_fillable_calculator.ts +++ b/packages/order-utils/src/remaining_fillable_calculator.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; export class RemainingFillableCalculator { private readonly _isTraderAssetZRX: boolean; diff --git a/packages/order-utils/src/salt.ts b/packages/order-utils/src/salt.ts index 90a4197c0a..ff47ab5d28 100644 --- a/packages/order-utils/src/salt.ts +++ b/packages/order-utils/src/salt.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; const MAX_DIGITS_IN_UNSIGNED_256_INT = 78; diff --git a/packages/order-utils/src/signature_utils.ts b/packages/order-utils/src/signature_utils.ts index d755846adc..96d90e21a5 100644 --- a/packages/order-utils/src/signature_utils.ts +++ b/packages/order-utils/src/signature_utils.ts @@ -1,8 +1,8 @@ -import { ExchangeContract, IValidatorContract, IWalletContract } from '@0xproject/abi-gen-wrappers'; -import * as artifacts from '@0xproject/contract-artifacts'; -import { schemas } from '@0xproject/json-schemas'; -import { ECSignature, Order, SignatureType, SignedOrder, ValidatorSignature } from '@0xproject/types'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { ExchangeContract, IValidatorContract, IWalletContract } from '@0x/abi-gen-wrappers'; +import * as artifacts from '@0x/contract-artifacts'; +import { schemas } from '@0x/json-schemas'; +import { ECSignature, Order, SignatureType, SignedOrder, ValidatorSignature } from '@0x/types'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { Provider } from 'ethereum-types'; import * as ethUtil from 'ethereumjs-util'; import * as _ from 'lodash'; diff --git a/packages/order-utils/src/sorting_utils.ts b/packages/order-utils/src/sorting_utils.ts index cd5163cf66..1de24264f7 100644 --- a/packages/order-utils/src/sorting_utils.ts +++ b/packages/order-utils/src/sorting_utils.ts @@ -1,6 +1,6 @@ -import { schemas } from '@0xproject/json-schemas'; -import { Order } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { schemas } from '@0x/json-schemas'; +import { Order } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; import { assert } from './assert'; diff --git a/packages/order-utils/src/store/balance_and_proxy_allowance_lazy_store.ts b/packages/order-utils/src/store/balance_and_proxy_allowance_lazy_store.ts index 8a65178b05..f42a76d0c0 100644 --- a/packages/order-utils/src/store/balance_and_proxy_allowance_lazy_store.ts +++ b/packages/order-utils/src/store/balance_and_proxy_allowance_lazy_store.ts @@ -1,5 +1,5 @@ -import { AssetProxyId } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { AssetProxyId } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; import { AbstractBalanceAndProxyAllowanceFetcher } from '../abstract/abstract_balance_and_proxy_allowance_fetcher'; diff --git a/packages/order-utils/src/store/order_filled_cancelled_lazy_store.ts b/packages/order-utils/src/store/order_filled_cancelled_lazy_store.ts index 6155c2064a..1d84ffdaa3 100644 --- a/packages/order-utils/src/store/order_filled_cancelled_lazy_store.ts +++ b/packages/order-utils/src/store/order_filled_cancelled_lazy_store.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; import { AbstractOrderFilledCancelledFetcher } from '../abstract/abstract_order_filled_cancelled_fetcher'; diff --git a/packages/order-utils/src/types.ts b/packages/order-utils/src/types.ts index 5b13dd754c..55ec553dbd 100644 --- a/packages/order-utils/src/types.ts +++ b/packages/order-utils/src/types.ts @@ -1,8 +1,8 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; export enum OrderError { InvalidSignature = 'INVALID_SIGNATURE', - InvalidMetamaskSigner = "MetaMask provider must be wrapped in a MetamaskSubprovider (from the '@0xproject/subproviders' package) in order to work with this method.", + InvalidMetamaskSigner = "MetaMask provider must be wrapped in a MetamaskSubprovider (from the '@0x/subproviders' package) in order to work with this method.", } export enum TradeSide { @@ -27,7 +27,7 @@ export interface CreateOrderOpts { /** * remainingFillableMakerAssetAmount: An array of BigNumbers corresponding to the `orders` parameter. - * You can use `OrderStateUtils` `@0xproject/order-utils` to perform blockchain lookups for these values. + * You can use `OrderStateUtils` `@0x/order-utils` to perform blockchain lookups for these values. * Defaults to `makerAssetAmount` values from the orders param. * slippageBufferAmount: An additional amount of makerAsset to be covered by the result in case of trade collisions or partial fills. * Defaults to 0 @@ -39,10 +39,10 @@ export interface FindOrdersThatCoverMakerAssetFillAmountOpts { /** * remainingFillableMakerAssetAmount: An array of BigNumbers corresponding to the `orders` parameter. - * You can use `OrderStateUtils` `@0xproject/order-utils` to perform blockchain lookups for these values. + * You can use `OrderStateUtils` `@0x/order-utils` to perform blockchain lookups for these values. * Defaults to `makerAssetAmount` values from the orders param. * remainingFillableFeeAmounts: An array of BigNumbers corresponding to the feeOrders parameter. - * You can use OrderStateUtils @0xproject/order-utils to perform blockchain lookups for these values. + * You can use OrderStateUtils @0x/order-utils to perform blockchain lookups for these values. * Defaults to `makerAssetAmount` values from the feeOrders param. * slippageBufferAmount: An additional amount of fee to be covered by the result in case of trade collisions or partial fills. * Defaults to 0 diff --git a/packages/order-utils/src/utils.ts b/packages/order-utils/src/utils.ts index 0ff05e8ed2..6b22610015 100644 --- a/packages/order-utils/src/utils.ts +++ b/packages/order-utils/src/utils.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; export const utils = { getSignatureTypeIndexIfExists(signature: string): number { diff --git a/packages/order-utils/test/eip712_utils_test.ts b/packages/order-utils/test/eip712_utils_test.ts index d65cabe9c9..a54e499580 100644 --- a/packages/order-utils/test/eip712_utils_test.ts +++ b/packages/order-utils/test/eip712_utils_test.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import 'mocha'; diff --git a/packages/order-utils/test/exchange_transfer_simulator_test.ts b/packages/order-utils/test/exchange_transfer_simulator_test.ts index c2367fd7f9..c26eb19078 100644 --- a/packages/order-utils/test/exchange_transfer_simulator_test.ts +++ b/packages/order-utils/test/exchange_transfer_simulator_test.ts @@ -1,8 +1,8 @@ -import { DummyERC20TokenContract, ERC20ProxyContract, ERC20TokenContract } from '@0xproject/abi-gen-wrappers'; -import * as artifacts from '@0xproject/contract-artifacts'; -import { BlockchainLifecycle, devConstants } from '@0xproject/dev-utils'; -import { ExchangeContractErrs } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { DummyERC20TokenContract, ERC20ProxyContract, ERC20TokenContract } from '@0x/abi-gen-wrappers'; +import * as artifacts from '@0x/contract-artifacts'; +import { BlockchainLifecycle, devConstants } from '@0x/dev-utils'; +import { ExchangeContractErrs } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import { assetDataUtils } from '../src/asset_data_utils'; diff --git a/packages/order-utils/test/market_utils_test.ts b/packages/order-utils/test/market_utils_test.ts index 31986ba1ac..42ea195bb8 100644 --- a/packages/order-utils/test/market_utils_test.ts +++ b/packages/order-utils/test/market_utils_test.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import 'mocha'; diff --git a/packages/order-utils/test/order_hash_test.ts b/packages/order-utils/test/order_hash_test.ts index fe44218d67..a85d4c81ac 100644 --- a/packages/order-utils/test/order_hash_test.ts +++ b/packages/order-utils/test/order_hash_test.ts @@ -1,5 +1,5 @@ -import { Order } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { Order } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import 'mocha'; diff --git a/packages/order-utils/test/order_state_utils_test.ts b/packages/order-utils/test/order_state_utils_test.ts index ea88027ae3..39c4c362ff 100644 --- a/packages/order-utils/test/order_state_utils_test.ts +++ b/packages/order-utils/test/order_state_utils_test.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import 'mocha'; diff --git a/packages/order-utils/test/order_validation_utils_test.ts b/packages/order-utils/test/order_validation_utils_test.ts index d3133c0a64..d4d12a6a7f 100644 --- a/packages/order-utils/test/order_validation_utils_test.ts +++ b/packages/order-utils/test/order_validation_utils_test.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import 'mocha'; diff --git a/packages/order-utils/test/rate_utils_test.ts b/packages/order-utils/test/rate_utils_test.ts index 2e299c209b..b13878bb59 100644 --- a/packages/order-utils/test/rate_utils_test.ts +++ b/packages/order-utils/test/rate_utils_test.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import 'mocha'; diff --git a/packages/order-utils/test/remaining_fillable_calculator_test.ts b/packages/order-utils/test/remaining_fillable_calculator_test.ts index a5a3b7fc63..c55a76defe 100644 --- a/packages/order-utils/test/remaining_fillable_calculator_test.ts +++ b/packages/order-utils/test/remaining_fillable_calculator_test.ts @@ -1,6 +1,6 @@ -import { SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import 'mocha'; diff --git a/packages/order-utils/test/signature_utils_test.ts b/packages/order-utils/test/signature_utils_test.ts index f2d6790fb1..84e5559a9b 100644 --- a/packages/order-utils/test/signature_utils_test.ts +++ b/packages/order-utils/test/signature_utils_test.ts @@ -1,5 +1,5 @@ -import { Order, SignatureType } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { Order, SignatureType } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import { JSONRPCErrorCallback, JSONRPCRequestPayload } from 'ethereum-types'; import * as ethUtil from 'ethereumjs-util'; diff --git a/packages/order-utils/test/sorting_utils_test.ts b/packages/order-utils/test/sorting_utils_test.ts index 0164325057..0b8757496b 100644 --- a/packages/order-utils/test/sorting_utils_test.ts +++ b/packages/order-utils/test/sorting_utils_test.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import 'mocha'; diff --git a/packages/order-utils/test/utils/simple_erc20_balance_and_proxy_allowance_fetcher.ts b/packages/order-utils/test/utils/simple_erc20_balance_and_proxy_allowance_fetcher.ts index d00a25031e..d3ea8b4567 100644 --- a/packages/order-utils/test/utils/simple_erc20_balance_and_proxy_allowance_fetcher.ts +++ b/packages/order-utils/test/utils/simple_erc20_balance_and_proxy_allowance_fetcher.ts @@ -1,5 +1,5 @@ -import { ERC20TokenContract } from '@0xproject/abi-gen-wrappers'; -import { BigNumber } from '@0xproject/utils'; +import { ERC20TokenContract } from '@0x/abi-gen-wrappers'; +import { BigNumber } from '@0x/utils'; import { AbstractBalanceAndProxyAllowanceFetcher } from '../../src/abstract/abstract_balance_and_proxy_allowance_fetcher'; diff --git a/packages/order-utils/test/utils/test_order_factory.ts b/packages/order-utils/test/utils/test_order_factory.ts index 69184f129f..1453326741 100644 --- a/packages/order-utils/test/utils/test_order_factory.ts +++ b/packages/order-utils/test/utils/test_order_factory.ts @@ -1,4 +1,4 @@ -import { Order, SignedOrder } from '@0xproject/types'; +import { Order, SignedOrder } from '@0x/types'; import * as _ from 'lodash'; import { constants } from '../../src/constants'; diff --git a/packages/order-utils/test/utils/web3_wrapper.ts b/packages/order-utils/test/utils/web3_wrapper.ts index ab801fa7f5..accfcb7feb 100644 --- a/packages/order-utils/test/utils/web3_wrapper.ts +++ b/packages/order-utils/test/utils/web3_wrapper.ts @@ -1,5 +1,5 @@ -import { web3Factory } from '@0xproject/dev-utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { web3Factory } from '@0x/dev-utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { Provider } from 'ethereum-types'; const provider: Provider = web3Factory.getRpcProvider({ shouldUseInProcessGanache: true }); diff --git a/packages/order-utils/tslint.json b/packages/order-utils/tslint.json index ffaefe83a6..dd9053357e 100644 --- a/packages/order-utils/tslint.json +++ b/packages/order-utils/tslint.json @@ -1,3 +1,3 @@ { - "extends": ["@0xproject/tslint-config"] + "extends": ["@0x/tslint-config"] } diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json index 1fa0b3bc9a..d574f4a184 100644 --- a/packages/order-watcher/CHANGELOG.json +++ b/packages/order-watcher/CHANGELOG.json @@ -11,7 +11,8 @@ "Updated to use new modularized artifacts and the latest version of @0xproject/contract-wrappers. Constructor has a new optional `contractAddresses` parameter.", "pr": 1105 } - ] + ], + "timestamp": 1539871071 }, { "version": "2.1.1", diff --git a/packages/order-watcher/CHANGELOG.md b/packages/order-watcher/CHANGELOG.md index 5fdf5c9440..299af54377 100644 --- a/packages/order-watcher/CHANGELOG.md +++ b/packages/order-watcher/CHANGELOG.md @@ -5,6 +5,11 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.2.0 - _October 18, 2018_ + + * Added getStats function and returns a Stats object (#1118) + * Updated to use new modularized artifacts and the latest version of @0xproject/contract-wrappers. Constructor has a new optional `contractAddresses` parameter. (#1105) + ## v2.1.1 - _October 4, 2018_ * Dependencies updated @@ -48,7 +53,7 @@ CHANGELOG * Export types: `ExchangeContractErrs`, `OrderRelevantState`, `JSONRPCRequestPayload`, `JSONRPCErrorCallback` and `JSONRPCResponsePayload` (#924) * Remove exporting types: `BlockParamLiteral`, `BlockParam`, `Order` (#924) -## v1.0.1-rc.3 - _August 13, 2018_ +## v1.0.1-rc.3 - _August 14, 2018_ * Dependencies updated diff --git a/packages/order-watcher/README.md b/packages/order-watcher/README.md index de64a70e79..c0b99b272c 100644 --- a/packages/order-watcher/README.md +++ b/packages/order-watcher/README.md @@ -9,20 +9,20 @@ An order watcher daemon that watches for order validity. **Install** ```bash -npm install @0xproject/order-watcher --save +npm install @0x/order-watcher --save ``` **Import** ```javascript -import { OrderWatcher } from '@0xproject/order-watcher'; +import { OrderWatcher } from '@0x/order-watcher'; ``` If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`: ```json "compilerOptions": { - "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"], + "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"], } ``` @@ -51,13 +51,13 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/order-watcher yarn build +PKG=@0x/order-watcher yarn build ``` Or continuously rebuild on change: ```bash -PKG=@0xproject/order-watcher yarn watch +PKG=@0x/order-watcher yarn watch ``` ### Clean diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index a3f7b1fc73..acc70544ec 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -1,6 +1,6 @@ { - "name": "@0xproject/order-watcher", - "version": "2.1.1", + "name": "@0x/order-watcher", + "version": "2.2.0", "description": "An order watcher daemon that watches for order validity", "keywords": [ "0x", @@ -33,9 +33,9 @@ "node": ">=6.0.0" }, "devDependencies": { - "@0xproject/dev-utils": "^1.0.12", - "@0xproject/migrations": "^1.0.14", - "@0xproject/tslint-config": "^1.0.8", + "@0x/dev-utils": "^1.0.13", + "@0x/migrations": "^2.0.0", + "@0x/tslint-config": "^1.0.9", "@types/bintrees": "^1.0.2", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", @@ -57,21 +57,21 @@ "typescript": "3.0.1" }, "dependencies": { - "@0xproject/abi-gen-wrappers": "^1.0.0", - "@0xproject/assert": "^1.0.13", - "@0xproject/base-contract": "^3.0.1", - "@0xproject/contract-addresses": "^1.0.0", - "@0xproject/contract-artifacts": "^1.0.0", - "@0xproject/contract-wrappers": "^2.0.2", - "@0xproject/fill-scenarios": "^1.0.7", - "@0xproject/json-schemas": "^1.0.7", - "@0xproject/order-utils": "^1.0.7", - "@0xproject/types": "^1.1.4", - "@0xproject/typescript-typings": "^3.0.2", - "@0xproject/utils": "^2.0.2", - "@0xproject/web3-wrapper": "^3.0.3", + "@0x/abi-gen-wrappers": "^1.0.1", + "@0x/assert": "^1.0.14", + "@0x/base-contract": "^3.0.2", + "@0x/contract-addresses": "^1.0.1", + "@0x/contract-artifacts": "^1.0.1", + "@0x/contract-wrappers": "^3.0.0", + "@0x/fill-scenarios": "^1.0.8", + "@0x/json-schemas": "^2.0.0", + "@0x/order-utils": "^2.0.0", + "@0x/types": "^1.2.0", + "@0x/typescript-typings": "^3.0.3", + "@0x/utils": "^2.0.3", + "@0x/web3-wrapper": "^3.1.0", "bintrees": "^1.0.2", - "ethereum-types": "^1.0.11", + "ethereum-types": "^1.1.1", "ethereumjs-blockstream": "6.0.0", "ethers": "~4.0.4", "lodash": "^4.17.5" diff --git a/packages/order-watcher/src/index.ts b/packages/order-watcher/src/index.ts index 6e862a427c..5eeba3e870 100644 --- a/packages/order-watcher/src/index.ts +++ b/packages/order-watcher/src/index.ts @@ -8,12 +8,12 @@ export { ExchangeContractErrs, OrderRelevantState, Stats, -} from '@0xproject/types'; +} from '@0x/types'; export { OnOrderStateChangeCallback, OrderWatcherConfig } from './types'; -export { ContractAddresses } from '@0xproject/contract-addresses'; -export { SignedOrder } from '@0xproject/types'; +export { ContractAddresses } from '@0x/contract-addresses'; +export { SignedOrder } from '@0x/types'; export { JSONRPCRequestPayload, JSONRPCErrorCallback, diff --git a/packages/order-watcher/src/order_watcher/collision_resistant_abi_decoder.ts b/packages/order-watcher/src/order_watcher/collision_resistant_abi_decoder.ts index e13663c7a0..2ea7969470 100644 --- a/packages/order-watcher/src/order_watcher/collision_resistant_abi_decoder.ts +++ b/packages/order-watcher/src/order_watcher/collision_resistant_abi_decoder.ts @@ -1,4 +1,4 @@ -import { AbiDecoder } from '@0xproject/utils'; +import { AbiDecoder } from '@0x/utils'; import { ContractAbi, DecodedLogArgs, LogEntry, LogWithDecodedArgs, RawLog } from 'ethereum-types'; const TOKEN_TYPE_COLLISION = `Token can't be marked as ERC20 and ERC721 at the same time`; diff --git a/packages/order-watcher/src/order_watcher/dependent_order_hashes_tracker.ts b/packages/order-watcher/src/order_watcher/dependent_order_hashes_tracker.ts index cc70bd5d7c..dbcc25186f 100644 --- a/packages/order-watcher/src/order_watcher/dependent_order_hashes_tracker.ts +++ b/packages/order-watcher/src/order_watcher/dependent_order_hashes_tracker.ts @@ -1,7 +1,7 @@ // tslint:disable:no-unnecessary-type-assertion -import { assetDataUtils, orderHashUtils } from '@0xproject/order-utils'; -import { AssetProxyId, ERC20AssetData, ERC721AssetData, SignedOrder } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { assetDataUtils, orderHashUtils } from '@0x/order-utils'; +import { AssetProxyId, ERC20AssetData, ERC721AssetData, SignedOrder } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; export interface OrderHashesByMakerAddress { diff --git a/packages/order-watcher/src/order_watcher/event_watcher.ts b/packages/order-watcher/src/order_watcher/event_watcher.ts index 9ea301815c..3149d858b2 100644 --- a/packages/order-watcher/src/order_watcher/event_watcher.ts +++ b/packages/order-watcher/src/order_watcher/event_watcher.ts @@ -1,5 +1,5 @@ -import { intervalUtils, logUtils } from '@0xproject/utils'; -import { marshaller, Web3Wrapper } from '@0xproject/web3-wrapper'; +import { intervalUtils, logUtils } from '@0x/utils'; +import { marshaller, Web3Wrapper } from '@0x/web3-wrapper'; import { BlockParamLiteral, FilterObject, LogEntry, Provider, RawLogEntry } from 'ethereum-types'; import { Block, BlockAndLogStreamer, Log } from 'ethereumjs-blockstream'; import * as _ from 'lodash'; diff --git a/packages/order-watcher/src/order_watcher/expiration_watcher.ts b/packages/order-watcher/src/order_watcher/expiration_watcher.ts index 6eadf14c72..ad20a6e3f0 100644 --- a/packages/order-watcher/src/order_watcher/expiration_watcher.ts +++ b/packages/order-watcher/src/order_watcher/expiration_watcher.ts @@ -1,4 +1,4 @@ -import { BigNumber, intervalUtils } from '@0xproject/utils'; +import { BigNumber, intervalUtils } from '@0x/utils'; import { RBTree } from 'bintrees'; import * as _ from 'lodash'; diff --git a/packages/order-watcher/src/order_watcher/order_watcher.ts b/packages/order-watcher/src/order_watcher/order_watcher.ts index 2f0dd2f2de..96c5ca7b4a 100644 --- a/packages/order-watcher/src/order_watcher/order_watcher.ts +++ b/packages/order-watcher/src/order_watcher/order_watcher.ts @@ -1,6 +1,6 @@ // tslint:disable:no-unnecessary-type-assertion -import { ContractAddresses } from '@0xproject/contract-addresses'; -import * as artifacts from '@0xproject/contract-artifacts'; +import { ContractAddresses } from '@0x/contract-addresses'; +import * as artifacts from '@0x/contract-artifacts'; import { AssetBalanceAndProxyAllowanceFetcher, ContractWrappers, @@ -23,17 +23,17 @@ import { WETH9EventArgs, WETH9Events, WETH9WithdrawalEventArgs, -} from '@0xproject/contract-wrappers'; -import { schemas } from '@0xproject/json-schemas'; +} from '@0x/contract-wrappers'; +import { schemas } from '@0x/json-schemas'; import { assetDataUtils, BalanceAndProxyAllowanceLazyStore, OrderFilledCancelledLazyStore, orderHashUtils, OrderStateUtils, -} from '@0xproject/order-utils'; -import { AssetProxyId, ExchangeContractErrs, OrderState, SignedOrder, Stats } from '@0xproject/types'; -import { errorUtils, intervalUtils } from '@0xproject/utils'; +} from '@0x/order-utils'; +import { AssetProxyId, ExchangeContractErrs, OrderState, SignedOrder, Stats } from '@0x/types'; +import { errorUtils, intervalUtils } from '@0x/utils'; import { BlockParamLiteral, LogEntryEvent, LogWithDecodedArgs, Provider } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/order-watcher/src/types.ts b/packages/order-watcher/src/types.ts index 27d8929854..8078dd971f 100644 --- a/packages/order-watcher/src/types.ts +++ b/packages/order-watcher/src/types.ts @@ -1,4 +1,4 @@ -import { OrderState } from '@0xproject/types'; +import { OrderState } from '@0x/types'; import { LogEntryEvent } from 'ethereum-types'; export enum OrderWatcherError { diff --git a/packages/order-watcher/src/utils/assert.ts b/packages/order-watcher/src/utils/assert.ts index e4a1e2c7bf..ccfc7325c2 100644 --- a/packages/order-watcher/src/utils/assert.ts +++ b/packages/order-watcher/src/utils/assert.ts @@ -1,13 +1,13 @@ -import { assert as sharedAssert } from '@0xproject/assert'; +import { assert as sharedAssert } from '@0x/assert'; // HACK: We need those two unused imports because they're actually used by sharedAssert which gets injected here // tslint:disable:no-unused-variable -import { Schema } from '@0xproject/json-schemas'; -import { ECSignature } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { Schema } from '@0x/json-schemas'; +import { ECSignature } from '@0x/types'; +import { BigNumber } from '@0x/utils'; // tslint:enable:no-unused-variable import { Provider } from 'ethereum-types'; -import { signatureUtils } from '@0xproject/order-utils'; +import { signatureUtils } from '@0x/order-utils'; export const assert = { ...sharedAssert, diff --git a/packages/order-watcher/src/utils/utils.ts b/packages/order-watcher/src/utils/utils.ts index 087fc635ed..a7d10aaf9a 100644 --- a/packages/order-watcher/src/utils/utils.ts +++ b/packages/order-watcher/src/utils/utils.ts @@ -1,4 +1,4 @@ -import { BigNumber } from '@0xproject/utils'; +import { BigNumber } from '@0x/utils'; export const utils = { getCurrentUnixTimestampSec(): BigNumber { diff --git a/packages/order-watcher/test/expiration_watcher_test.ts b/packages/order-watcher/test/expiration_watcher_test.ts index 17be625bc7..fb5ea2a27d 100644 --- a/packages/order-watcher/test/expiration_watcher_test.ts +++ b/packages/order-watcher/test/expiration_watcher_test.ts @@ -1,9 +1,9 @@ -import { tokenUtils } from '@0xproject/contract-wrappers/lib/test/utils/token_utils'; -import { BlockchainLifecycle, callbackErrorReporter } from '@0xproject/dev-utils'; -import { FillScenarios } from '@0xproject/fill-scenarios'; -import { assetDataUtils, orderHashUtils } from '@0xproject/order-utils'; -import { DoneCallback } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { tokenUtils } from '@0x/contract-wrappers/lib/test/utils/token_utils'; +import { BlockchainLifecycle, callbackErrorReporter } from '@0x/dev-utils'; +import { FillScenarios } from '@0x/fill-scenarios'; +import { assetDataUtils, orderHashUtils } from '@0x/order-utils'; +import { DoneCallback } from '@0x/types'; +import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import * as _ from 'lodash'; import 'mocha'; diff --git a/packages/order-watcher/test/order_watcher_test.ts b/packages/order-watcher/test/order_watcher_test.ts index e13d443964..271e5dec57 100644 --- a/packages/order-watcher/test/order_watcher_test.ts +++ b/packages/order-watcher/test/order_watcher_test.ts @@ -1,9 +1,9 @@ // tslint:disable:no-unnecessary-type-assertion -import { ContractWrappers } from '@0xproject/contract-wrappers'; -import { tokenUtils } from '@0xproject/contract-wrappers/lib/test/utils/token_utils'; -import { BlockchainLifecycle, callbackErrorReporter } from '@0xproject/dev-utils'; -import { FillScenarios } from '@0xproject/fill-scenarios'; -import { assetDataUtils, orderHashUtils } from '@0xproject/order-utils'; +import { ContractWrappers } from '@0x/contract-wrappers'; +import { tokenUtils } from '@0x/contract-wrappers/lib/test/utils/token_utils'; +import { BlockchainLifecycle, callbackErrorReporter } from '@0x/dev-utils'; +import { FillScenarios } from '@0x/fill-scenarios'; +import { assetDataUtils, orderHashUtils } from '@0x/order-utils'; import { DoneCallback, ExchangeContractErrs, @@ -11,9 +11,9 @@ import { OrderStateInvalid, OrderStateValid, SignedOrder, -} from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +} from '@0x/types'; +import { BigNumber } from '@0x/utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import * as _ from 'lodash'; import 'mocha'; diff --git a/packages/order-watcher/test/utils/migrate.ts b/packages/order-watcher/test/utils/migrate.ts index 53319a3836..665ce0faaa 100644 --- a/packages/order-watcher/test/utils/migrate.ts +++ b/packages/order-watcher/test/utils/migrate.ts @@ -1,6 +1,6 @@ -import { ContractAddresses } from '@0xproject/contract-addresses'; -import { devConstants } from '@0xproject/dev-utils'; -import { runMigrationsOnceAsync } from '@0xproject/migrations'; +import { ContractAddresses } from '@0x/contract-addresses'; +import { devConstants } from '@0x/dev-utils'; +import { runMigrationsOnceAsync } from '@0x/migrations'; import { provider } from './web3_wrapper'; diff --git a/packages/order-watcher/test/utils/web3_wrapper.ts b/packages/order-watcher/test/utils/web3_wrapper.ts index ab801fa7f5..accfcb7feb 100644 --- a/packages/order-watcher/test/utils/web3_wrapper.ts +++ b/packages/order-watcher/test/utils/web3_wrapper.ts @@ -1,5 +1,5 @@ -import { web3Factory } from '@0xproject/dev-utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { web3Factory } from '@0x/dev-utils'; +import { Web3Wrapper } from '@0x/web3-wrapper'; import { Provider } from 'ethereum-types'; const provider: Provider = web3Factory.getRpcProvider({ shouldUseInProcessGanache: true }); diff --git a/packages/order-watcher/tslint.json b/packages/order-watcher/tslint.json index 059573ce78..4ade3b924a 100644 --- a/packages/order-watcher/tslint.json +++ b/packages/order-watcher/tslint.json @@ -2,5 +2,5 @@ "rules": { "prefer-readonly": true }, - "extends": ["@0xproject/tslint-config"] + "extends": ["@0x/tslint-config"] } diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json index ac3f227165..97485be960 100644 --- a/packages/react-docs/CHANGELOG.json +++ b/packages/react-docs/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1539871071, + "version": "1.0.14", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "version": "1.0.13", "changes": [ diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md index 485bf61a6f..096bd84604 100644 --- a/packages/react-docs/CHANGELOG.md +++ b/packages/react-docs/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.14 - _October 18, 2018_ + + * Dependencies updated + ## v1.0.13 - _October 4, 2018_ * Dependencies updated @@ -37,7 +41,7 @@ CHANGELOG * Dependencies updated -## v1.0.5 - _August 13, 2018_ +## v1.0.5 - _August 14, 2018_ * Dependencies updated diff --git a/packages/react-docs/README.md b/packages/react-docs/README.md index 51e9499671..19c092e4de 100644 --- a/packages/react-docs/README.md +++ b/packages/react-docs/README.md @@ -1,4 +1,4 @@ -## @0xproject/react-docs +## @0x/react-docs #### WARNING: Alpha software. Expect things to break when trying to use. @@ -24,7 +24,7 @@ A full-page React component for rendering beautiful documentation for Solidity a ## Installation ```bash -yarn add @0xproject/react-docs +yarn add @0x/react-docs ``` ## Usage @@ -37,7 +37,7 @@ If your project is in [TypeScript](https://www.typescriptlang.org/), add the fol ```json "compilerOptions": { - "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"], + "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"], } ``` @@ -74,13 +74,13 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/react-docs yarn build +PKG=@0x/react-docs yarn build ``` Or continuously rebuild on change: ```bash -PKG=@0xproject/react-docs yarn watch +PKG=@0x/react-docs yarn watch ``` ### Clean diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index b1e80d1b6a..04e1387c6f 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -1,6 +1,6 @@ { - "name": "@0xproject/react-docs", - "version": "1.0.13", + "name": "@0x/react-docs", + "version": "1.0.14", "engines": { "node": ">=6.12" }, @@ -24,18 +24,19 @@ "url": "https://github.com/0xProject/0x-monorepo.git" }, "devDependencies": { - "@0xproject/dev-utils": "^1.0.12", - "@0xproject/tslint-config": "^1.0.8", + "@0x/dev-utils": "^1.0.13", + "@0x/tslint-config": "^1.0.9", "@types/compare-versions": "^3.0.0", + "@types/styled-components": "^4.0.0", "make-promises-safe": "^1.1.0", "shx": "^0.2.2", "tslint": "^5.9.1", "typescript": "3.0.1" }, "dependencies": { - "@0xproject/react-shared": "^1.0.15", - "@0xproject/types": "^1.1.4", - "@0xproject/utils": "^2.0.2", + "@0x/react-shared": "^1.0.17", + "@0x/types": "^1.2.0", + "@0x/utils": "^2.0.3", "@types/lodash": "4.14.104", "@types/material-ui": "^0.20.0", "@types/node": "*", @@ -49,9 +50,10 @@ "react": "^16.4.2", "react-dom": "^16.4.2", "react-markdown": "^3.2.2", - "react-scroll": "0xproject/react-scroll#similar-to-pr-330", + "react-scroll": "0xproject/react-scroll#similar-to-pr-330-but-with-replace-state", "react-tooltip": "^3.2.7", - "semver": "5.5.0" + "semver": "5.5.0", + "styled-components": "^3.3.0" }, "publishConfig": { "access": "public" diff --git a/packages/react-docs/src/components/badge.tsx b/packages/react-docs/src/components/badge.tsx index d34f8a0fc4..e3d5be273b 100644 --- a/packages/react-docs/src/components/badge.tsx +++ b/packages/react-docs/src/components/badge.tsx @@ -1,4 +1,4 @@ -import { Styles } from '@0xproject/react-shared'; +import { Styles } from '@0x/react-shared'; import * as React from 'react'; const styles: Styles = { diff --git a/packages/react-docs/src/components/comment.tsx b/packages/react-docs/src/components/comment.tsx index c3687c5104..4d34f711e9 100644 --- a/packages/react-docs/src/components/comment.tsx +++ b/packages/react-docs/src/components/comment.tsx @@ -1,4 +1,4 @@ -import { MarkdownCodeBlock } from '@0xproject/react-shared'; +import { colors, MarkdownCodeBlock } from '@0x/react-shared'; import * as React from 'react'; import * as ReactMarkdown from 'react-markdown'; @@ -13,7 +13,7 @@ const defaultProps = { export const Comment: React.SFC = (props: CommentProps) => { return ( -
+
); diff --git a/packages/react-docs/src/components/custom_enum.tsx b/packages/react-docs/src/components/custom_enum.tsx index fa7c43146b..e971a012a9 100644 --- a/packages/react-docs/src/components/custom_enum.tsx +++ b/packages/react-docs/src/components/custom_enum.tsx @@ -1,8 +1,8 @@ -import { logUtils } from '@0xproject/utils'; +import { logUtils } from '@0x/utils'; import * as _ from 'lodash'; import * as React from 'react'; -import { CustomType } from '@0xproject/types'; +import { CustomType } from '@0x/types'; const STRING_ENUM_CODE_PREFIX = ' strEnum('; diff --git a/packages/react-docs/src/components/documentation.tsx b/packages/react-docs/src/components/doc_reference.tsx similarity index 64% rename from packages/react-docs/src/components/documentation.tsx rename to packages/react-docs/src/components/doc_reference.tsx index a23111297d..00b1286a4c 100644 --- a/packages/react-docs/src/components/documentation.tsx +++ b/packages/react-docs/src/components/doc_reference.tsx @@ -2,13 +2,13 @@ import { colors, constants as sharedConstants, EtherscanLinkSuffixes, + HeaderSizes, + Link, MarkdownSection, - NestedSidebarMenu, Networks, SectionHeader, - Styles, utils as sharedUtils, -} from '@0xproject/react-shared'; +} from '@0x/react-shared'; import { DocAgnosticFormat, Event, @@ -18,9 +18,8 @@ import { TypeDefinitionByName, TypescriptFunction, TypescriptMethod, -} from '@0xproject/types'; +} from '@0x/types'; import * as _ from 'lodash'; -import CircularProgress from 'material-ui/CircularProgress'; import * as React from 'react'; import * as semver from 'semver'; @@ -42,142 +41,42 @@ const networkNameToColor: { [network: string]: string } = { [Networks.Rinkeby]: colors.darkYellow, }; -export interface DocumentationProps { +export interface DocReferenceProps { selectedVersion: string; availableVersions: string[]; docsInfo: DocsInfo; sourceUrl: string; - onVersionSelected: (semver: string) => void; docAgnosticFormat?: DocAgnosticFormat; - sidebarHeader?: React.ReactNode; - topBarHeight?: number; } -export interface DocumentationState { - isHoveringSidebar: boolean; -} +export interface DocReferenceState {} -export class Documentation extends React.Component { - public static defaultProps: Partial = { - topBarHeight: 0, - }; - constructor(props: DocumentationProps) { - super(props); - this.state = { - isHoveringSidebar: false, - }; - } +export class DocReference extends React.Component { public componentDidMount(): void { window.addEventListener('hashchange', this._onHashChanged.bind(this), false); } public componentWillUnmount(): void { window.removeEventListener('hashchange', this._onHashChanged.bind(this), false); } - public componentDidUpdate(prevProps: DocumentationProps, _prevState: DocumentationState): void { + public componentDidUpdate(prevProps: DocReferenceProps, _prevState: DocReferenceState): void { if (!_.isEqual(prevProps.docAgnosticFormat, this.props.docAgnosticFormat)) { const hash = window.location.hash.slice(1); sharedUtils.scrollToHash(hash, sharedConstants.SCROLL_CONTAINER_ID); } } public render(): React.ReactNode { - const styles: Styles = { - mainContainers: { - position: 'absolute', - top: 1, - left: 0, - bottom: 0, - right: 0, - overflowX: 'hidden', - overflowY: 'scroll', - minHeight: `calc(100vh - ${this.props.topBarHeight}px)`, - WebkitOverflowScrolling: 'touch', - }, - menuContainer: { - borderColor: colors.grey300, - maxWidth: 330, - marginLeft: 20, - }, - }; - const menuSubsectionsBySection = this.props.docsInfo.getMenuSubsectionsBySection(this.props.docAgnosticFormat); - return ( -
- {_.isUndefined(this.props.docAgnosticFormat) ? ( - this._renderLoading(styles.mainContainers) - ) : ( -
-
-
-
- -
-
-
-
-
- {this._renderDocumentation()} -
-
-
-
- )} -
- ); - } - private _renderLoading(mainContainersStyles: React.CSSProperties): React.ReactNode { - return ( -
-
-
- -
-
- Loading documentation... -
-
-
- ); - } - private _renderDocumentation(): React.ReactNode { - const subMenus = _.values(this.props.docsInfo.menu); + const subMenus = _.values(this.props.docsInfo.markdownMenu); const orderedSectionNames = _.flatten(subMenus); const typeDefinitionByName = this.props.docsInfo.getTypeDefinitionsByName(this.props.docAgnosticFormat); const renderedSections = _.map(orderedSectionNames, this._renderSection.bind(this, typeDefinitionByName)); - return renderedSections; + return ( +
+
+ {renderedSections} +
+ ); } private _renderSection(typeDefinitionByName: TypeDefinitionByName, sectionName: string): React.ReactNode { const markdownVersions = _.keys(this.props.docsInfo.sectionNameToMarkdownByVersion); @@ -195,11 +94,16 @@ export class Documentation extends React.Component ); } @@ -290,7 +194,9 @@ export class Documentation extends React.Component - {!isExportedFunctionSection &&

Functions

} + {!isExportedFunctionSection && ( +
Functions
+ )}
{functionDefs}
)} @@ -309,6 +215,15 @@ export class Documentation extends React.Component{typeDefs}
)} +
); } @@ -318,9 +233,9 @@ export class Documentation extends React.Component {`import { `} - + {exportName} - + {` } from '${this.props.docsInfo.packageName}'`}
@@ -349,14 +264,16 @@ export class Documentation extends React.Component - - +
+ + + +
); }, ); @@ -406,16 +323,6 @@ export class Documentation extends React.Component ); } - private _onSidebarHover(_event: React.FormEvent): void { - this.setState({ - isHoveringSidebar: true, - }); - } - private _onSidebarHoverOff(): void { - this.setState({ - isHoveringSidebar: false, - }); - } private _onHashChanged(_event: any): void { const hash = window.location.hash.slice(1); sharedUtils.scrollToHash(hash, sharedConstants.SCROLL_CONTAINER_ID); diff --git a/packages/react-docs/src/components/event_definition.tsx b/packages/react-docs/src/components/event_definition.tsx index 37236275bd..b767697888 100644 --- a/packages/react-docs/src/components/event_definition.tsx +++ b/packages/react-docs/src/components/event_definition.tsx @@ -1,5 +1,5 @@ -import { AnchorTitle, colors, HeaderSizes } from '@0xproject/react-shared'; -import { Event, EventArg } from '@0xproject/types'; +import { AnchorTitle, colors, HeaderSizes } from '@0x/react-shared'; +import { Event, EventArg } from '@0x/types'; import * as _ from 'lodash'; import * as React from 'react'; diff --git a/packages/react-docs/src/components/interface.tsx b/packages/react-docs/src/components/interface.tsx index cad7d6c464..0df44ca1c7 100644 --- a/packages/react-docs/src/components/interface.tsx +++ b/packages/react-docs/src/components/interface.tsx @@ -1,7 +1,7 @@ import * as _ from 'lodash'; import * as React from 'react'; -import { CustomType, TypeDefinitionByName } from '@0xproject/types'; +import { CustomType, TypeDefinitionByName } from '@0x/types'; import { DocsInfo } from '../docs_info'; diff --git a/packages/react-docs/src/components/property_block.tsx b/packages/react-docs/src/components/property_block.tsx index 8434e86824..d0bd84802b 100644 --- a/packages/react-docs/src/components/property_block.tsx +++ b/packages/react-docs/src/components/property_block.tsx @@ -1,5 +1,5 @@ -import { AnchorTitle, HeaderSizes } from '@0xproject/react-shared'; -import { Property, TypeDefinitionByName } from '@0xproject/types'; +import { AnchorTitle, HeaderSizes } from '@0x/react-shared'; +import { Property, TypeDefinitionByName } from '@0x/types'; import * as React from 'react'; import { DocsInfo } from '../docs_info'; diff --git a/packages/react-docs/src/components/signature.tsx b/packages/react-docs/src/components/signature.tsx index 1f3dd0ee82..c229999b12 100644 --- a/packages/react-docs/src/components/signature.tsx +++ b/packages/react-docs/src/components/signature.tsx @@ -1,7 +1,7 @@ import * as _ from 'lodash'; import * as React from 'react'; -import { Parameter, Type as TypeDef, TypeDefinitionByName, TypeParameter } from '@0xproject/types'; +import { Parameter, Type as TypeDef, TypeDefinitionByName, TypeParameter } from '@0x/types'; import { DocsInfo } from '../docs_info'; diff --git a/packages/react-docs/src/components/signature_block.tsx b/packages/react-docs/src/components/signature_block.tsx index 5ec82983a7..7cdf19bb0d 100644 --- a/packages/react-docs/src/components/signature_block.tsx +++ b/packages/react-docs/src/components/signature_block.tsx @@ -1,11 +1,5 @@ -import { AnchorTitle, colors, HeaderSizes, Styles } from '@0xproject/react-shared'; -import { - Parameter, - SolidityMethod, - TypeDefinitionByName, - TypescriptFunction, - TypescriptMethod, -} from '@0xproject/types'; +import { AnchorTitle, colors, HeaderSizes, Styles } from '@0x/react-shared'; +import { Parameter, SolidityMethod, TypeDefinitionByName, TypescriptFunction, TypescriptMethod } from '@0x/types'; import * as _ from 'lodash'; import * as React from 'react'; @@ -55,7 +49,7 @@ export class SignatureBlock extends React.Component diff --git a/packages/react-docs/src/components/source_link.tsx b/packages/react-docs/src/components/source_link.tsx index 3096ad8d5c..6459824c2d 100644 --- a/packages/react-docs/src/components/source_link.tsx +++ b/packages/react-docs/src/components/source_link.tsx @@ -1,5 +1,5 @@ -import { colors } from '@0xproject/react-shared'; -import { Source } from '@0xproject/types'; +import { colors, Link } from '@0x/react-shared'; +import { Source } from '@0x/types'; import * as React from 'react'; export interface SourceLinkProps { @@ -13,9 +13,9 @@ export const SourceLink = (props: SourceLinkProps) => { const sourceCodeUrl = `${props.sourceUrl}/${src.fileName}#L${src.line}`; return (
- - Source - + + {'Source'} +
); }; diff --git a/packages/react-docs/src/components/type.tsx b/packages/react-docs/src/components/type.tsx index 5c018f5dd6..412b99b9df 100644 --- a/packages/react-docs/src/components/type.tsx +++ b/packages/react-docs/src/components/type.tsx @@ -1,6 +1,6 @@ -import { colors, constants as sharedConstants, utils as sharedUtils } from '@0xproject/react-shared'; -import { Type as TypeDef, TypeDefinitionByName, TypeDocTypes } from '@0xproject/types'; -import { errorUtils } from '@0xproject/utils'; +import { colors, constants as sharedConstants, Link, utils as sharedUtils } from '@0x/react-shared'; +import { Type as TypeDef, TypeDefinitionByName, TypeDocTypes } from '@0x/types'; +import { errorUtils } from '@0x/utils'; import * as _ from 'lodash'; import * as React from 'react'; import { Link as ScrollLink } from 'react-scroll'; @@ -204,15 +204,12 @@ export const Type: React.SFC = (props: TypeProps): any => { const isExportedClassReference = !!props.type.isExportedClassReference; const typeNameUrlIfExists = !_.isUndefined(props.type.externalLink) ? props.type.externalLink : undefined; if (!_.isUndefined(typeNameUrlIfExists)) { - typeName = ( - + typeName = props.isInPopover ? ( + {typeName} + ) : ( + {typeName} - + ); } else if ( (isReference || isArray) && @@ -223,39 +220,41 @@ export const Type: React.SFC = (props: TypeProps): any => { ? props.type.name : `${props.docsInfo.typeSectionName}-${typeName}`; typeName = ( - + {sharedUtils.isUserOnMobile() || props.isInPopover || isExportedClassReference ? ( {typeName} ) : ( - - {typeName} - - - - + + {typeName} + + + + + )} - + ); } return ( diff --git a/packages/react-docs/src/components/type_definition.tsx b/packages/react-docs/src/components/type_definition.tsx index 9a3e50a1b6..a1fde51dae 100644 --- a/packages/react-docs/src/components/type_definition.tsx +++ b/packages/react-docs/src/components/type_definition.tsx @@ -1,6 +1,6 @@ -import { AnchorTitle, colors, HeaderSizes } from '@0xproject/react-shared'; -import { CustomType, CustomTypeChild, TypeDefinitionByName, TypeDocTypes } from '@0xproject/types'; -import { errorUtils } from '@0xproject/utils'; +import { AnchorTitle, colors, HeaderSizes } from '@0x/react-shared'; +import { CustomType, CustomTypeChild, TypeDefinitionByName, TypeDocTypes } from '@0x/types'; +import { errorUtils } from '@0x/utils'; import * as _ from 'lodash'; import * as React from 'react'; @@ -124,6 +124,7 @@ export class TypeDefinition extends React.Component 
diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index 092a8c2660..54b59ef1f0 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -1,5 +1,5 @@
-import { MenuSubsectionsBySection } from '@0xproject/react-shared';
-import { DocAgnosticFormat, TypeDefinitionByName } from '@0xproject/types';
+import { ALink, utils as sharedUtils } from '@0x/react-shared';
+import { DocAgnosticFormat, ObjectMap, TypeDefinitionByName } from '@0x/types';
 import * as _ from 'lodash';
 
 import {
@@ -17,7 +17,7 @@ export class DocsInfo {
     public displayName: string;
     public packageName: string;
     public packageUrl: string;
-    public menu: DocsMenu;
+    public markdownMenu: DocsMenu;
     public typeSectionName: string;
     public sections: SectionsMap;
     public sectionNameToMarkdownByVersion: SectionNameToMarkdownByVersion;
@@ -25,7 +25,7 @@ export class DocsInfo {
     constructor(config: DocsInfoConfig) {
         this.id = config.id;
         this.type = config.type;
-        this.menu = config.markdownMenu;
+        this.markdownMenu = config.markdownMenu;
         this.displayName = config.displayName;
         this.packageName = config.packageName;
         this.packageUrl = config.packageUrl;
@@ -34,10 +34,31 @@ export class DocsInfo {
         this.sectionNameToMarkdownByVersion = config.sectionNameToMarkdownByVersion;
         this.contractsByVersionByNetworkId = config.contractsByVersionByNetworkId;
     }
-    public getMenuSubsectionsBySection(docAgnosticFormat?: DocAgnosticFormat): MenuSubsectionsBySection {
-        const menuSubsectionsBySection = {} as MenuSubsectionsBySection;
+    public getTypeDefinitionsByName(docAgnosticFormat: DocAgnosticFormat): ObjectMap {
+        if (_.isUndefined(docAgnosticFormat[this.typeSectionName])) {
+            return {};
+        }
+
+        const section = docAgnosticFormat[this.typeSectionName];
+        const typeDefinitionByName = _.keyBy(section.types, 'name') as any;
+        return typeDefinitionByName;
+    }
+    public getSectionNameToLinks(docAgnosticFormat: DocAgnosticFormat): ObjectMap {
+        const sectionNameToLinks: ObjectMap = {};
+        _.each(this.markdownMenu, (linkTitles, sectionName) => {
+            sectionNameToLinks[sectionName] = [];
+            _.each(linkTitles, linkTitle => {
+                const to = sharedUtils.getIdFromName(linkTitle);
+                const links = sectionNameToLinks[sectionName];
+                links.push({
+                    title: linkTitle,
+                    to,
+                });
+            });
+        });
+
         if (_.isUndefined(docAgnosticFormat)) {
-            return menuSubsectionsBySection;
+            return sectionNameToLinks;
         }
 
         const docSections = _.keys(this.sections);
@@ -58,7 +79,13 @@ export class DocsInfo {
             if (sectionName === this.typeSectionName) {
                 const sortedTypesNames = _.sortBy(docSection.types, 'name');
                 const typeNames = _.map(sortedTypesNames, t => t.name);
-                menuSubsectionsBySection[sectionName] = typeNames;
+                const typeLinks = _.map(typeNames, typeName => {
+                    return {
+                        to: `${sectionName}-${typeName}`,
+                        title: typeName,
+                    };
+                });
+                sectionNameToLinks[sectionName] = typeLinks;
             } else if (isExportedFunctionSection) {
                 // Noop so that we don't have the method listed underneath itself.
             } else {
@@ -73,23 +100,18 @@ export class DocsInfo {
                 const methodNames = _.map(methodsSortedByName, m => m.name);
                 const sortedFunctionNames = _.sortBy(docSection.functions, 'name');
                 const functionNames = _.map(sortedFunctionNames, m => m.name);
-                menuSubsectionsBySection[sectionName] = [
-                    ...eventNames,
-                    ...propertyNames,
-                    ...functionNames,
-                    ...methodNames,
-                ];
+                const names = [...eventNames, ...propertyNames, ...functionNames, ...methodNames];
+
+                const links = _.map(names, name => {
+                    return {
+                        to: `${sectionName}-${name}`,
+                        title: name,
+                    };
+                });
+
+                sectionNameToLinks[sectionName] = links;
             }
         });
-        return menuSubsectionsBySection;
-    }
-    public getTypeDefinitionsByName(docAgnosticFormat: DocAgnosticFormat): { [name: string]: TypeDefinitionByName } {
-        if (_.isUndefined(docAgnosticFormat[this.typeSectionName])) {
-            return {};
-        }
-
-        const section = docAgnosticFormat[this.typeSectionName];
-        const typeDefinitionByName = _.keyBy(section.types, 'name') as any;
-        return typeDefinitionByName;
+        return sectionNameToLinks;
     }
 }
diff --git a/packages/react-docs/src/index.ts b/packages/react-docs/src/index.ts
index f9382940c8..a5ed788b15 100644
--- a/packages/react-docs/src/index.ts
+++ b/packages/react-docs/src/index.ts
@@ -1,11 +1,11 @@
-export { DocAgnosticFormat, GeneratedDocJson } from '@0xproject/types';
+export { DocAgnosticFormat, GeneratedDocJson } from '@0x/types';
 
 // Exported to give users of this library added flexibility if they want to build
 // a docs page from scratch using the individual components.
 export { Badge } from './components/badge';
 export { Comment } from './components/comment';
 export { CustomEnum } from './components/custom_enum';
-export { Documentation } from './components/documentation';
+export { DocReference } from './components/doc_reference';
 export { Enum } from './components/enum';
 export { EventDefinition } from './components/event_definition';
 export { Interface } from './components/interface';
diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index 19605d4971..f74ec3e281 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -16,8 +16,8 @@ import {
     TypeParameter,
     TypescriptFunction,
     TypescriptMethod,
-} from '@0xproject/types';
-import { errorUtils } from '@0xproject/utils';
+} from '@0x/types';
+import { errorUtils } from '@0x/utils';
 import * as _ from 'lodash';
 
 import { DocsInfo } from '../docs_info';
@@ -95,7 +95,9 @@ export class TypeDocUtils {
 
         if (!_.isEmpty(this._externalExportToLink)) {
             this._docsInfo.sections[constants.EXTERNAL_EXPORTS_SECTION_NAME] = constants.EXTERNAL_EXPORTS_SECTION_NAME;
-            this._docsInfo.menu[constants.EXTERNAL_EXPORTS_SECTION_NAME] = [constants.EXTERNAL_EXPORTS_SECTION_NAME];
+            this._docsInfo.markdownMenu[constants.EXTERNAL_EXPORTS_SECTION_NAME] = [
+                constants.EXTERNAL_EXPORTS_SECTION_NAME,
+            ];
             const docSection: DocSection = {
                 comment: 'This package also re-exports some third-party libraries for your convenience.',
                 constructors: [],
@@ -119,7 +121,7 @@ export class TypeDocUtils {
                     case KindString.ObjectLiteral: {
                         sectionName = child.name;
                         this._docsInfo.sections[sectionName] = sectionName;
-                        this._docsInfo.menu[sectionName] = [sectionName];
+                        this._docsInfo.markdownMenu[sectionName] = [sectionName];
                         const entities = child.children;
                         const commentObj = child.comment;
                         const sectionComment = !_.isUndefined(commentObj) ? commentObj.shortText : '';
@@ -136,7 +138,7 @@ export class TypeDocUtils {
                     case KindString.Function: {
                         sectionName = child.name;
                         this._docsInfo.sections[sectionName] = sectionName;
-                        this._docsInfo.menu[sectionName] = [sectionName];
+                        this._docsInfo.markdownMenu[sectionName] = [sectionName];
                         const entities = [child];
                         const commentObj = child.comment;
                         const SectionComment = !_.isUndefined(commentObj) ? commentObj.shortText : '';
@@ -158,7 +160,7 @@ export class TypeDocUtils {
         });
         if (!_.isEmpty(typeEntities)) {
             this._docsInfo.sections[constants.TYPES_SECTION_NAME] = constants.TYPES_SECTION_NAME;
-            this._docsInfo.menu[constants.TYPES_SECTION_NAME] = [constants.TYPES_SECTION_NAME];
+            this._docsInfo.markdownMenu[constants.TYPES_SECTION_NAME] = [constants.TYPES_SECTION_NAME];
             const docSection = this._convertEntitiesToDocSection(typeEntities, constants.TYPES_SECTION_NAME);
             docAgnosticFormat[constants.TYPES_SECTION_NAME] = docSection;
         }
diff --git a/packages/react-docs/tslint.json b/packages/react-docs/tslint.json
index c78434416d..c3f6d9cae7 100644
--- a/packages/react-docs/tslint.json
+++ b/packages/react-docs/tslint.json
@@ -1,5 +1,5 @@
 {
-    "extends": ["@0xproject/tslint-config"],
+    "extends": ["@0x/tslint-config"],
     "rules": {
         "no-object-literal-type-assertion": false,
         "completed-docs": false,
diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json
index d1907e7858..8578b46036 100644
--- a/packages/react-shared/CHANGELOG.json
+++ b/packages/react-shared/CHANGELOG.json
@@ -1,11 +1,20 @@
 [
     {
-        "timestamp": 1538693146,
-        "version": "1.0.15",
+        "version": "1.0.17",
         "changes": [
             {
                 "note": "Dependencies updated"
             }
+        ],
+        "timestamp": 1539871071
+    },
+    {
+        "timestamp": 1538693146,
+        "version": "1.0.16",
+        "changes": [
+            {
+                "note": "Unpublished package"
+            }
         ]
     },
     {
diff --git a/packages/react-shared/CHANGELOG.md b/packages/react-shared/CHANGELOG.md
index 20d3e0bf73..fc3f7e32c4 100644
--- a/packages/react-shared/CHANGELOG.md
+++ b/packages/react-shared/CHANGELOG.md
@@ -5,10 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v1.0.15 - _October 4, 2018_
+## v1.0.17 - _October 18, 2018_
 
     * Dependencies updated
 
+## v1.0.16 - _October 4, 2018_
+
+    * Unpublished package
+
 ## v1.0.14 - _October 2, 2018_
 
     * Dependencies updated
@@ -41,7 +45,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.6 - _August 13, 2018_
+## v1.0.6 - _August 14, 2018_
 
     * Dependencies updated
 
diff --git a/packages/react-shared/README.md b/packages/react-shared/README.md
index 88e6f18aee..7ff9a94d90 100644
--- a/packages/react-shared/README.md
+++ b/packages/react-shared/README.md
@@ -1,18 +1,18 @@
-## @0xproject/react-shared
+## @0x/react-shared
 
 Contains React components & frontend types/utils shared between 0x projects.
 
 ## Installation
 
 ```bash
-yarn add @0xproject/react-shared
+yarn add @0x/react-shared
 ```
 
 If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
 
 ```json
 "compilerOptions": {
-    "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+    "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"],
 }
 ```
 
@@ -41,13 +41,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0xproject/react-shared yarn build
+PKG=@0x/react-shared yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0xproject/react-shared yarn watch
+PKG=@0x/react-shared yarn watch
 ```
 
 ### Clean
diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json
index afed68c425..488586f897 100644
--- a/packages/react-shared/package.json
+++ b/packages/react-shared/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/react-shared",
-    "version": "1.0.15",
+    "name": "@0x/react-shared",
+    "version": "1.0.17",
     "engines": {
         "node": ">=6.12"
     },
@@ -25,14 +25,15 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.12",
-        "@0xproject/tslint-config": "^1.0.8",
+        "@0x/dev-utils": "^1.0.13",
+        "@0x/tslint-config": "^1.0.9",
         "make-promises-safe": "^1.1.0",
         "shx": "^0.2.2",
         "tslint": "^5.9.1",
         "typescript": "3.0.1"
     },
     "dependencies": {
+        "@0x/types": "^1.2.0",
         "@material-ui/core": "^3.0.1",
         "@types/is-mobile": "0.3.0",
         "@types/lodash": "4.14.104",
@@ -40,7 +41,10 @@
         "@types/node": "*",
         "@types/react": "*",
         "@types/react-dom": "*",
+        "@types/react-router-dom": "^4.0.4",
         "@types/react-scroll": "1.5.3",
+        "@types/styled-components": "^4.0.0",
+        "@types/valid-url": "^1.0.2",
         "basscss": "^8.0.3",
         "change-case": "^3.0.2",
         "is-mobile": "^0.2.2",
@@ -50,7 +54,10 @@
         "react-dom": "^16.4.2",
         "react-highlight": "0xproject/react-highlight#2f40a42e0a3f0ad126f9f42d505b97b603fc7162",
         "react-markdown": "^3.2.2",
-        "react-scroll": "0xproject/react-scroll#similar-to-pr-330"
+        "react-router-dom": "^4.1.1",
+        "react-scroll": "0xproject/react-scroll#similar-to-pr-330-but-with-replace-state",
+        "styled-components": "^3.3.0",
+        "valid-url": "^1.0.9"
     },
     "publishConfig": {
         "access": "public"
diff --git a/packages/react-shared/src/components/anchor_title.tsx b/packages/react-shared/src/components/anchor_title.tsx
index 8f7e4af277..bd99edcab6 100644
--- a/packages/react-shared/src/components/anchor_title.tsx
+++ b/packages/react-shared/src/components/anchor_title.tsx
@@ -1,7 +1,9 @@
 import * as React from 'react';
 import { Link as ScrollLink } from 'react-scroll';
+import styled from 'styled-components';
 
 import { HeaderSizes, Styles } from '../types';
+import { colors } from '../utils/colors';
 import { constants } from '../utils/constants';
 
 const headerSizeToScrollOffset: { [headerSize: string]: number } = {
@@ -14,20 +16,14 @@ export interface AnchorTitleProps {
     id: string;
     headerSize: HeaderSizes;
     shouldShowAnchor: boolean;
+    isDisabled: boolean;
 }
 
-export interface AnchorTitleState {
-    isHovering: boolean;
-}
+export interface AnchorTitleState {}
 
 const styles: Styles = {
-    anchor: {
-        fontSize: 20,
-        transform: 'rotate(45deg)',
-        cursor: 'pointer',
-    },
     h1: {
-        fontSize: '1.8em',
+        fontSize: '1.875em',
     },
     h2: {
         fontSize: '1.5em',
@@ -38,18 +34,28 @@ const styles: Styles = {
     },
 };
 
+interface AnchorIconProps {
+    shouldShowAnchor: boolean;
+}
+
+const AnchorIcon =
+    styled.i <
+    AnchorIconProps >
+    `
+            opacity: ${props => (props.shouldShowAnchor ? 1 : 0)};
+            &:hover {
+                opacity: ${props => (props.shouldShowAnchor ? 0.6 : 0)};
+            }
+            font-size: 20px;
+            transform: rotate(45deg);
+            cursor: pointer;
+        `;
+
 export class AnchorTitle extends React.Component {
-    constructor(props: AnchorTitleProps) {
-        super(props);
-        this.state = {
-            isHovering: false,
-        };
-    }
+    public static defaultProps: Partial = {
+        isDisabled: false,
+    };
     public render(): React.ReactNode {
-        let opacity = 0;
-        if (this.props.shouldShowAnchor) {
-            opacity = this.state.isHovering ? 0.6 : 1;
-        }
         return (
             

-                

+                

                     {this.props.title}
                 

-                
-                    
-                
+                {!this.props.isDisabled && (
+                    
+                        
+                    
+                )}
             

         );
     }
-    private _setHoverState(isHovering: boolean): void {
-        this.setState({
-            isHovering,
-        });
-    }
 }
diff --git a/packages/react-shared/src/components/link.tsx b/packages/react-shared/src/components/link.tsx
new file mode 100644
index 0000000000..5a456109bc
--- /dev/null
+++ b/packages/react-shared/src/components/link.tsx
@@ -0,0 +1,131 @@
+import * as _ from 'lodash';
+import * as React from 'react';
+import { Link as ReactRounterLink } from 'react-router-dom';
+import { Link as ScrollLink } from 'react-scroll';
+import * as validUrl from 'valid-url';
+
+import { LinkType } from '../types';
+import { constants } from '../utils/constants';
+
+interface LinkProps {
+    to: string;
+    shouldOpenInNewTab?: boolean;
+    className?: string;
+    onMouseOver?: (event: React.MouseEvent) => void;
+    onMouseLeave?: (event: React.MouseEvent) => void;
+    onMouseEnter?: (event: React.MouseEvent) => void;
+    textDecoration?: string;
+    fontColor?: string;
+}
+
+export interface LinkState {}
+
+/**
+ * A generic link component which let's the developer render internal, external and scroll-to-hash links, and
+ * their associated behaviors with a single link component. Many times we want a menu including a combination of
+ * internal, external and scroll links and the abstraction of the differences of rendering each types of link
+ * makes it much easier to do so.
+ */
+export class Link extends React.Component {
+    public static defaultProps: Partial = {
+        shouldOpenInNewTab: false,
+        className: '',
+        onMouseOver: _.noop.bind(_),
+        onMouseLeave: _.noop.bind(_),
+        onMouseEnter: _.noop.bind(_),
+        textDecoration: 'none',
+        fontColor: 'inherit',
+    };
+    private _outerReactScrollSpan: HTMLSpanElement | null;
+    constructor(props: LinkProps) {
+        super(props);
+        this._outerReactScrollSpan = null;
+    }
+    public render(): React.ReactNode {
+        let type: LinkType;
+        const isReactRoute = _.startsWith(this.props.to, '/');
+        const isExternal = validUrl.isWebUri(this.props.to) || _.startsWith(this.props.to, 'mailto:');
+        if (isReactRoute) {
+            type = LinkType.ReactRoute;
+        } else if (isExternal) {
+            type = LinkType.External;
+        } else {
+            type = LinkType.ReactScroll;
+        }
+
+        if (type === LinkType.ReactScroll && this.props.shouldOpenInNewTab) {
+            throw new Error(`Cannot open LinkType.ReactScroll links in new tab. link.to: ${this.props.to}`);
+        }
+
+        const styleWithDefault = {
+            textDecoration: this.props.textDecoration,
+            cursor: 'pointer',
+            color: this.props.fontColor,
+        };
+
+        switch (type) {
+            case LinkType.External:
+                return (
+                    
+                        {this.props.children}
+                    
+                );
+            case LinkType.ReactRoute:
+                return (
+                    
+                        {this.props.children}
+                    
+                );
+            case LinkType.ReactScroll:
+                return (
+                     (this._outerReactScrollSpan = input)}
+                        onMouseOver={this.props.onMouseOver}
+                        onMouseEnter={this.props.onMouseEnter}
+                        onMouseLeave={this.props.onMouseLeave}
+                    >
+                        
+                            
+                                {this.props.children}
+                            
+                        
+                    
+                );
+            default:
+                throw new Error(`Unrecognized LinkType: ${type}`);
+        }
+    }
+    // HACK(fabio): For some reason, the react-scroll link decided to stop the propagation of click events.
+    // We do however rely on these events being propagated in certain scenarios (e.g when the link
+    // is within a dropdown we want to close upon being clicked). Because of this, we register the
+    // click event of an inner span, and pass it around the react-scroll link to an outer span.
+    private _onClickPropagateClickEventAroundScrollLink(): void {
+        if (!_.isNull(this._outerReactScrollSpan)) {
+            this._outerReactScrollSpan.click();
+        }
+    }
+}
diff --git a/packages/react-shared/src/components/markdown_paragraph_block.tsx b/packages/react-shared/src/components/markdown_paragraph_block.tsx
new file mode 100644
index 0000000000..eeaef8571d
--- /dev/null
+++ b/packages/react-shared/src/components/markdown_paragraph_block.tsx
@@ -0,0 +1,10 @@
+import * as _ from 'lodash';
+import * as React from 'react';
+
+import { colors } from '../utils/colors';
+
+export interface MarkdownParagraphBlockProps {}
+
+export const MarkdownParagraphBlock: React.StatelessComponent = ({ children }) => {
+    return {children};
+};
diff --git a/packages/react-shared/src/components/markdown_section.tsx b/packages/react-shared/src/components/markdown_section.tsx
index 09b214548e..e6a7d80d5b 100644
--- a/packages/react-shared/src/components/markdown_section.tsx
+++ b/packages/react-shared/src/components/markdown_section.tsx
@@ -8,14 +8,17 @@ import { colors } from '../utils/colors';
 import { utils } from '../utils/utils';
 
 import { AnchorTitle } from './anchor_title';
+import { Link } from './link';
 import { MarkdownCodeBlock } from './markdown_code_block';
 import { MarkdownLinkBlock } from './markdown_link_block';
+import { MarkdownParagraphBlock } from './markdown_paragraph_block';
 
 export interface MarkdownSectionProps {
     sectionName: string;
     markdownContent: string;
     headerSize?: HeaderSizes;
     githubLink?: string;
+    alternativeSectionTitle?: string;
 }
 
 interface DefaultMarkdownSectionProps {
@@ -42,20 +45,23 @@ export class MarkdownSection extends React.Component
-                
-                    

+                
+                    

                         

-                            
+                            
                                 
@@ -63,23 +69,29 @@ export class MarkdownSection extends React.Component
                         

                             {!_.isUndefined(githubLink) && (
-                                
-                                    Edit on Github
-                                
+                                

+                                    
+                                        Edit on Github
+                                    
+                                

                             )}
                         

                     

-                    

                     
+                    

                 
diff --git a/packages/react-shared/src/components/nested_sidebar_menu.tsx b/packages/react-shared/src/components/nested_sidebar_menu.tsx
index c8bddb59a4..196c91af1a 100644
--- a/packages/react-shared/src/components/nested_sidebar_menu.tsx
+++ b/packages/react-shared/src/components/nested_sidebar_menu.tsx
@@ -1,149 +1,119 @@
+import { ObjectMap } from '@0x/types';
 import * as _ from 'lodash';
 import MenuItem from 'material-ui/MenuItem';
 import * as React from 'react';
-import { Link as ScrollLink } from 'react-scroll';
 
-import { MenuSubsectionsBySection, Styles } from '../types';
+import { ALink, Styles } from '../types';
 import { colors } from '../utils/colors';
-import { constants } from '../utils/constants';
 import { utils } from '../utils/utils';
 
-import { VersionDropDown } from './version_drop_down';
+import { Link } from './link';
 
 export interface NestedSidebarMenuProps {
-    topLevelMenu: { [topLevel: string]: string[] };
-    menuSubsectionsBySection: MenuSubsectionsBySection;
+    sectionNameToLinks: ObjectMap;
     sidebarHeader?: React.ReactNode;
-    shouldDisplaySectionHeaders?: boolean;
-    onMenuItemClick?: () => void;
-    selectedVersion?: string;
-    versions?: string[];
-    onVersionSelected?: (semver: string) => void;
+    shouldReformatMenuItemNames?: boolean;
 }
 
-export interface NestedSidebarMenuState {}
+export interface NestedSidebarMenuState {
+    scrolledToId?: string;
+}
 
 const styles: Styles = {
-    menuItemWithHeaders: {
+    menuItem: {
         minHeight: 0,
+        paddingLeft: 8,
+        borderRadius: 6,
     },
-    menuItemWithoutHeaders: {
-        minHeight: 48,
-    },
-    menuItemInnerDivWithHeaders: {
+    menuItemInnerDiv: {
         color: colors.grey800,
         fontSize: 14,
         lineHeight: 2,
         padding: 0,
+        whiteSpace: 'nowrap',
+        overflow: 'hidden',
+        textOverflow: 'ellipsis',
     },
 };
 
 export class NestedSidebarMenu extends React.Component {
     public static defaultProps: Partial = {
-        shouldDisplaySectionHeaders: true,
-        onMenuItemClick: _.noop.bind(_),
+        shouldReformatMenuItemNames: true,
     };
-    public render(): React.ReactNode {
-        const navigation = _.map(this.props.topLevelMenu, (menuItems: string[], sectionName: string) => {
-            const finalSectionName = utils.convertCamelCaseToSpaces(sectionName);
-            if (this.props.shouldDisplaySectionHeaders) {
-                // tslint:disable-next-line:no-unused-variable
-                const id = utils.getIdFromName(sectionName);
-                return (
-                    

-                        

-                            {finalSectionName.toUpperCase()}
-                        

-                        {this._renderMenuItems(menuItems)}
-                    

-                );
-            } else {
-                return 
{this._renderMenuItems(menuItems)}
;
+    private _urlIntervalCheckId: number | undefined = undefined;
+    constructor(props: NestedSidebarMenuProps) {
+        super(props);
+        this.state = {};
+    }
+    public componentDidMount(): void {
+        this._urlIntervalCheckId = window.setInterval(() => {
+            const scrollId = location.hash.slice(1);
+            if (scrollId !== this.state.scrolledToId) {
+                this.setState({
+                    scrolledToId: scrollId,
+                });
             }
+        }, 200);
+    }
+    public componentWillUnmount(): void {
+        window.clearInterval(this._urlIntervalCheckId);
+    }
+    public render(): React.ReactNode {
+        const navigation = _.map(this.props.sectionNameToLinks, (links: ALink[], sectionName: string) => {
+            const finalSectionName = utils.convertCamelCaseToSpaces(sectionName);
+            // tslint:disable-next-line:no-unused-variable
+            return (
+                

+                    

+                        {finalSectionName.toUpperCase()}
+                    

+                    {this._renderMenuItems(links)}
+                

+            );
         });
-        const maxWidthWithScrollbar = 307;
         return (
             

                 {this.props.sidebarHeader}
-                {!_.isUndefined(this.props.versions) &&
-                    !_.isUndefined(this.props.selectedVersion) &&
-                    !_.isUndefined(this.props.onVersionSelected) && (
-                        

-                            
-                        

-                    )}
-                
{navigation}

+                
{navigation}

             

         );
     }
-    private _renderMenuItems(menuItemNames: string[]): React.ReactNode[] {
-        const menuItemStyles = this.props.shouldDisplaySectionHeaders
-            ? styles.menuItemWithHeaders
-            : styles.menuItemWithoutHeaders;
-        const menuItemInnerDivStyles = this.props.shouldDisplaySectionHeaders ? styles.menuItemInnerDivWithHeaders : {};
-        const menuItems = _.map(menuItemNames, menuItemName => {
-            const finalMenuItemName = utils.convertDashesToSpaces(menuItemName);
-            const id = utils.getIdFromName(menuItemName);
+    private _renderMenuItems(links: ALink[]): React.ReactNode[] {
+        const scrolledToId = this.state.scrolledToId;
+        const menuItems = _.map(links, link => {
+            const finalMenuItemName = this.props.shouldReformatMenuItemNames
+                ? utils.convertDashesToSpaces(link.title)
+                : link.title;
+            let menuItemStyle = styles.menuItem;
+            let menuItemInnerDivStyle = styles.menuItemInnerDiv;
+            const isScrolledTo = link.to === scrolledToId;
+            if (isScrolledTo) {
+                menuItemStyle = {
+                    ...menuItemStyle,
+                    backgroundColor: colors.lightLinkBlue,
+                };
+                menuItemInnerDivStyle = {
+                    ...menuItemInnerDivStyle,
+                    color: colors.white,
+                    fontWeight: 'bold',
+                };
+            }
             return (
-                

-                    
-                        
-                            {finalMenuItemName}
+                

+                    
+                        
+                            
+                                {finalMenuItemName}
+                            
                         
-                    
-                    {this._renderMenuItemSubsections(menuItemName)}
+                    
                 

             );
         });
         return menuItems;
     }
-    private _renderMenuItemSubsections(menuItemName: string): React.ReactNode {
-        if (_.isUndefined(this.props.menuSubsectionsBySection[menuItemName])) {
-            return null;
-        }
-        return this._renderMenuSubsectionsBySection(menuItemName, this.props.menuSubsectionsBySection[menuItemName]);
-    }
-    private _renderMenuSubsectionsBySection(menuItemName: string, entityNames: string[]): React.ReactNode {
-        return (
-            
    
-                {_.map(entityNames, entityName => {
-                    const name = `${menuItemName}-${entityName}`;
-                    const id = utils.getIdFromName(name);
-                    return (
-                        
  • 
-                            
-                                
-                                    {entityName}
-                                
-                            
-                        
    • 
-                    );
-                })}
-            

-        );
-    }
 }
diff --git a/packages/react-shared/src/components/version_drop_down.tsx b/packages/react-shared/src/components/version_drop_down.tsx
deleted file mode 100644
index 5ff4bed54c..0000000000
--- a/packages/react-shared/src/components/version_drop_down.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import MenuItem from '@material-ui/core/MenuItem';
-import Select from '@material-ui/core/Select';
-import * as _ from 'lodash';
-import * as React from 'react';
-
-export interface VersionDropDownProps {
-    selectedVersion: string;
-    versions: string[];
-    onVersionSelected: (semver: string) => void;
-}
-
-export interface VersionDropDownState {}
-
-export class VersionDropDown extends React.Component {
-    public render(): React.ReactNode {
-        return (
-            

-                
-            

-        );
-    }
-    private _renderDropDownItems(): React.ReactNode[] {
-        const items = _.map(this.props.versions, version => {
-            return (
-                
-                    v{version}
-                
-            );
-        });
-        return items;
-    }
-    private _updateSelectedVersion(event: React.ChangeEvent): void {
-        this.props.onVersionSelected(event.target.value);
-    }
-}
diff --git a/packages/react-shared/src/index.ts b/packages/react-shared/src/index.ts
index 3b50c01178..e33b09f191 100644
--- a/packages/react-shared/src/index.ts
+++ b/packages/react-shared/src/index.ts
@@ -4,8 +4,9 @@ export { MarkdownCodeBlock } from './components/markdown_code_block';
 export { MarkdownSection } from './components/markdown_section';
 export { NestedSidebarMenu } from './components/nested_sidebar_menu';
 export { SectionHeader } from './components/section_header';
+export { Link } from './components/link';
 
-export { HeaderSizes, Styles, MenuSubsectionsBySection, EtherscanLinkSuffixes, Networks } from './types';
+export { HeaderSizes, Styles, EtherscanLinkSuffixes, Networks, ALink } from './types';
 
 export { utils } from './utils/utils';
 export { constants } from './utils/constants';
diff --git a/packages/react-shared/src/types.ts b/packages/react-shared/src/types.ts
index 88fadcc098..9e8dcb6b64 100644
--- a/packages/react-shared/src/types.ts
+++ b/packages/react-shared/src/types.ts
@@ -8,10 +8,6 @@ export enum HeaderSizes {
     H3 = 'h3',
 }
 
-export interface MenuSubsectionsBySection {
-    [section: string]: string[];
-}
-
 export enum EtherscanLinkSuffixes {
     Address = 'address',
     Tx = 'tx',
@@ -23,3 +19,15 @@ export enum Networks {
     Ropsten = 'Ropsten',
     Rinkeby = 'Rinkeby',
 }
+
+export enum LinkType {
+    External = 'EXTERNAL',
+    ReactScroll = 'REACT_SCROLL',
+    ReactRoute = 'REACT_ROUTE',
+}
+
+export interface ALink {
+    title: string;
+    to: string;
+    shouldOpenInNewTab?: boolean;
+}
diff --git a/packages/react-shared/src/utils/colors.ts b/packages/react-shared/src/utils/colors.ts
index 7d047a50e4..a4dd7fefab 100644
--- a/packages/react-shared/src/utils/colors.ts
+++ b/packages/react-shared/src/utils/colors.ts
@@ -8,13 +8,17 @@ const baseColors = {
     greyishPink: '#E6E5E5',
     grey300: '#E0E0E0',
     beigeWhite: '#E4E4E4',
-    grey350: '#cacaca',
+    lightBgGrey: '#EDEDED',
+    grey325: '#dfdfdf',
+    grey350: '#CACACA',
     grey400: '#BDBDBD',
     lightGrey: '#BBBBBB',
     grey500: '#9E9E9E',
     grey: '#A5A5A5',
     darkGrey: '#818181',
     landingLinkGrey: '#919191',
+    linkSectionGrey: '#999999',
+    greyTheme: '#666666',
     grey700: '#616161',
     grey750: '#515151',
     grey800: '#424242',
@@ -22,10 +26,12 @@ const baseColors = {
     heroGrey: '#404040',
     projectsGrey: '#343333',
     darkestGrey: '#272727',
+    lightestBlue: '#E7F1FD',
     lightBlue: '#60A4F4',
     lightBlueA700: '#0091EA',
-    linkBlue: '#1D5CDE',
+    lightLinkBlue: '#3289F1',
     mediumBlue: '#488AEA',
+    linkBlue: '#1D5CDE',
     darkBlue: '#4D5481',
     lightTurquois: '#aefcdc',
     turquois: '#058789',
diff --git a/packages/react-shared/src/utils/constants.ts b/packages/react-shared/src/utils/constants.ts
index 562ab776b5..2dca1a078d 100644
--- a/packages/react-shared/src/utils/constants.ts
+++ b/packages/react-shared/src/utils/constants.ts
@@ -2,8 +2,7 @@ import { Networks } from '../types';
 
 export const constants = {
     DOCS_SCROLL_DURATION_MS: 0,
-    DOCS_CONTAINER_ID: 'documentation',
-    SCROLL_CONTAINER_ID: 'documentation',
+    SCROLL_CONTAINER_ID: 'scroll_container',
     SCROLL_TOP_ID: 'pageScrollTop',
     NETWORK_NAME_BY_ID: {
         1: Networks.Mainnet,
diff --git a/packages/react-shared/tslint.json b/packages/react-shared/tslint.json
index c78434416d..c3f6d9cae7 100644
--- a/packages/react-shared/tslint.json
+++ b/packages/react-shared/tslint.json
@@ -1,5 +1,5 @@
 {
-    "extends": ["@0xproject/tslint-config"],
+    "extends": ["@0x/tslint-config"],
     "rules": {
         "no-object-literal-type-assertion": false,
         "completed-docs": false,
diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json
index 3b19a253a8..d945c305b3 100644
--- a/packages/sol-compiler/CHANGELOG.json
+++ b/packages/sol-compiler/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1539871071,
+        "version": "1.1.8",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "1.1.7",
         "changes": [
diff --git a/packages/sol-compiler/CHANGELOG.md b/packages/sol-compiler/CHANGELOG.md
index d436462c94..1a86d097da 100644
--- a/packages/sol-compiler/CHANGELOG.md
+++ b/packages/sol-compiler/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.1.8 - _October 18, 2018_
+
+    * Dependencies updated
+
 ## v1.1.7 - _October 4, 2018_
 
     * Dependencies updated
@@ -39,7 +43,7 @@ CHANGELOG
     * Stop exporting types: `ContractArtifact`, `ContractNetworks` (#924)
     * Export types: `CompilerSettings`, `OutputField` (#924)
 
-## v1.0.5 - _August 13, 2018_
+## v1.0.5 - _August 14, 2018_
 
     * Dependencies updated
 
diff --git a/packages/sol-compiler/README.md b/packages/sol-compiler/README.md
index 3a6ca130bd..445aea3158 100644
--- a/packages/sol-compiler/README.md
+++ b/packages/sol-compiler/README.md
@@ -1,4 +1,4 @@
-## @0xproject/sol-compiler
+## @0x/sol-compiler
 
 Sol-compiler is a wrapper around [solc-js](https://www.npmjs.com/package/solc) that adds:
 
@@ -15,33 +15,33 @@ Sol-compiler is a wrapper around [solc-js](https://www.npmjs.com/package/solc) t
 #### CLI Installation
 
 ```bash
-yarn global add @0xproject/sol-compiler
+yarn global add @0x/sol-compiler
 ```
 
 #### API Installation
 
 ```bash
-yarn add @0xproject/sol-compiler
+yarn add @0x/sol-compiler
 ```
 
 If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
 
 ```json
 "compilerOptions": {
-    "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+    "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"],
 }
 ```
 
 **Import**
 
 ```typescript
-import { Compiler } from '@0xproject/sol-compiler';
+import { Compiler } from '@0x/sol-compiler';
 ```
 
 or
 
 ```javascript
-var Compiler = require('@0xproject/sol-compiler').Compiler;
+var Compiler = require('@0x/sol-compiler').Compiler;
 ```
 
 ## Contributing
@@ -69,13 +69,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0xproject/sol-compiler yarn build
+PKG=@0x/sol-compiler yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0xproject/sol-compiler yarn watch
+PKG=@0x/sol-compiler yarn watch
 ```
 
 ### Clean
diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json
index 828ce1dbc9..4c4370b1fb 100644
--- a/packages/sol-compiler/package.json
+++ b/packages/sol-compiler/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/sol-compiler",
-    "version": "1.1.7",
+    "name": "@0x/sol-compiler",
+    "version": "1.1.8",
     "engines": {
         "node": ">=6.12"
     },
@@ -42,8 +42,8 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-compiler/README.md",
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.12",
-        "@0xproject/tslint-config": "^1.0.8",
+        "@0x/dev-utils": "^1.0.13",
+        "@0x/tslint-config": "^1.0.9",
         "@types/mkdirp": "^0.5.2",
         "@types/require-from-string": "^1.2.0",
         "@types/semver": "^5.5.0",
@@ -65,16 +65,16 @@
         "zeppelin-solidity": "1.8.0"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.13",
-        "@0xproject/json-schemas": "^1.0.7",
-        "@0xproject/sol-resolver": "^1.0.14",
-        "@0xproject/types": "^1.1.4",
-        "@0xproject/typescript-typings": "^3.0.2",
-        "@0xproject/utils": "^2.0.2",
-        "@0xproject/web3-wrapper": "^3.0.3",
+        "@0x/assert": "^1.0.14",
+        "@0x/json-schemas": "^2.0.0",
+        "@0x/sol-resolver": "^1.0.15",
+        "@0x/types": "^1.2.0",
+        "@0x/typescript-typings": "^3.0.3",
+        "@0x/utils": "^2.0.3",
+        "@0x/web3-wrapper": "^3.1.0",
         "@types/yargs": "^11.0.0",
         "chalk": "^2.3.0",
-        "ethereum-types": "^1.0.11",
+        "ethereum-types": "^1.1.1",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.5",
         "mkdirp": "^0.5.1",
diff --git a/packages/sol-compiler/src/cli.ts b/packages/sol-compiler/src/cli.ts
index 83dadc7ca5..0a9db6e055 100644
--- a/packages/sol-compiler/src/cli.ts
+++ b/packages/sol-compiler/src/cli.ts
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 // We need the above pragma since this script will be run as a command-line tool.
 
-import { logUtils } from '@0xproject/utils';
+import { logUtils } from '@0x/utils';
 import * as _ from 'lodash';
 import 'source-map-support/register';
 import * as yargs from 'yargs';
diff --git a/packages/sol-compiler/src/compiler.ts b/packages/sol-compiler/src/compiler.ts
index 7eefc14748..8ee7fa4a91 100644
--- a/packages/sol-compiler/src/compiler.ts
+++ b/packages/sol-compiler/src/compiler.ts
@@ -1,4 +1,4 @@
-import { assert } from '@0xproject/assert';
+import { assert } from '@0x/assert';
 import {
     FallthroughResolver,
     FSResolver,
@@ -7,8 +7,8 @@ import {
     RelativeFSResolver,
     Resolver,
     URLResolver,
-} from '@0xproject/sol-resolver';
-import { fetchAsync, logUtils } from '@0xproject/utils';
+} from '@0x/sol-resolver';
+import { fetchAsync, logUtils } from '@0x/utils';
 import chalk from 'chalk';
 import { CompilerOptions, ContractArtifact, ContractVersionData, StandardOutput } from 'ethereum-types';
 import * as ethUtil from 'ethereumjs-util';
diff --git a/packages/sol-compiler/src/utils/compiler.ts b/packages/sol-compiler/src/utils/compiler.ts
index c153beb0fd..cda67a4149 100644
--- a/packages/sol-compiler/src/utils/compiler.ts
+++ b/packages/sol-compiler/src/utils/compiler.ts
@@ -1,5 +1,5 @@
-import { ContractSource } from '@0xproject/sol-resolver';
-import { logUtils } from '@0xproject/utils';
+import { ContractSource } from '@0x/sol-resolver';
+import { logUtils } from '@0x/utils';
 import { ContractArtifact } from 'ethereum-types';
 import * as _ from 'lodash';
 import * as path from 'path';
diff --git a/packages/sol-compiler/src/utils/fs_wrapper.ts b/packages/sol-compiler/src/utils/fs_wrapper.ts
index 8d6800276e..a52b509632 100644
--- a/packages/sol-compiler/src/utils/fs_wrapper.ts
+++ b/packages/sol-compiler/src/utils/fs_wrapper.ts
@@ -1,4 +1,4 @@
-import { promisify } from '@0xproject/utils';
+import { promisify } from '@0x/utils';
 import * as fs from 'fs';
 import * as mkdirp from 'mkdirp';
 
diff --git a/packages/sol-compiler/test/util/constants.ts b/packages/sol-compiler/test/util/constants.ts
index 88d6db550f..a74ea1b68d 100644
--- a/packages/sol-compiler/test/util/constants.ts
+++ b/packages/sol-compiler/test/util/constants.ts
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 
 export const constants = {
     networkId: 0,
diff --git a/packages/sol-compiler/test/util/provider.ts b/packages/sol-compiler/test/util/provider.ts
index cc372b2eb3..4561a16990 100644
--- a/packages/sol-compiler/test/util/provider.ts
+++ b/packages/sol-compiler/test/util/provider.ts
@@ -1,4 +1,4 @@
-import { web3Factory } from '@0xproject/dev-utils';
+import { web3Factory } from '@0x/dev-utils';
 import { Provider } from 'ethereum-types';
 
 const providerConfigs = { shouldUseInProcessGanache: true };
diff --git a/packages/sol-compiler/tslint.json b/packages/sol-compiler/tslint.json
index ffaefe83a6..dd9053357e 100644
--- a/packages/sol-compiler/tslint.json
+++ b/packages/sol-compiler/tslint.json
@@ -1,3 +1,3 @@
 {
-    "extends": ["@0xproject/tslint-config"]
+    "extends": ["@0x/tslint-config"]
 }
diff --git a/packages/sol-cov/CHANGELOG.json b/packages/sol-cov/CHANGELOG.json
index 283946f07a..cbee0233bc 100644
--- a/packages/sol-cov/CHANGELOG.json
+++ b/packages/sol-cov/CHANGELOG.json
@@ -6,7 +6,8 @@
                 "note": "Make @types/solidity-parser-antlr a 'dependency' so it's available to users of the library",
                 "pr": 1105
             }
-        ]
+        ],
+        "timestamp": 1539871071
     },
     {
         "version": "2.1.7",
diff --git a/packages/sol-cov/CHANGELOG.md b/packages/sol-cov/CHANGELOG.md
index c019c9e79e..11ed486e29 100644
--- a/packages/sol-cov/CHANGELOG.md
+++ b/packages/sol-cov/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.1.8 - _October 18, 2018_
+
+    * Make @types/solidity-parser-antlr a 'dependency' so it's available to users of the library (#1105)
+
 ## v2.1.7 - _October 4, 2018_
 
     * Dependencies updated
@@ -37,7 +41,7 @@ CHANGELOG
 
     * Export types: `JSONRPCRequestPayload`, `Provider`, `JSONRPCErrorCallback`, `JSONRPCResponsePayload`, `JSONRPCRequestPayloadWithMethod`, `NextCallback`, `ErrorCallback`, `OnNextCompleted` and `Callback` (#924)
 
-## v2.0.0 - _August 13, 2018_
+## v2.0.0 - _August 14, 2018_
 
     * Fix a bug when eth_call coverage was not computed because of silent schema validation failures (#938)
     * Make `TruffleArtifactAdapter` read the `truffle.js` config for `solc` settings (#938)
diff --git a/packages/sol-cov/README.md b/packages/sol-cov/README.md
index 0a63ac06ec..31d73dc634 100644
--- a/packages/sol-cov/README.md
+++ b/packages/sol-cov/README.md
@@ -1,4 +1,4 @@
-## @0xproject/sol-cov
+## @0x/sol-cov
 
 A Solidity code coverage tool.
 
@@ -7,19 +7,19 @@ A Solidity code coverage tool.
 ## Installation
 
 ```bash
-yarn add @0xproject/sol-cov
+yarn add @0x/sol-cov
 ```
 
 **Import**
 
 ```javascript
-import { CoverageSubprovider } from '@0xproject/sol-cov';
+import { CoverageSubprovider } from '@0x/sol-cov';
 ```
 
 or
 
 ```javascript
-var CoverageSubprovider = require('@0xproject/sol-cov').CoverageSubprovider;
+var CoverageSubprovider = require('@0x/sol-cov').CoverageSubprovider;
 ```
 
 ## Contributing
@@ -47,13 +47,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0xproject/sol-cov yarn build
+PKG=@0x/sol-cov yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0xproject/sol-cov yarn watch
+PKG=@0x/sol-cov yarn watch
 ```
 
 ### Clean
diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json
index 49473f6c8f..a56713d69c 100644
--- a/packages/sol-cov/package.json
+++ b/packages/sol-cov/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/sol-cov",
-    "version": "2.1.7",
+    "name": "@0x/sol-cov",
+    "version": "2.1.8",
     "engines": {
         "node": ">=6.12"
     },
@@ -42,14 +42,14 @@
     },
     "homepage": "https://github.com/0xProject/0x.js/packages/sol-cov/README.md",
     "dependencies": {
-        "@0xproject/dev-utils": "^1.0.12",
-        "@0xproject/sol-compiler": "^1.1.7",
-        "@0xproject/subproviders": "^2.0.7",
-        "@0xproject/typescript-typings": "^3.0.2",
-        "@0xproject/utils": "^2.0.2",
-        "@0xproject/web3-wrapper": "^3.0.3",
+        "@0x/dev-utils": "^1.0.13",
+        "@0x/sol-compiler": "^1.1.8",
+        "@0x/subproviders": "^2.1.0",
+        "@0x/typescript-typings": "^3.0.3",
+        "@0x/utils": "^2.0.3",
+        "@0x/web3-wrapper": "^3.1.0",
         "@types/solidity-parser-antlr": "^0.2.0",
-        "ethereum-types": "^1.0.11",
+        "ethereum-types": "^1.1.1",
         "ethereumjs-util": "^5.1.1",
         "glob": "^7.1.2",
         "istanbul": "^0.4.5",
@@ -61,7 +61,7 @@
         "solidity-parser-antlr": "^0.2.12"
     },
     "devDependencies": {
-        "@0xproject/tslint-config": "^1.0.8",
+        "@0x/tslint-config": "^1.0.9",
         "@types/istanbul": "^0.4.30",
         "@types/loglevel": "^1.5.3",
         "@types/mkdirp": "^0.5.1",
diff --git a/packages/sol-cov/src/artifact_adapters/sol_compiler_artifact_adapter.ts b/packages/sol-cov/src/artifact_adapters/sol_compiler_artifact_adapter.ts
index 8a74022bfb..57391abbea 100644
--- a/packages/sol-cov/src/artifact_adapters/sol_compiler_artifact_adapter.ts
+++ b/packages/sol-cov/src/artifact_adapters/sol_compiler_artifact_adapter.ts
@@ -1,4 +1,4 @@
-import { logUtils } from '@0xproject/utils';
+import { logUtils } from '@0x/utils';
 import { CompilerOptions, ContractArtifact } from 'ethereum-types';
 import * as fs from 'fs';
 import * as glob from 'glob';
diff --git a/packages/sol-cov/src/artifact_adapters/truffle_artifact_adapter.ts b/packages/sol-cov/src/artifact_adapters/truffle_artifact_adapter.ts
index b4d1aa7ba4..f064911d32 100644
--- a/packages/sol-cov/src/artifact_adapters/truffle_artifact_adapter.ts
+++ b/packages/sol-cov/src/artifact_adapters/truffle_artifact_adapter.ts
@@ -1,4 +1,4 @@
-import { Compiler, CompilerOptions } from '@0xproject/sol-compiler';
+import { Compiler, CompilerOptions } from '@0x/sol-compiler';
 import * as fs from 'fs';
 import * as glob from 'glob';
 import * as path from 'path';
diff --git a/packages/sol-cov/src/index.ts b/packages/sol-cov/src/index.ts
index 612d0869af..348e0fc9bc 100644
--- a/packages/sol-cov/src/index.ts
+++ b/packages/sol-cov/src/index.ts
@@ -22,4 +22,4 @@ export {
     ErrorCallback,
     OnNextCompleted,
     Callback,
-} from '@0xproject/subproviders';
+} from '@0x/subproviders';
diff --git a/packages/sol-cov/src/revert_trace.ts b/packages/sol-cov/src/revert_trace.ts
index a78d1afa8f..d60c6e7d9b 100644
--- a/packages/sol-cov/src/revert_trace.ts
+++ b/packages/sol-cov/src/revert_trace.ts
@@ -1,4 +1,4 @@
-import { logUtils } from '@0xproject/utils';
+import { logUtils } from '@0x/utils';
 import { OpCode, StructLog } from 'ethereum-types';
 
 import * as _ from 'lodash';
diff --git a/packages/sol-cov/src/trace.ts b/packages/sol-cov/src/trace.ts
index 635019fc0a..b38dbdce0a 100644
--- a/packages/sol-cov/src/trace.ts
+++ b/packages/sol-cov/src/trace.ts
@@ -1,4 +1,4 @@
-import { logUtils } from '@0xproject/utils';
+import { logUtils } from '@0x/utils';
 import { OpCode, StructLog } from 'ethereum-types';
 import * as _ from 'lodash';
 
diff --git a/packages/sol-cov/src/trace_collection_subprovider.ts b/packages/sol-cov/src/trace_collection_subprovider.ts
index a69bccb078..25e38768d9 100644
--- a/packages/sol-cov/src/trace_collection_subprovider.ts
+++ b/packages/sol-cov/src/trace_collection_subprovider.ts
@@ -1,6 +1,6 @@
-import { BlockchainLifecycle } from '@0xproject/dev-utils';
-import { Callback, ErrorCallback, NextCallback, Subprovider } from '@0xproject/subproviders';
-import { CallDataRPC, marshaller, Web3Wrapper } from '@0xproject/web3-wrapper';
+import { BlockchainLifecycle } from '@0x/dev-utils';
+import { Callback, ErrorCallback, NextCallback, Subprovider } from '@0x/subproviders';
+import { CallDataRPC, marshaller, Web3Wrapper } from '@0x/web3-wrapper';
 import { JSONRPCRequestPayload, Provider, TxData } from 'ethereum-types';
 import * as _ from 'lodash';
 import { Lock } from 'semaphore-async-await';
diff --git a/packages/sol-cov/src/trace_collector.ts b/packages/sol-cov/src/trace_collector.ts
index 3e2ae3516b..44cffc2385 100644
--- a/packages/sol-cov/src/trace_collector.ts
+++ b/packages/sol-cov/src/trace_collector.ts
@@ -1,4 +1,4 @@
-import { promisify } from '@0xproject/utils';
+import { promisify } from '@0x/utils';
 import { stripHexPrefix } from 'ethereumjs-util';
 import * as fs from 'fs';
 import { Collector } from 'istanbul';
diff --git a/packages/sol-cov/src/utils.ts b/packages/sol-cov/src/utils.ts
index b696bd4639..d8bc65e739 100644
--- a/packages/sol-cov/src/utils.ts
+++ b/packages/sol-cov/src/utils.ts
@@ -1,4 +1,4 @@
-import { addressUtils, BigNumber } from '@0xproject/utils';
+import { addressUtils, BigNumber } from '@0x/utils';
 import { OpCode, StructLog } from 'ethereum-types';
 import { addHexPrefix } from 'ethereumjs-util';
 import * as _ from 'lodash';
diff --git a/packages/sol-cov/tslint.json b/packages/sol-cov/tslint.json
index 015dce8510..631f46bcaa 100644
--- a/packages/sol-cov/tslint.json
+++ b/packages/sol-cov/tslint.json
@@ -1,5 +1,5 @@
 {
-    "extends": ["@0xproject/tslint-config"],
+    "extends": ["@0x/tslint-config"],
     "rules": {
         "completed-docs": false
     }
diff --git a/packages/sol-doc/CHANGELOG.json b/packages/sol-doc/CHANGELOG.json
index c0b094ba0a..e117ff2915 100644
--- a/packages/sol-doc/CHANGELOG.json
+++ b/packages/sol-doc/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1539871071,
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "1.0.2",
         "changes": [
diff --git a/packages/sol-doc/CHANGELOG.md b/packages/sol-doc/CHANGELOG.md
index 437c2e7be9..9adc02b197 100644
--- a/packages/sol-doc/CHANGELOG.md
+++ b/packages/sol-doc/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.3 - _October 18, 2018_
+
+    * Dependencies updated
+
 ## v1.0.2 - _October 4, 2018_
 
     * Dependencies updated
diff --git a/packages/sol-doc/package.json b/packages/sol-doc/package.json
index b9fe9f56d8..de10b9e171 100644
--- a/packages/sol-doc/package.json
+++ b/packages/sol-doc/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/sol-doc",
-    "version": "1.0.2",
+    "name": "@0x/sol-doc",
+    "version": "1.0.3",
     "description": "Solidity documentation generator",
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.js",
@@ -25,16 +25,16 @@
     "author": "F. Eugene Aumson",
     "license": "Apache-2.0",
     "dependencies": {
-        "@0xproject/sol-compiler": "^1.1.7",
-        "@0xproject/types": "^1.1.4",
-        "@0xproject/utils": "^2.0.2",
-        "ethereum-types": "^1.0.11",
+        "@0x/sol-compiler": "^1.1.8",
+        "@0x/types": "^1.2.0",
+        "@0x/utils": "^2.0.3",
+        "ethereum-types": "^1.1.1",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.10",
         "yargs": "^12.0.2"
     },
     "devDependencies": {
-        "@0xproject/tslint-config": "^1.0.8",
+        "@0x/tslint-config": "^1.0.9",
         "chai": "^4.1.2",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^2.0.2",
diff --git a/packages/sol-doc/src/cli.ts b/packages/sol-doc/src/cli.ts
index a1847e8686..6da132d566 100644
--- a/packages/sol-doc/src/cli.ts
+++ b/packages/sol-doc/src/cli.ts
@@ -1,7 +1,7 @@
 import 'source-map-support/register';
 import * as yargs from 'yargs';
 
-import { logUtils } from '@0xproject/utils';
+import { logUtils } from '@0x/utils';
 
 import { SolDoc } from './sol_doc';
 
diff --git a/packages/sol-doc/src/sol_doc.ts b/packages/sol-doc/src/sol_doc.ts
index 686e9ca348..e2cfb39e28 100644
--- a/packages/sol-doc/src/sol_doc.ts
+++ b/packages/sol-doc/src/sol_doc.ts
@@ -14,7 +14,7 @@ import {
 import ethUtil = require('ethereumjs-util');
 import * as _ from 'lodash';
 
-import { Compiler, CompilerOptions } from '@0xproject/sol-compiler';
+import { Compiler, CompilerOptions } from '@0x/sol-compiler';
 import {
     CustomType,
     CustomTypeChild,
@@ -27,7 +27,7 @@ import {
     SolidityMethod,
     Type,
     TypeDocTypes,
-} from '@0xproject/types';
+} from '@0x/types';
 
 export class SolDoc {
     private _customTypeHashToName: ObjectMap | undefined;
diff --git a/packages/sol-doc/test/solidity_doc_generator_test.ts b/packages/sol-doc/test/solidity_doc_generator_test.ts
index f166fb1434..a49f29d02c 100644
--- a/packages/sol-doc/test/solidity_doc_generator_test.ts
+++ b/packages/sol-doc/test/solidity_doc_generator_test.ts
@@ -3,7 +3,7 @@ import * as _ from 'lodash';
 import * as chai from 'chai';
 import 'mocha';
 
-import { DocAgnosticFormat, Event, SolidityMethod } from '@0xproject/types';
+import { DocAgnosticFormat, Event, SolidityMethod } from '@0x/types';
 
 import { SolDoc } from '../src/sol_doc';
 
diff --git a/packages/sol-doc/tslint.json b/packages/sol-doc/tslint.json
index ffaefe83a6..dd9053357e 100644
--- a/packages/sol-doc/tslint.json
+++ b/packages/sol-doc/tslint.json
@@ -1,3 +1,3 @@
 {
-    "extends": ["@0xproject/tslint-config"]
+    "extends": ["@0x/tslint-config"]
 }
diff --git a/packages/sol-resolver/CHANGELOG.json b/packages/sol-resolver/CHANGELOG.json
index f09870cacf..a72ca6d63b 100644
--- a/packages/sol-resolver/CHANGELOG.json
+++ b/packages/sol-resolver/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1539871071,
+        "version": "1.0.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1538693146,
         "version": "1.0.14",
diff --git a/packages/sol-resolver/CHANGELOG.md b/packages/sol-resolver/CHANGELOG.md
index ef9033dde6..671d3ea849 100644
--- a/packages/sol-resolver/CHANGELOG.md
+++ b/packages/sol-resolver/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.15 - _October 18, 2018_
+
+    * Dependencies updated
+
 ## v1.0.14 - _October 4, 2018_
 
     * Dependencies updated
@@ -41,7 +45,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.5 - _August 13, 2018_
+## v1.0.5 - _August 14, 2018_
 
     * Fix a bug where RelativeFSResolver would crash when trying to read a directory (#909)
     * Fix a bug where NpmResolver would crash when trying to read a directory (#961)
diff --git a/packages/sol-resolver/README.md b/packages/sol-resolver/README.md
index 8487947f02..2ab336bc9c 100644
--- a/packages/sol-resolver/README.md
+++ b/packages/sol-resolver/README.md
@@ -1,23 +1,23 @@
-## @0xproject/sol-resolver
+## @0x/sol-resolver
 
 A Solidity import resolver used by [sol-compiler](https://github.com/0xProject/0x-monorepo/tree/development/packages/sol-compiler).
 
 ## Installation
 
 ```bash
-yarn add @0xproject/sol-resolver
+yarn add @0x/sol-resolver
 ```
 
 **Import**
 
 ```javascript
-import { Resolver } from '@0xproject/sol-resolver';
+import { Resolver } from '@0x/sol-resolver';
 ```
 
 or
 
 ```javascript
-var Resolver = require('@0xproject/sol-resolver').Resolver;
+var Resolver = require('@0x/sol-resolver').Resolver;
 ```
 
 ## Contributing
@@ -45,13 +45,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0xproject/sol-resolver yarn build
+PKG=@0x/sol-resolver yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0xproject/sol-resolver yarn watch
+PKG=@0x/sol-resolver yarn watch
 ```
 
 ### Clean
diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json
index 2c86d556a4..4bd63f4069 100644
--- a/packages/sol-resolver/package.json
+++ b/packages/sol-resolver/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/sol-resolver",
-    "version": "1.0.14",
+    "name": "@0x/sol-resolver",
+    "version": "1.0.15",
     "engines": {
         "node": ">=6.12"
     },
@@ -23,15 +23,15 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/resolver/README.md",
     "devDependencies": {
-        "@0xproject/tslint-config": "^1.0.8",
+        "@0x/tslint-config": "^1.0.9",
         "make-promises-safe": "^1.1.0",
         "shx": "^0.2.2",
         "tslint": "5.11.0",
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/types": "^1.1.4",
-        "@0xproject/typescript-typings": "^3.0.2",
+        "@0x/types": "^1.2.0",
+        "@0x/typescript-typings": "^3.0.3",
         "lodash": "^4.17.5"
     },
     "publishConfig": {
diff --git a/packages/sol-resolver/tslint.json b/packages/sol-resolver/tslint.json
index ffaefe83a6..dd9053357e 100644
--- a/packages/sol-resolver/tslint.json
+++ b/packages/sol-resolver/tslint.json
@@ -1,3 +1,3 @@
 {
-    "extends": ["@0xproject/tslint-config"]
+    "extends": ["@0x/tslint-config"]
 }
diff --git a/packages/sra-report/.npmignore b/packages/sra-report/.npmignore
deleted file mode 100644
index d645458f6c..0000000000
--- a/packages/sra-report/.npmignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.*
-yarn-error.log
-/src/
-/scripts/
-tsconfig.json
-/lib/monorepo_scripts/
diff --git a/packages/sra-report/CHANGELOG.json b/packages/sra-report/CHANGELOG.json
deleted file mode 100644
index c88854b085..0000000000
--- a/packages/sra-report/CHANGELOG.json
+++ /dev/null
@@ -1,289 +0,0 @@
-[
-    {
-        "version": "1.0.13",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ],
-        "timestamp": 1538693146
-    },
-    {
-        "timestamp": 1538157789,
-        "version": "1.0.12",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1537907159,
-        "version": "1.0.11",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1537875740,
-        "version": "1.0.10",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1537541580,
-        "version": "1.0.9",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1536142250,
-        "version": "1.0.8",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1535377027,
-        "version": "1.0.7",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1535133899,
-        "version": "1.0.6",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1534210131,
-        "version": "1.0.5",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1532619515,
-        "version": "1.0.4",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1532614997,
-        "version": "1.0.3",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1532605697,
-        "version": "1.0.2",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1532357734,
-        "version": "1.0.1",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1532043000,
-        "version": "1.0.0",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1531919263,
-        "version": "0.1.6",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1531149657,
-        "version": "0.1.5",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1529397769,
-        "version": "0.1.4",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1527617805,
-        "version": "0.1.3",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1527617227,
-        "version": "0.1.2",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1527616612,
-        "version": "0.1.1",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "version": "0.1.0",
-        "changes": [
-            {
-                "note": "Properly export the executable binary",
-                "pr": 588
-            }
-        ],
-        "timestamp": 1527009133
-    },
-    {
-        "timestamp": 1525477860,
-        "version": "0.0.14",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1525453812,
-        "version": "0.0.13",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1525428773,
-        "version": "0.0.12",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1524079658,
-        "version": "0.0.11",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1524073495,
-        "version": "0.0.10",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1524044013,
-        "version": "0.0.9",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1523462196,
-        "version": "0.0.8",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "timestamp": 1522673609,
-        "version": "0.0.7",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
-    {
-        "version": "0.0.6",
-        "changes": [
-            {
-                "note": "Added postman collection unit tests",
-                "pr": 451
-            }
-        ],
-        "timestamp": 1522658513
-    },
-    {
-        "version": "0.0.2",
-        "changes": [
-            {
-                "note": "Consolidate all `console.log` calls into `logUtils` in the `@0xproject/utils` package",
-                "pr": 452
-            }
-        ],
-        "timestamp": 1521298800
-    },
-    {
-        "version": "0.0.1",
-        "changes": [],
-        "timestamp": 1520434800
-    }
-]
diff --git a/packages/sra-report/CHANGELOG.md b/packages/sra-report/CHANGELOG.md
deleted file mode 100644
index 803baae5b1..0000000000
--- a/packages/sra-report/CHANGELOG.md
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-CHANGELOG
-
-## v1.0.13 - _October 4, 2018_
-
-    * Dependencies updated
-
-## v1.0.12 - _September 28, 2018_
-
-    * Dependencies updated
-
-## v1.0.11 - _September 25, 2018_
-
-    * Dependencies updated
-
-## v1.0.10 - _September 25, 2018_
-
-    * Dependencies updated
-
-## v1.0.9 - _September 21, 2018_
-
-    * Dependencies updated
-
-## v1.0.8 - _September 5, 2018_
-
-    * Dependencies updated
-
-## v1.0.7 - _August 27, 2018_
-
-    * Dependencies updated
-
-## v1.0.6 - _August 24, 2018_
-
-    * Dependencies updated
-
-## v1.0.5 - _August 13, 2018_
-
-    * Dependencies updated
-
-## v1.0.4 - _July 26, 2018_
-
-    * Dependencies updated
-
-## v1.0.3 - _July 26, 2018_
-
-    * Dependencies updated
-
-## v1.0.2 - _July 26, 2018_
-
-    * Dependencies updated
-
-## v1.0.1 - _July 23, 2018_
-
-    * Dependencies updated
-
-## v1.0.0 - _July 19, 2018_
-
-    * Dependencies updated
-
-## v0.1.6 - _July 18, 2018_
-
-    * Dependencies updated
-
-## v0.1.5 - _July 9, 2018_
-
-    * Dependencies updated
-
-## v0.1.4 - _June 19, 2018_
-
-    * Dependencies updated
-
-## v0.1.3 - _May 29, 2018_
-
-    * Dependencies updated
-
-## v0.1.2 - _May 29, 2018_
-
-    * Dependencies updated
-
-## v0.1.1 - _May 29, 2018_
-
-    * Dependencies updated
-
-## v0.1.0 - _May 22, 2018_
-
-    * Properly export the executable binary (#588)
-
-## v0.0.14 - _May 4, 2018_
-
-    * Dependencies updated
-
-## v0.0.13 - _May 4, 2018_
-
-    * Dependencies updated
-
-## v0.0.12 - _May 4, 2018_
-
-    * Dependencies updated
-
-## v0.0.11 - _April 18, 2018_
-
-    * Dependencies updated
-
-## v0.0.10 - _April 18, 2018_
-
-    * Dependencies updated
-
-## v0.0.9 - _April 18, 2018_
-
-    * Dependencies updated
-
-## v0.0.8 - _April 11, 2018_
-
-    * Dependencies updated
-
-## v0.0.7 - _April 2, 2018_
-
-    * Dependencies updated
-
-## v0.0.6 - _April 2, 2018_
-
-    * Added postman collection unit tests (#451)
-
-## v0.0.2 - _March 17, 2018_
-
-    * Consolidate all `console.log` calls into `logUtils` in the `@0xproject/utils` package (#452)
-
-## v0.0.1 - _March 7, 2018_
diff --git a/packages/sra-report/README.md b/packages/sra-report/README.md
deleted file mode 100644
index d8df36a29d..0000000000
--- a/packages/sra-report/README.md
+++ /dev/null
@@ -1,138 +0,0 @@
-# SRA Report
-
-This tool allows you to generate reports that detail an endpoint's [standard relayer API HTTP specification](https://github.com/0xProject/standard-relayer-api/blob/master/http/v0.md) compliance. The tool will perform a [Postman collection](https://www.getpostman.com/docs/v6/postman/collections/creating_collections) run and either print a report to the console or save it to disk as a json file. SRA report can also output a Postman collection file and [Postman environment](https://www.getpostman.com/docs/v6/postman/environments_and_globals/manage_environments) file in order to facilitate replication and debugging of collection runs using the [Postman native app](https://www.getpostman.com/docs/v6/postman/launching_postman/installation_and_updates).
-
-The tool currently performs the following checks for each endpoint:
-
-*   `application/json` Content-Type header validation
-*   JSON schema validation
-*   Correct filtering when a query paramater is provided (ex. when querying for a specific maker address, all orders returned have the same maker address that was provided by the query)
-
-Features to come:
-
-*   Correct sorting (ex. the `/orderbook` endpoint should return orders in order of price)
-*   Tests for pagination
-*   Tests for the `POST /order` endpoint
-*   Tests for failure cases and errors
-
-## Installation
-
-`yarn add -g @0xproject/sra-report`
-
-## Options
-
-```
-sra-report
-Options:
-  --help                      Show help                                [boolean]
-  --version                   Show version number                      [boolean]
-  --endpoint-url, -e          API endpoint url to test for standard relayer API
-                              compliance                     [string] [required]
-  --output, -o, --out         The relative path to write the report generated by
-                              the collection run, prints to console by default
-                                                                        [string]
-  --network-id, -n            ID of the network that the API is serving orders
-                              from                         [number] [default: 1]
-  --environment, --env        The relative path to a postman environment file
-                              for the collection run                    [string]
-  --export-collection, --ec   The relative path to write the postman collection
-                              file used by the collection run           [string]
-  --export-environment, --ee  The relative path to write the postman environment
-                              file used by the collection run           [string]
-```
-
-## Example Usage
-
-### Print report to console
-
-```bash
-sra-report --endpoint-url 'http://api.example.com'
-```
-
-### Save a report to disk
-
-```bash
-sra-report --endpoint-url 'http://api.example.com' --output 'path/to/report.json'
-```
-
-### Generate report for an endpoint that serves kovan testnet orders
-
-```bash
-sra-report --endpoint-url 'http://kovan.api.example.com' --network-id 42
-```
-
-### Write Postman collection and environment files for use in the Postman native app
-
-```bash
-sra-report --endpoint-url 'http://.api.example.com' --export-collection 'path/to/collection.json' --export-environment 'path/to/environment.json'
-```
-
-### Run the report using a custom environment
-
-```bash
-sra-report --endpoint-url 'http://.api.example.com' --environment 'path/to/custom/environment.json'
-```
-
-## Custom environments
-
-When testing your standard relayer API endpoint in development, it may be useful to modify the Postman environment file generated by this tool such that specific query parameters are used during the collection run. For example, by default, this tool will grab the first order it can from the `/orders` endpoint and use properties from that order as query parameters for the rest of the run. Another example is the tool will default to the [WETH](https://etherscan.io/address/0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2) and [ZRX](https://etherscan.io/address/0xe41d2489571d322189246dafa5ebde1f4699f498) token contracts when querying some endpoints but you may want to specify these.
-
-In order to provide a custom environment to the tool, perform the following steps:
-
-1.  Export a Postman environment file using the tool: [example](#Write-Postman-collection-and-environment-files-for-use-in-the-Postman-native-app)
-2.  Open the Postman environment file using your favorite text editor or in the Postman native app
-3.  Modify the specific values you want
-4.  Save the environment file and export it if using the Postman native app
-5.  Run the tool and supply a path to your modified environment file: [example](#Run-the-report-using-a-custom-environment)
-
-## Contributing
-
-We welcome improvements and fixes from the wider community! To report bugs within this package, please create an issue in this repository.
-
-Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started.
-
-### Install dependencies
-
-If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them:
-
-```bash
-yarn config set workspaces-experimental true
-```
-
-Then install dependencies
-
-```bash
-yarn install
-```
-
-### Build
-
-To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
-
-```bash
-PKG=@0xproject/sra-report yarn build
-```
-
-Or continuously rebuild on change:
-
-```bash
-PKG=@0xproject/sra-report yarn watch
-```
-
-### Clean
-
-```bash
-yarn clean
-```
-
-### Lint
-
-```bash
-yarn lint
-```
-
-### Run Tests
-
-```bash
-yarn test
-```
diff --git a/packages/sra-report/bin/sra-report.js b/packages/sra-report/bin/sra-report.js
deleted file mode 100755
index 8d6bdccf84..0000000000
--- a/packages/sra-report/bin/sra-report.js
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-require('../lib/src/index.js')
diff --git a/packages/sra-report/coverage/.gitkeep b/packages/sra-report/coverage/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json
deleted file mode 100644
index a822aa61d9..0000000000
--- a/packages/sra-report/package.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-    "name": "@0xproject/sra-report",
-    "version": "1.0.13",
-    "engines": {
-        "node": ">=6.12"
-    },
-    "description": "Generate reports for standard relayer API compliance",
-    "main": "lib/src/index.js",
-    "types": "lib/src/index.d.ts",
-    "scripts": {
-        "clean": "shx rm -rf lib",
-        "build": "tsc -b",
-        "build:ci": "yarn build",
-        "lint": "tslint --project .",
-        "test:circleci": "yarn test:coverage",
-        "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
-        "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
-        "test": "run-s copy_test_environments copy_test_fixtures run_mocha",
-        "rebuild_and_test": "run-s clean build test",
-        "copy_test_fixtures": "copyfiles -u 2 './test/fixtures/**/*.json' ./lib/test/fixtures",
-        "copy_test_environments": "copyfiles -u 2 './test/environments/**/*.json' ./lib/test/environments",
-        "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --exit"
-    },
-    "bin": {
-        "sra-report": "bin/sra-report.js"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/0xProject/0x-monorepo.git"
-    },
-    "license": "Apache-2.0",
-    "bugs": {
-        "url": "https://github.com/0xProject/0x-monorepo/issues"
-    },
-    "homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-report/README.md",
-    "dependencies": {
-        "@0xproject/assert": "^1.0.13",
-        "@0xproject/connect": "1.0.4",
-        "@0xproject/json-schemas": "^0.8.3",
-        "@0xproject/order-utils": "^0.0.9",
-        "@0xproject/types": "^0.8.2",
-        "@0xproject/typescript-typings": "^3.0.2",
-        "@0xproject/utils": "^2.0.2",
-        "chalk": "^2.3.0",
-        "lodash": "^4.17.5",
-        "newman": "^3.9.3",
-        "yargs": "^10.0.3"
-    },
-    "devDependencies": {
-        "@0xproject/tslint-config": "^1.0.8",
-        "@types/lodash": "4.14.104",
-        "@types/mocha": "^2.2.48",
-        "@types/newman": "^3.9.0",
-        "@types/nock": "^9.1.2",
-        "@types/node": "*",
-        "@types/yargs": "^10.0.0",
-        "chai": "^4.0.1",
-        "chai-as-promised": "^7.1.0",
-        "copyfiles": "^2.0.0",
-        "dirty-chai": "^2.0.1",
-        "make-promises-safe": "^1.1.0",
-        "mocha": "^4.1.0",
-        "nock": "^9.2.3",
-        "npm-run-all": "^4.1.2",
-        "nyc": "^11.0.1",
-        "shx": "^0.2.2",
-        "tslint": "5.11.0",
-        "typescript": "3.0.1"
-    },
-    "publishConfig": {
-        "access": "public"
-    }
-}
diff --git a/packages/sra-report/postman_collections/sra_report.postman_collection.json b/packages/sra-report/postman_collections/sra_report.postman_collection.json
deleted file mode 100644
index 9a8e8e0fa6..0000000000
--- a/packages/sra-report/postman_collections/sra_report.postman_collection.json
+++ /dev/null
@@ -1,910 +0,0 @@
-{
-    "info": {
-        "name": "sra_report",
-        "_postman_id": "d5828163-ddb9-46a9-ec39-c2b81417b6c0",
-        "description":
-            "[Standard Relayer API](\nhttps://github.com/0xProject/standard-relayer-api)\n\n\n0x Protocol is an open standard. Because of this, we expect many independent applications to be built that will want to use the protocol. In order to make it easier for anyone to source liquidity that conforms to the 0x order format, relayers can opt-in to implementing a set of standard relayer API endpoints. In doing so, they allow clients of the standard relayer API to access the orders on their orderbook.",
-        "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-    },
-    "item": [
-        {
-            "name": "GET /token_pairs",
-            "description": "",
-            "item": [
-                {
-                    "name": "default request",
-                    "event": [
-                        {
-                            "listen": "test",
-                            "script": {
-                                "id": "42cb5e3f-6013-4a7c-b341-0d10cb3f2c9c",
-                                "type": "text/javascript",
-                                "exec": [""]
-                            }
-                        }
-                    ],
-                    "request": {
-                        "method": "GET",
-                        "header": [],
-                        "body": {},
-                        "url": {
-                            "raw": "{{url}}/token_pairs",
-                            "host": ["{{url}}"],
-                            "path": ["token_pairs"]
-                        },
-                        "description": ""
-                    },
-                    "response": []
-                },
-                {
-                    "name": "tokenA param",
-                    "event": [
-                        {
-                            "listen": "test",
-                            "script": {
-                                "id": "0b0712ff-7846-40a3-9253-4bca2551350c",
-                                "type": "text/javascript",
-                                "exec": [
-                                    "const filterTokenEnvKey = 'tokenContractAddress1';",
-                                    "const filterTokenAddress = pm.environment.get(filterTokenEnvKey);",
-                                    "const responseJsonData = pm.response.json();",
-                                    "pm.test('Token pairs are properly filtered', function() {",
-                                    "    _.forEach(responseJsonData, function(tokenPair) {",
-                                    "        const tokenAIsFilterToken = _.get(tokenPair, 'tokenA.address') === filterTokenAddress;",
-                                    "        const tokenBIsFilterToken = _.get(tokenPair, 'tokenB.address') === filterTokenAddress;",
-                                    "        const condition = tokenAIsFilterToken || tokenBIsFilterToken",
-                                    "        pm.expect(condition).to.be.true;",
-                                    "    });",
-                                    "});",
-                                    ""
-                                ]
-                            }
-                        }
-                    ],
-                    "request": {
-                        "method": "GET",
-                        "header": [],
-                        "body": {},
-                        "url": {
-                            "raw": "{{url}}/token_pairs?tokenA={{tokenContractAddress1}}",
-                            "host": ["{{url}}"],
-                            "path": ["token_pairs"],
-                            "query": [
-                                {
-                                    "key": "tokenA",
-                                    "value": "{{tokenContractAddress1}}",
-                                    "equals": true
-                                }
-                            ]
-                        },
-                        "description": ""
-                    },
-                    "response": []
-                },
-                {
-                    "name": "tokenB param",
-                    "event": [
-                        {
-                            "listen": "test",
-                            "script": {
-                                "id": "ef0e6be8-06d8-4975-a1c4-2199bc8b5aa6",
-                                "type": "text/javascript",
-                                "exec": [
-                                    "const filterTokenEnvKey = 'tokenContractAddress1';",
-                                    "const filterTokenAddress = pm.environment.get(filterTokenEnvKey);",
-                                    "const responseJsonData = pm.response.json();",
-                                    "pm.test('Token pairs are properly filtered', function() {",
-                                    "    _.forEach(responseJsonData, function(tokenPair) {",
-                                    "        const tokenAIsFilterToken = _.get(tokenPair, 'tokenA.address') === filterTokenAddress;",
-                                    "        const tokenBIsFilterToken = _.get(tokenPair, 'tokenB.address') === filterTokenAddress;",
-                                    "        const condition = tokenAIsFilterToken || tokenBIsFilterToken",
-                                    "        pm.expect(condition).to.be.true;",
-                                    "    });",
-                                    "});",
-                                    ""
-                                ]
-                            }
-                        }
-                    ],
-                    "request": {
-                        "method": "GET",
-                        "header": [],
-                        "body": {},
-                        "url": {
-                            "raw": "{{url}}/token_pairs?tokenB={{tokenContractAddress1}}",
-                            "host": ["{{url}}"],
-                            "path": ["token_pairs"],
-                            "query": [
-                                {
-                                    "key": "tokenB",
-                                    "value": "{{tokenContractAddress1}}",
-                                    "equals": true
-                                }
-                            ]
-                        },
-                        "description": ""
-                    },
-                    "response": []
-                },
-                {
-                    "name": "tokenA and tokenB params",
-                    "event": [
-                        {
-                            "listen": "test",
-                            "script": {
-                                "id": "9ca4bed3-b8e0-4a90-96ba-42f0da3a7d68",
-                                "type": "text/javascript",
-                                "exec": [
-                                    "const filterTokenAEnvKey = 'tokenContractAddress1';",
-                                    "const filterTokenBEnvKey = 'tokenContractAddress2';",
-                                    "const filterTokenAAddress = pm.environment.get(filterTokenAEnvKey);",
-                                    "const filterTokenBAddress = pm.environment.get(filterTokenBEnvKey);",
-                                    "const responseJsonData = pm.response.json();",
-                                    "pm.test('Token pairs are properly filtered', function() {",
-                                    "    _.forEach(responseJsonData, function(tokenPair) {",
-                                    "        const tokenAIsFilterTokenA = _.get(tokenPair, 'tokenA.address') === filterTokenAAddress;",
-                                    "        const tokenAIsFilterTokenB = _.get(tokenPair, 'tokenA.address') === filterTokenBAddress;",
-                                    "        const tokenBIsFilterTokenA = _.get(tokenPair, 'tokenB.address') === filterTokenAAddress;",
-                                    "        const tokenBIsFilterTokenB = _.get(tokenPair, 'tokenB.address') === filterTokenBAddress;",
-                                    "        const condition = (tokenAIsFilterTokenA && tokenBIsFilterTokenB) || (tokenBIsFilterTokenA && tokenAIsFilterTokenB)",
-                                    "        pm.expect(condition).to.be.true;",
-                                    "    });",
-                                    "});",
-                                    ""
-                                ]
-                            }
-                        }
-                    ],
-                    "request": {
-                        "method": "GET",
-                        "header": [],
-                        "body": {},
-                        "url": {
-                            "raw":
-                                "{{url}}/token_pairs?tokenA={{tokenContractAddress1}}&tokenB={{tokenContractAddress2}}",
-                            "host": ["{{url}}"],
-                            "path": ["token_pairs"],
-                            "query": [
-                                {
-                                    "key": "tokenA",
-                                    "value": "{{tokenContractAddress1}}",
-                                    "equals": true
-                                },
-                                {
-                                    "key": "tokenB",
-                                    "value": "{{tokenContractAddress2}}",
-                                    "equals": true
-                                }
-                            ]
-                        },
-                        "description": ""
-                    },
-                    "response": []
-                }
-            ],
-            "event": [
-                {
-                    "listen": "prerequest",
-                    "script": {
-                        "id": "3d032e92-6a17-49f0-8115-bae1c7298b55",
-                        "type": "text/javascript",
-                        "exec": [""]
-                    }
-                },
-                {
-                    "listen": "test",
-                    "script": {
-                        "id": "25addb38-bd1c-4eb3-a193-5617119dc0d6",
-                        "type": "text/javascript",
-                        "exec": [
-                            "const schema = tv4.getSchema('/RelayerApiTokenPairsResponse');",
-                            "const responseJsonData = pm.response.json();",
-                            "",
-                            "pm.test('Schema is valid', function() {",
-                            "    pm.expect(tv4.validate(responseJsonData, schema)).to.be.true;",
-                            "});",
-                            ""
-                        ]
-                    }
-                }
-            ]
-        },
-        {
-            "name": "GET /orders",
-            "description": "",
-            "item": [
-                {
-                    "name": "default request",
-                    "event": [
-                        {
-                            "listen": "test",
-                            "script": {
-                                "id": "118f47dd-1d93-4288-841f-de88783eff3b",
-                                "type": "text/javascript",
-                                "exec": [""]
-                            }
-                        }
-                    ],
-                    "request": {
-                        "method": "GET",
-                        "header": [],
-                        "body": {},
-                        "url": {
-                            "raw": "{{url}}/orders",
-                            "host": ["{{url}}"],
-                            "path": ["orders"]
-                        },
-                        "description":
-                            "Retrieves a list of orders given query parameters. For querying an entire orderbook snapshot, the orderbook endpoint is recommended.\n\nParameters\n  * exchangeContractAddress [string]: returns orders created for this exchange address\n  * tokenAddress [string]: returns orders where makerTokenAddress or takerTokenAddress is token address\n  * makerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * takerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * maker [string]: returns orders where maker is maker address\n  * taker [string]: returns orders where taker is taker address\n  * trader [string]: returns orders where maker or taker is trader address\n  * feeRecipient [string]: returns orders where feeRecipient is feeRecipient address\n\nAll parameters are optional."
-                    },
-                    "response": []
-                },
-                {
-                    "name": "exchangeContract param",
-                    "event": [
-                        {
-                            "listen": "test",
-                            "script": {
-                                "id": "374c4b28-5672-400c-8c23-9cb1a3e63117",
-                                "type": "text/javascript",
-                                "exec": [
-                                    "const exchangeContractEnvKey = 'exchangeContractAddress';",
-                                    "const requestedExchangeContractAddress = pm.environment.get(exchangeContractEnvKey);",
-                                    "const responseJsonData = pm.response.json();",
-                                    "pm.test('Orders are properly filtered', function() {",
-                                    "    _.forEach(responseJsonData, function(order) {",
-                                    "        const returnedExchangeContractAddress = _.get(order, 'exchangeContractAddress');",
-                                    "        pm.expect(requestedExchangeContractAddress).to.equal(returnedExchangeContractAddress);",
-                                    "    });",
-                                    "});",
-                                    ""
-                                ]
-                            }
-                        }
-                    ],
-                    "request": {
-                        "method": "GET",
-                        "header": [],
-                        "body": {},
-                        "url": {
-                            "raw": "{{url}}/orders?exchangeContractAddress={{exchangeContractAddress}}",
-                            "host": ["{{url}}"],
-                            "path": ["orders"],
-                            "query": [
-                                {
-                                    "key": "exchangeContractAddress",
-                                    "value": "{{exchangeContractAddress}}",
-                                    "equals": true
-                                }
-                            ]
-                        },
-                        "description":
-                            "Retrieves a list of orders given query parameters. For querying an entire orderbook snapshot, the orderbook endpoint is recommended.\n\nParameters\n  * exchangeContractAddress [string]: returns orders created for this exchange address\n  * tokenAddress [string]: returns orders where makerTokenAddress or takerTokenAddress is token address\n  * makerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * takerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * maker [string]: returns orders where maker is maker address\n  * taker [string]: returns orders where taker is taker address\n  * trader [string]: returns orders where maker or taker is trader address\n  * feeRecipient [string]: returns orders where feeRecipient is feeRecipient address\n\nAll parameters are optional."
-                    },
-                    "response": []
-                },
-                {
-                    "name": "tokenAddress param",
-                    "event": [
-                        {
-                            "listen": "test",
-                            "script": {
-                                "id": "e74a9069-18b9-42d3-b2d0-e18580ad73f2",
-                                "type": "text/javascript",
-                                "exec": [
-                                    "const filterTokenEnvKey = 'tokenContractAddress2';",
-                                    "const filterTokenAddress = pm.environment.get(filterTokenEnvKey);",
-                                    "const responseJsonData = pm.response.json();",
-                                    "pm.test('Orders are properly filtered', function() {",
-                                    "    _.forEach(responseJsonData, function(order) {",
-                                    "        const makerTokenAddress = _.get(order, 'makerTokenAddress');",
-                                    "        const takerTokenAddress = _.get(order, 'takerTokenAddress');",
-                                    "        const makerTokenAddressIsFilterToken = makerTokenAddress === filterTokenAddress;",
-                                    "        const takerTokenAddressIsFilterToken = takerTokenAddress === filterTokenAddress;",
-                                    "        const condition = makerTokenAddressIsFilterToken || takerTokenAddressIsFilterToken;",
-                                    "        pm.expect(condition).to.be.true;",
-                                    "    });",
-                                    "});",
-                                    ""
-                                ]
-                            }
-                        }
-                    ],
-                    "request": {
-                        "method": "GET",
-                        "header": [],
-                        "body": {},
-                        "url": {
-                            "raw": "{{url}}/orders?tokenAddress={{tokenContractAddress2}}",
-                            "host": ["{{url}}"],
-                            "path": ["orders"],
-                            "query": [
-                                {
-                                    "key": "tokenAddress",
-                                    "value": "{{tokenContractAddress2}}",
-                                    "equals": true
-                                }
-                            ]
-                        },
-                        "description":
-                            "Retrieves a list of orders given query parameters. For querying an entire orderbook snapshot, the orderbook endpoint is recommended.\n\nParameters\n  * exchangeContractAddress [string]: returns orders created for this exchange address\n  * tokenAddress [string]: returns orders where makerTokenAddress or takerTokenAddress is token address\n  * makerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * takerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * maker [string]: returns orders where maker is maker address\n  * taker [string]: returns orders where taker is taker address\n  * trader [string]: returns orders where maker or taker is trader address\n  * feeRecipient [string]: returns orders where feeRecipient is feeRecipient address\n\nAll parameters are optional."
-                    },
-                    "response": []
-                },
-                {
-                    "name": "makerTokenAddress param",
-                    "event": [
-                        {
-                            "listen": "test",
-                            "script": {
-                                "id": "c539f306-aa03-495d-a90a-0179e1b751aa",
-                                "type": "text/javascript",
-                                "exec": [
-                                    "const filterTokenEnvKey = 'tokenContractAddress2';",
-                                    "const filterTokenAddress = pm.environment.get(filterTokenEnvKey);",
-                                    "const responseJsonData = pm.response.json();",
-                                    "pm.test('Orders are properly filtered', function() {",
-                                    "    _.forEach(responseJsonData, function(order) {",
-                                    "        const makerTokenAddress = _.get(order, 'makerTokenAddress');",
-                                    "        pm.expect(makerTokenAddress).to.be.equal(filterTokenAddress);",
-                                    "    });",
-                                    "});",
-                                    ""
-                                ]
-                            }
-                        }
-                    ],
-                    "request": {
-                        "method": "GET",
-                        "header": [],
-                        "body": {},
-                        "url": {
-                            "raw": "{{url}}/orders?makerTokenAddress={{tokenContractAddress2}}",
-                            "host": ["{{url}}"],
-                            "path": ["orders"],
-                            "query": [
-                                {
-                                    "key": "makerTokenAddress",
-                                    "value": "{{tokenContractAddress2}}",
-                                    "equals": true
-                                }
-                            ]
-                        },
-                        "description":
-                            "Retrieves a list of orders given query parameters. For querying an entire orderbook snapshot, the orderbook endpoint is recommended.\n\nParameters\n  * exchangeContractAddress [string]: returns orders created for this exchange address\n  * tokenAddress [string]: returns orders where makerTokenAddress or takerTokenAddress is token address\n  * makerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * takerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * maker [string]: returns orders where maker is maker address\n  * taker [string]: returns orders where taker is taker address\n  * trader [string]: returns orders where maker or taker is trader address\n  * feeRecipient [string]: returns orders where feeRecipient is feeRecipient address\n\nAll parameters are optional."
-                    },
-                    "response": []
-                },
-                {
-                    "name": "takerTokenAddress param",
-                    "event": [
-                        {
-                            "listen": "test",
-                            "script": {
-                                "id": "49b2fcaf-5fe2-471f-ae10-e48a440d4c6d",
-                                "type": "text/javascript",
-                                "exec": [
-                                    "const filterTokenEnvKey = 'tokenContractAddress2';",
-                                    "const filterTokenAddress = pm.environment.get(filterTokenEnvKey);",
-                                    "const responseJsonData = pm.response.json();",
-                                    "pm.test('Orders are properly filtered', function() {",
-                                    "    _.forEach(responseJsonData, function(order) {",
-                                    "        const takerTokenAddress = _.get(order, 'takerTokenAddress');",
-                                    "        pm.expect(takerTokenAddress).to.be.equal(filterTokenAddress);",
-                                    "    });",
-                                    "});",
-                                    ""
-                                ]
-                            }
-                        }
-                    ],
-                    "request": {
-                        "method": "GET",
-                        "header": [],
-                        "body": {},
-                        "url": {
-                            "raw": "{{url}}/orders?takerTokenAddress={{tokenContractAddress2}}",
-                            "host": ["{{url}}"],
-                            "path": ["orders"],
-                            "query": [
-                                {
-                                    "key": "takerTokenAddress",
-                                    "value": "{{tokenContractAddress2}}",
-                                    "equals": true
-                                }
-                            ]
-                        },
-                        "description":
-                            "Retrieves a list of orders given query parameters. For querying an entire orderbook snapshot, the orderbook endpoint is recommended.\n\nParameters\n  * exchangeContractAddress [string]: returns orders created for this exchange address\n  * tokenAddress [string]: returns orders where makerTokenAddress or takerTokenAddress is token address\n  * makerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * takerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * maker [string]: returns orders where maker is maker address\n  * taker [string]: returns orders where taker is taker address\n  * trader [string]: returns orders where maker or taker is trader address\n  * feeRecipient [string]: returns orders where feeRecipient is feeRecipient address\n\nAll parameters are optional."
-                    },
-                    "response": []
-                },
-                {
-                    "name": "maker param",
-                    "event": [
-                        {
-                            "listen": "test",
-                            "script": {
-                                "id": "1f5960de-117f-44fb-82e0-581626cbf62b",
-                                "type": "text/javascript",
-                                "exec": [
-                                    "const orderMakerEnvKey = 'orderMaker';",
-                                    "const referenceOrderMakerAddress = pm.environment.get(orderMakerEnvKey);",
-                                    "const responseJsonData = pm.response.json();",
-                                    "pm.test('Orders are properly filtered', function() {",
-                                    "    _.forEach(responseJsonData, function(order) {",
-                                    "        const returnedMakerAddress = _.get(order, 'maker');",
-                                    "        pm.expect(referenceOrderMakerAddress).to.be.equal(returnedMakerAddress);",
-                                    "    });",
-                                    "});",
-                                    ""
-                                ]
-                            }
-                        }
-                    ],
-                    "request": {
-                        "method": "GET",
-                        "header": [],
-                        "body": {},
-                        "url": {
-                            "raw": "{{url}}/orders?maker={{orderMaker}}",
-                            "host": ["{{url}}"],
-                            "path": ["orders"],
-                            "query": [
-                                {
-                                    "key": "maker",
-                                    "value": "{{orderMaker}}",
-                                    "equals": true
-                                }
-                            ]
-                        },
-                        "description":
-                            "Retrieves a list of orders given query parameters. For querying an entire orderbook snapshot, the orderbook endpoint is recommended.\n\nParameters\n  * exchangeContractAddress [string]: returns orders created for this exchange address\n  * tokenAddress [string]: returns orders where makerTokenAddress or takerTokenAddress is token address\n  * makerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * takerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * maker [string]: returns orders where maker is maker address\n  * taker [string]: returns orders where taker is taker address\n  * trader [string]: returns orders where maker or taker is trader address\n  * feeRecipient [string]: returns orders where feeRecipient is feeRecipient address\n\nAll parameters are optional."
-                    },
-                    "response": []
-                },
-                {
-                    "name": "taker param",
-                    "event": [
-                        {
-                            "listen": "test",
-                            "script": {
-                                "id": "f23de2eb-b444-49d3-93b7-14ae712d6502",
-                                "type": "text/javascript",
-                                "exec": [
-                                    "const orderTakerEnvKey = 'orderTaker';",
-                                    "const referenceOrderTakerAddress = pm.environment.get(orderTakerEnvKey);",
-                                    "const responseJsonData = pm.response.json();",
-                                    "pm.test('Orders are properly filtered', function() {",
-                                    "    _.forEach(responseJsonData, function(order) {",
-                                    "        const returnedTakerAddress = _.get(order, 'taker');",
-                                    "        pm.expect(referenceOrderTakerAddress).to.be.equal(returnedTakerAddress);",
-                                    "    });",
-                                    "});",
-                                    ""
-                                ]
-                            }
-                        }
-                    ],
-                    "request": {
-                        "method": "GET",
-                        "header": [],
-                        "body": {},
-                        "url": {
-                            "raw": "{{url}}/orders?taker={{orderTaker}}",
-                            "host": ["{{url}}"],
-                            "path": ["orders"],
-                            "query": [
-                                {
-                                    "key": "taker",
-                                    "value": "{{orderTaker}}",
-                                    "equals": true
-                                }
-                            ]
-                        },
-                        "description":
-                            "Retrieves a list of orders given query parameters. For querying an entire orderbook snapshot, the orderbook endpoint is recommended.\n\nParameters\n  * exchangeContractAddress [string]: returns orders created for this exchange address\n  * tokenAddress [string]: returns orders where makerTokenAddress or takerTokenAddress is token address\n  * makerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * takerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * maker [string]: returns orders where maker is maker address\n  * taker [string]: returns orders where taker is taker address\n  * trader [string]: returns orders where maker or taker is trader address\n  * feeRecipient [string]: returns orders where feeRecipient is feeRecipient address\n\nAll parameters are optional."
-                    },
-                    "response": []
-                },
-                {
-                    "name": "trader param",
-                    "event": [
-                        {
-                            "listen": "test",
-                            "script": {
-                                "id": "9689639a-47ce-4c3b-8180-859fd28437be",
-                                "type": "text/javascript",
-                                "exec": [
-                                    "const orderTraderEnvKey = 'orderMaker';",
-                                    "const referenceOrderTraderAddress = pm.environment.get(orderTraderEnvKey);",
-                                    "const responseJsonData = pm.response.json();",
-                                    "pm.test('Orders are properly filtered', function() {",
-                                    "    _.forEach(responseJsonData, function(order) {",
-                                    "        const returnedMakerAddress = _.get(order, 'maker');",
-                                    "        const returnedTakerAddress = _.get(order, 'taker');",
-                                    "        const condition = (referenceOrderTraderAddress === returnedMakerAddress) || (referenceOrderTraderAddress === returnedTakerAddress);",
-                                    "        pm.expect(condition).to.be.true;",
-                                    "    });",
-                                    "});",
-                                    ""
-                                ]
-                            }
-                        }
-                    ],
-                    "request": {
-                        "method": "GET",
-                        "header": [],
-                        "body": {},
-                        "url": {
-                            "raw": "{{url}}/orders?trader={{orderMaker}}",
-                            "host": ["{{url}}"],
-                            "path": ["orders"],
-                            "query": [
-                                {
-                                    "key": "trader",
-                                    "value": "{{orderMaker}}",
-                                    "equals": true
-                                }
-                            ]
-                        },
-                        "description":
-                            "Retrieves a list of orders given query parameters. For querying an entire orderbook snapshot, the orderbook endpoint is recommended.\n\nParameters\n  * exchangeContractAddress [string]: returns orders created for this exchange address\n  * tokenAddress [string]: returns orders where makerTokenAddress or takerTokenAddress is token address\n  * makerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * takerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * maker [string]: returns orders where maker is maker address\n  * taker [string]: returns orders where taker is taker address\n  * trader [string]: returns orders where maker or taker is trader address\n  * feeRecipient [string]: returns orders where feeRecipient is feeRecipient address\n\nAll parameters are optional."
-                    },
-                    "response": []
-                },
-                {
-                    "name": "feeRecipient param",
-                    "event": [
-                        {
-                            "listen": "test",
-                            "script": {
-                                "id": "010c0cf6-8d5b-4fe3-8b92-b2009ea43a3e",
-                                "type": "text/javascript",
-                                "exec": [
-                                    "const orderFeeRecipientEnvKey = 'orderFeeRecipient';",
-                                    "const referenceOrderFeeRecipientAddress = pm.environment.get(orderFeeRecipientEnvKey);",
-                                    "const responseJsonData = pm.response.json();",
-                                    "pm.test('Orders are properly filtered', function() {",
-                                    "    _.forEach(responseJsonData, function(order) {",
-                                    "        const returnedFeeRecipientAddress = _.get(order, 'feeRecipient');",
-                                    "        pm.expect(referenceOrderFeeRecipientAddress).to.be.equal(returnedFeeRecipientAddress);",
-                                    "    });",
-                                    "});",
-                                    ""
-                                ]
-                            }
-                        }
-                    ],
-                    "request": {
-                        "method": "GET",
-                        "header": [],
-                        "body": {},
-                        "url": {
-                            "raw": "{{url}}/orders?feeRecipient={{orderFeeRecipient}}",
-                            "host": ["{{url}}"],
-                            "path": ["orders"],
-                            "query": [
-                                {
-                                    "key": "feeRecipient",
-                                    "value": "{{orderFeeRecipient}}",
-                                    "equals": true
-                                }
-                            ]
-                        },
-                        "description":
-                            "Retrieves a list of orders given query parameters. For querying an entire orderbook snapshot, the orderbook endpoint is recommended.\n\nParameters\n  * exchangeContractAddress [string]: returns orders created for this exchange address\n  * tokenAddress [string]: returns orders where makerTokenAddress or takerTokenAddress is token address\n  * makerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * takerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * maker [string]: returns orders where maker is maker address\n  * taker [string]: returns orders where taker is taker address\n  * trader [string]: returns orders where maker or taker is trader address\n  * feeRecipient [string]: returns orders where feeRecipient is feeRecipient address\n\nAll parameters are optional."
-                    },
-                    "response": []
-                }
-            ],
-            "event": [
-                {
-                    "listen": "prerequest",
-                    "script": {
-                        "id": "4eafcc26-fb01-4182-b963-67a0b418fcbc",
-                        "type": "text/javascript",
-                        "exec": [""]
-                    }
-                },
-                {
-                    "listen": "test",
-                    "script": {
-                        "id": "d28effd1-4a73-4ee8-82cc-21b1ab06928d",
-                        "type": "text/javascript",
-                        "exec": [
-                            "const schema = tv4.getSchema('/signedOrdersSchema');",
-                            "const responseJsonData = pm.response.json();",
-                            "",
-                            "pm.test('Schema is valid', function() {",
-                            "    pm.expect(tv4.validate(responseJsonData, schema)).to.be.true;",
-                            "});",
-                            ""
-                        ]
-                    }
-                }
-            ]
-        },
-        {
-            "name": "GET /order",
-            "description": "",
-            "item": [
-                {
-                    "name": "orderHash param",
-                    "event": [
-                        {
-                            "listen": "test",
-                            "script": {
-                                "id": "18876df2-384e-43d5-93a1-7e24571e1308",
-                                "type": "text/javascript",
-                                "exec": [
-                                    "const orderEnvKey = 'order';",
-                                    "const referenceOrderString = pm.environment.get(orderEnvKey);",
-                                    "const referenceOrderJson = JSON.parse(referenceOrderString);",
-                                    "const orderPropertyNames = [",
-                                    "    'maker',",
-                                    "    'taker',",
-                                    "    'makerFee',",
-                                    "    'takerFee',",
-                                    "    'makerTokenAmount',",
-                                    "    'takerTokenAmount',",
-                                    "    'makerTokenAddress',",
-                                    "    'takerTokenAddress',",
-                                    "    'salt',",
-                                    "    'feeRecipient',",
-                                    "    'expirationUnixTimestampSec',",
-                                    "    'exchangeContractAddress'",
-                                    "];",
-                                    "const signaturePropertyNames = [",
-                                    "    'v',",
-                                    "    'r',",
-                                    "    's'",
-                                    "];",
-                                    "const returnedOrderJson = pm.response.json();",
-                                    "pm.test('Order is properly retreived', function() {",
-                                    "    _.forEach(orderPropertyNames, function(propertyName) {",
-                                    "        const returnedProperty = _.get(returnedOrderJson, propertyName);",
-                                    "        const referenceProperty = _.get(referenceOrderJson, propertyName);",
-                                    "        pm.expect(returnedProperty).to.be.equal(referenceProperty);",
-                                    "    });",
-                                    "    const returnedSignature = _.get(returnedOrderJson, 'ecSignature');",
-                                    "    const referenceSignature = _.get(returnedOrderJson, 'ecSignature');",
-                                    "    _.forEach(signaturePropertyNames, function(propertyName) {",
-                                    "        const returnedSignatureProperty = _.get(returnedSignature, propertyName);",
-                                    "        const referenceSignatureProperty = _.get(referenceSignature, propertyName);",
-                                    "        pm.expect(returnedSignatureProperty).to.be.equal(referenceSignatureProperty);",
-                                    "    });",
-                                    "});",
-                                    ""
-                                ]
-                            }
-                        }
-                    ],
-                    "request": {
-                        "method": "GET",
-                        "header": [],
-                        "body": {},
-                        "url": {
-                            "raw": "{{url}}/order/{{orderHash}}",
-                            "host": ["{{url}}"],
-                            "path": ["order", "{{orderHash}}"]
-                        },
-                        "description": "Retrieves a specific order by orderHash."
-                    },
-                    "response": []
-                }
-            ],
-            "event": [
-                {
-                    "listen": "prerequest",
-                    "script": {
-                        "id": "e356d2ff-d105-42c1-b679-d9d917dcd68d",
-                        "type": "text/javascript",
-                        "exec": [""]
-                    }
-                },
-                {
-                    "listen": "test",
-                    "script": {
-                        "id": "8d2d4717-6f76-47ab-8e5a-f383192f6ee4",
-                        "type": "text/javascript",
-                        "exec": [
-                            "const schema = tv4.getSchema('/SignedOrder');",
-                            "const responseJsonData = pm.response.json();",
-                            "",
-                            "pm.test('Schema is valid', function() {",
-                            "    pm.expect(tv4.validate(responseJsonData, schema)).to.be.true;",
-                            "});",
-                            ""
-                        ]
-                    }
-                }
-            ]
-        },
-        {
-            "name": "GET /orderbook",
-            "description": "",
-            "item": [
-                {
-                    "name": "baseTokenAddress and quoteTokenAddress params",
-                    "event": [
-                        {
-                            "listen": "test",
-                            "script": {
-                                "id": "9ed05327-1a2f-4e50-b4aa-e21f961dbe78",
-                                "type": "text/javascript",
-                                "exec": [
-                                    "const baseTokenEnvKey = 'tokenContractAddress2';",
-                                    "const quoteTokenEnvKey = 'tokenContractAddress1';",
-                                    "const baseTokenAddress = pm.environment.get(baseTokenEnvKey);",
-                                    "const quoteTokenAddress = pm.environment.get(quoteTokenEnvKey);",
-                                    "const responseJsonData = pm.response.json();",
-                                    "pm.test('Orderbook is properly filtered', function() {",
-                                    "    const bids = _.get(responseJsonData, 'bids');",
-                                    "    const asks = _.get(responseJsonData, 'asks');",
-                                    "    _.forEach(bids, function(order) {",
-                                    "        const makerTokenAddress = _.get(order, 'makerTokenAddress');",
-                                    "        const takerTokenAddress = _.get(order, 'takerTokenAddress');",
-                                    "        pm.expect(makerTokenAddress).to.be.equal(quoteTokenAddress);",
-                                    "        pm.expect(takerTokenAddress).to.be.equal(baseTokenAddress);",
-                                    "    });",
-                                    "    _.forEach(asks, function(order) {",
-                                    "        const makerTokenAddress = _.get(order, 'makerTokenAddress');",
-                                    "        const takerTokenAddress = _.get(order, 'takerTokenAddress');",
-                                    "        pm.expect(makerTokenAddress).to.be.equal(baseTokenAddress);",
-                                    "        pm.expect(takerTokenAddress).to.be.equal(quoteTokenAddress);",
-                                    "    });",
-                                    "});",
-                                    ""
-                                ]
-                            }
-                        }
-                    ],
-                    "request": {
-                        "method": "GET",
-                        "header": [],
-                        "body": {},
-                        "url": {
-                            "raw":
-                                "{{url}}/orderbook?baseTokenAddress={{tokenContractAddress2}}"eTokenAddress={{tokenContractAddress1}}",
-                            "host": ["{{url}}"],
-                            "path": ["orderbook"],
-                            "query": [
-                                {
-                                    "key": "baseTokenAddress",
-                                    "value": "{{tokenContractAddress2}}",
-                                    "equals": true
-                                },
-                                {
-                                    "key": "quoteTokenAddress",
-                                    "value": "{{tokenContractAddress1}}",
-                                    "equals": true
-                                }
-                            ]
-                        },
-                        "description":
-                            "Retrieves a list of orders given query parameters. For querying an entire orderbook snapshot, the orderbook endpoint is recommended.\n\nParameters\n  * exchangeContractAddress [string]: returns orders created for this exchange address\n  * tokenAddress [string]: returns orders where makerTokenAddress or takerTokenAddress is token address\n  * makerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * takerTokenAddress [string]: returns orders with specified makerTokenAddress\n  * maker [string]: returns orders where maker is maker address\n  * taker [string]: returns orders where taker is taker address\n  * trader [string]: returns orders where maker or taker is trader address\n  * feeRecipient [string]: returns orders where feeRecipient is feeRecipient address\n\nAll parameters are optional."
-                    },
-                    "response": []
-                }
-            ],
-            "event": [
-                {
-                    "listen": "prerequest",
-                    "script": {
-                        "id": "bdf90dbc-9217-4089-8bc0-351baadddd3e",
-                        "type": "text/javascript",
-                        "exec": [""]
-                    }
-                },
-                {
-                    "listen": "test",
-                    "script": {
-                        "id": "d5080a34-57c4-4d5d-8e01-5e79599282ec",
-                        "type": "text/javascript",
-                        "exec": [
-                            "const schema = tv4.getSchema('/RelayerApiOrderBookResponse');",
-                            "const responseJsonData = pm.response.json();",
-                            "",
-                            "pm.test('Schema is valid', function() {",
-                            "    pm.expect(tv4.validate(responseJsonData, schema)).to.be.true;",
-                            "});",
-                            ""
-                        ]
-                    }
-                }
-            ]
-        },
-        {
-            "name": "POST /fees",
-            "description": "",
-            "item": [
-                {
-                    "name": "default request",
-                    "request": {
-                        "method": "POST",
-                        "header": [
-                            {
-                                "key": "Content-Type",
-                                "value": "application/json"
-                            }
-                        ],
-                        "body": {
-                            "mode": "raw",
-                            "raw":
-                                "{\n    \"exchangeContractAddress\": \"0x12459c951127e0c374ff9105dda097662a027093\",\n    \"maker\": \"0x9e56625509c2f60af937f23b7b532600390e8c8b\",\n    \"taker\": \"0x0000000000000000000000000000000000000000\",\n    \"makerTokenAddress\": \"0x323b5d4c32345ced77393b3530b1eed0f346429d\",\n    \"takerTokenAddress\": \"0xef7fff64389b814a946f3e92105513705ca6b990\",\n    \"makerTokenAmount\": \"10000000000000000\",\n    \"takerTokenAmount\": \"20000000000000000\",\n    \"expirationUnixTimestampSec\": \"42\",\n    \"salt\": \"67006738228878699843088602623665307406148487219438534730168799356281242528500\"\n}"
-                        },
-                        "url": {
-                            "raw": "{{url}}/fees",
-                            "host": ["{{url}}"],
-                            "path": ["fees"]
-                        },
-                        "description":
-                            "Given an unsigned order without the fee-related properties, returns the required feeRecipient, makerFee, and takerFee of that order."
-                    },
-                    "response": []
-                }
-            ],
-            "event": [
-                {
-                    "listen": "prerequest",
-                    "script": {
-                        "id": "75d66506-0fa9-4b0e-982b-ef53bf3310f8",
-                        "type": "text/javascript",
-                        "exec": [""]
-                    }
-                },
-                {
-                    "listen": "test",
-                    "script": {
-                        "id": "4c5f9f7b-8635-4bdb-9240-a74754a2de4f",
-                        "type": "text/javascript",
-                        "exec": [
-                            "const schema = tv4.getSchema('/RelayerApiFeesResponse');",
-                            "const responseJsonData = pm.response.json();",
-                            "",
-                            "pm.test('Schema is valid', function() {",
-                            "  pm.expect(tv4.validate(responseJsonData, schema)).to.be.true;",
-                            "});",
-                            ""
-                        ]
-                    }
-                }
-            ]
-        }
-    ],
-    "event": [
-        {
-            "listen": "prerequest",
-            "script": {
-                "id": "da60f639-df79-4f4d-9861-79219f5fc341",
-                "type": "text/javascript",
-                "exec": [
-                    "const schemaKeysString = pm.environment.get('schemaKeys');",
-                    "const schemaKeys = JSON.parse(schemaKeysString);",
-                    "_.forEach(schemaKeys, function(schemaKey) {",
-                    "    const schemaString = pm.environment.get(schemaKey);",
-                    "    const schema = JSON.parse(schemaString);",
-                    "    tv4.addSchema(schema);",
-                    "});",
-                    ""
-                ]
-            }
-        },
-        {
-            "listen": "test",
-            "script": {
-                "id": "b4917e72-ac87-421d-b7a5-21b64285ba5b",
-                "type": "text/javascript",
-                "exec": [
-                    "pm.test('Has Content-Type header with value application/json', function () {",
-                    "    pm.response.to.have.header('Content-Type');",
-                    "    const contentType = postman.getResponseHeader('Content-Type');",
-                    "    pm.expect(contentType).to.include('application/json');",
-                    "});",
-                    ""
-                ]
-            }
-        }
-    ]
-}
diff --git a/packages/sra-report/src/contract_addresses/kovan_addresses.ts b/packages/sra-report/src/contract_addresses/kovan_addresses.ts
deleted file mode 100644
index e06568f526..0000000000
--- a/packages/sra-report/src/contract_addresses/kovan_addresses.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const addresses = {
-    WETH: '0xd0a1e359811322d97991e03f863a0c30c2cf029c',
-    ZRX: '0x6ff6c0ff1d68b964901f986d4c9fa3ac68346570',
-    EXCHANGE: '0x90fe2af704b34e0224bf2299c838e04d4dcf1364',
-};
diff --git a/packages/sra-report/src/contract_addresses/mainnet_addresses.ts b/packages/sra-report/src/contract_addresses/mainnet_addresses.ts
deleted file mode 100644
index e9aa0f1678..0000000000
--- a/packages/sra-report/src/contract_addresses/mainnet_addresses.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const addresses = {
-    WETH: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-    ZRX: '0xe41d2489571d322189246dafa5ebde1f4699f498',
-    EXCHANGE: '0x12459c951127e0c374ff9105dda097662a027093',
-};
diff --git a/packages/sra-report/src/contract_addresses/rinkeby_addresses.ts b/packages/sra-report/src/contract_addresses/rinkeby_addresses.ts
deleted file mode 100644
index b1e0848d0d..0000000000
--- a/packages/sra-report/src/contract_addresses/rinkeby_addresses.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const addresses = {
-    WETH: '0xc778417e063141139fce010982780140aa0cd5ab',
-    ZRX: '0x00f58d6d585f84b2d7267940cede30ce2fe6eae8',
-    EXCHANGE: '0x1d16ef40fac01cec8adac2ac49427b9384192c05',
-};
diff --git a/packages/sra-report/src/contract_addresses/ropsten_addresses.ts b/packages/sra-report/src/contract_addresses/ropsten_addresses.ts
deleted file mode 100644
index 80e6e5e7e0..0000000000
--- a/packages/sra-report/src/contract_addresses/ropsten_addresses.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const addresses = {
-    WETH: '0xc778417e063141139fce010982780140aa0cd5ab',
-    ZRX: '0xa8e9fa8f91e5ae138c74648c9c304f1c75003a8d',
-    EXCHANGE: '0x479cc461fecd078f766ecc58533d6f69580cf3ac',
-};
diff --git a/packages/sra-report/src/globals.d.ts b/packages/sra-report/src/globals.d.ts
deleted file mode 100644
index 783b92913c..0000000000
--- a/packages/sra-report/src/globals.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare module '*.json' {
-    const value: any;
-    export default value;
-}
diff --git a/packages/sra-report/src/index.ts b/packages/sra-report/src/index.ts
deleted file mode 100644
index b23b6c8d21..0000000000
--- a/packages/sra-report/src/index.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/env node
-import { assert } from '@0xproject/assert';
-import { logUtils } from '@0xproject/utils';
-import chalk from 'chalk';
-import * as _ from 'lodash';
-import * as yargs from 'yargs';
-
-import * as sraReportCollectionJSON from '../../postman_collections/sra_report.postman_collection.json';
-
-import { postmanEnvironmentFactory } from './postman_environment_factory';
-import { utils } from './utils';
-
-const DEFAULT_NETWORK_ID = 1;
-const networkNameToId: { [networkName: string]: number } = {
-    mainnet: 1,
-    ropsten: 3,
-    rinkeby: 4,
-    kovan: 42,
-};
-const SUPPORTED_NETWORK_IDS = [
-    networkNameToId.mainnet,
-    networkNameToId.ropsten,
-    networkNameToId.rinkeby,
-    networkNameToId.kovan,
-];
-
-// extract command line arguments
-const args = yargs
-    .option('endpoint-url', {
-        alias: ['e'],
-        describe: 'API endpoint url to test for standard relayer API compliance',
-        type: 'string',
-        demandOption: true,
-    })
-    .option('output', {
-        alias: ['o', 'out'],
-        describe: 'The relative path to write the report generated by the collection run, prints to console by default',
-        type: 'string',
-        normalize: true,
-        demandOption: false,
-    })
-    .option('network-id', {
-        alias: ['n'],
-        describe: 'ID of the network that the API is serving orders from',
-        type: 'number',
-        default: DEFAULT_NETWORK_ID,
-    })
-    .option('environment', {
-        alias: ['env'],
-        describe: 'The relative path to a postman environment file for the collection run',
-        type: 'string',
-        normalize: true,
-        demandOption: false,
-    })
-    .option('export-collection', {
-        alias: ['ec'],
-        describe: 'The relative path to write the postman collection file used by the collection run',
-        type: 'string',
-        normalize: true,
-        demandOption: false,
-    })
-    .option('export-environment', {
-        alias: ['ee'],
-        describe: 'The relative path to write the postman environment file used by the collection run',
-        type: 'string',
-        normalize: true,
-        demandOption: false,
-    })
-    .example(
-        "$0 --endpoint-url 'http://api.example.com' --out 'path/to/report.json' --network-id 42 --environment 'path/to/custom/environment.json' --export-collection 'path/to/collection.json' --export-environment 'path/to/environment.json'",
-        'Full usage example',
-    ).argv;
-// perform extra validation on command line arguments
-try {
-    assert.isWebUri('args', args.endpointUrl);
-} catch (err) {
-    logUtils.log(`${chalk.red(`Invalid url format:`)} ${args.endpointUrl}`);
-    process.exit(1);
-}
-if (!_.includes(SUPPORTED_NETWORK_IDS, args.networkId)) {
-    logUtils.log(`${chalk.red(`Unsupported network id:`)} ${args.networkId}`);
-    logUtils.log(`${chalk.bold(`Supported network ids:`)} ${SUPPORTED_NETWORK_IDS}`);
-    process.exit(1);
-}
-const mainAsync = async () => {
-    const newmanReporterOptions = !_.isUndefined(args.output)
-        ? {
-              reporters: 'json',
-              reporter: {
-                  json: {
-                      export: args.output,
-                  },
-              },
-          }
-        : {
-              reporters: 'cli',
-          };
-    const environment = !_.isUndefined(args.environment)
-        ? args.environment
-        : await postmanEnvironmentFactory.createPostmanEnvironmentAsync(args.endpointUrl, args.networkId);
-    const newmanRunOptions = {
-        collection: sraReportCollectionJSON,
-        environment,
-        exportCollection: args.exportCollection,
-        exportEnvironment: args.exportEnvironment,
-        ...newmanReporterOptions,
-    };
-    await utils.newmanRunAsync(newmanRunOptions);
-};
-
-mainAsync().catch(logUtils.log.bind(logUtils));
diff --git a/packages/sra-report/src/postman_environment_factory.ts b/packages/sra-report/src/postman_environment_factory.ts
deleted file mode 100644
index 3dcb978297..0000000000
--- a/packages/sra-report/src/postman_environment_factory.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import { HttpClient } from '@0xproject/connect';
-import { Schema, schemas as schemasByName } from '@0xproject/json-schemas';
-import { getOrderHashHex } from '@0xproject/order-utils';
-import { logUtils } from '@0xproject/utils';
-import chalk from 'chalk';
-import * as _ from 'lodash';
-
-import { addresses as kovanAddresses } from './contract_addresses/kovan_addresses';
-import { addresses as mainnetAddresses } from './contract_addresses/mainnet_addresses';
-import { addresses as rinkebyAddresses } from './contract_addresses/rinkeby_addresses';
-import { addresses as ropstenAddresses } from './contract_addresses/ropsten_addresses';
-
-const ENVIRONMENT_NAME = 'SRA Report';
-const networkNameToId: { [networkName: string]: number } = {
-    mainnet: 1,
-    ropsten: 3,
-    rinkeby: 4,
-    kovan: 42,
-};
-
-export interface EnvironmentValue {
-    key: string;
-    value: string;
-    enabled: true;
-    type: 'text';
-}
-
-export interface Environment {
-    name: string;
-    values: EnvironmentValue[];
-}
-
-export interface Addresses {
-    WETH: string;
-    ZRX: string;
-    EXCHANGE: string;
-}
-
-export const postmanEnvironmentFactory = {
-    /**
-     * Dynamically generates a postman environment (https://www.getpostman.com/docs/v6/postman/environments_and_globals/manage_environments)
-     * When running the postman collection via newman, we provide it a set of environment variables
-     * These variables include:
-     *  - 0x JSON schemas for response body validation
-     *  - Contract addresses based on the network id for making specific queries (ex. baseTokenAddress=ZRX_address)
-     *  - Order properties for making specific queries (ex. maker=orderMaker)
-     */
-    async createPostmanEnvironmentAsync(url: string, networkId: number): Promise {
-        const orderEnvironmentValues = await createOrderEnvironmentValuesAsync(url);
-        const allEnvironmentValues = _.concat(
-            createSchemaEnvironmentValues(),
-            createContractAddressEnvironmentValues(networkId),
-            orderEnvironmentValues,
-            createEnvironmentValue('url', url),
-        );
-        const environment = {
-            name: ENVIRONMENT_NAME,
-            values: allEnvironmentValues,
-        };
-        return environment;
-    },
-};
-function createSchemaEnvironmentValues(): EnvironmentValue[] {
-    const schemas: Schema[] = _.values(schemasByName);
-    const schemaEnvironmentValues = _.compact(
-        _.map(schemas, (schema: Schema) => {
-            if (_.isUndefined(schema.id)) {
-                return undefined;
-            } else {
-                const schemaKey = convertSchemaIdToKey(schema.id);
-                const stringifiedSchema = JSON.stringify(schema);
-                const schemaEnvironmentValue = createEnvironmentValue(schemaKey, stringifiedSchema);
-                return schemaEnvironmentValue;
-            }
-        }),
-    );
-    const schemaKeys = _.map(schemaEnvironmentValues, (environmentValue: EnvironmentValue) => {
-        return environmentValue.key;
-    });
-    const result = _.concat(schemaEnvironmentValues, createEnvironmentValue('schemaKeys', JSON.stringify(schemaKeys)));
-    return result;
-}
-function createContractAddressEnvironmentValues(networkId: number): EnvironmentValue[] {
-    const contractAddresses = getContractAddresses(networkId);
-    return [
-        createEnvironmentValue('tokenContractAddress1', contractAddresses.WETH),
-        createEnvironmentValue('tokenContractAddress2', contractAddresses.ZRX),
-        createEnvironmentValue('exchangeContractAddress', contractAddresses.EXCHANGE),
-    ];
-}
-async function createOrderEnvironmentValuesAsync(url: string): Promise {
-    const httpClient = new HttpClient(url);
-    const orders = await httpClient.getOrdersAsync();
-    const orderIfExists = _.head(orders);
-    if (!_.isUndefined(orderIfExists)) {
-        return [
-            createEnvironmentValue('order', JSON.stringify(orderIfExists)),
-            createEnvironmentValue('orderMaker', orderIfExists.maker),
-            createEnvironmentValue('orderTaker', orderIfExists.taker),
-            createEnvironmentValue('orderFeeRecipient', orderIfExists.feeRecipient),
-            createEnvironmentValue('orderHash', getOrderHashHex(orderIfExists)),
-        ];
-    } else {
-        logUtils.log(`${chalk.red(`No orders from /orders found`)}`);
-        return [
-            createEnvironmentValue('order', ''),
-            createEnvironmentValue('orderMaker', ''),
-            createEnvironmentValue('orderTaker', ''),
-            createEnvironmentValue('orderFeeRecipient', ''),
-            createEnvironmentValue('orderHash', ''),
-        ];
-    }
-}
-function getContractAddresses(networkId: number): Addresses {
-    switch (networkId) {
-        case networkNameToId.mainnet:
-            return mainnetAddresses;
-        case networkNameToId.ropsten:
-            return ropstenAddresses;
-        case networkNameToId.rinkeby:
-            return rinkebyAddresses;
-        case networkNameToId.kovan:
-            return kovanAddresses;
-        default:
-            throw new Error('Unsupported network id');
-    }
-}
-function convertSchemaIdToKey(schemaId: string): string {
-    let result = schemaId;
-    if (_.startsWith(result, '/')) {
-        result = result.substr(1);
-    }
-    result = `${result}Schema`;
-    return result;
-}
-
-function createEnvironmentValue(key: string, value: string): EnvironmentValue {
-    return {
-        key,
-        value,
-        enabled: true,
-        type: 'text',
-    };
-}
diff --git a/packages/sra-report/src/utils.ts b/packages/sra-report/src/utils.ts
deleted file mode 100644
index 3a83a7ea0c..0000000000
--- a/packages/sra-report/src/utils.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { promisify } from '@0xproject/utils';
-import { NewmanRunSummary, run as newmanRun } from 'newman';
-
-export const utils = {
-    newmanRunAsync: promisify(newmanRun),
-};
diff --git a/packages/sra-report/test/environments/postman_environment.json b/packages/sra-report/test/environments/postman_environment.json
deleted file mode 100644
index e26a47e5f8..0000000000
--- a/packages/sra-report/test/environments/postman_environment.json
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-    "id": "f23e415f-99a8-4d47-8796-6400af77d85f",
-    "name": "SRA Report",
-    "values": [
-        {
-            "type": "any",
-            "value": "{\"id\":\"/Number\",\"type\":\"string\",\"pattern\":\"^\\\\d+(\\\\.\\\\d+)?$\"}",
-            "key": "NumberSchema"
-        },
-        {
-            "type": "any",
-            "value": "{\"id\":\"/Address\",\"type\":\"string\",\"pattern\":\"^0x[0-9a-f]{40}$\"}",
-            "key": "AddressSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/ECSignature\",\"properties\":{\"v\":{\"type\":\"number\",\"minimum\":27,\"maximum\":28},\"r\":{\"$ref\":\"/ECSignatureParameter\"},\"s\":{\"$ref\":\"/ECSignatureParameter\"}},\"required\":[\"v\",\"r\",\"s\"],\"type\":\"object\"}",
-            "key": "ECSignatureSchema"
-        },
-        {
-            "type": "any",
-            "value": "{\"id\":\"/ECSignatureParameter\",\"type\":\"string\",\"pattern\":\"^0[xX][0-9A-Fa-f]{64}$\"}",
-            "key": "ECSignatureParameterSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/IndexFilterValues\",\"additionalProperties\":{\"oneOf\":[{\"$ref\":\"/Number\"},{\"$ref\":\"/Address\"},{\"$ref\":\"/OrderHashSchema\"}]},\"type\":\"object\"}",
-            "key": "IndexFilterValuesSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/OrderCancellationRequests\",\"type\":\"array\",\"items\":{\"properties\":{\"order\":{\"$ref\":\"/Order\"},\"takerTokenCancelAmount\":{\"$ref\":\"/Number\"}},\"required\":[\"order\",\"takerTokenCancelAmount\"],\"type\":\"object\"}}",
-            "key": "OrderCancellationRequestsSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/OrderFillOrKillRequests\",\"type\":\"array\",\"items\":{\"properties\":{\"signedOrder\":{\"$ref\":\"/SignedOrder\"},\"fillTakerAmount\":{\"$ref\":\"/Number\"}},\"required\":[\"signedOrder\",\"fillTakerAmount\"],\"type\":\"object\"}}",
-            "key": "OrderFillOrKillRequestsSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/OrderFillRequests\",\"type\":\"array\",\"items\":{\"properties\":{\"signedOrder\":{\"$ref\":\"/SignedOrder\"},\"takerTokenFillAmount\":{\"$ref\":\"/Number\"}},\"required\":[\"signedOrder\",\"takerTokenFillAmount\"],\"type\":\"object\"}}",
-            "key": "OrderFillRequestsSchema"
-        },
-        {
-            "type": "any",
-            "value": "{\"id\":\"/OrderHashSchema\",\"type\":\"string\",\"pattern\":\"^0x[0-9a-fA-F]{64}$\"}",
-            "key": "OrderHashSchemaSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/Order\",\"properties\":{\"maker\":{\"$ref\":\"/Address\"},\"taker\":{\"$ref\":\"/Address\"},\"makerFee\":{\"$ref\":\"/Number\"},\"takerFee\":{\"$ref\":\"/Number\"},\"makerTokenAmount\":{\"$ref\":\"/Number\"},\"takerTokenAmount\":{\"$ref\":\"/Number\"},\"makerTokenAddress\":{\"$ref\":\"/Address\"},\"takerTokenAddress\":{\"$ref\":\"/Address\"},\"salt\":{\"$ref\":\"/Number\"},\"feeRecipient\":{\"$ref\":\"/Address\"},\"expirationUnixTimestampSec\":{\"$ref\":\"/Number\"},\"exchangeContractAddress\":{\"$ref\":\"/Address\"}},\"required\":[\"maker\",\"taker\",\"makerFee\",\"takerFee\",\"makerTokenAmount\",\"takerTokenAmount\",\"salt\",\"feeRecipient\",\"expirationUnixTimestampSec\",\"exchangeContractAddress\"],\"type\":\"object\"}",
-            "key": "OrderSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/SignedOrder\",\"allOf\":[{\"$ref\":\"/Order\"},{\"properties\":{\"ecSignature\":{\"$ref\":\"/ECSignature\"}},\"required\":[\"ecSignature\"]}]}",
-            "key": "SignedOrderSchema"
-        },
-        {
-            "type": "any",
-            "value": "{\"id\":\"/signedOrdersSchema\",\"type\":\"array\",\"items\":{\"$ref\":\"/SignedOrder\"}}",
-            "key": "signedOrdersSchemaSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/BlockParam\",\"oneOf\":[{\"type\":\"number\"},{\"enum\":[\"latest\",\"earliest\",\"pending\"]}]}",
-            "key": "BlockParamSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/BlockRange\",\"properties\":{\"fromBlock\":{\"$ref\":\"/BlockParam\"},\"toBlock\":{\"$ref\":\"/BlockParam\"}},\"type\":\"object\"}",
-            "key": "BlockRangeSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/Token\",\"properties\":{\"name\":{\"type\":\"string\"},\"symbol\":{\"type\":\"string\"},\"decimals\":{\"type\":\"number\"},\"address\":{\"$ref\":\"/Address\"}},\"required\":[\"name\",\"symbol\",\"decimals\",\"address\"],\"type\":\"object\"}",
-            "key": "TokenSchema"
-        },
-        {
-            "type": "any",
-            "value": "{\"id\":\"/JsNumber\",\"type\":\"number\",\"minimum\":0}",
-            "key": "JsNumberSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/TxData\",\"properties\":{\"from\":{\"$ref\":\"/Address\"},\"to\":{\"$ref\":\"/Address\"},\"value\":{\"oneOf\":[{\"$ref\":\"/Number\"},{\"$ref\":\"/JsNumber\"}]},\"gas\":{\"oneOf\":[{\"$ref\":\"/Number\"},{\"$ref\":\"/JsNumber\"}]},\"gasPrice\":{\"oneOf\":[{\"$ref\":\"/Number\"},{\"$ref\":\"/JsNumber\"}]},\"data\":{\"type\":\"string\",\"pattern\":\"^0x[0-9a-f]*$\"},\"nonce\":{\"type\":\"number\",\"minimum\":0}},\"required\":[\"from\"],\"type\":\"object\",\"additionalProperties\":false}",
-            "key": "TxDataSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/RelayerApiErrorResponse\",\"type\":\"object\",\"properties\":{\"code\":{\"type\":\"number\"},\"reason\":{\"type\":\"string\"},\"validationErrors\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"properties\":{\"field\":{\"type\":\"string\"},\"code\":{\"type\":\"number\"},\"reason\":{\"type\":\"string\"}},\"required\":[\"field\",\"code\",\"reason\"]}}},\"required\":[\"code\",\"reason\"]}",
-            "key": "RelayerApiErrorResponseSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/RelayerApiFeesPayload\",\"type\":\"object\",\"properties\":{\"exchangeContractAddress\":{\"$ref\":\"/Address\"},\"maker\":{\"$ref\":\"/Address\"},\"taker\":{\"$ref\":\"/Address\"},\"makerTokenAddress\":{\"$ref\":\"/Address\"},\"takerTokenAddress\":{\"$ref\":\"/Address\"},\"makerTokenAmount\":{\"$ref\":\"/Number\"},\"takerTokenAmount\":{\"$ref\":\"/Number\"},\"expirationUnixTimestampSec\":{\"$ref\":\"/Number\"},\"salt\":{\"$ref\":\"/Number\"}},\"required\":[\"exchangeContractAddress\",\"maker\",\"taker\",\"makerTokenAddress\",\"takerTokenAddress\",\"expirationUnixTimestampSec\",\"salt\"]}",
-            "key": "RelayerApiFeesPayloadSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/RelayerApiFeesResponse\",\"type\":\"object\",\"properties\":{\"makerFee\":{\"$ref\":\"/Number\"},\"takerFee\":{\"$ref\":\"/Number\"},\"feeRecipient\":{\"$ref\":\"/Address\"}},\"required\":[\"makerFee\",\"takerFee\",\"feeRecipient\"]}",
-            "key": "RelayerApiFeesResponseSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/RelayerApiOrderBookResponse\",\"type\":\"object\",\"properties\":{\"bids\":{\"$ref\":\"/signedOrdersSchema\"},\"asks\":{\"$ref\":\"/signedOrdersSchema\"}},\"required\":[\"bids\",\"asks\"]}",
-            "key": "RelayerApiOrderBookResponseSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/RelayerApiTokenPairsResponse\",\"type\":\"array\",\"items\":{\"properties\":{\"tokenA\":{\"$ref\":\"/RelayerApiTokenTradeInfo\"},\"tokenB\":{\"$ref\":\"/RelayerApiTokenTradeInfo\"}},\"required\":[\"tokenA\",\"tokenB\"],\"type\":\"object\"}}",
-            "key": "RelayerApiTokenPairsResponseSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/RelayerApiTokenTradeInfo\",\"type\":\"object\",\"properties\":{\"address\":{\"$ref\":\"/Address\"},\"minAmount\":{\"$ref\":\"/Number\"},\"maxAmount\":{\"$ref\":\"/Number\"},\"precision\":{\"type\":\"number\"}},\"required\":[\"address\"]}",
-            "key": "RelayerApiTokenTradeInfoSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/RelayerApiOrderbookChannelSubscribe\",\"type\":\"object\",\"properties\":{\"type\":{\"enum\":[\"subscribe\"]},\"channel\":{\"enum\":[\"orderbook\"]},\"requestId\":{\"type\":\"number\"},\"payload\":{\"$ref\":\"/RelayerApiOrderbookChannelSubscribePayload\"}},\"required\":[\"type\",\"channel\",\"requestId\",\"payload\"]}",
-            "key": "RelayerApiOrderbookChannelSubscribeSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/RelayerApiOrderbookChannelSubscribePayload\",\"type\":\"object\",\"properties\":{\"baseTokenAddress\":{\"$ref\":\"/Address\"},\"quoteTokenAddress\":{\"$ref\":\"/Address\"},\"snapshot\":{\"type\":\"boolean\"},\"limit\":{\"type\":\"number\"}},\"required\":[\"baseTokenAddress\",\"quoteTokenAddress\"]}",
-            "key": "RelayerApiOrderbookChannelSubscribePayloadSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/RelayerApiOrderbookChannelUpdate\",\"type\":\"object\",\"properties\":{\"type\":{\"enum\":[\"update\"]},\"channel\":{\"enum\":[\"orderbook\"]},\"requestId\":{\"type\":\"number\"},\"payload\":{\"$ref\":\"/SignedOrder\"}},\"required\":[\"type\",\"channel\",\"requestId\",\"payload\"]}",
-            "key": "RelayerApiOrderbookChannelUpdateSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/RelayerApiOrderbookChannelSnapshot\",\"type\":\"object\",\"properties\":{\"type\":{\"enum\":[\"snapshot\"]},\"channel\":{\"enum\":[\"orderbook\"]},\"requestId\":{\"type\":\"number\"},\"payload\":{\"$ref\":\"/RelayerApiOrderbookChannelSnapshotPayload\"}},\"required\":[\"type\",\"channel\",\"requestId\",\"payload\"]}",
-            "key": "RelayerApiOrderbookChannelSnapshotSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"id\":\"/RelayerApiOrderbookChannelSnapshotPayload\",\"type\":\"object\",\"properties\":{\"bids\":{\"$ref\":\"/signedOrdersSchema\"},\"asks\":{\"$ref\":\"/signedOrdersSchema\"}},\"required\":[\"bids\",\"asks\"]}",
-            "key": "RelayerApiOrderbookChannelSnapshotPayloadSchema"
-        },
-        {
-            "type": "any",
-            "value":
-                "[\"NumberSchema\",\"AddressSchema\",\"ECSignatureSchema\",\"ECSignatureParameterSchema\",\"IndexFilterValuesSchema\",\"OrderCancellationRequestsSchema\",\"OrderFillOrKillRequestsSchema\",\"OrderFillRequestsSchema\",\"OrderHashSchemaSchema\",\"OrderSchema\",\"SignedOrderSchema\",\"signedOrdersSchemaSchema\",\"BlockParamSchema\",\"BlockRangeSchema\",\"TokenSchema\",\"JsNumberSchema\",\"TxDataSchema\",\"RelayerApiErrorResponseSchema\",\"RelayerApiFeesPayloadSchema\",\"RelayerApiFeesResponseSchema\",\"RelayerApiOrderBookResponseSchema\",\"RelayerApiTokenPairsResponseSchema\",\"RelayerApiTokenTradeInfoSchema\",\"RelayerApiOrderbookChannelSubscribeSchema\",\"RelayerApiOrderbookChannelSubscribePayloadSchema\",\"RelayerApiOrderbookChannelUpdateSchema\",\"RelayerApiOrderbookChannelSnapshotSchema\",\"RelayerApiOrderbookChannelSnapshotPayloadSchema\"]",
-            "key": "schemaKeys"
-        },
-        {
-            "type": "any",
-            "value": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "key": "tokenContractAddress1"
-        },
-        {
-            "type": "any",
-            "value": "0xe41d2489571d322189246dafa5ebde1f4699f498",
-            "key": "tokenContractAddress2"
-        },
-        {
-            "type": "any",
-            "value": "0x12459c951127e0c374ff9105dda097662a027093",
-            "key": "exchangeContractAddress"
-        },
-        {
-            "type": "any",
-            "value":
-                "{\"orderHash\":\"0xe91e990bab4c9c6bd60ff3673222390e3da8b7bd9a50eab98a8cb20723b24ee1\",\"exchangeContractAddress\":\"0x12459c951127e0c374ff9105dda097662a027093\",\"maker\":\"0x93690d55b14d701c259ba7960395c095aa52c3a8\",\"taker\":\"0x0000000000000000000000000000000000000000\",\"makerTokenAddress\":\"0x2956356cd2a2bf3202f771f50d3d14a367b48070\",\"takerTokenAddress\":\"0x0abdace70d3790235af448c88547603b945604ea\",\"feeRecipient\":\"0xa258b39954cef5cb142fd567a46cddb31a670124\",\"makerTokenAmount\":\"2926675830000000000\",\"takerTokenAmount\":\"24386933000000000000000\",\"makerFee\":\"18419638100000000000\",\"takerFee\":\"35812978500000000000\",\"expirationUnixTimestampSec\":\"9223372036854775807\",\"salt\":\"89583415499996246176114840147523733506098603782358761236056286417408784066968\",\"ecSignature\":{\"r\":\"0x32eb5bbf713210274ddd885e6b555699bc0189676ff73a4dc98c4cac41d3a6a6\",\"s\":\"0x193eb9440df49dc7817b6142c0be021cd1f9fc0916d86c7b49e9e07a402f3645\",\"v\":28}}",
-            "key": "order"
-        },
-        {
-            "type": "any",
-            "value": "0x93690d55b14d701c259ba7960395c095aa52c3a8",
-            "key": "orderMaker"
-        },
-        {
-            "type": "any",
-            "value": "0x0000000000000000000000000000000000000000",
-            "key": "orderTaker"
-        },
-        {
-            "type": "any",
-            "value": "0xa258b39954cef5cb142fd567a46cddb31a670124",
-            "key": "orderFeeRecipient"
-        },
-        {
-            "type": "any",
-            "value": "0xe91e990bab4c9c6bd60ff3673222390e3da8b7bd9a50eab98a8cb20723b24ee1",
-            "key": "orderHash"
-        },
-        {
-            "type": "any",
-            "value": "https://example.com",
-            "key": "url"
-        }
-    ],
-    "_postman_variable_scope": "environment",
-    "_postman_exported_at": "2018-03-10T23:53:03.913Z",
-    "_postman_exported_using": "Newman/3.9.3"
-}
diff --git a/packages/sra-report/test/fixtures/v0/token_pairs/default_request.json b/packages/sra-report/test/fixtures/v0/token_pairs/default_request.json
deleted file mode 100644
index cd19be1e1c..0000000000
--- a/packages/sra-report/test/fixtures/v0/token_pairs/default_request.json
+++ /dev/null
@@ -1,3698 +0,0 @@
-[
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x01b3ec4aae1b8729529beb4965f27d008788b0eb",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0371a82e4a9d0a4312f3ee2ac9c6958512891372",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x05f4a42e251f2d52b8ed15e9fedaacfcef1fad27",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x076c97e1c869072ee22f8c91978c99b4bcb02591",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x09d8b66c48424324b25754a873e290cae5dca439",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0abdace70d3790235af448c88547603b945604ea",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0cf0ee63788a0849fe5297f3407f701e122cc023",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0d8775f648430679a709e98d2b0cb6250d2887ef",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0e0989b1f9b8a38983c2ba8053269ca62ec9b195",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0f513ffb4926ff82d7f60a05069047aca295c413",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0f5d2fb29fb7d3cfee444a200298f468908cc942",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x1063ce524265d5a3a624f4914acd573dd89ce988",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x106aa49295b525fcf959aa75ec3f7dcbf5352f1c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x107c4504cd79c5d2696ea0030a8dd4e92601b82e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x1183f92a5624d68e85ffb9170f16bf0443b4c242",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x12480e24eb5bec1a9d4369cab6a80cad3c0a377a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x12b19d3e2ccc14da04fae33e63652ce469b3f2fd",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x12fef5e57bf45873cd9b62e9dbd7bfb99e32d73e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x168296bb09e24a88805cb9c33356536b980d3fc5",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x1776e1f26f98b1a5df9cd347953a26dd3cb46671",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x177d39ac676ed1c67a2b268ad7f1e58826e5b0af",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x1d462414fe14cf489c7a21cac78509f4bf8cd7c0",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x24692791bc444c5cd0b81e3cbcaba4b04acd1f3b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x255aa6df07540cb5d3d297f0d0d4d84cb52bc8e6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x27054b13b1b798b345b591a4d22e6562d47ea75a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x27695e09149adc738a978e9a678f99e4c39e9eb9",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x27dce1ec4d3f72c3e457cc50354f1f975ddef488",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x27f610bf36eca0939093343ac28b1534a721dbb4",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x2956356cd2a2bf3202f771f50d3d14a367b48070",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x340d2bde5eb28c1eed91b2f790723e3b160613b7",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x3597bfd533a99c9aa083587b074434e61eb0a258",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x3618516f45cd3c913f81f9987af41077932bc40d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x386467f1f3ddbe832448650418311a479eecfc57",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x3883f5e181fccaf8410fa61e12b59bad963fb645",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x399a0e6fbeb3d74c85357439f4c8aed9678a5cbf",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x39bb259f66e1c59d5abef88375979b4d20d98022",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x3d1ba9be9f66b8ee101911bc36d3fb562eac2244",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x4156d3342d5c385a87d264f90653733592000581",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x419d0d8bdd9af5e606ae2232ed285aff190e711b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x41e5560054824ea6b0732e656e3ad64e20e94e45",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x42d6622dece394b54999fbd73d108123806f6a18",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x44f588aeeb8c44471439d1270b3603c66a9262f1",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x4ceda7906a5ed2179785cd3a40a69ee8bc99c466",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x4d8fc1453a0f359e99c9675954e656d80d996fbf",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x4df47b4969b2911c966506e3592c41389493953b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x4df812f6064def1e5e029f1ca858777cc98d2d81",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x514910771af9ca656af840dff83e8264ecf986ca",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x52a7cb918c11a16958be40cba7e31e32a499a465",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x533ef0984b2faa227acc620c67cce12aa39cd8cd",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x554c20b7c486beee439277b4540a434566dc4c02",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x56ba2ee7890461f463f7be02aac3099f6d5811a8",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x5732046a883704404f284ce41ffadd5b007fd668",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x595832f8fc6bf59c85c527fec3740a1b7a361269",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x5af2be193a6abca9c8817001f45744777db30756",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x5b2e4a700dfbc560061e957edec8f6eeeb74a320",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x5bc7e5f0ab8b2e10d2d0a3f21739fce62459aef3",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x5ca9a71b1d01849c0a95490cc00559717fcf0d1d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x5e3346444010135322268a4630d2ed5f8d09446c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x607f4c5bb672230e8672085532f7e901544a7375",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x614ea929892ea43d3ea2c5e3311b01cc589bad6c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x6425c6be902d692ae2db752b3c268afadb099d3b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x672a1ad4f667fb18a333af13667aa0af1f5b5bdd",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x6781a0f84c7e9e846dcb84a9a5bd49333067b104",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x6810e776880c02933d47db1b9fc05908e5386b96",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x744d70fdbe2ba4cf95131626614a1763df805b9e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x7654915a1b82d6d2d0afc37c52af556ea8983c7e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x7b69b78cc7fee48202c208609ae6d1f78ce42e13",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x7d4b8cce0591c9044a22ee543533b72e976e36c3",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x80fb784b7ed66730e8b1dbd9820afd29931aab03",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x814964b1bceaf24e26296d031eadf134a2ca4105",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x865e3707a580f9db89304005cddd050ade8873eb",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x88fcfbc22c6d3dbaa25af478c578978339bde77a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x8a854288a5976036a725879164ca3e91d30c6a1b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x8ae4bf2c33a8e667de34b54938b0ccd03eb8cc06",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x8eb24319393716668d768dcec29356ae9cffe285",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x8f8221afbb33998d8584a2b05749ba73c37a938a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x9214ec02cb71cba0ada6896b8da260736a67ab10",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x923108a439c4e8c2315c4f6521e5ce95b44e9b4c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x960b236a07cf122663c4303350609a66a7b288c0",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x983f6d60db79ea8ca4eb9968c6aff8cfa04b3c63",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x9992ec3cf6a55b00978cddf2b27bc6882d88d1ec",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x99ea4db9ee77acd40b119bd1dc4e33e1c070b80d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x9a005c9a89bd72a4bd27721e7a09a3c11d2b03c4",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xa5fd1a791c4dfcaacc963d4f73c6ae5824149ea7",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xa8006c4ca56f24d6836727d106349320db7fef82",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xa87c3ec87eb802aad080df0adb331e504d327e5d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xab16e0d25c06cb376259cc18c1de4aca57605589",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xac3211a5025414af2866ff09c23fc18bc97e79b1",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xacfa209fb73bf3dd5bbfb1101b9bc999c49062a5",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb24754be79281553dc1adc160ddf5cd9b74361a4",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb3bd49e28f8f832b8d1e246106991e546c323502",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb45a50545beeab73f38f31e5973768c421805e5e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb4efd85c19999d84251304bda99e90b92300bd93",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb5a5f22694352c15b00323844ad545abb2b11028",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb5c0e43a6330b9eb904ec57ea24d70269ae4652e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb62d18dea74045e822352ce4b3ee77319dc5ff2f",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb64ef51c888972c908cfacf59b47c1afbc0ab8ac",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb98d4c97425d9908e66e53a6fdf673acca0be986",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xba2184520a1cc49a6159c57e61e1844e085615b6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xba5f11b16b155792cf3b2e6880e8706859a8aeb6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xbdc5bac39dbe132b1e030e898ae3830017d7d969",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xbeb9ef514a379b997e0798fdcc901ee474b6d9a1",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xbf2179859fc6d5bee9bf9158632dc51678a4100e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xc27a2f05fa577a83ba0fdb4c38443c0718356501",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xc438b4c0dfbb1593be6dee03bbd1a84bb3aa6213",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xc66ea802717bfb9833400264dd12c2bceaa34a6d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xc997d07b0bc607b6d1bcb6fb9d4a5579c466c3e5",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xd0a4b8946cb52f0661273bfbc6fd0e0c75fc6433",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xd26114cd6ee289accf82350c8d8487fedb8a0c07",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xd2d6158683aee4cc838067727209a0aaf4359de3",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xd4c435f5b09f855c3317c8524cb1f586e42795fa",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xd4fa1460f537bb9085d22c7bccb5dd450ef28e3a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xd8912c10681d8b21fd3742244f44658dba12264e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xe0b7927c4af23765cb51314a0e0521a9645f0e2a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xe2e6d4be086c6938b53b22144855eef674281639",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xe41d2489571d322189246dafa5ebde1f4699f498",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xe94327d07fc17907b4db788e5adf2ed424addff6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xea097a2b1db00627b2fa17460ad260c016016977",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xea1f346faf023f974eb5adaf088bbcdf02d761f4",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xea38eaa3c86c8f9b751533ba2e562deb9acded40",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xeab43193cf0623073ca89db9b712796356fa7414",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xeb2da9fac54284cea731d1f10bb34eecb3c00c14",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xeb7c20027172e5d143fb030d50f91cece2d1485d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xef2463099360a085f1f10b076ed72ef625497a06",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xf433089366899d83a9f26a773d59ec7ecf30355e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xf6b55acbbc49f4524aa48d19281a9a77c54de10f",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xf6cfe53d6febaeea051f400ff5fc14f0cbbdaca1",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xf7b098298f7c69fc14610bf71d5e02c60792894c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xf970b8e36e23f7fc3fd752eea86f8be8d83375a6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xfec0cf7fe078a500abf15f1284958f22049c2c7e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x01b3ec4aae1b8729529beb4965f27d008788b0eb",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0371a82e4a9d0a4312f3ee2ac9c6958512891372",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x05f4a42e251f2d52b8ed15e9fedaacfcef1fad27",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x076c97e1c869072ee22f8c91978c99b4bcb02591",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x09d8b66c48424324b25754a873e290cae5dca439",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0abdace70d3790235af448c88547603b945604ea",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0cf0ee63788a0849fe5297f3407f701e122cc023",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0d8775f648430679a709e98d2b0cb6250d2887ef",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0e0989b1f9b8a38983c2ba8053269ca62ec9b195",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0f513ffb4926ff82d7f60a05069047aca295c413",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0f5d2fb29fb7d3cfee444a200298f468908cc942",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x1063ce524265d5a3a624f4914acd573dd89ce988",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x106aa49295b525fcf959aa75ec3f7dcbf5352f1c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x107c4504cd79c5d2696ea0030a8dd4e92601b82e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x1183f92a5624d68e85ffb9170f16bf0443b4c242",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x12480e24eb5bec1a9d4369cab6a80cad3c0a377a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x12b19d3e2ccc14da04fae33e63652ce469b3f2fd",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x12fef5e57bf45873cd9b62e9dbd7bfb99e32d73e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x168296bb09e24a88805cb9c33356536b980d3fc5",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x1776e1f26f98b1a5df9cd347953a26dd3cb46671",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x177d39ac676ed1c67a2b268ad7f1e58826e5b0af",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x1d462414fe14cf489c7a21cac78509f4bf8cd7c0",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x24692791bc444c5cd0b81e3cbcaba4b04acd1f3b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x255aa6df07540cb5d3d297f0d0d4d84cb52bc8e6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x27054b13b1b798b345b591a4d22e6562d47ea75a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x27695e09149adc738a978e9a678f99e4c39e9eb9",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x27dce1ec4d3f72c3e457cc50354f1f975ddef488",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x27f610bf36eca0939093343ac28b1534a721dbb4",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x2956356cd2a2bf3202f771f50d3d14a367b48070",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x340d2bde5eb28c1eed91b2f790723e3b160613b7",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x3597bfd533a99c9aa083587b074434e61eb0a258",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x3618516f45cd3c913f81f9987af41077932bc40d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x386467f1f3ddbe832448650418311a479eecfc57",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x3883f5e181fccaf8410fa61e12b59bad963fb645",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x399a0e6fbeb3d74c85357439f4c8aed9678a5cbf",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x39bb259f66e1c59d5abef88375979b4d20d98022",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x3d1ba9be9f66b8ee101911bc36d3fb562eac2244",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x4156d3342d5c385a87d264f90653733592000581",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x419d0d8bdd9af5e606ae2232ed285aff190e711b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x41e5560054824ea6b0732e656e3ad64e20e94e45",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x42d6622dece394b54999fbd73d108123806f6a18",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x44f588aeeb8c44471439d1270b3603c66a9262f1",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x4ceda7906a5ed2179785cd3a40a69ee8bc99c466",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x4d8fc1453a0f359e99c9675954e656d80d996fbf",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x4df47b4969b2911c966506e3592c41389493953b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x4df812f6064def1e5e029f1ca858777cc98d2d81",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x514910771af9ca656af840dff83e8264ecf986ca",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x52a7cb918c11a16958be40cba7e31e32a499a465",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x533ef0984b2faa227acc620c67cce12aa39cd8cd",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x554c20b7c486beee439277b4540a434566dc4c02",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x56ba2ee7890461f463f7be02aac3099f6d5811a8",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x5732046a883704404f284ce41ffadd5b007fd668",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x595832f8fc6bf59c85c527fec3740a1b7a361269",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x5af2be193a6abca9c8817001f45744777db30756",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x5b2e4a700dfbc560061e957edec8f6eeeb74a320",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x5bc7e5f0ab8b2e10d2d0a3f21739fce62459aef3",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x5ca9a71b1d01849c0a95490cc00559717fcf0d1d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x5e3346444010135322268a4630d2ed5f8d09446c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x607f4c5bb672230e8672085532f7e901544a7375",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x614ea929892ea43d3ea2c5e3311b01cc589bad6c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x6425c6be902d692ae2db752b3c268afadb099d3b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x672a1ad4f667fb18a333af13667aa0af1f5b5bdd",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x6781a0f84c7e9e846dcb84a9a5bd49333067b104",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x6810e776880c02933d47db1b9fc05908e5386b96",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x744d70fdbe2ba4cf95131626614a1763df805b9e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x7654915a1b82d6d2d0afc37c52af556ea8983c7e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x7b69b78cc7fee48202c208609ae6d1f78ce42e13",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x7d4b8cce0591c9044a22ee543533b72e976e36c3",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x80fb784b7ed66730e8b1dbd9820afd29931aab03",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x814964b1bceaf24e26296d031eadf134a2ca4105",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x865e3707a580f9db89304005cddd050ade8873eb",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x88fcfbc22c6d3dbaa25af478c578978339bde77a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x8a854288a5976036a725879164ca3e91d30c6a1b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x8ae4bf2c33a8e667de34b54938b0ccd03eb8cc06",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x8eb24319393716668d768dcec29356ae9cffe285",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x8f8221afbb33998d8584a2b05749ba73c37a938a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x9214ec02cb71cba0ada6896b8da260736a67ab10",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x923108a439c4e8c2315c4f6521e5ce95b44e9b4c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x960b236a07cf122663c4303350609a66a7b288c0",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x983f6d60db79ea8ca4eb9968c6aff8cfa04b3c63",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x9992ec3cf6a55b00978cddf2b27bc6882d88d1ec",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x99ea4db9ee77acd40b119bd1dc4e33e1c070b80d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x9a005c9a89bd72a4bd27721e7a09a3c11d2b03c4",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xa5fd1a791c4dfcaacc963d4f73c6ae5824149ea7",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xa8006c4ca56f24d6836727d106349320db7fef82",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xa87c3ec87eb802aad080df0adb331e504d327e5d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xab16e0d25c06cb376259cc18c1de4aca57605589",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xac3211a5025414af2866ff09c23fc18bc97e79b1",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xacfa209fb73bf3dd5bbfb1101b9bc999c49062a5",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb24754be79281553dc1adc160ddf5cd9b74361a4",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb3bd49e28f8f832b8d1e246106991e546c323502",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb45a50545beeab73f38f31e5973768c421805e5e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb4efd85c19999d84251304bda99e90b92300bd93",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb5a5f22694352c15b00323844ad545abb2b11028",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb5c0e43a6330b9eb904ec57ea24d70269ae4652e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb62d18dea74045e822352ce4b3ee77319dc5ff2f",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb64ef51c888972c908cfacf59b47c1afbc0ab8ac",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb98d4c97425d9908e66e53a6fdf673acca0be986",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xba2184520a1cc49a6159c57e61e1844e085615b6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xba5f11b16b155792cf3b2e6880e8706859a8aeb6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xbdc5bac39dbe132b1e030e898ae3830017d7d969",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xbeb9ef514a379b997e0798fdcc901ee474b6d9a1",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xbf2179859fc6d5bee9bf9158632dc51678a4100e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xc27a2f05fa577a83ba0fdb4c38443c0718356501",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xc438b4c0dfbb1593be6dee03bbd1a84bb3aa6213",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xc66ea802717bfb9833400264dd12c2bceaa34a6d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xc997d07b0bc607b6d1bcb6fb9d4a5579c466c3e5",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xd0a4b8946cb52f0661273bfbc6fd0e0c75fc6433",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xd26114cd6ee289accf82350c8d8487fedb8a0c07",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xd2d6158683aee4cc838067727209a0aaf4359de3",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xd4c435f5b09f855c3317c8524cb1f586e42795fa",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xd4fa1460f537bb9085d22c7bccb5dd450ef28e3a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xd8912c10681d8b21fd3742244f44658dba12264e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xe0b7927c4af23765cb51314a0e0521a9645f0e2a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xe2e6d4be086c6938b53b22144855eef674281639",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xe41d2489571d322189246dafa5ebde1f4699f498",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xe94327d07fc17907b4db788e5adf2ed424addff6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xea097a2b1db00627b2fa17460ad260c016016977",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xea1f346faf023f974eb5adaf088bbcdf02d761f4",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xea38eaa3c86c8f9b751533ba2e562deb9acded40",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xeab43193cf0623073ca89db9b712796356fa7414",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xeb2da9fac54284cea731d1f10bb34eecb3c00c14",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xeb7c20027172e5d143fb030d50f91cece2d1485d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xef2463099360a085f1f10b076ed72ef625497a06",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xf433089366899d83a9f26a773d59ec7ecf30355e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xf6b55acbbc49f4524aa48d19281a9a77c54de10f",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xf6cfe53d6febaeea051f400ff5fc14f0cbbdaca1",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xf7b098298f7c69fc14610bf71d5e02c60792894c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xf970b8e36e23f7fc3fd752eea86f8be8d83375a6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xfec0cf7fe078a500abf15f1284958f22049c2c7e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    }
-]
diff --git a/packages/sra-report/test/fixtures/v0/token_pairs/malformed.json b/packages/sra-report/test/fixtures/v0/token_pairs/malformed.json
deleted file mode 100644
index 19e076c418..0000000000
--- a/packages/sra-report/test/fixtures/v0/token_pairs/malformed.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-    {
-        "tokenA": {
-            "address": "4a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x01b3ec4aae1b8729529beb4965f27d008788b0eb",
-            "minAmount": "1",
-            "maxAmount": 999999999999999999999,
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenX": {
-            "address": "0x0371a82e4a9d0a4312f3ee2ac9c6958512891372",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    }
-]
diff --git a/packages/sra-report/test/fixtures/v0/token_pairs/token_a_and_token_b_params.json b/packages/sra-report/test/fixtures/v0/token_pairs/token_a_and_token_b_params.json
deleted file mode 100644
index cdb9c477b3..0000000000
--- a/packages/sra-report/test/fixtures/v0/token_pairs/token_a_and_token_b_params.json
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xe41d2489571d322189246dafa5ebde1f4699f498",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    }
-]
diff --git a/packages/sra-report/test/fixtures/v0/token_pairs/token_a_param.json b/packages/sra-report/test/fixtures/v0/token_pairs/token_a_param.json
deleted file mode 100644
index 7c2e8cb3ad..0000000000
--- a/packages/sra-report/test/fixtures/v0/token_pairs/token_a_param.json
+++ /dev/null
@@ -1,1864 +0,0 @@
-[
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x01b3ec4aae1b8729529beb4965f27d008788b0eb",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0371a82e4a9d0a4312f3ee2ac9c6958512891372",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x05f4a42e251f2d52b8ed15e9fedaacfcef1fad27",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x076c97e1c869072ee22f8c91978c99b4bcb02591",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x09d8b66c48424324b25754a873e290cae5dca439",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0abdace70d3790235af448c88547603b945604ea",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0cf0ee63788a0849fe5297f3407f701e122cc023",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0d8775f648430679a709e98d2b0cb6250d2887ef",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0e0989b1f9b8a38983c2ba8053269ca62ec9b195",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0f513ffb4926ff82d7f60a05069047aca295c413",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x0f5d2fb29fb7d3cfee444a200298f468908cc942",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x1063ce524265d5a3a624f4914acd573dd89ce988",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x106aa49295b525fcf959aa75ec3f7dcbf5352f1c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x107c4504cd79c5d2696ea0030a8dd4e92601b82e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x1183f92a5624d68e85ffb9170f16bf0443b4c242",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x12480e24eb5bec1a9d4369cab6a80cad3c0a377a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x12b19d3e2ccc14da04fae33e63652ce469b3f2fd",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x12fef5e57bf45873cd9b62e9dbd7bfb99e32d73e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x168296bb09e24a88805cb9c33356536b980d3fc5",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x1776e1f26f98b1a5df9cd347953a26dd3cb46671",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x177d39ac676ed1c67a2b268ad7f1e58826e5b0af",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x1d462414fe14cf489c7a21cac78509f4bf8cd7c0",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x24692791bc444c5cd0b81e3cbcaba4b04acd1f3b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x255aa6df07540cb5d3d297f0d0d4d84cb52bc8e6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x27054b13b1b798b345b591a4d22e6562d47ea75a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x27695e09149adc738a978e9a678f99e4c39e9eb9",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x27dce1ec4d3f72c3e457cc50354f1f975ddef488",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x27f610bf36eca0939093343ac28b1534a721dbb4",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x2956356cd2a2bf3202f771f50d3d14a367b48070",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x340d2bde5eb28c1eed91b2f790723e3b160613b7",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x3597bfd533a99c9aa083587b074434e61eb0a258",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x3618516f45cd3c913f81f9987af41077932bc40d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x386467f1f3ddbe832448650418311a479eecfc57",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x3883f5e181fccaf8410fa61e12b59bad963fb645",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x399a0e6fbeb3d74c85357439f4c8aed9678a5cbf",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x39bb259f66e1c59d5abef88375979b4d20d98022",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x3d1ba9be9f66b8ee101911bc36d3fb562eac2244",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x4156d3342d5c385a87d264f90653733592000581",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x419d0d8bdd9af5e606ae2232ed285aff190e711b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x41e5560054824ea6b0732e656e3ad64e20e94e45",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x42d6622dece394b54999fbd73d108123806f6a18",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x44f588aeeb8c44471439d1270b3603c66a9262f1",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x4ceda7906a5ed2179785cd3a40a69ee8bc99c466",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x4d8fc1453a0f359e99c9675954e656d80d996fbf",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x4df47b4969b2911c966506e3592c41389493953b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x4df812f6064def1e5e029f1ca858777cc98d2d81",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x514910771af9ca656af840dff83e8264ecf986ca",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x52a7cb918c11a16958be40cba7e31e32a499a465",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x533ef0984b2faa227acc620c67cce12aa39cd8cd",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x554c20b7c486beee439277b4540a434566dc4c02",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x56ba2ee7890461f463f7be02aac3099f6d5811a8",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x5732046a883704404f284ce41ffadd5b007fd668",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x595832f8fc6bf59c85c527fec3740a1b7a361269",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x5af2be193a6abca9c8817001f45744777db30756",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x5b2e4a700dfbc560061e957edec8f6eeeb74a320",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x5bc7e5f0ab8b2e10d2d0a3f21739fce62459aef3",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x5ca9a71b1d01849c0a95490cc00559717fcf0d1d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x5e3346444010135322268a4630d2ed5f8d09446c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x607f4c5bb672230e8672085532f7e901544a7375",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x614ea929892ea43d3ea2c5e3311b01cc589bad6c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x6425c6be902d692ae2db752b3c268afadb099d3b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x672a1ad4f667fb18a333af13667aa0af1f5b5bdd",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x6781a0f84c7e9e846dcb84a9a5bd49333067b104",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x6810e776880c02933d47db1b9fc05908e5386b96",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x744d70fdbe2ba4cf95131626614a1763df805b9e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x7654915a1b82d6d2d0afc37c52af556ea8983c7e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x7b69b78cc7fee48202c208609ae6d1f78ce42e13",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x7d4b8cce0591c9044a22ee543533b72e976e36c3",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x80fb784b7ed66730e8b1dbd9820afd29931aab03",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x814964b1bceaf24e26296d031eadf134a2ca4105",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x865e3707a580f9db89304005cddd050ade8873eb",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x88fcfbc22c6d3dbaa25af478c578978339bde77a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x8a854288a5976036a725879164ca3e91d30c6a1b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x8ae4bf2c33a8e667de34b54938b0ccd03eb8cc06",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x8eb24319393716668d768dcec29356ae9cffe285",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x8f8221afbb33998d8584a2b05749ba73c37a938a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x9214ec02cb71cba0ada6896b8da260736a67ab10",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x923108a439c4e8c2315c4f6521e5ce95b44e9b4c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x960b236a07cf122663c4303350609a66a7b288c0",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x983f6d60db79ea8ca4eb9968c6aff8cfa04b3c63",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x9992ec3cf6a55b00978cddf2b27bc6882d88d1ec",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x99ea4db9ee77acd40b119bd1dc4e33e1c070b80d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x9a005c9a89bd72a4bd27721e7a09a3c11d2b03c4",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xa5fd1a791c4dfcaacc963d4f73c6ae5824149ea7",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xa8006c4ca56f24d6836727d106349320db7fef82",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xa87c3ec87eb802aad080df0adb331e504d327e5d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xab16e0d25c06cb376259cc18c1de4aca57605589",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xac3211a5025414af2866ff09c23fc18bc97e79b1",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xacfa209fb73bf3dd5bbfb1101b9bc999c49062a5",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb24754be79281553dc1adc160ddf5cd9b74361a4",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb3bd49e28f8f832b8d1e246106991e546c323502",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb45a50545beeab73f38f31e5973768c421805e5e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb4efd85c19999d84251304bda99e90b92300bd93",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb5a5f22694352c15b00323844ad545abb2b11028",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb5c0e43a6330b9eb904ec57ea24d70269ae4652e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb62d18dea74045e822352ce4b3ee77319dc5ff2f",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb64ef51c888972c908cfacf59b47c1afbc0ab8ac",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xb98d4c97425d9908e66e53a6fdf673acca0be986",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xba2184520a1cc49a6159c57e61e1844e085615b6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xba5f11b16b155792cf3b2e6880e8706859a8aeb6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xbdc5bac39dbe132b1e030e898ae3830017d7d969",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xbeb9ef514a379b997e0798fdcc901ee474b6d9a1",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xbf2179859fc6d5bee9bf9158632dc51678a4100e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xc27a2f05fa577a83ba0fdb4c38443c0718356501",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xc438b4c0dfbb1593be6dee03bbd1a84bb3aa6213",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xc66ea802717bfb9833400264dd12c2bceaa34a6d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xc997d07b0bc607b6d1bcb6fb9d4a5579c466c3e5",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xd0a4b8946cb52f0661273bfbc6fd0e0c75fc6433",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xd26114cd6ee289accf82350c8d8487fedb8a0c07",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xd2d6158683aee4cc838067727209a0aaf4359de3",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xd4c435f5b09f855c3317c8524cb1f586e42795fa",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xd4fa1460f537bb9085d22c7bccb5dd450ef28e3a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xd8912c10681d8b21fd3742244f44658dba12264e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xe0b7927c4af23765cb51314a0e0521a9645f0e2a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xe2e6d4be086c6938b53b22144855eef674281639",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xe41d2489571d322189246dafa5ebde1f4699f498",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xe94327d07fc17907b4db788e5adf2ed424addff6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xea097a2b1db00627b2fa17460ad260c016016977",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xea1f346faf023f974eb5adaf088bbcdf02d761f4",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xea38eaa3c86c8f9b751533ba2e562deb9acded40",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xeab43193cf0623073ca89db9b712796356fa7414",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xeb2da9fac54284cea731d1f10bb34eecb3c00c14",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xeb7c20027172e5d143fb030d50f91cece2d1485d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xef2463099360a085f1f10b076ed72ef625497a06",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xf433089366899d83a9f26a773d59ec7ecf30355e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xf6b55acbbc49f4524aa48d19281a9a77c54de10f",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xf6cfe53d6febaeea051f400ff5fc14f0cbbdaca1",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xf7b098298f7c69fc14610bf71d5e02c60792894c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xf970b8e36e23f7fc3fd752eea86f8be8d83375a6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenA": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xfec0cf7fe078a500abf15f1284958f22049c2c7e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    }
-]
diff --git a/packages/sra-report/test/fixtures/v0/token_pairs/token_b_param.json b/packages/sra-report/test/fixtures/v0/token_pairs/token_b_param.json
deleted file mode 100644
index 1be6cae969..0000000000
--- a/packages/sra-report/test/fixtures/v0/token_pairs/token_b_param.json
+++ /dev/null
@@ -1,1864 +0,0 @@
-[
-    {
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x01b3ec4aae1b8729529beb4965f27d008788b0eb",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x0371a82e4a9d0a4312f3ee2ac9c6958512891372",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x05f4a42e251f2d52b8ed15e9fedaacfcef1fad27",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x076c97e1c869072ee22f8c91978c99b4bcb02591",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x09d8b66c48424324b25754a873e290cae5dca439",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x0abdace70d3790235af448c88547603b945604ea",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x0cf0ee63788a0849fe5297f3407f701e122cc023",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x0d8775f648430679a709e98d2b0cb6250d2887ef",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x0e0989b1f9b8a38983c2ba8053269ca62ec9b195",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x0f513ffb4926ff82d7f60a05069047aca295c413",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x0f5d2fb29fb7d3cfee444a200298f468908cc942",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x1063ce524265d5a3a624f4914acd573dd89ce988",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x106aa49295b525fcf959aa75ec3f7dcbf5352f1c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x107c4504cd79c5d2696ea0030a8dd4e92601b82e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x1183f92a5624d68e85ffb9170f16bf0443b4c242",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x12480e24eb5bec1a9d4369cab6a80cad3c0a377a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x12b19d3e2ccc14da04fae33e63652ce469b3f2fd",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x12fef5e57bf45873cd9b62e9dbd7bfb99e32d73e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x168296bb09e24a88805cb9c33356536b980d3fc5",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x1776e1f26f98b1a5df9cd347953a26dd3cb46671",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x177d39ac676ed1c67a2b268ad7f1e58826e5b0af",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x1d462414fe14cf489c7a21cac78509f4bf8cd7c0",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x24692791bc444c5cd0b81e3cbcaba4b04acd1f3b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x255aa6df07540cb5d3d297f0d0d4d84cb52bc8e6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x27054b13b1b798b345b591a4d22e6562d47ea75a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x27695e09149adc738a978e9a678f99e4c39e9eb9",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x27dce1ec4d3f72c3e457cc50354f1f975ddef488",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x27f610bf36eca0939093343ac28b1534a721dbb4",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x2956356cd2a2bf3202f771f50d3d14a367b48070",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x340d2bde5eb28c1eed91b2f790723e3b160613b7",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x3597bfd533a99c9aa083587b074434e61eb0a258",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x3618516f45cd3c913f81f9987af41077932bc40d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x386467f1f3ddbe832448650418311a479eecfc57",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x3883f5e181fccaf8410fa61e12b59bad963fb645",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x399a0e6fbeb3d74c85357439f4c8aed9678a5cbf",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x39bb259f66e1c59d5abef88375979b4d20d98022",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x3d1ba9be9f66b8ee101911bc36d3fb562eac2244",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x4156d3342d5c385a87d264f90653733592000581",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x419d0d8bdd9af5e606ae2232ed285aff190e711b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x41e5560054824ea6b0732e656e3ad64e20e94e45",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x42d6622dece394b54999fbd73d108123806f6a18",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x44f588aeeb8c44471439d1270b3603c66a9262f1",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x4ceda7906a5ed2179785cd3a40a69ee8bc99c466",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x4d8fc1453a0f359e99c9675954e656d80d996fbf",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x4df47b4969b2911c966506e3592c41389493953b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x4df812f6064def1e5e029f1ca858777cc98d2d81",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x514910771af9ca656af840dff83e8264ecf986ca",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x52a7cb918c11a16958be40cba7e31e32a499a465",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x533ef0984b2faa227acc620c67cce12aa39cd8cd",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x554c20b7c486beee439277b4540a434566dc4c02",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x56ba2ee7890461f463f7be02aac3099f6d5811a8",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x5732046a883704404f284ce41ffadd5b007fd668",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x595832f8fc6bf59c85c527fec3740a1b7a361269",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x5af2be193a6abca9c8817001f45744777db30756",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x5b2e4a700dfbc560061e957edec8f6eeeb74a320",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x5bc7e5f0ab8b2e10d2d0a3f21739fce62459aef3",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x5ca9a71b1d01849c0a95490cc00559717fcf0d1d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x5e3346444010135322268a4630d2ed5f8d09446c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x607f4c5bb672230e8672085532f7e901544a7375",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x614ea929892ea43d3ea2c5e3311b01cc589bad6c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x6425c6be902d692ae2db752b3c268afadb099d3b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x672a1ad4f667fb18a333af13667aa0af1f5b5bdd",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x6781a0f84c7e9e846dcb84a9a5bd49333067b104",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x6810e776880c02933d47db1b9fc05908e5386b96",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x744d70fdbe2ba4cf95131626614a1763df805b9e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x7654915a1b82d6d2d0afc37c52af556ea8983c7e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x7b69b78cc7fee48202c208609ae6d1f78ce42e13",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x7d4b8cce0591c9044a22ee543533b72e976e36c3",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x80fb784b7ed66730e8b1dbd9820afd29931aab03",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x814964b1bceaf24e26296d031eadf134a2ca4105",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x865e3707a580f9db89304005cddd050ade8873eb",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x88fcfbc22c6d3dbaa25af478c578978339bde77a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x8a854288a5976036a725879164ca3e91d30c6a1b",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x8ae4bf2c33a8e667de34b54938b0ccd03eb8cc06",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x8eb24319393716668d768dcec29356ae9cffe285",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x8f8221afbb33998d8584a2b05749ba73c37a938a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x9214ec02cb71cba0ada6896b8da260736a67ab10",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x923108a439c4e8c2315c4f6521e5ce95b44e9b4c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x960b236a07cf122663c4303350609a66a7b288c0",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x983f6d60db79ea8ca4eb9968c6aff8cfa04b3c63",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x9992ec3cf6a55b00978cddf2b27bc6882d88d1ec",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x99ea4db9ee77acd40b119bd1dc4e33e1c070b80d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x9a005c9a89bd72a4bd27721e7a09a3c11d2b03c4",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xa5fd1a791c4dfcaacc963d4f73c6ae5824149ea7",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xa8006c4ca56f24d6836727d106349320db7fef82",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xa87c3ec87eb802aad080df0adb331e504d327e5d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xab16e0d25c06cb376259cc18c1de4aca57605589",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xac3211a5025414af2866ff09c23fc18bc97e79b1",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xacfa209fb73bf3dd5bbfb1101b9bc999c49062a5",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xb24754be79281553dc1adc160ddf5cd9b74361a4",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xb3bd49e28f8f832b8d1e246106991e546c323502",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xb45a50545beeab73f38f31e5973768c421805e5e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xb4efd85c19999d84251304bda99e90b92300bd93",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xb5a5f22694352c15b00323844ad545abb2b11028",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xb5c0e43a6330b9eb904ec57ea24d70269ae4652e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xb62d18dea74045e822352ce4b3ee77319dc5ff2f",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xb64ef51c888972c908cfacf59b47c1afbc0ab8ac",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xb98d4c97425d9908e66e53a6fdf673acca0be986",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xba2184520a1cc49a6159c57e61e1844e085615b6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xba5f11b16b155792cf3b2e6880e8706859a8aeb6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xbdc5bac39dbe132b1e030e898ae3830017d7d969",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xbeb9ef514a379b997e0798fdcc901ee474b6d9a1",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xbf2179859fc6d5bee9bf9158632dc51678a4100e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xc27a2f05fa577a83ba0fdb4c38443c0718356501",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xc438b4c0dfbb1593be6dee03bbd1a84bb3aa6213",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xc66ea802717bfb9833400264dd12c2bceaa34a6d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xc997d07b0bc607b6d1bcb6fb9d4a5579c466c3e5",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xd0a4b8946cb52f0661273bfbc6fd0e0c75fc6433",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xd26114cd6ee289accf82350c8d8487fedb8a0c07",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xd2d6158683aee4cc838067727209a0aaf4359de3",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xd4c435f5b09f855c3317c8524cb1f586e42795fa",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xd4fa1460f537bb9085d22c7bccb5dd450ef28e3a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xd8912c10681d8b21fd3742244f44658dba12264e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xe0b7927c4af23765cb51314a0e0521a9645f0e2a",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xe2e6d4be086c6938b53b22144855eef674281639",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xe41d2489571d322189246dafa5ebde1f4699f498",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xe94327d07fc17907b4db788e5adf2ed424addff6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xea097a2b1db00627b2fa17460ad260c016016977",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xea1f346faf023f974eb5adaf088bbcdf02d761f4",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xea38eaa3c86c8f9b751533ba2e562deb9acded40",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xeab43193cf0623073ca89db9b712796356fa7414",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xeb2da9fac54284cea731d1f10bb34eecb3c00c14",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xeb7c20027172e5d143fb030d50f91cece2d1485d",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xef2463099360a085f1f10b076ed72ef625497a06",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xf433089366899d83a9f26a773d59ec7ecf30355e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xf6b55acbbc49f4524aa48d19281a9a77c54de10f",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xf6cfe53d6febaeea051f400ff5fc14f0cbbdaca1",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xf7b098298f7c69fc14610bf71d5e02c60792894c",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xf970b8e36e23f7fc3fd752eea86f8be8d83375a6",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    },
-    {
-        "tokenB": {
-            "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        },
-        "tokenA": {
-            "address": "0xfec0cf7fe078a500abf15f1284958f22049c2c7e",
-            "minAmount": "1",
-            "maxAmount": "999999999999999999999",
-            "precision": 8
-        }
-    }
-]
diff --git a/packages/sra-report/test/postman_collection_v0_test.ts b/packages/sra-report/test/postman_collection_v0_test.ts
deleted file mode 100644
index dfb16b10d9..0000000000
--- a/packages/sra-report/test/postman_collection_v0_test.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import 'mocha';
-import * as nock from 'nock';
-
-import * as defaultRequestTokenPairsResponseJSON from './fixtures/v0/token_pairs/default_request.json';
-import * as malformedTokenPairsResponseJSON from './fixtures/v0/token_pairs/malformed.json';
-import * as tokenAAndTokenBParamsTokenPairsResponseJSON from './fixtures/v0/token_pairs/token_a_and_token_b_params.json';
-import * as tokenAParamTokenPairsResponseJSON from './fixtures/v0/token_pairs/token_a_param.json';
-import * as tokenBParamTokenPairsResponseJSON from './fixtures/v0/token_pairs/token_b_param.json';
-import { testRunner } from './test_runner';
-
-describe('Postman Collection v0', () => {
-    const testRelayerUrl = 'https://example.com';
-    const nockScope = nock(testRelayerUrl);
-    afterEach(() => {
-        nock.cleanAll();
-    });
-    describe('GET /token_pairs', () => {
-        const postmanCollectionFolderName = 'GET /token_pairs';
-        const resourcePath = '/token_pairs';
-        describe('default request', () => {
-            const postmanCollectionRequestName = 'default request';
-            const nockInterceptor = nockScope.get(resourcePath);
-            testRunner.runContentTypeTests(nockInterceptor, postmanCollectionFolderName, postmanCollectionRequestName);
-            testRunner.runSchemaTests(
-                nockInterceptor,
-                postmanCollectionFolderName,
-                postmanCollectionRequestName,
-                malformedTokenPairsResponseJSON,
-                defaultRequestTokenPairsResponseJSON,
-            );
-        });
-        describe('tokenA param', () => {
-            const postmanCollectionRequestName = 'tokenA param';
-            const nockInterceptor = nockScope.get(resourcePath).query({
-                tokenA: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-            });
-            testRunner.runContentTypeTests(nockInterceptor, postmanCollectionFolderName, postmanCollectionRequestName);
-            testRunner.runSchemaTests(
-                nockInterceptor,
-                postmanCollectionFolderName,
-                postmanCollectionRequestName,
-                malformedTokenPairsResponseJSON,
-                tokenAParamTokenPairsResponseJSON,
-            );
-        });
-        describe('tokenB param', () => {
-            const postmanCollectionRequestName = 'tokenB param';
-            const nockInterceptor = nockScope.get(resourcePath).query({
-                tokenB: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-            });
-            testRunner.runContentTypeTests(nockInterceptor, postmanCollectionFolderName, postmanCollectionRequestName);
-            testRunner.runSchemaTests(
-                nockInterceptor,
-                postmanCollectionFolderName,
-                postmanCollectionRequestName,
-                malformedTokenPairsResponseJSON,
-                tokenBParamTokenPairsResponseJSON,
-            );
-        });
-        describe('tokenA and tokenB params', () => {
-            const postmanCollectionRequestName = 'tokenA and tokenB params';
-            const nockInterceptor = nockScope.get(resourcePath).query({
-                tokenA: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                tokenB: '0xe41d2489571d322189246dafa5ebde1f4699f498',
-            });
-            testRunner.runContentTypeTests(nockInterceptor, postmanCollectionFolderName, postmanCollectionRequestName);
-            testRunner.runSchemaTests(
-                nockInterceptor,
-                postmanCollectionFolderName,
-                postmanCollectionRequestName,
-                malformedTokenPairsResponseJSON,
-                tokenAAndTokenBParamsTokenPairsResponseJSON,
-            );
-        });
-    });
-});
diff --git a/packages/sra-report/test/test_runner.ts b/packages/sra-report/test/test_runner.ts
deleted file mode 100644
index 8094018f2f..0000000000
--- a/packages/sra-report/test/test_runner.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import * as chai from 'chai';
-import * as chaiAsPromised from 'chai-as-promised';
-import * as dirtyChai from 'dirty-chai';
-import * as _ from 'lodash';
-import 'mocha';
-import {
-    NewmanRunExecution,
-    NewmanRunExecutionAssertion,
-    NewmanRunExecutionAssertionError,
-    NewmanRunSummary,
-} from 'newman';
-import * as nock from 'nock';
-
-import * as sraReportCollectionJSON from '../../postman_collections/sra_report.postman_collection.json';
-import { utils } from '../src/utils';
-
-import * as postmanEnvironmentJSON from './environments/postman_environment.json';
-
-chai.config.includeStack = true;
-chai.use(dirtyChai);
-chai.use(chaiAsPromised);
-const expect = chai.expect;
-
-const CONTENT_TYPE_ASSERTION_NAME = 'Has Content-Type header with value application/json';
-const SCHEMA_ASSERTION_NAME = 'Schema is valid';
-const SUCCESS_STATUS = 200;
-const baseNewmanRunOptions = {
-    collection: sraReportCollectionJSON,
-    environment: postmanEnvironmentJSON,
-    reporter: {
-        cli: {
-            noConsole: true,
-        },
-    },
-};
-
-export const testRunner = {
-    runContentTypeTests(
-        nockInterceptor: nock.Interceptor,
-        postmanCollectionFolderName: string,
-        postmanCollectionRequestName: string,
-    ): void {
-        const newmanRunOptions = {
-            ...baseNewmanRunOptions,
-            folder: postmanCollectionFolderName,
-        };
-        describe(CONTENT_TYPE_ASSERTION_NAME, () => {
-            it('fails when there are no headers', async () => {
-                nockInterceptor.reply(SUCCESS_STATUS, {});
-                const summary = await utils.newmanRunAsync(newmanRunOptions);
-                const error = findAssertionErrorIfExists(
-                    summary,
-                    postmanCollectionRequestName,
-                    CONTENT_TYPE_ASSERTION_NAME,
-                );
-                const errorMessage = _.get(error, 'message');
-                expect(error).to.not.be.undefined();
-                expect(errorMessage).to.equal(`expected response to have header with key 'Content-Type'`);
-            });
-            it('fails when Content-Type header exists but not with value application/json', async () => {
-                const headers = {
-                    'Content-Type': 'text/html',
-                };
-                nockInterceptor.reply(SUCCESS_STATUS, {}, headers);
-                const summary = await utils.newmanRunAsync(newmanRunOptions);
-                const error = findAssertionErrorIfExists(
-                    summary,
-                    postmanCollectionRequestName,
-                    CONTENT_TYPE_ASSERTION_NAME,
-                );
-                const errorMessage = _.get(error, 'message');
-                expect(error).to.not.be.undefined();
-                expect(errorMessage).to.equal(`expected 'text/html' to include 'application/json'`);
-            });
-            it('passes when Content-Type header exists with value application/json', async () => {
-                const headers = {
-                    'Content-Type': 'charset=utf-8; application/json',
-                };
-                nockInterceptor.reply(SUCCESS_STATUS, {}, headers);
-                const summary = await utils.newmanRunAsync(newmanRunOptions);
-                const error = findAssertionErrorIfExists(
-                    summary,
-                    postmanCollectionRequestName,
-                    CONTENT_TYPE_ASSERTION_NAME,
-                );
-                expect(error).to.be.undefined();
-            });
-        });
-    },
-    runSchemaTests(
-        nockInterceptor: nock.Interceptor,
-        postmanCollectionFolderName: string,
-        postmanCollectionRequestName: string,
-        malformedJson: object,
-        correctJson: object,
-    ): void {
-        const newmanRunOptions = {
-            ...baseNewmanRunOptions,
-            folder: postmanCollectionFolderName,
-        };
-        describe(SCHEMA_ASSERTION_NAME, () => {
-            it('fails when schema is invalid', async () => {
-                nockInterceptor.reply(SUCCESS_STATUS, malformedJson);
-                const summary = await utils.newmanRunAsync(newmanRunOptions);
-                const error = findAssertionErrorIfExists(summary, postmanCollectionRequestName, SCHEMA_ASSERTION_NAME);
-                const errorMessage = _.get(error, 'message');
-                expect(error).to.not.be.undefined();
-                expect(errorMessage).to.equal('expected false to be true');
-            });
-            it('passes when schema is valid', async () => {
-                nockInterceptor.reply(SUCCESS_STATUS, correctJson);
-                const summary = await utils.newmanRunAsync(newmanRunOptions);
-                const error = findAssertionErrorIfExists(summary, postmanCollectionRequestName, SCHEMA_ASSERTION_NAME);
-                expect(error).to.be.undefined();
-            });
-        });
-    },
-};
-
-function findAssertionErrorIfExists(
-    summary: NewmanRunSummary,
-    postmanCollectionRequestName: string,
-    postmanCollectionAssertionName: string,
-): NewmanRunExecutionAssertionError | undefined {
-    const matchingExecutionIfExists = _.find(summary.run.executions, (execution: NewmanRunExecution) => {
-        return execution.item.name === postmanCollectionRequestName;
-    });
-    if (_.isUndefined(matchingExecutionIfExists)) {
-        return undefined;
-    }
-    const matchingAssertionIfExists = _.find(
-        matchingExecutionIfExists.assertions,
-        (assertion: NewmanRunExecutionAssertion) => {
-            return assertion.assertion === postmanCollectionAssertionName;
-        },
-    );
-    if (_.isUndefined(matchingAssertionIfExists)) {
-        return undefined;
-    } else {
-        const error = matchingAssertionIfExists.error;
-        return error;
-    }
-}
diff --git a/packages/sra-report/tsconfig.json b/packages/sra-report/tsconfig.json
deleted file mode 100644
index 2ee711adcc..0000000000
--- a/packages/sra-report/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "extends": "../../tsconfig",
-    "compilerOptions": {
-        "outDir": "lib",
-        "rootDir": "."
-    },
-    "include": ["./src/**/*", "./test/**/*"]
-}
diff --git a/packages/sra-report/tslint.json b/packages/sra-report/tslint.json
deleted file mode 100644
index ffaefe83a6..0000000000
--- a/packages/sra-report/tslint.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "extends": ["@0xproject/tslint-config"]
-}
diff --git a/packages/sra-spec/CHANGELOG.json b/packages/sra-spec/CHANGELOG.json
index 333a1dde04..a068df3fb0 100644
--- a/packages/sra-spec/CHANGELOG.json
+++ b/packages/sra-spec/CHANGELOG.json
@@ -6,7 +6,8 @@
                 "note": "Make @loopback/openapi-v3-types a 'dependency' so it's available to users of the library",
                 "pr": 1105
             }
-        ]
+        ],
+        "timestamp": 1539871071
     },
     {
         "version": "1.0.6",
diff --git a/packages/sra-spec/CHANGELOG.md b/packages/sra-spec/CHANGELOG.md
index 4d27f20df2..ba4cddec29 100644
--- a/packages/sra-spec/CHANGELOG.md
+++ b/packages/sra-spec/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.7 - _October 18, 2018_
+
+    * Make @loopback/openapi-v3-types a 'dependency' so it's available to users of the library (#1105)
+
 ## v1.0.6 - _October 4, 2018_
 
     * Dependencies updated
@@ -38,6 +42,6 @@ CHANGELOG
 
     * Add takerAddress to /orders parameters (#974)
 
-## v1.0.1-rc.4 - _August 13, 2018_
+## v1.0.1-rc.4 - _August 14, 2018_
 
     * Add inital spec for SRA v2 (#916)
diff --git a/packages/sra-spec/README.md b/packages/sra-spec/README.md
index 7eee6396b5..4575aaf66f 100644
--- a/packages/sra-spec/README.md
+++ b/packages/sra-spec/README.md
@@ -1,4 +1,4 @@
-## @0xproject/sra-spec
+## @0x/sra-spec
 
 Contains the Standard Relayer API [OpenAPI Spec](https://github.com/OAI/OpenAPI-Specification).
 
@@ -9,7 +9,7 @@ A deployed [ReDoc](https://github.com/Rebilly/ReDoc) static site with the API ca
 ## Usage
 
 ```
-import { api } from '@0xproject/sra-spec';
+import { api } from '@0x/sra-spec';
 ```
 
 ## Installation
@@ -53,13 +53,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0xproject/sra-spec yarn build
+PKG=@0x/sra-spec yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0xproject/sra-spec yarn watch
+PKG=@0x/sra-spec yarn watch
 ```
 
 ### Static Site
diff --git a/packages/sra-spec/package.json b/packages/sra-spec/package.json
index c3ddde36ee..0c55465d74 100644
--- a/packages/sra-spec/package.json
+++ b/packages/sra-spec/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/sra-spec",
-    "version": "1.0.6",
+    "name": "@0x/sra-spec",
+    "version": "1.0.7",
     "engines": {
         "node": ">=6.12"
     },
@@ -35,11 +35,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-spec/README.md",
     "dependencies": {
-        "@0xproject/json-schemas": "^1.0.7",
+        "@0x/json-schemas": "^2.0.0",
         "@loopback/openapi-v3-types": "^0.8.2"
     },
     "devDependencies": {
-        "@0xproject/tslint-config": "^1.0.8",
+        "@0x/tslint-config": "^1.0.9",
         "@types/mocha": "^2.2.42",
         "@types/node": "^10.5.3",
         "chai": "^4.0.1",
diff --git a/packages/sra-spec/src/json-schemas.ts b/packages/sra-spec/src/json-schemas.ts
index 47cca9b040..9eb32de599 100644
--- a/packages/sra-spec/src/json-schemas.ts
+++ b/packages/sra-spec/src/json-schemas.ts
@@ -1,4 +1,4 @@
-import { schemas as jsonSchemas } from '@0xproject/json-schemas';
+import { schemas as jsonSchemas } from '@0x/json-schemas';
 
 // Only include schemas we actually need
 const {
diff --git a/packages/sra-spec/src/md/introduction.md b/packages/sra-spec/src/md/introduction.md
index f27186f41e..824df89984 100644
--- a/packages/sra-spec/src/md/introduction.md
+++ b/packages/sra-spec/src/md/introduction.md
@@ -1,7 +1,3 @@
-# Testing
-
-Use the [sra-report](https://github.com/0xProject/0x-monorepo/tree/development/packages/sra-report) command line tool to test your API for SRA compliance.
-
 # Schemas
 
 The [JSON schemas](http://json-schema.org/) for the API payloads and responses can be found in [@0xproject/json-schemas](https://github.com/0xProject/0x.js/tree/development/packages/json-schemas). Examples of each payload and response can be found in the library's [test suite](https://github.com/0xProject/0x.js/blob/development/packages/json-schemas/test/schema_test.ts#L1).
diff --git a/packages/sra-spec/tslint.json b/packages/sra-spec/tslint.json
index ffaefe83a6..dd9053357e 100644
--- a/packages/sra-spec/tslint.json
+++ b/packages/sra-spec/tslint.json
@@ -1,3 +1,3 @@
 {
-    "extends": ["@0xproject/tslint-config"]
+    "extends": ["@0x/tslint-config"]
 }
diff --git a/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json
index 6aeeeb3330..b145bbbe57 100644
--- a/packages/subproviders/CHANGELOG.json
+++ b/packages/subproviders/CHANGELOG.json
@@ -14,7 +14,8 @@
                 "note": "Make web3-provider-engine types a 'dependency' so it's available to users of the library",
                 "pr": 1105
             }
-        ]
+        ],
+        "timestamp": 1539871071
     },
     {
         "version": "2.0.7",
diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md
index 872948ad79..f9e3e63a6a 100644
--- a/packages/subproviders/CHANGELOG.md
+++ b/packages/subproviders/CHANGELOG.md
@@ -5,6 +5,12 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.1.0 - _October 18, 2018_
+
+    * Add `MetamaskSubprovider` to handle inconsistent JSON RPC behaviour (#1102)
+    * Add support for `eth_signTypedData` in wallets Mnemonic, Private and EthLightWallet (#1102)
+    * Make web3-provider-engine types a 'dependency' so it's available to users of the library (#1105)
+
 ## v2.0.7 - _October 4, 2018_
 
     * Dependencies updated
@@ -37,7 +43,7 @@ CHANGELOG
 
     * Export types: `PartialTxParams`, `JSONRPCRequestPayloadWithMethod`, `ECSignatureString`, `AccountFetchingConfigs`, `LedgerEthereumClientFactoryAsync`, `OnNextCompleted`, `MnemonicWalletSubproviderConfigs`, LedgerGetAddressResult, `JSONRPCRequestPayload`, `Provider`, `JSONRPCResponsePayload` and `JSONRPCErrorCallback` (#924)
 
-## v1.0.5 - _August 13, 2018_
+## v1.0.5 - _August 14, 2018_
 
     * Dependencies updated
 
diff --git a/packages/subproviders/README.md b/packages/subproviders/README.md
index 90c9b7bbe6..6f97d760ee 100644
--- a/packages/subproviders/README.md
+++ b/packages/subproviders/README.md
@@ -1,4 +1,4 @@
-## @0xproject/subproviders
+## @0x/subproviders
 
 A few useful web3 subproviders including a LedgerSubprovider useful for adding Ledger Nano S support.
 
@@ -9,14 +9,14 @@ We have written up a [Wiki](https://0xproject.com/wiki#Web3-Provider-Examples) a
 ## Installation
 
 ```
-yarn add @0xproject/subproviders
+yarn add @0x/subproviders
 ```
 
 If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
 
 ```json
 "compilerOptions": {
-    "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+    "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"],
 }
 ```
 
@@ -45,13 +45,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0xproject/subproviders yarn build
+PKG=@0x/subproviders yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0xproject/subproviders yarn watch
+PKG=@0x/subproviders yarn watch
 ```
 
 ### Clean
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index 1fe1ee4ade..4eef09fe62 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/subproviders",
-    "version": "2.0.7",
+    "name": "@0x/subproviders",
+    "version": "2.1.0",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,11 +29,11 @@
         }
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.13",
-        "@0xproject/types": "^1.1.4",
-        "@0xproject/typescript-typings": "^3.0.2",
-        "@0xproject/utils": "^2.0.2",
-        "@0xproject/web3-wrapper": "^3.0.3",
+        "@0x/assert": "^1.0.14",
+        "@0x/types": "^1.2.0",
+        "@0x/typescript-typings": "^3.0.3",
+        "@0x/utils": "^2.0.3",
+        "@0x/web3-wrapper": "^3.1.0",
         "@ledgerhq/hw-app-eth": "^4.3.0",
         "@ledgerhq/hw-transport-u2f": "^4.3.0",
         "@types/eth-lightwallet": "^3.0.0",
@@ -43,7 +43,7 @@
         "bip39": "^2.5.0",
         "bn.js": "^4.11.8",
         "eth-lightwallet": "^3.0.1",
-        "ethereum-types": "^1.0.11",
+        "ethereum-types": "^1.1.1",
         "ethereumjs-tx": "^1.3.5",
         "ethereumjs-util": "^5.1.1",
         "ganache-core": "^2.2.1",
@@ -54,7 +54,7 @@
         "web3-provider-engine": "14.0.6"
     },
     "devDependencies": {
-        "@0xproject/tslint-config": "^1.0.8",
+        "@0x/tslint-config": "^1.0.9",
         "@types/bip39": "^2.4.0",
         "@types/bn.js": "^4.11.0",
         "@types/ethereumjs-tx": "^1.0.0",
diff --git a/packages/subproviders/src/index.ts b/packages/subproviders/src/index.ts
index 9f4dac58bd..050027f96d 100644
--- a/packages/subproviders/src/index.ts
+++ b/packages/subproviders/src/index.ts
@@ -48,14 +48,7 @@ export {
     LedgerGetAddressResult,
 } from './types';
 
-export {
-    ECSignature,
-    EIP712Object,
-    EIP712ObjectValue,
-    EIP712TypedData,
-    EIP712Types,
-    EIP712Parameter,
-} from '@0xproject/types';
+export { ECSignature, EIP712Object, EIP712ObjectValue, EIP712TypedData, EIP712Types, EIP712Parameter } from '@0x/types';
 
 export {
     JSONRPCRequestPayload,
diff --git a/packages/subproviders/src/subproviders/base_wallet_subprovider.ts b/packages/subproviders/src/subproviders/base_wallet_subprovider.ts
index 409a0d3308..e9d1040748 100644
--- a/packages/subproviders/src/subproviders/base_wallet_subprovider.ts
+++ b/packages/subproviders/src/subproviders/base_wallet_subprovider.ts
@@ -1,5 +1,5 @@
-import { assert } from '@0xproject/assert';
-import { addressUtils } from '@0xproject/utils';
+import { assert } from '@0x/assert';
+import { addressUtils } from '@0x/utils';
 import { JSONRPCRequestPayload, JSONRPCResponsePayload } from 'ethereum-types';
 import * as _ from 'lodash';
 
diff --git a/packages/subproviders/src/subproviders/eth_lightwallet_subprovider.ts b/packages/subproviders/src/subproviders/eth_lightwallet_subprovider.ts
index a1d93ac493..15cd713af3 100644
--- a/packages/subproviders/src/subproviders/eth_lightwallet_subprovider.ts
+++ b/packages/subproviders/src/subproviders/eth_lightwallet_subprovider.ts
@@ -1,4 +1,4 @@
-import { EIP712TypedData } from '@0xproject/types';
+import { EIP712TypedData } from '@0x/types';
 import * as lightwallet from 'eth-lightwallet';
 
 import { PartialTxParams } from '../types';
diff --git a/packages/subproviders/src/subproviders/ledger.ts b/packages/subproviders/src/subproviders/ledger.ts
index ee8edde92a..28e348f909 100644
--- a/packages/subproviders/src/subproviders/ledger.ts
+++ b/packages/subproviders/src/subproviders/ledger.ts
@@ -1,5 +1,5 @@
-import { assert } from '@0xproject/assert';
-import { addressUtils } from '@0xproject/utils';
+import { assert } from '@0x/assert';
+import { addressUtils } from '@0x/utils';
 import EthereumTx = require('ethereumjs-tx');
 import ethUtil = require('ethereumjs-util');
 import HDNode = require('hdkey');
diff --git a/packages/subproviders/src/subproviders/metamask_subprovider.ts b/packages/subproviders/src/subproviders/metamask_subprovider.ts
index 46fc2a9cde..ba207d4cce 100644
--- a/packages/subproviders/src/subproviders/metamask_subprovider.ts
+++ b/packages/subproviders/src/subproviders/metamask_subprovider.ts
@@ -1,4 +1,4 @@
-import { marshaller, Web3Wrapper } from '@0xproject/web3-wrapper';
+import { marshaller, Web3Wrapper } from '@0x/web3-wrapper';
 import { JSONRPCRequestPayload, Provider } from 'ethereum-types';
 import * as ethUtil from 'ethereumjs-util';
 
diff --git a/packages/subproviders/src/subproviders/mnemonic_wallet.ts b/packages/subproviders/src/subproviders/mnemonic_wallet.ts
index 04a11c7bef..140e3d5153 100644
--- a/packages/subproviders/src/subproviders/mnemonic_wallet.ts
+++ b/packages/subproviders/src/subproviders/mnemonic_wallet.ts
@@ -1,6 +1,6 @@
-import { assert } from '@0xproject/assert';
-import { EIP712TypedData } from '@0xproject/types';
-import { addressUtils } from '@0xproject/utils';
+import { assert } from '@0x/assert';
+import { EIP712TypedData } from '@0x/types';
+import { addressUtils } from '@0x/utils';
 import * as bip39 from 'bip39';
 import HDNode = require('hdkey');
 import * as _ from 'lodash';
diff --git a/packages/subproviders/src/subproviders/private_key_wallet.ts b/packages/subproviders/src/subproviders/private_key_wallet.ts
index e89c4c1869..dca7e6810b 100644
--- a/packages/subproviders/src/subproviders/private_key_wallet.ts
+++ b/packages/subproviders/src/subproviders/private_key_wallet.ts
@@ -1,6 +1,6 @@
-import { assert } from '@0xproject/assert';
-import { EIP712TypedData } from '@0xproject/types';
-import { signTypedDataUtils } from '@0xproject/utils';
+import { assert } from '@0x/assert';
+import { EIP712TypedData } from '@0x/types';
+import { signTypedDataUtils } from '@0x/utils';
 import EthereumTx = require('ethereumjs-tx');
 import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
diff --git a/packages/subproviders/src/subproviders/redundant_subprovider.ts b/packages/subproviders/src/subproviders/redundant_subprovider.ts
index 59a2986f8b..58312f2037 100644
--- a/packages/subproviders/src/subproviders/redundant_subprovider.ts
+++ b/packages/subproviders/src/subproviders/redundant_subprovider.ts
@@ -1,4 +1,4 @@
-import { promisify } from '@0xproject/utils';
+import { promisify } from '@0x/utils';
 import { JSONRPCRequestPayload } from 'ethereum-types';
 import * as _ from 'lodash';
 
diff --git a/packages/subproviders/src/subproviders/rpc_subprovider.ts b/packages/subproviders/src/subproviders/rpc_subprovider.ts
index 18d6da307d..437518e127 100644
--- a/packages/subproviders/src/subproviders/rpc_subprovider.ts
+++ b/packages/subproviders/src/subproviders/rpc_subprovider.ts
@@ -1,6 +1,6 @@
-import { assert } from '@0xproject/assert';
-import { StatusCodes } from '@0xproject/types';
-import { fetchAsync } from '@0xproject/utils';
+import { assert } from '@0x/assert';
+import { StatusCodes } from '@0x/types';
+import { fetchAsync } from '@0x/utils';
 import { JSONRPCRequestPayload } from 'ethereum-types';
 import JsonRpcError = require('json-rpc-error');
 
diff --git a/packages/subproviders/src/subproviders/signer.ts b/packages/subproviders/src/subproviders/signer.ts
index eda7db42e2..9bd5cbdf10 100644
--- a/packages/subproviders/src/subproviders/signer.ts
+++ b/packages/subproviders/src/subproviders/signer.ts
@@ -1,4 +1,4 @@
-import { marshaller, Web3Wrapper } from '@0xproject/web3-wrapper';
+import { marshaller, Web3Wrapper } from '@0x/web3-wrapper';
 import { JSONRPCRequestPayload, Provider } from 'ethereum-types';
 
 import { Callback, ErrorCallback } from '../types';
diff --git a/packages/subproviders/src/subproviders/subprovider.ts b/packages/subproviders/src/subproviders/subprovider.ts
index dcf880c793..cd6780e0c8 100644
--- a/packages/subproviders/src/subproviders/subprovider.ts
+++ b/packages/subproviders/src/subproviders/subprovider.ts
@@ -1,4 +1,4 @@
-import { promisify } from '@0xproject/utils';
+import { promisify } from '@0x/utils';
 import { JSONRPCRequestPayload, JSONRPCResponsePayload, Provider } from 'ethereum-types';
 
 import { Callback, ErrorCallback, JSONRPCRequestPayloadWithMethod } from '../types';
diff --git a/packages/subproviders/src/types.ts b/packages/subproviders/src/types.ts
index e8a47ad34b..ed3aea1766 100644
--- a/packages/subproviders/src/types.ts
+++ b/packages/subproviders/src/types.ts
@@ -1,4 +1,4 @@
-import { ECSignature } from '@0xproject/types';
+import { ECSignature } from '@0x/types';
 import { JSONRPCRequestPayload } from 'ethereum-types';
 import HDNode = require('hdkey');
 
diff --git a/packages/subproviders/test/integration/ledger_subprovider_test.ts b/packages/subproviders/test/integration/ledger_subprovider_test.ts
index 527ee5b224..b072e611bd 100644
--- a/packages/subproviders/test/integration/ledger_subprovider_test.ts
+++ b/packages/subproviders/test/integration/ledger_subprovider_test.ts
@@ -1,5 +1,5 @@
-import { DoneCallback } from '@0xproject/types';
-import { promisify } from '@0xproject/utils';
+import { DoneCallback } from '@0x/types';
+import { promisify } from '@0x/utils';
 import Eth from '@ledgerhq/hw-app-eth';
 // HACK: This dependency is optional and tslint skips optional dependencies
 // tslint:disable-next-line:no-implicit-dependencies
diff --git a/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts b/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts
index 05f213cf56..a5cef30dc3 100644
--- a/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts
+++ b/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts
@@ -1,7 +1,7 @@
 import * as chai from 'chai';
 import FixtureSubprovider = require('web3-provider-engine/subproviders/fixture');
 
-import { promisify } from '@0xproject/utils';
+import { promisify } from '@0x/utils';
 import EthereumTx = require('ethereumjs-tx');
 
 import { NonceTrackerSubprovider, Web3ProviderEngine } from '../../src';
diff --git a/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts b/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts
index e30d2f74e5..fb4e43f9e3 100644
--- a/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts
+++ b/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts
@@ -1,4 +1,4 @@
-import { DoneCallback } from '@0xproject/types';
+import { DoneCallback } from '@0x/types';
 import * as chai from 'chai';
 import { JSONRPCResponsePayload } from 'ethereum-types';
 import * as Sinon from 'sinon';
diff --git a/packages/subproviders/test/utils/report_callback_errors.ts b/packages/subproviders/test/utils/report_callback_errors.ts
index eaefea7c3e..6eb7420c3e 100644
--- a/packages/subproviders/test/utils/report_callback_errors.ts
+++ b/packages/subproviders/test/utils/report_callback_errors.ts
@@ -1,4 +1,4 @@
-import { DoneCallback } from '@0xproject/types';
+import { DoneCallback } from '@0x/types';
 
 export const reportCallbackErrors = (done: DoneCallback) => {
     return (f: (...args: any[]) => void) => {
diff --git a/packages/subproviders/tslint.json b/packages/subproviders/tslint.json
index ffaefe83a6..dd9053357e 100644
--- a/packages/subproviders/tslint.json
+++ b/packages/subproviders/tslint.json
@@ -1,3 +1,3 @@
 {
-    "extends": ["@0xproject/tslint-config"]
+    "extends": ["@0x/tslint-config"]
 }
diff --git a/packages/testnet-faucets/README.md b/packages/testnet-faucets/README.md
index a92b93fc09..8b85e35179 100644
--- a/packages/testnet-faucets/README.md
+++ b/packages/testnet-faucets/README.md
@@ -1,4 +1,4 @@
-## @0xproject/testnet-faucets
+## @0x/testnet-faucets
 
 This faucet dispenses 0.1 test ether to one recipient per second and 0.1 test ZRX every 5 seconds. It has a max queue size of 1000.
 
@@ -31,13 +31,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0xproject/testnet-faucets yarn build
+PKG=@0x/testnet-faucets yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0xproject/testnet-faucets yarn watch
+PKG=@0x/testnet-faucets yarn watch
 ```
 
 ### Clean
diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json
index a113889cc6..e683ae25a8 100644
--- a/packages/testnet-faucets/package.json
+++ b/packages/testnet-faucets/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
-    "name": "@0xproject/testnet-faucets",
-    "version": "1.0.51",
+    "name": "@0x/testnet-faucets",
+    "version": "1.0.52",
     "engines": {
         "node": ">=6.12"
     },
@@ -18,13 +18,13 @@
     "author": "Fabio Berger",
     "license": "Apache-2.0",
     "dependencies": {
-        "0x.js": "^1.0.8",
-        "@0xproject/subproviders": "^2.0.7",
-        "@0xproject/typescript-typings": "^3.0.2",
-        "@0xproject/utils": "^2.0.2",
-        "@0xproject/web3-wrapper": "^3.0.3",
+        "0x.js": "^2.0.0",
+        "@0x/subproviders": "^2.1.0",
+        "@0x/typescript-typings": "^3.0.3",
+        "@0x/utils": "^2.0.3",
+        "@0x/web3-wrapper": "^3.1.0",
         "body-parser": "^1.17.1",
-        "ethereum-types": "^1.0.11",
+        "ethereum-types": "^1.1.1",
         "ethereumjs-tx": "^1.3.5",
         "ethereumjs-util": "^5.1.1",
         "express": "^4.15.2",
@@ -32,7 +32,7 @@
         "rollbar": "^0.6.5"
     },
     "devDependencies": {
-        "@0xproject/tslint-config": "^1.0.8",
+        "@0x/tslint-config": "^1.0.9",
         "@types/body-parser": "^1.16.1",
         "@types/express": "^4.0.35",
         "@types/lodash": "4.14.104",
diff --git a/packages/testnet-faucets/src/ts/dispatch_queue.ts b/packages/testnet-faucets/src/ts/dispatch_queue.ts
index 0a13df7c9d..3d0958fbfc 100644
--- a/packages/testnet-faucets/src/ts/dispatch_queue.ts
+++ b/packages/testnet-faucets/src/ts/dispatch_queue.ts
@@ -1,4 +1,4 @@
-import { intervalUtils, logUtils } from '@0xproject/utils';
+import { intervalUtils, logUtils } from '@0x/utils';
 import * as _ from 'lodash';
 
 import { errorReporter } from './error_reporter';
diff --git a/packages/testnet-faucets/src/ts/dispense_asset_tasks.ts b/packages/testnet-faucets/src/ts/dispense_asset_tasks.ts
index fa63ab63e1..32f5cb6236 100644
--- a/packages/testnet-faucets/src/ts/dispense_asset_tasks.ts
+++ b/packages/testnet-faucets/src/ts/dispense_asset_tasks.ts
@@ -1,6 +1,6 @@
 import { ERC20TokenWrapper } from '0x.js';
-import { BigNumber, logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { BigNumber, logUtils } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 
 import { configs } from './configs';
diff --git a/packages/testnet-faucets/src/ts/error_reporter.ts b/packages/testnet-faucets/src/ts/error_reporter.ts
index 49c37b6ebf..d5358aed03 100644
--- a/packages/testnet-faucets/src/ts/error_reporter.ts
+++ b/packages/testnet-faucets/src/ts/error_reporter.ts
@@ -1,4 +1,4 @@
-import { logUtils } from '@0xproject/utils';
+import { logUtils } from '@0x/utils';
 import * as express from 'express';
 import rollbar = require('rollbar');
 
diff --git a/packages/testnet-faucets/src/ts/handler.ts b/packages/testnet-faucets/src/ts/handler.ts
index 5cc52e4894..2dfa3c3afc 100644
--- a/packages/testnet-faucets/src/ts/handler.ts
+++ b/packages/testnet-faucets/src/ts/handler.ts
@@ -11,9 +11,9 @@ import {
     SignedOrder,
     Web3ProviderEngine,
 } from '0x.js';
-import { NonceTrackerSubprovider, PrivateKeyWalletSubprovider } from '@0xproject/subproviders';
-import { logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { NonceTrackerSubprovider, PrivateKeyWalletSubprovider } from '@0x/subproviders';
+import { logUtils } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as express from 'express';
 import * as _ from 'lodash';
 
diff --git a/packages/testnet-faucets/src/ts/parameter_transformer.ts b/packages/testnet-faucets/src/ts/parameter_transformer.ts
index 7320b1d1c3..bed8eb99e1 100644
--- a/packages/testnet-faucets/src/ts/parameter_transformer.ts
+++ b/packages/testnet-faucets/src/ts/parameter_transformer.ts
@@ -1,4 +1,4 @@
-import { addressUtils } from '@0xproject/utils';
+import { addressUtils } from '@0x/utils';
 import { NextFunction, Request, Response } from 'express';
 import * as _ from 'lodash';
 
diff --git a/packages/testnet-faucets/tslint.json b/packages/testnet-faucets/tslint.json
index ffaefe83a6..dd9053357e 100644
--- a/packages/testnet-faucets/tslint.json
+++ b/packages/testnet-faucets/tslint.json
@@ -1,3 +1,3 @@
 {
-    "extends": ["@0xproject/tslint-config"]
+    "extends": ["@0x/tslint-config"]
 }
diff --git a/packages/tslint-config/CHANGELOG.json b/packages/tslint-config/CHANGELOG.json
index 2a9b22922d..99fbc79898 100644
--- a/packages/tslint-config/CHANGELOG.json
+++ b/packages/tslint-config/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1539871071,
+        "version": "1.0.9",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1538693146,
         "version": "1.0.8",
diff --git a/packages/tslint-config/CHANGELOG.md b/packages/tslint-config/CHANGELOG.md
index 0486cb523a..f0b429d298 100644
--- a/packages/tslint-config/CHANGELOG.md
+++ b/packages/tslint-config/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.9 - _October 18, 2018_
+
+    * Dependencies updated
+
 ## v1.0.8 - _October 4, 2018_
 
     * Dependencies updated
@@ -17,7 +21,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.5 - _August 13, 2018_
+## v1.0.5 - _August 14, 2018_
 
     * Dependencies updated
 
diff --git a/packages/tslint-config/README.md b/packages/tslint-config/README.md
index d630ec84de..5614e5e546 100644
--- a/packages/tslint-config/README.md
+++ b/packages/tslint-config/README.md
@@ -1,11 +1,11 @@
-## @0xproject/tslint-config
+## @0x/tslint-config
 
 TSLint configuration and custom linter rules used by 0xProject.
 
 ## Installation
 
 ```bash
-yarn add --dev @0xproject/tslint-config
+yarn add --dev @0x/tslint-config
 ```
 
 ## Usage
@@ -14,7 +14,7 @@ Add the following to your `tslint.json` file
 
 ```json
 {
-    "extends": ["@0xproject/tslint-config"]
+    "extends": ["@0x/tslint-config"]
 }
 ```
 
@@ -43,13 +43,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0xproject/tslint-config yarn build
+PKG=@0x/tslint-config yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0xproject/tslint-config yarn watch
+PKG=@0x/tslint-config yarn watch
 ```
 
 ### Clean
diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json
index 9cd2ef88c7..0a8c1b2458 100644
--- a/packages/tslint-config/package.json
+++ b/packages/tslint-config/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/tslint-config",
-    "version": "1.0.8",
+    "name": "@0x/tslint-config",
+    "version": "1.0.9",
     "engines": {
         "node": ">=6.12"
     },
diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json
index 106dc32816..84a06faa81 100644
--- a/packages/types/CHANGELOG.json
+++ b/packages/types/CHANGELOG.json
@@ -14,7 +14,8 @@
                 "note": "Add `AssetData` union type (`type AssetData = ERC20AssetData | ERC721AssetData`)",
                 "pr": 1131
             }
-        ]
+        ],
+        "timestamp": 1539871071
     },
     {
         "timestamp": 1538693146,
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
index aeb056903b..d1b8ea79ca 100644
--- a/packages/types/CHANGELOG.md
+++ b/packages/types/CHANGELOG.md
@@ -5,6 +5,12 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.2.0 - _October 18, 2018_
+
+    * Added `EIP712Parameter` `EIP712Types` `EIP712TypedData` for EIP712 signing (#1102)
+    * Added `ZeroExTransaction` type for Exchange executeTransaction (#1102)
+    * Add `AssetData` union type (`type AssetData = ERC20AssetData | ERC721AssetData`) (#1131)
+
 ## v1.1.4 - _October 4, 2018_
 
     * Dependencies updated
@@ -44,7 +50,7 @@ CHANGELOG
 
     * Add revert reasons for ERC721Token (#933)
 
-## v1.0.1-rc.4 - _August 13, 2018_
+## v1.0.1-rc.4 - _August 14, 2018_
 
     * Added SignerType to handle different signing prefix scenarios (#914)
 
diff --git a/packages/types/README.md b/packages/types/README.md
index c091b83026..136eb19403 100644
--- a/packages/types/README.md
+++ b/packages/types/README.md
@@ -1,25 +1,25 @@
-## @0xproject/types
+## @0x/types
 
 Typescript types shared across 0x projects and packages
 
 ## Installation
 
 ```bash
-yarn add -D @0xproject/types
+yarn add -D @0x/types
 ```
 
 If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
 
 ```json
 "compilerOptions": {
-    "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+    "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"],
 }
 ```
 
 ## Usage
 
 ```javascript
-import { TransactionReceipt, TxData, TxDataPayable } from '@0xproject/types';
+import { TransactionReceipt, TxData, TxDataPayable } from '@0x/types';
 ```
 
 ## Contributing
@@ -47,13 +47,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0xproject/types yarn build
+PKG=@0x/types yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0xproject/types yarn watch
+PKG=@0x/types yarn watch
 ```
 
 ### Clean
diff --git a/packages/types/package.json b/packages/types/package.json
index 104f22178e..fdd68a4868 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/types",
-    "version": "1.1.4",
+    "name": "@0x/types",
+    "version": "1.2.0",
     "engines": {
         "node": ">=6.12"
     },
@@ -23,7 +23,7 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/types/README.md",
     "devDependencies": {
-        "@0xproject/tslint-config": "^1.0.8",
+        "@0x/tslint-config": "^1.0.9",
         "make-promises-safe": "^1.1.0",
         "shx": "^0.2.2",
         "tslint": "5.11.0",
@@ -32,7 +32,7 @@
     "dependencies": {
         "@types/node": "*",
         "bignumber.js": "~4.1.0",
-        "ethereum-types": "^1.0.11"
+        "ethereum-types": "^1.1.1"
     },
     "publishConfig": {
         "access": "public"
diff --git a/packages/types/tslint.json b/packages/types/tslint.json
index ffaefe83a6..dd9053357e 100644
--- a/packages/types/tslint.json
+++ b/packages/types/tslint.json
@@ -1,3 +1,3 @@
 {
-    "extends": ["@0xproject/tslint-config"]
+    "extends": ["@0x/tslint-config"]
 }
diff --git a/packages/typescript-typings/CHANGELOG.json b/packages/typescript-typings/CHANGELOG.json
index 4a85fd5923..e21e788b56 100644
--- a/packages/typescript-typings/CHANGELOG.json
+++ b/packages/typescript-typings/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1539871071,
+        "version": "3.0.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1538693146,
         "version": "3.0.2",
diff --git a/packages/typescript-typings/CHANGELOG.md b/packages/typescript-typings/CHANGELOG.md
index 71ab1113b9..df58bfc570 100644
--- a/packages/typescript-typings/CHANGELOG.md
+++ b/packages/typescript-typings/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.0.3 - _October 18, 2018_
+
+    * Dependencies updated
+
 ## v3.0.2 - _October 4, 2018_
 
     * Dependencies updated
@@ -33,7 +37,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.4 - _August 13, 2018_
+## v1.0.4 - _August 14, 2018_
 
     * Dependencies updated
 
diff --git a/packages/typescript-typings/README.md b/packages/typescript-typings/README.md
index 439cb6484b..e3b4c044ff 100644
--- a/packages/typescript-typings/README.md
+++ b/packages/typescript-typings/README.md
@@ -1,11 +1,11 @@
-## @0xproject/typescript-typings
+## @0x/typescript-typings
 
 Type repository for external packages used by 0x. This is like our small version of [DefinitelyTyped](https://github.com/DefinitelyTyped/DefinitelyTyped)
 
 ## Installation
 
 ```bash
-yarn add -D @0xproject/typescript-typings
+yarn add -D @0x/typescript-typings
 ```
 
 ## Usage
@@ -13,7 +13,7 @@ yarn add -D @0xproject/typescript-typings
 Add the following line within an `compilerOptions` section of your `tsconfig.json`
 
 ```json
-"typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"]
+"typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"]
 ```
 
 This will allow the TS compiler to first look into that repo and then fallback to DT types.
@@ -43,13 +43,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0xproject/typescript-typings yarn build
+PKG=@0x/typescript-typings yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0xproject/typescript-typings yarn watch
+PKG=@0x/typescript-typings yarn watch
 ```
 
 ### Clean
diff --git a/packages/typescript-typings/package.json b/packages/typescript-typings/package.json
index e03d78d511..6b9e676028 100644
--- a/packages/typescript-typings/package.json
+++ b/packages/typescript-typings/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/typescript-typings",
-    "version": "3.0.2",
+    "name": "@0x/typescript-typings",
+    "version": "3.0.3",
     "engines": {
         "node": ">=6.12"
     },
@@ -27,7 +27,7 @@
         "@types/bn.js": "^4.11.0",
         "@types/react": "*",
         "bignumber.js": "~4.1.0",
-        "ethereum-types": "^1.0.11",
+        "ethereum-types": "^1.1.1",
         "popper.js": "1.14.3"
     },
     "devDependencies": {
diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json
index 237ebeecc6..7594581d4a 100644
--- a/packages/utils/CHANGELOG.json
+++ b/packages/utils/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1539871071,
+        "version": "2.0.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1538693146,
         "version": "2.0.2",
diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md
index fa731ecf0a..45b2cd0c2a 100644
--- a/packages/utils/CHANGELOG.md
+++ b/packages/utils/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.0.3 - _October 18, 2018_
+
+    * Dependencies updated
+
 ## v2.0.2 - _October 4, 2018_
 
     * Dependencies updated
@@ -41,7 +45,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.5 - _August 13, 2018_
+## v1.0.5 - _August 14, 2018_
 
     * Increased BigNumber decimal precision from 20 to 78 (#807)
     * Store different ABIs for events with same function signature and different amount of indexed arguments (#933)
diff --git a/packages/utils/README.md b/packages/utils/README.md
index c9a2f58468..0b15f00c52 100644
--- a/packages/utils/README.md
+++ b/packages/utils/README.md
@@ -1,25 +1,25 @@
-## @0xproject/utils
+## @0x/utils
 
 Utils to be shared across 0x projects and packages
 
 ## Installation
 
 ```bash
-yarn add @0xproject/utils
+yarn add @0x/utils
 ```
 
 If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
 
 ```json
 "compilerOptions": {
-    "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+    "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"],
 }
 ```
 
 ## Usage
 
 ```javascript
-import { addressUtils, bigNumberConfigs, classUtils, intervalUtils, promisify } from '@0xproject/utils';
+import { addressUtils, bigNumberConfigs, classUtils, intervalUtils, promisify } from '@0x/utils';
 ```
 
 ## Troubleshooting
@@ -62,13 +62,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0xproject/utils yarn build
+PKG=@0x/utils yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0xproject/utils yarn watch
+PKG=@0x/utils yarn watch
 ```
 
 ### Clean
diff --git a/packages/utils/package.json b/packages/utils/package.json
index f365cf97fb..f89cfda176 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/utils",
-    "version": "2.0.2",
+    "name": "@0x/utils",
+    "version": "2.0.3",
     "engines": {
         "node": ">=6.12"
     },
@@ -28,7 +28,7 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/utils/README.md",
     "devDependencies": {
-        "@0xproject/tslint-config": "^1.0.8",
+        "@0x/tslint-config": "^1.0.9",
         "@types/detect-node": "2.0.0",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
@@ -41,13 +41,13 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/types": "^1.1.4",
-        "@0xproject/typescript-typings": "^3.0.2",
+        "@0x/types": "^1.2.0",
+        "@0x/typescript-typings": "^3.0.3",
         "@types/node": "*",
         "abortcontroller-polyfill": "^1.1.9",
         "bignumber.js": "~4.1.0",
         "detect-node": "2.0.3",
-        "ethereum-types": "^1.0.11",
+        "ethereum-types": "^1.1.1",
         "ethereumjs-util": "^5.1.1",
         "ethers": "~4.0.4",
         "isomorphic-fetch": "^2.2.1",
diff --git a/packages/utils/src/abi_decoder.ts b/packages/utils/src/abi_decoder.ts
index c0b2c7950a..2da46db350 100644
--- a/packages/utils/src/abi_decoder.ts
+++ b/packages/utils/src/abi_decoder.ts
@@ -9,7 +9,7 @@ import {
     RawLog,
     SolidityTypes,
 } from 'ethereum-types';
-import { ethers } from 'ethers';
+import * as ethers from 'ethers';
 import * as _ from 'lodash';
 
 import { addressUtils } from './address_utils';
diff --git a/packages/utils/src/sign_typed_data_utils.ts b/packages/utils/src/sign_typed_data_utils.ts
index cd5bcb42f4..6963b90846 100644
--- a/packages/utils/src/sign_typed_data_utils.ts
+++ b/packages/utils/src/sign_typed_data_utils.ts
@@ -2,7 +2,7 @@ import * as ethUtil from 'ethereumjs-util';
 import * as ethers from 'ethers';
 import * as _ from 'lodash';
 
-import { EIP712Object, EIP712ObjectValue, EIP712TypedData, EIP712Types } from '@0xproject/types';
+import { EIP712Object, EIP712ObjectValue, EIP712TypedData, EIP712Types } from '@0x/types';
 
 export const signTypedDataUtils = {
     /**
diff --git a/packages/utils/tslint.json b/packages/utils/tslint.json
index ffaefe83a6..dd9053357e 100644
--- a/packages/utils/tslint.json
+++ b/packages/utils/tslint.json
@@ -1,3 +1,3 @@
 {
-    "extends": ["@0xproject/tslint-config"]
+    "extends": ["@0x/tslint-config"]
 }
diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json
index be5c1fef65..b8d06eac1e 100644
--- a/packages/web3-wrapper/CHANGELOG.json
+++ b/packages/web3-wrapper/CHANGELOG.json
@@ -11,7 +11,8 @@
                     "Web3Wrapper now throws when an RPC request contains an error field in the response. Previously errors could be swallowed and undefined returned.",
                 "pr": 1102
             }
-        ]
+        ],
+        "timestamp": 1539871071
     },
     {
         "version": "3.0.3",
diff --git a/packages/web3-wrapper/CHANGELOG.md b/packages/web3-wrapper/CHANGELOG.md
index 8f1dc0f3f4..90d62953aa 100644
--- a/packages/web3-wrapper/CHANGELOG.md
+++ b/packages/web3-wrapper/CHANGELOG.md
@@ -5,6 +5,11 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.1.0 - _October 18, 2018_
+
+    * Add `signTypedData` to perform EIP712 `eth_signTypedData`. (#1102)
+    * Web3Wrapper now throws when an RPC request contains an error field in the response. Previously errors could be swallowed and undefined returned. (#1102)
+
 ## v3.0.3 - _October 4, 2018_
 
     * Dependencies updated
@@ -40,7 +45,7 @@ CHANGELOG
     * Stop exporting types: `CallTxDataBaseRPC` and `AbstractBlockRPC` (#924)
     * Export `AbiDecoder` class (#924)
 
-## v1.2.0 - _August 13, 2018_
+## v1.2.0 - _August 14, 2018_
 
     * Export marshaller to convert between RPC and user-space data formats (#938)
     * Export RPC types (#938)
@@ -80,7 +85,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v0.7.0 - _June 3, 2018_
+## v0.7.0 - _June 4, 2018_
 
     * Add `web3Wrapper.getContractCodeAsync` (#675)
     * Add `web3Wrapper.getTransactionTraceAsync` (#675)
diff --git a/packages/web3-wrapper/README.md b/packages/web3-wrapper/README.md
index 06c7881013..4402de19c9 100644
--- a/packages/web3-wrapper/README.md
+++ b/packages/web3-wrapper/README.md
@@ -1,4 +1,4 @@
-## @0xproject/web3-wrapper
+## @0x/web3-wrapper
 
 Web3-wrapper is a JSON-RPC client for Ethereum nodes. It is a type-safe alternative to [Web3.js](https://github.com/ethereum/web3.js/) written in TypeScript.
 
@@ -7,14 +7,14 @@ Web3-wrapper is a JSON-RPC client for Ethereum nodes. It is a type-safe alternat
 ## Installation
 
 ```bash
-yarn add @0xproject/web3-wrapper
+yarn add @0x/web3-wrapper
 ```
 
 If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
 
 ```json
 "compilerOptions": {
-    "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+    "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"],
 }
 ```
 
@@ -43,13 +43,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0xproject/web3-wrapper yarn build
+PKG=@0x/web3-wrapper yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0xproject/web3-wrapper yarn watch
+PKG=@0x/web3-wrapper yarn watch
 ```
 
 ### Clean
diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index 4d033e1306..579957747c 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/web3-wrapper",
-    "version": "3.0.3",
+    "name": "@0x/web3-wrapper",
+    "version": "3.1.0",
     "engines": {
         "node": ">=6.12"
     },
@@ -35,7 +35,7 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/web3-wrapper/README.md",
     "devDependencies": {
-        "@0xproject/tslint-config": "^1.0.8",
+        "@0x/tslint-config": "^1.0.9",
         "@types/ganache-core": "^2.1.0",
         "@types/lodash": "4.14.104",
         "chai": "^4.0.1",
@@ -53,11 +53,11 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.13",
-        "@0xproject/json-schemas": "^1.0.7",
-        "@0xproject/typescript-typings": "^3.0.2",
-        "@0xproject/utils": "^2.0.2",
-        "ethereum-types": "^1.0.11",
+        "@0x/assert": "^1.0.14",
+        "@0x/json-schemas": "^2.0.0",
+        "@0x/typescript-typings": "^3.0.3",
+        "@0x/utils": "^2.0.3",
+        "ethereum-types": "^1.1.1",
         "ethereumjs-util": "^5.1.1",
         "ethers": "~4.0.4",
         "lodash": "^4.17.5"
diff --git a/packages/web3-wrapper/src/index.ts b/packages/web3-wrapper/src/index.ts
index 9bef06fd4c..679563a2b3 100644
--- a/packages/web3-wrapper/src/index.ts
+++ b/packages/web3-wrapper/src/index.ts
@@ -1,7 +1,7 @@
 export { Web3Wrapper } from './web3_wrapper';
 export { marshaller } from './marshaller';
 
-export { AbiDecoder } from '@0xproject/utils';
+export { AbiDecoder } from '@0x/utils';
 
 export {
     BlockParam,
diff --git a/packages/web3-wrapper/src/marshaller.ts b/packages/web3-wrapper/src/marshaller.ts
index 572a322d6e..299c6a64c8 100644
--- a/packages/web3-wrapper/src/marshaller.ts
+++ b/packages/web3-wrapper/src/marshaller.ts
@@ -1,4 +1,4 @@
-import { addressUtils } from '@0xproject/utils';
+import { addressUtils } from '@0x/utils';
 import {
     BlockParam,
     BlockParamLiteral,
diff --git a/packages/web3-wrapper/src/utils.ts b/packages/web3-wrapper/src/utils.ts
index 0b568aac53..c685876323 100644
--- a/packages/web3-wrapper/src/utils.ts
+++ b/packages/web3-wrapper/src/utils.ts
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 
 export const utils = {
diff --git a/packages/web3-wrapper/src/web3_wrapper.ts b/packages/web3-wrapper/src/web3_wrapper.ts
index 726246f1a3..3ba1536803 100644
--- a/packages/web3-wrapper/src/web3_wrapper.ts
+++ b/packages/web3-wrapper/src/web3_wrapper.ts
@@ -1,6 +1,6 @@
-import { assert } from '@0xproject/assert';
-import { schemas } from '@0xproject/json-schemas';
-import { AbiDecoder, addressUtils, BigNumber, intervalUtils, promisify } from '@0xproject/utils';
+import { assert } from '@0x/assert';
+import { schemas } from '@0x/json-schemas';
+import { AbiDecoder, addressUtils, BigNumber, intervalUtils, promisify } from '@0x/utils';
 import {
     BlockParam,
     BlockParamLiteral,
@@ -145,7 +145,7 @@ export class Web3Wrapper {
         if (_.isUndefined((provider as any).sendAsync)) {
             // Web3@1.0 provider doesn't support synchronous http requests,
             // so it only has an async `send` method, instead of a `send` and `sendAsync` in web3@0.x.x`
-            // We re-assign the send method so that Web3@1.0 providers work with @0xproject/web3-wrapper
+            // We re-assign the send method so that Web3@1.0 providers work with @0x/web3-wrapper
             (provider as any).sendAsync = (provider as any).send;
         }
         this.abiDecoder = new AbiDecoder([]);
diff --git a/packages/web3-wrapper/tslint.json b/packages/web3-wrapper/tslint.json
index ffaefe83a6..dd9053357e 100644
--- a/packages/web3-wrapper/tslint.json
+++ b/packages/web3-wrapper/tslint.json
@@ -1,3 +1,3 @@
 {
-    "extends": ["@0xproject/tslint-config"]
+    "extends": ["@0x/tslint-config"]
 }
diff --git a/packages/website/README.md b/packages/website/README.md
index 2edc17cd9f..d82d045a68 100644
--- a/packages/website/README.md
+++ b/packages/website/README.md
@@ -33,13 +33,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0xproject/website yarn build
+PKG=@0x/website yarn build
 ```
 
 ### Run dev server
 
 ```bash
-PKG=@0xproject/website yarn watch
+PKG=@0x/website yarn watch
 ```
 
 Visit [0xproject.localhost:3572](http://0xproject.localhost:3572) in your browser.
diff --git a/packages/website/less/all.less b/packages/website/less/all.less
index c62db0d20a..3747e48604 100644
--- a/packages/website/less/all.less
+++ b/packages/website/less/all.less
@@ -34,17 +34,7 @@ a {
     }
 }
 
-#documentation {
-    p {
-        line-height: 1.5;
-    }
-
-    .comment {
-        p {
-            margin: 0px;
-        }
-    }
-
+#scroll_container {
     .typeTooltip {
         border: 1px solid lightgray;
         opacity: 1;
@@ -83,6 +73,7 @@ a {
 
 code {
     border: 1px solid #e3eefe;
+    border-radius: 4px;
     font-family: 'Roboto Mono';
     background-color: #f2f6ff !important; // lightBlue
 }
diff --git a/packages/website/md/docs/asset_buyer/installation.md b/packages/website/md/docs/asset_buyer/installation.md
index 483ee2b652..76affaa098 100644
--- a/packages/website/md/docs/asset_buyer/installation.md
+++ b/packages/website/md/docs/asset_buyer/installation.md
@@ -1,17 +1,17 @@
 **Install**
 
 ```bash
-yarn add @0xproject/asset-buyer
+yarn add @0x/asset-buyer
 ```
 
 **Import**
 
 ```javascript
-import { AssetBuyer } from '@0xproject/asset-buyer';
+import { AssetBuyer } from '@0x/asset-buyer';
 ```
 
 or
 
 ```javascript
-var AssetBuyer = require('@0xproject/asset-buyer').AssetBuyer;
+var AssetBuyer = require('@0x/asset-buyer').AssetBuyer;
 ```
diff --git a/packages/website/md/docs/asset_buyer/introduction.md b/packages/website/md/docs/asset_buyer/introduction.md
index a40d20cc9f..a59539ac6c 100644
--- a/packages/website/md/docs/asset_buyer/introduction.md
+++ b/packages/website/md/docs/asset_buyer/introduction.md
@@ -1 +1 @@
-Welcome to the [@0xproject/asset-buyer](https://github.com/0xProject/0x-monorepo/tree/development/packages/asset-buyer) documentation! AssetBuyer is a library that provides an easy way to buy any asset with ETH in one click, leveraging 0x liquidity and the [Forwarder contract](https://0xproject.com/docs/contracts#Forwarder).
+Welcome to the [asset-buyer](https://github.com/0xProject/0x-monorepo/tree/development/packages/asset-buyer) documentation! AssetBuyer is a library that provides an easy way to buy any asset with ETH in one click, leveraging 0x liquidity and the [Forwarder contract](https://0xproject.com/docs/contracts#Forwarder).
diff --git a/packages/website/md/docs/connect/1.0.0/installation.md b/packages/website/md/docs/connect/1/installation.md
similarity index 100%
rename from packages/website/md/docs/connect/1.0.0/installation.md
rename to packages/website/md/docs/connect/1/installation.md
diff --git a/packages/website/md/docs/connect/1.0.0/introduction.md b/packages/website/md/docs/connect/1/introduction.md
similarity index 100%
rename from packages/website/md/docs/connect/1.0.0/introduction.md
rename to packages/website/md/docs/connect/1/introduction.md
diff --git a/packages/website/md/docs/connect/2.0.0/introduction.md b/packages/website/md/docs/connect/2/introduction.md
similarity index 100%
rename from packages/website/md/docs/connect/2.0.0/introduction.md
rename to packages/website/md/docs/connect/2/introduction.md
diff --git a/packages/website/md/docs/connect/3/installation.md b/packages/website/md/docs/connect/3/installation.md
new file mode 100644
index 0000000000..6797d96331
--- /dev/null
+++ b/packages/website/md/docs/connect/3/installation.md
@@ -0,0 +1,15 @@
+**Install**
+
+```bash
+npm install @0x/connect --save
+```
+
+**Import**
+
+```javascript
+import { HttpClient } from '@0x/connect';
+```
+
+### Wiki
+
+Check out our [0x Connect introduction tutorial](https://0xproject.com/wiki#Intro-Tutorial) for information on how to integrate relayers into your application.
diff --git a/packages/website/md/docs/contract_wrappers/installation.md b/packages/website/md/docs/contract_wrappers/1/installation.md
similarity index 100%
rename from packages/website/md/docs/contract_wrappers/installation.md
rename to packages/website/md/docs/contract_wrappers/1/installation.md
diff --git a/packages/website/md/docs/contract_wrappers/introduction.md b/packages/website/md/docs/contract_wrappers/1/introduction.md
similarity index 100%
rename from packages/website/md/docs/contract_wrappers/introduction.md
rename to packages/website/md/docs/contract_wrappers/1/introduction.md
diff --git a/packages/website/md/docs/contract_wrappers/2/installation.md b/packages/website/md/docs/contract_wrappers/2/installation.md
new file mode 100644
index 0000000000..50610550a9
--- /dev/null
+++ b/packages/website/md/docs/contract_wrappers/2/installation.md
@@ -0,0 +1,11 @@
+**Install**
+
+```bash
+npm install @0x/contract-wrappers --save
+```
+
+**Import**
+
+```javascript
+import { ContractWrappers } from '@0x/contract-wrappers';
+```
diff --git a/packages/website/md/docs/json_schemas/1.0.0/installation.md b/packages/website/md/docs/json_schemas/1/installation.md
similarity index 100%
rename from packages/website/md/docs/json_schemas/1.0.0/installation.md
rename to packages/website/md/docs/json_schemas/1/installation.md
diff --git a/packages/website/md/docs/json_schemas/1.0.0/introduction.md b/packages/website/md/docs/json_schemas/1/introduction.md
similarity index 100%
rename from packages/website/md/docs/json_schemas/1.0.0/introduction.md
rename to packages/website/md/docs/json_schemas/1/introduction.md
diff --git a/packages/website/md/docs/json_schemas/1.0.0/schemas.md b/packages/website/md/docs/json_schemas/1/schemas.md
similarity index 100%
rename from packages/website/md/docs/json_schemas/1.0.0/schemas.md
rename to packages/website/md/docs/json_schemas/1/schemas.md
diff --git a/packages/website/md/docs/json_schemas/1.0.0/usage.md b/packages/website/md/docs/json_schemas/1/usage.md
similarity index 100%
rename from packages/website/md/docs/json_schemas/1.0.0/usage.md
rename to packages/website/md/docs/json_schemas/1/usage.md
diff --git a/packages/website/md/docs/json_schemas/2.0.0/schemas.md b/packages/website/md/docs/json_schemas/2/schemas.md
similarity index 100%
rename from packages/website/md/docs/json_schemas/2.0.0/schemas.md
rename to packages/website/md/docs/json_schemas/2/schemas.md
diff --git a/packages/website/md/docs/json_schemas/3/installation.md b/packages/website/md/docs/json_schemas/3/installation.md
new file mode 100644
index 0000000000..a998861137
--- /dev/null
+++ b/packages/website/md/docs/json_schemas/3/installation.md
@@ -0,0 +1,17 @@
+**Install**
+
+```bash
+yarn add @0x/json-schemas
+```
+
+**Import**
+
+```javascript
+import { schemas } from '@0x/json-schemas';
+```
+
+or
+
+```javascript
+var schemas = require('@0x/json-schemas').schemas;
+```
diff --git a/packages/website/md/docs/json_schemas/3/introduction.md b/packages/website/md/docs/json_schemas/3/introduction.md
new file mode 100644
index 0000000000..0039d014a7
--- /dev/null
+++ b/packages/website/md/docs/json_schemas/3/introduction.md
@@ -0,0 +1,3 @@
+Welcome to the [json-schemas](https://github.com/0xProject/0x-monorepo/tree/development/packages/json-schemas) documentation! This package provides JSON schemas for validating 0x Protocol & Standard Relayer API data structures. It provides both the raw JSON schemas and a schema validator class to interact with them from a JS project.
+
+If you are not using a Javascript-based language for your project, you can use a Javascript environment to render the JSON schemas within this package and use them together with a [JSON Schema](http://json-schema.org/) implementation in your [language of choice](http://json-schema.org/implementations.html) (e.g Python, Haskell, Go, C, C++, Rust, Ruby, Scala, etc...).
diff --git a/packages/website/md/docs/json_schemas/3/usage.md b/packages/website/md/docs/json_schemas/3/usage.md
new file mode 100644
index 0000000000..2b72eeaad3
--- /dev/null
+++ b/packages/website/md/docs/json_schemas/3/usage.md
@@ -0,0 +1,14 @@
+The following example shows you how to validate a 0x order using the `@0x/json-schemas` package.
+
+```javascript
+import {SchemaValidator, ValidatorResult, schemas} from '@0x/json-schemas';
+
+const {orderSchema} = schemas;
+const validator = new SchemaValidator();
+
+const order = {
+    ...
+};
+const validatorResult: ValidatorResult = validator.validate(order, orderSchema); // Contains all errors
+const isValid: boolean = validator.isValid(order, orderSchema); // Only returns boolean
+```
diff --git a/packages/website/md/docs/order_utils/1.0.0/installation.md b/packages/website/md/docs/order_utils/1/installation.md
similarity index 100%
rename from packages/website/md/docs/order_utils/1.0.0/installation.md
rename to packages/website/md/docs/order_utils/1/installation.md
diff --git a/packages/website/md/docs/order_utils/1.0.0/introduction.md b/packages/website/md/docs/order_utils/1/introduction.md
similarity index 100%
rename from packages/website/md/docs/order_utils/1.0.0/introduction.md
rename to packages/website/md/docs/order_utils/1/introduction.md
diff --git a/packages/website/md/docs/order_utils/2/installation.md b/packages/website/md/docs/order_utils/2/installation.md
new file mode 100644
index 0000000000..d4bac6a531
--- /dev/null
+++ b/packages/website/md/docs/order_utils/2/installation.md
@@ -0,0 +1,17 @@
+**Install**
+
+```bash
+yarn add @0x/order-utils
+```
+
+**Import**
+
+```javascript
+import { createSignedOrderAsync } from '@0x/order-utils';
+```
+
+or
+
+```javascript
+var createSignedOrderAsync = require('@0x/order-utils').createSignedOrderAsync;
+```
diff --git a/packages/website/md/docs/order_utils/2/introduction.md b/packages/website/md/docs/order_utils/2/introduction.md
new file mode 100644
index 0000000000..5678966036
--- /dev/null
+++ b/packages/website/md/docs/order_utils/2/introduction.md
@@ -0,0 +1 @@
+Welcome to the [order-utils](https://github.com/0xProject/0x-monorepo/tree/development/packages/order-utils) documentation! Order utils is a set of utils around creating, signing, validating 0x orders.
diff --git a/packages/website/md/docs/order_watcher/installation.md b/packages/website/md/docs/order_watcher/1/installation.md
similarity index 100%
rename from packages/website/md/docs/order_watcher/installation.md
rename to packages/website/md/docs/order_watcher/1/installation.md
diff --git a/packages/website/md/docs/order_watcher/introduction.md b/packages/website/md/docs/order_watcher/1/introduction.md
similarity index 100%
rename from packages/website/md/docs/order_watcher/introduction.md
rename to packages/website/md/docs/order_watcher/1/introduction.md
diff --git a/packages/website/md/docs/order_watcher/2/installation.md b/packages/website/md/docs/order_watcher/2/installation.md
new file mode 100644
index 0000000000..883eb40e56
--- /dev/null
+++ b/packages/website/md/docs/order_watcher/2/installation.md
@@ -0,0 +1,17 @@
+**Install**
+
+```bash
+yarn add @0x/order-watcher
+```
+
+**Import**
+
+```javascript
+import { OrderWatcher } from '@0x/order-watcher';
+```
+
+or
+
+```javascript
+var OrderWatcher = require('@0x/order-utils').OrderWatcher;
+```
diff --git a/packages/website/md/docs/order_watcher/2/introduction.md b/packages/website/md/docs/order_watcher/2/introduction.md
new file mode 100644
index 0000000000..b2d574053a
--- /dev/null
+++ b/packages/website/md/docs/order_watcher/2/introduction.md
@@ -0,0 +1 @@
+Welcome to the [order-watcher](https://github.com/0xProject/0x-monorepo/tree/development/packages/order-watcher) documentation! OrderWatcher is a daemon that efficiently watches a set of orders, emitting events whenever the validity of an order changes. It can be used by relayers to prune an orderbook, or by traders to keep orders fetched from a Relayer up-to-date.
diff --git a/packages/website/md/docs/smart_contracts/1.0.0/introduction.md b/packages/website/md/docs/smart_contracts/1/introduction.md
similarity index 100%
rename from packages/website/md/docs/smart_contracts/1.0.0/introduction.md
rename to packages/website/md/docs/smart_contracts/1/introduction.md
diff --git a/packages/website/md/docs/smart_contracts/2.0.0/introduction.md b/packages/website/md/docs/smart_contracts/2/introduction.md
similarity index 100%
rename from packages/website/md/docs/smart_contracts/2.0.0/introduction.md
rename to packages/website/md/docs/smart_contracts/2/introduction.md
diff --git a/packages/website/md/docs/sol-compiler/installation.md b/packages/website/md/docs/sol-compiler/1/installation.md
similarity index 100%
rename from packages/website/md/docs/sol-compiler/installation.md
rename to packages/website/md/docs/sol-compiler/1/installation.md
diff --git a/packages/website/md/docs/sol-compiler/introduction.md b/packages/website/md/docs/sol-compiler/1/introduction.md
similarity index 100%
rename from packages/website/md/docs/sol-compiler/introduction.md
rename to packages/website/md/docs/sol-compiler/1/introduction.md
diff --git a/packages/website/md/docs/sol-compiler/usage.md b/packages/website/md/docs/sol-compiler/1/usage.md
similarity index 100%
rename from packages/website/md/docs/sol-compiler/usage.md
rename to packages/website/md/docs/sol-compiler/1/usage.md
diff --git a/packages/website/md/docs/sol-compiler/2/installation.md b/packages/website/md/docs/sol-compiler/2/installation.md
new file mode 100644
index 0000000000..7e7b690fe0
--- /dev/null
+++ b/packages/website/md/docs/sol-compiler/2/installation.md
@@ -0,0 +1,23 @@
+#### CLI Installation
+
+```bash
+yarn global add @0x/sol-compiler
+```
+
+#### API Installation
+
+```bash
+yarn add @0x/sol-compiler
+```
+
+**Import**
+
+```typescript
+import { Compiler } from '@0x/sol-compiler';
+```
+
+or
+
+```javascript
+var Compiler = require('@0x/sol-compiler').Compiler;
+```
diff --git a/packages/website/md/docs/sol-compiler/2/usage.md b/packages/website/md/docs/sol-compiler/2/usage.md
new file mode 100644
index 0000000000..68e5a988fe
--- /dev/null
+++ b/packages/website/md/docs/sol-compiler/2/usage.md
@@ -0,0 +1,24 @@
+#### CLI Usage
+
+```bash
+$ sol-compiler
+Options:
+  --version        Show version number                                 [boolean]
+  --contracts-dir  path of contracts directory to compile               [string]
+  --artifacts-dir  path to write contracts artifacts to                 [string]
+  --contracts      comma separated list of contracts to compile
+                                                         [string] [default: "*"]
+  --help           Show help                                           [boolean]
+```
+
+#### API Usage
+
+```typescript
+import { Compiler } from '@0x/sol-compiler';
+
+const compiler = new Compiler();
+
+(async () => {
+    await compiler.compileAllAsync();
+})().catch(console.log);
+```
diff --git a/packages/website/md/docs/sol_cov/installation.md b/packages/website/md/docs/sol_cov/1/installation.md
similarity index 100%
rename from packages/website/md/docs/sol_cov/installation.md
rename to packages/website/md/docs/sol_cov/1/installation.md
diff --git a/packages/website/md/docs/sol_cov/introduction.md b/packages/website/md/docs/sol_cov/1/introduction.md
similarity index 100%
rename from packages/website/md/docs/sol_cov/introduction.md
rename to packages/website/md/docs/sol_cov/1/introduction.md
diff --git a/packages/website/md/docs/sol_cov/usage.md b/packages/website/md/docs/sol_cov/1/usage.md
similarity index 100%
rename from packages/website/md/docs/sol_cov/usage.md
rename to packages/website/md/docs/sol_cov/1/usage.md
diff --git a/packages/website/md/docs/sol_cov/2/installation.md b/packages/website/md/docs/sol_cov/2/installation.md
new file mode 100644
index 0000000000..1d4557cf55
--- /dev/null
+++ b/packages/website/md/docs/sol_cov/2/installation.md
@@ -0,0 +1,17 @@
+**Install**
+
+```bash
+yarn add @0x/sol-cov
+```
+
+**Import**
+
+```javascript
+import { CoverageSubprovider } from '@0x/sol-cov';
+```
+
+or
+
+```javascript
+var CoverageSubprovider = require('@0x/sol-cov').CoverageSubprovider;
+```
diff --git a/packages/website/md/docs/sol_cov/2/introduction.md b/packages/website/md/docs/sol_cov/2/introduction.md
new file mode 100644
index 0000000000..ac3256845a
--- /dev/null
+++ b/packages/website/md/docs/sol_cov/2/introduction.md
@@ -0,0 +1 @@
+Welcome to the [sol-cov](https://github.com/0xProject/0x-monorepo/tree/development/packages/sol-cov) documentation! Sol-cov is a Solidity coverage tool for your smart contract tests.
diff --git a/packages/website/md/docs/sol_cov/2/usage.md b/packages/website/md/docs/sol_cov/2/usage.md
new file mode 100644
index 0000000000..d1c76474b7
--- /dev/null
+++ b/packages/website/md/docs/sol_cov/2/usage.md
@@ -0,0 +1,62 @@
+Sol-cov uses transaction traces in order to figure out which lines of Solidity source code have been covered by your tests. In order for it to gather these traces, you must add the `CoverageSubprovider` to the [ProviderEngine](https://github.com/MetaMask/provider-engine) instance you use when running your Solidity tests. If you're unfamiliar with ProviderEngine, please read the [Web3 Provider explained](https://0xproject.com/wiki#Web3-Provider-Explained) wiki article.
+
+The CoverageSubprovider eavesdrops on the `eth_sendTransaction` and `eth_call` RPC calls and collects traces after each call using `debug_traceTransaction`. `eth_call`'s' don't generate traces - so we take a snapshot, re-submit it as a transaction, get the trace and then revert the snapshot.
+
+Coverage subprovider needs some info about your contracts (`srcMap`, `bytecode`). It gets that info from your project's artifacts. Some frameworks have their own artifact format. Some artifact formats don't actually contain all the neccessary data.
+
+In order to use `CoverageSubprovider` with your favorite framework you need to pass an `artifactsAdapter` to it.
+
+### Sol-compiler
+
+If you are generating your artifacts with [@0x/sol-compiler](https://0xproject.com/docs/sol-compiler) you can use the `SolCompilerArtifactsAdapter` we've implemented for you.
+
+```typescript
+import { SolCompilerArtifactsAdapter } from '@0x/sol-cov';
+const artifactsPath = 'src/artifacts';
+const contractsPath = 'src/contracts';
+const artifactsAdapter = new SolCompilerArtifactsAdapter(artifactsPath, contractsPath);
+```
+
+### Truffle
+
+If your project is using [Truffle](https://truffleframework.com/), we've written a `TruffleArtifactsAdapter`for you.
+
+```typescript
+import { TruffleArtifactAdapter } from '@0x/sol-cov';
+const contractsPath = 'src/contracts';
+const artifactAdapter = new TruffleArtifactAdapter(contractsDir);
+```
+
+Because truffle artifacts don't have all the data we need - we actually will recompile your contracts under the hood. That's why you don't need to pass an `artifactsPath`.
+
+### Other framework/toolset
+
+You'll need to write your own artifacts adapter. It should extend `AbstractArtifactsAdapter`.
+Look at the code of the two adapters above for examples.
+
+### Usage
+
+```typescript
+import { CoverageSubprovider } from '@0x/sol-cov';
+import ProviderEngine = require('web3-provider-engine');
+
+const provider = new ProviderEngine();
+
+const artifactsPath = 'src/artifacts';
+const contractsPath = 'src/contracts';
+const networkId = 50;
+// Some calls might not have `from` address specified. Nevertheless - transactions need to be submitted from an address with at least some funds. defaultFromAddress is the address that will be used to submit those calls as transactions from.
+const defaultFromAddress = '0x5409ed021d9299bf6814279a6a1411a7e866a631';
+const isVerbose = true;
+const coverageSubprovider = new CoverageSubprovider(artifactsAdapter, defaultFromAddress, isVerbose);
+
+provider.addProvider(coverageSubprovider);
+```
+
+After your test suite is complete (e.g in the Mocha global `after` hook), you'll need to call:
+
+```typescript
+await coverageSubprovider.writeCoverageAsync();
+```
+
+This will create a `coverage.json` file in a `coverage` directory. This file has an [Istanbul format](https://github.com/gotwarlost/istanbul/blob/master/coverage.json.md) - so you can use it with any of the existing Istanbul reporters.
diff --git a/packages/website/md/docs/subproviders/installation.md b/packages/website/md/docs/subproviders/1/installation.md
similarity index 100%
rename from packages/website/md/docs/subproviders/installation.md
rename to packages/website/md/docs/subproviders/1/installation.md
diff --git a/packages/website/md/docs/subproviders/introduction.md b/packages/website/md/docs/subproviders/1/introduction.md
similarity index 100%
rename from packages/website/md/docs/subproviders/introduction.md
rename to packages/website/md/docs/subproviders/1/introduction.md
diff --git a/packages/website/md/docs/subproviders/ledger_node_hid.md b/packages/website/md/docs/subproviders/1/ledger_node_hid.md
similarity index 100%
rename from packages/website/md/docs/subproviders/ledger_node_hid.md
rename to packages/website/md/docs/subproviders/1/ledger_node_hid.md
diff --git a/packages/website/md/docs/subproviders/2/installation.md b/packages/website/md/docs/subproviders/2/installation.md
new file mode 100644
index 0000000000..025dd0dee4
--- /dev/null
+++ b/packages/website/md/docs/subproviders/2/installation.md
@@ -0,0 +1,15 @@
+```bash
+npm install @0x/subproviders --save
+```
+
+**Import**
+
+```typescript
+import { LedgerSubprovider } from '@0x/subproviders';
+```
+
+or
+
+```javascript
+var LedgerSubprovider = require('@0x/subproviders').LedgerSubprovider;
+```
diff --git a/packages/website/md/docs/web3_wrapper/installation.md b/packages/website/md/docs/web3_wrapper/1/installation.md
similarity index 100%
rename from packages/website/md/docs/web3_wrapper/installation.md
rename to packages/website/md/docs/web3_wrapper/1/installation.md
diff --git a/packages/website/md/docs/web3_wrapper/introduction.md b/packages/website/md/docs/web3_wrapper/1/introduction.md
similarity index 100%
rename from packages/website/md/docs/web3_wrapper/introduction.md
rename to packages/website/md/docs/web3_wrapper/1/introduction.md
diff --git a/packages/website/md/docs/web3_wrapper/2/installation.md b/packages/website/md/docs/web3_wrapper/2/installation.md
new file mode 100644
index 0000000000..14c4f066c8
--- /dev/null
+++ b/packages/website/md/docs/web3_wrapper/2/installation.md
@@ -0,0 +1,25 @@
+**Install**
+
+```bash
+npm install @0x/web3-wrapper --save
+```
+
+**Import**
+
+```javascript
+import { Web3Wrapper } from '@0x/web3-wrapper';
+```
+
+or
+
+```javascript
+var Web3Wrapper = require('@0x/web3-wrapper').Web3Wrapper;
+```
+
+If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
+
+```
+"include": [
+    "./node_modules/web3-typescript-typings/index.d.ts",
+]
+```
diff --git a/packages/website/package.json b/packages/website/package.json
index efab95c802..777790ca92 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/website",
-    "version": "0.0.54",
+    "name": "@0x/website",
+    "version": "0.0.55",
     "engines": {
         "node": ">=6.12"
     },
@@ -19,23 +19,22 @@
     "author": "Fabio Berger",
     "license": "Apache-2.0",
     "dependencies": {
-        "0x.js": "^0.38.6",
-        "@0xproject/contract-wrappers": "^2.0.2",
-        "@0xproject/json-schemas": "^1.0.7",
-        "@0xproject/order-utils": "^1.0.7",
-        "@0xproject/react-docs": "^1.0.13",
-        "@0xproject/react-shared": "^1.0.15",
-        "@0xproject/subproviders": "^2.0.7",
-        "@0xproject/types": "^1.1.4",
-        "@0xproject/typescript-typings": "^3.0.2",
-        "@0xproject/utils": "^2.0.2",
-        "@0xproject/web3-wrapper": "^3.0.3",
+        "@0x/contract-wrappers": "^3.0.0",
+        "@0x/json-schemas": "^2.0.0",
+        "@0x/order-utils": "^2.0.0",
+        "@0x/react-docs": "^1.0.14",
+        "@0x/react-shared": "^1.0.17",
+        "@0x/subproviders": "^2.1.0",
+        "@0x/types": "^1.2.0",
+        "@0x/typescript-typings": "^3.0.3",
+        "@0x/utils": "^2.0.3",
+        "@0x/web3-wrapper": "^3.1.0",
         "accounting": "^0.4.1",
         "basscss": "^8.0.3",
         "blockies": "^0.0.2",
         "bowser": "^1.9.3",
         "deep-equal": "^1.0.1",
-        "ethereum-types": "^1.0.11",
+        "ethereum-types": "^1.1.1",
         "ethereumjs-util": "^5.1.1",
         "find-versions": "^2.0.0",
         "jsonschema": "^1.2.0",
@@ -53,8 +52,7 @@
         "react-helmet": "^5.2.0",
         "react-popper": "^1.0.0-beta.6",
         "react-redux": "^5.0.3",
-        "react-router-dom": "^4.1.1",
-        "react-scroll": "0xproject/react-scroll#similar-to-pr-330",
+        "react-scroll": "0xproject/react-scroll#similar-to-pr-330-but-with-replace-state",
         "react-tooltip": "^3.2.7",
         "react-typist": "^2.0.4",
         "redux": "^3.6.0",
@@ -83,7 +81,6 @@
         "@types/react-dom": "^16.0.7",
         "@types/react-helmet": "^5.0.6",
         "@types/react-redux": "^4.4.37",
-        "@types/react-router-dom": "^4.0.4",
         "@types/react-scroll": "1.5.3",
         "@types/react-tap-event-plugin": "0.0.30",
         "@types/redux": "^3.6.0",
diff --git a/packages/website/public/css/basscss_responsive_custom.css b/packages/website/public/css/basscss_responsive_custom.css
index 5f8bd9117d..92a681cb12 100644
--- a/packages/website/public/css/basscss_responsive_custom.css
+++ b/packages/website/public/css/basscss_responsive_custom.css
@@ -26,6 +26,10 @@
     .sm-right {
         float: right;
     }
+    .sm-justify-end {
+        ms-flex-pack: end;
+        justify-content: flex-end;
+    }
 }
 
 @media (min-width: 52em) {
@@ -54,6 +58,10 @@
     .md-right {
         float: right;
     }
+    .md-justify-end {
+        ms-flex-pack: end;
+        justify-content: flex-end;
+    }
 }
 
 @media (min-width: 64em) {
@@ -82,4 +90,8 @@
     .lg-right {
         float: right;
     }
+    .lg-justify-end {
+        ms-flex-pack: end;
+        justify-content: flex-end;
+    }
 }
diff --git a/packages/website/public/images/developers/tutorials/0x_order_basics.svg b/packages/website/public/images/developers/tutorials/0x_order_basics.svg
new file mode 100644
index 0000000000..57b04dfa57
--- /dev/null
+++ b/packages/website/public/images/developers/tutorials/0x_order_basics.svg
@@ -0,0 +1 @@
+Artboard 1
\ No newline at end of file
diff --git a/packages/website/public/images/developers/tutorials/build_a_relayer.svg b/packages/website/public/images/developers/tutorials/build_a_relayer.svg
new file mode 100644
index 0000000000..afda40d881
--- /dev/null
+++ b/packages/website/public/images/developers/tutorials/build_a_relayer.svg
@@ -0,0 +1,3 @@
+
+
+
diff --git a/packages/website/public/images/developers/tutorials/build_a_trading_bot.svg b/packages/website/public/images/developers/tutorials/build_a_trading_bot.svg
new file mode 100644
index 0000000000..960616bfe2
--- /dev/null
+++ b/packages/website/public/images/developers/tutorials/build_a_trading_bot.svg
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/packages/website/public/images/developers/tutorials/develop_on_ethereum.svg b/packages/website/public/images/developers/tutorials/develop_on_ethereum.svg
new file mode 100644
index 0000000000..e2c492ecd7
--- /dev/null
+++ b/packages/website/public/images/developers/tutorials/develop_on_ethereum.svg
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/packages/website/public/images/developers/tutorials/use_shared_liquidity.svg b/packages/website/public/images/developers/tutorials/use_shared_liquidity.svg
new file mode 100644
index 0000000000..c402964aad
--- /dev/null
+++ b/packages/website/public/images/developers/tutorials/use_shared_liquidity.svg
@@ -0,0 +1,3 @@
+
+
+
diff --git a/packages/website/public/images/docs_logo.svg b/packages/website/public/images/docs_logo.svg
new file mode 100644
index 0000000000..e3c4b628b7
--- /dev/null
+++ b/packages/website/public/images/docs_logo.svg
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/website/translations/chinese.json b/packages/website/translations/chinese.json
index ed1a6044a2..2d3ad69742 100644
--- a/packages/website/translations/chinese.json
+++ b/packages/website/translations/chinese.json
@@ -78,5 +78,24 @@
     "WEBSITE": "网站",
     "DEVELOPERS": "首页",
     "HOME": "Rocket.chat",
-    "ROCKETCHAT": "开发人员"
+    "ROCKETCHAT": "开发人员",
+    "BUILD_A_RELAYER": "build a relayer",
+    "BUILD_A_RELAYER_DESCRIPTION": "Learn more about building applications ontop of Ethereum",
+    "DEVELOP_ON_ETHEREUM": "develop on Ethereum",
+    "DEVELOP_ON_ETHEREUM_DESCRIPTION": "Learn how to build your own 0x relayer from scratch",
+    "ORDER_BASICS": "0x order basics",
+    "ORDER_BASICS_DESCRIPTION": "Tutorial on how to create, validate and fill an order using 0x",
+    "USE_SHARED_LIQUIDITY": "use shared liquidity",
+    "USE_SHARED_LIQUIDITY_DESCRIPTION": "Access the shared liquidity pool using the Standard Relayer API",
+    "VIEW_ALL_DOCUMENTATION": "view all documentation",
+    "SANDBOX": "0x.js sandbox",
+    "GITHUB": "github",
+    "LIVE_CHAT": "live chat",
+    "LIBRARIES_AND_TOOLS": "Libraries & Tools",
+    "LIBRARIES_AND_TOOLS_DESCRIPTION":
+        "A list of available tools maintained by the 0x core developers and wider community for building on top of 0x Protocol and Ethereum",
+    "MORE": "more",
+    "START_BUILDING_ON_0X": "Start building on 0x",
+    "START_BUILDING_ON_0X_DESCRIPTION":
+        "Follow one of our \"Getting started\" guides to learn more about building ontop of 0x."
 }
diff --git a/packages/website/translations/english.json b/packages/website/translations/english.json
index ac8e4900ac..fab8ed56b3 100644
--- a/packages/website/translations/english.json
+++ b/packages/website/translations/english.json
@@ -83,11 +83,30 @@
     "HOME": "home",
     "ROCKETCHAT": "rocket.chat",
     "TRADE_CALL_TO_ACTION": "trade on 0x",
+    "BUILD_A_RELAYER": "build a relayer",
+    "BUILD_A_RELAYER_DESCRIPTION": "Learn more about building applications ontop of Ethereum",
+    "DEVELOP_ON_ETHEREUM": "develop on Ethereum",
+    "DEVELOP_ON_ETHEREUM_DESCRIPTION": "Learn how to build your own 0x relayer from scratch",
+    "ORDER_BASICS": "0x order basics",
+    "ORDER_BASICS_DESCRIPTION": "Tutorial on how to create, validate and fill an order using 0x",
+    "USE_SHARED_LIQUIDITY": "use shared liquidity",
+    "USE_SHARED_LIQUIDITY_DESCRIPTION": "Learn how to tap into shared liquidity using the Standard Relayer API",
+    "VIEW_ALL_DOCUMENTATION": "view all documentation",
+    "SANDBOX": "0x.js sandbox",
+    "GITHUB": "github",
+    "LIVE_CHAT": "live chat",
+    "LIBRARIES_AND_TOOLS": "Libraries & Tools",
+    "LIBRARIES_AND_TOOLS_DESCRIPTION":
+        "A list of available tools maintained by the 0x core developers and wider community for building on top of 0x Protocol and Ethereum",
+    "MORE": "more",
     "OUR_MISSION_AND_VALUES": "our mission & values",
     "GAMING_AND_COLLECTABLES": "gaming & collectables",
     "GAMING_AND_COLLECTABLES_DESCRIPTION":
         "artists and game makers are tokenizing digital art and in-game items known as non-fungible tokens (NFTs). 0x enables these creators to add exchange functionality to give access and the ability to build marketplaces for NFT trading.",
     "ORDER_BOOKS": "order books",
     "ORDER_BOOKS_DESCRIPTION":
-        "there are thousands of decentralized apps that have native utility tokens. 0x provides market makers and professional exchanges an ability to host order books to facilitate the exchange of these assets."
+        "there are thousands of decentralized apps that have native utility tokens. 0x provides market makers and professional exchanges an ability to host order books to facilitate the exchange of these assets.",
+    "START_BUILDING_ON_0X": "Start building on 0x",
+    "START_BUILDING_ON_0X_DESCRIPTION":
+        "Follow one of our \"Getting started\" guides to learn more about building ontop of 0x."
 }
diff --git a/packages/website/translations/korean.json b/packages/website/translations/korean.json
index 8892f2deed..8470bf9a02 100644
--- a/packages/website/translations/korean.json
+++ b/packages/website/translations/korean.json
@@ -78,5 +78,24 @@
     "WEBSITE": "Website",
     "HOME": "홈",
     "ROCKETCHAT": "Rocket.chat",
-    "DEVELOPERS": "개발자"
+    "DEVELOPERS": "개발자",
+    "BUILD_A_RELAYER": "build a relayer",
+    "BUILD_A_RELAYER_DESCRIPTION": "Learn more about building applications ontop of Ethereum",
+    "DEVELOP_ON_ETHEREUM": "develop on Ethereum",
+    "DEVELOP_ON_ETHEREUM_DESCRIPTION": "Learn how to build your own 0x relayer from scratch",
+    "ORDER_BASICS": "0x order basics",
+    "ORDER_BASICS_DESCRIPTION": "Tutorial on how to create, validate and fill an order using 0x",
+    "USE_SHARED_LIQUIDITY": "use shared liquidity",
+    "USE_SHARED_LIQUIDITY_DESCRIPTION": "Learn how to tap into shared liquidity using the Standard Relayer API",
+    "VIEW_ALL_DOCUMENTATION": "view all documentation",
+    "SANDBOX": "0x.js sandbox",
+    "GITHUB": "github",
+    "LIVE_CHAT": "live chat",
+    "LIBRARIES_AND_TOOLS": "Libraries & Tools",
+    "LIBRARIES_AND_TOOLS_DESCRIPTION":
+        "A list of available tools maintained by the 0x core developers and wider community for building on top of 0x Protocol and Ethereum",
+    "MORE": "more",
+    "START_BUILDING_ON_0X": "Start building on 0x",
+    "START_BUILDING_ON_0X_DESCRIPTION":
+        "Follow one of our \"Getting started\" guides to learn more about building ontop of 0x."
 }
diff --git a/packages/website/translations/russian.json b/packages/website/translations/russian.json
index 41a7a990d5..b2bc151abb 100644
--- a/packages/website/translations/russian.json
+++ b/packages/website/translations/russian.json
@@ -78,5 +78,24 @@
     "WEBSITE": "Веб-сайт",
     "DEVELOPERS": "Домашняя страница",
     "HOME": "Rocket.chat",
-    "ROCKETCHAT": "Для разработчиков"
+    "ROCKETCHAT": "Для разработчиков",
+    "BUILD_A_RELAYER": "build a relayer",
+    "BUILD_A_RELAYER_DESCRIPTION": "Learn more about building applications ontop of Ethereum",
+    "DEVELOP_ON_ETHEREUM": "develop on Ethereum",
+    "DEVELOP_ON_ETHEREUM_DESCRIPTION": "Learn how to build your own 0x relayer from scratch",
+    "ORDER_BASICS": "0x order basics",
+    "ORDER_BASICS_DESCRIPTION": "Tutorial on how to create, validate and fill an order using 0x",
+    "USE_SHARED_LIQUIDITY": "use shared liquidity",
+    "USE_SHARED_LIQUIDITY_DESCRIPTION": "Learn how to tap into shared liquidity using the Standard Relayer API",
+    "VIEW_ALL_DOCUMENTATION": "view all documentation",
+    "SANDBOX": "0x.js sandbox",
+    "GITHUB": "github",
+    "LIVE_CHAT": "live chat",
+    "LIBRARIES_AND_TOOLS": "Libraries & Tools",
+    "LIBRARIES_AND_TOOLS_DESCRIPTION":
+        "A list of available tools maintained by the 0x core developers and wider community for building on top of 0x Protocol and Ethereum",
+    "MORE": "more",
+    "START_BUILDING_ON_0X": "Start building on 0x",
+    "START_BUILDING_ON_0X_DESCRIPTION":
+        "Follow one of our \"Getting started\" guides to learn more about building ontop of 0x."
 }
diff --git a/packages/website/translations/spanish.json b/packages/website/translations/spanish.json
index 7780190ac9..fefb924477 100644
--- a/packages/website/translations/spanish.json
+++ b/packages/website/translations/spanish.json
@@ -79,5 +79,24 @@
     "WEBSITE": "website",
     "DEVELOPERS": "inicio",
     "HOME": "rocket.chat",
-    "ROCKETCHAT": "desarrolladores"
+    "ROCKETCHAT": "desarrolladores",
+    "BUILD_A_RELAYER": "build a relayer",
+    "BUILD_A_RELAYER_DESCRIPTION": "Learn more about building applications ontop of Ethereum",
+    "DEVELOP_ON_ETHEREUM": "develop on Ethereum",
+    "DEVELOP_ON_ETHEREUM_DESCRIPTION": "Learn how to build your own 0x relayer from scratch",
+    "ORDER_BASICS": "0x order basics",
+    "ORDER_BASICS_DESCRIPTION": "Tutorial on how to create, validate and fill an order using 0x",
+    "USE_SHARED_LIQUIDITY": "use shared liquidity",
+    "USE_SHARED_LIQUIDITY_DESCRIPTION": "Learn how to tap into shared liquidity using the Standard Relayer API",
+    "VIEW_ALL_DOCUMENTATION": "view all documentation",
+    "SANDBOX": "0x.js sandbox",
+    "GITHUB": "github",
+    "LIVE_CHAT": "live chat",
+    "LIBRARIES_AND_TOOLS": "Libraries & Tools",
+    "LIBRARIES_AND_TOOLS_DESCRIPTION":
+        "A list of available tools maintained by the 0x core developers and wider community for building on top of 0x Protocol and Ethereum",
+    "MORE": "more",
+    "START_BUILDING_ON_0X": "Start building on 0x",
+    "START_BUILDING_ON_0X_DESCRIPTION":
+        "Follow one of our \"Getting started\" guides to learn more about building ontop of 0x."
 }
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 8955bbc30e..efb5aef23b 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -1,4 +1,3 @@
-import { ZeroEx } from '0x.js';
 import {
     BlockRange,
     ContractWrappers,
@@ -8,9 +7,9 @@ import {
     ExchangeEvents,
     ExchangeFillEventArgs,
     IndexedFilterValues,
-} from '@0xproject/contract-wrappers';
-import { assetDataUtils, orderHashUtils, signatureUtils } from '@0xproject/order-utils';
-import { EtherscanLinkSuffixes, utils as sharedUtils } from '@0xproject/react-shared';
+} from '@0x/contract-wrappers';
+import { assetDataUtils, orderHashUtils, signatureUtils } from '@0x/order-utils';
+import { EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared';
 import {
     ledgerEthereumBrowserClientFactoryAsync,
     LedgerSubprovider,
@@ -19,10 +18,10 @@ import {
     RPCSubprovider,
     SignerSubprovider,
     Web3ProviderEngine,
-} from '@0xproject/subproviders';
-import { SignedOrder, Token as ZeroExToken } from '@0xproject/types';
-import { BigNumber, intervalUtils, logUtils, promisify } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+} from '@0x/subproviders';
+import { SignedOrder, Token as ZeroExToken } from '@0x/types';
+import { BigNumber, intervalUtils, logUtils, promisify } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import { BlockParam, LogWithDecodedArgs, Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
 import * as _ from 'lodash';
 import * as moment from 'moment';
@@ -53,6 +52,7 @@ import { backendClient } from 'ts/utils/backend_client';
 import { configs } from 'ts/utils/configs';
 import { constants } from 'ts/utils/constants';
 import { errorReporter } from 'ts/utils/error_reporter';
+import { fakeTokenRegistry } from 'ts/utils/fake_token_registry';
 import { tokenAddressOverrides } from 'ts/utils/token_address_overrides';
 import { utils } from 'ts/utils/utils';
 import FilterSubprovider = require('web3-provider-engine/subproviders/filters');
@@ -74,7 +74,6 @@ export class Blockchain {
     public networkId: number;
     public nodeVersion: string;
     private _contractWrappers: ContractWrappers;
-    private _zeroEx: ZeroEx;
     private readonly _dispatcher: Dispatcher;
     private _web3Wrapper?: Web3Wrapper;
     private _blockchainWatcher?: BlockchainWatcher;
@@ -228,8 +227,9 @@ export class Blockchain {
         }
     }
     public async isAddressInTokenRegistryAsync(tokenAddress: string): Promise {
-        utils.assert(!_.isUndefined(this._zeroEx), 'ZeroEx must be instantiated.');
-        const tokenIfExists = await this._zeroEx.tokenRegistry.getTokenIfExistsAsync(tokenAddress);
+        const tokens = fakeTokenRegistry[this.networkId];
+        const tokenIfExists = _.find(tokens, { address: tokenAddress });
+
         // HACK: Override token addresses on testnets
         const tokenSymbolToAddressOverrides = tokenAddressOverrides[this.networkId];
         let isTokenAddressInOverrides = false;
@@ -768,8 +768,7 @@ export class Blockchain {
         if (this.networkId === constants.NETWORK_ID_MAINNET) {
             tokenRegistryTokens = await backendClient.getTokenInfosAsync();
         } else {
-            utils.assert(!_.isUndefined(this._zeroEx), 'ZeroEx must be instantiated.');
-            tokenRegistryTokens = await this._zeroEx.tokenRegistry.getTokensAsync();
+            tokenRegistryTokens = fakeTokenRegistry[this.networkId];
             const tokenSymbolToAddressOverrides = tokenAddressOverrides[this.networkId];
             if (!_.isUndefined(tokenAddressOverrides)) {
                 // HACK: Override token addresses on testnets
@@ -865,11 +864,6 @@ export class Blockchain {
             networkId,
         };
         this._contractWrappers = new ContractWrappers(provider, contractWrappersConfig);
-        if (!_.isUndefined(this._zeroEx)) {
-            this._zeroEx.setProvider(provider, networkId);
-        } else {
-            this._zeroEx = new ZeroEx(provider, { networkId });
-        }
         if (!_.isUndefined(this._blockchainWatcher)) {
             this._blockchainWatcher.destroy();
         }
diff --git a/packages/website/ts/blockchain_watcher.ts b/packages/website/ts/blockchain_watcher.ts
index 39ed8b08b6..835932dcd7 100644
--- a/packages/website/ts/blockchain_watcher.ts
+++ b/packages/website/ts/blockchain_watcher.ts
@@ -1,5 +1,5 @@
-import { BigNumber, intervalUtils, logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { BigNumber, intervalUtils, logUtils } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import { Dispatcher } from 'ts/redux/dispatcher';
 
diff --git a/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx b/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx
index 18c0609917..a0114d8981 100644
--- a/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx
+++ b/packages/website/ts/components/dialogs/blockchain_err_dialog.tsx
@@ -1,4 +1,4 @@
-import { colors, Networks } from '@0xproject/react-shared';
+import { colors, Networks } from '@0x/react-shared';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
 import * as React from 'react';
diff --git a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
index f2cfb279a3..9b9421f1a5 100644
--- a/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
+++ b/packages/website/ts/components/dialogs/eth_weth_conversion_dialog.tsx
@@ -1,5 +1,5 @@
-import { colors } from '@0xproject/react-shared';
-import { BigNumber } from '@0xproject/utils';
+import { colors } from '@0x/react-shared';
+import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
diff --git a/packages/website/ts/components/dialogs/ledger_config_dialog.tsx b/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
index fbc6c868b7..a9f591150d 100644
--- a/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
+++ b/packages/website/ts/components/dialogs/ledger_config_dialog.tsx
@@ -1,6 +1,6 @@
-import { colors, constants as sharedConstants } from '@0xproject/react-shared';
-import { BigNumber, logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { colors, constants as sharedConstants } from '@0x/react-shared';
+import { BigNumber, logUtils } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
diff --git a/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx b/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx
index ef295762b0..326df2a8c8 100644
--- a/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx
+++ b/packages/website/ts/components/dialogs/portal_disclaimer_dialog.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
 import * as React from 'react';
diff --git a/packages/website/ts/components/dialogs/send_dialog.tsx b/packages/website/ts/components/dialogs/send_dialog.tsx
index 2754b153f6..5f6927cef6 100644
--- a/packages/website/ts/components/dialogs/send_dialog.tsx
+++ b/packages/website/ts/components/dialogs/send_dialog.tsx
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
diff --git a/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx b/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx
index afbb30b82d..bbec1d6491 100644
--- a/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx
+++ b/packages/website/ts/components/dialogs/u2f_not_supported_dialog.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
 import * as React from 'react';
diff --git a/packages/website/ts/components/documentation/docs_logo.tsx b/packages/website/ts/components/documentation/docs_logo.tsx
new file mode 100644
index 0000000000..2840d59601
--- /dev/null
+++ b/packages/website/ts/components/documentation/docs_logo.tsx
@@ -0,0 +1,20 @@
+import { Link } from '@0x/react-shared';
+import * as React from 'react';
+import { WebsitePaths } from 'ts/types';
+
+export interface DocsLogoProps {
+    height: number;
+    containerStyle?: React.CSSProperties;
+}
+
+export const DocsLogo: React.StatelessComponent = props => {
+    return (
+        
+            
+        
+    );
+};
+
+DocsLogo.defaultProps = {
+    containerStyle: {},
+};
diff --git a/packages/website/ts/components/documentation/docs_top_bar.tsx b/packages/website/ts/components/documentation/docs_top_bar.tsx
new file mode 100644
index 0000000000..2054d08604
--- /dev/null
+++ b/packages/website/ts/components/documentation/docs_top_bar.tsx
@@ -0,0 +1,108 @@
+import { ALink, colors, Link } from '@0x/react-shared';
+import * as _ from 'lodash';
+import Drawer from 'material-ui/Drawer';
+import * as React from 'react';
+import { DocsLogo } from 'ts/components/documentation/docs_logo';
+import { Container } from 'ts/components/ui/container';
+import { Text } from 'ts/components/ui/text';
+import { Deco, Key, ScreenWidths } from 'ts/types';
+import { constants } from 'ts/utils/constants';
+import { Translate } from 'ts/utils/translate';
+
+export interface DocsTopBarProps {
+    location: Location;
+    screenWidth: ScreenWidths;
+    translate: Translate;
+    sidebar?: React.ReactNode;
+}
+
+interface DocsTopBarState {
+    isDrawerOpen: boolean;
+}
+
+export class DocsTopBar extends React.Component {
+    constructor(props: DocsTopBarProps) {
+        super(props);
+        this.state = {
+            isDrawerOpen: false,
+        };
+    }
+    public componentWillReceiveProps(nextProps: DocsTopBarProps): void {
+        if (nextProps.location.pathname !== this.props.location.pathname) {
+            this.setState({
+                isDrawerOpen: false,
+            });
+        }
+    }
+    public render(): React.ReactNode {
+        return (
+            
+                
+                    
+                        
+                            {this._renderMenuItems(constants.DEVELOPER_TOPBAR_LINKS)}
+                        
+                    
+                    
+                        
+                            
+                        
+                    
+                    
+                        
+                    
+                
+                
+                {this.props.screenWidth === ScreenWidths.Sm && this._renderDrawer()}
+            
+        );
+    }
+    private _renderMenuItems(menuItemLinks: ALink[]): React.ReactNode {
+        const menuItems = _.map(menuItemLinks, menuItemInfo => {
+            return (
+                
+                    
+                        
+                            {this.props.translate.get(menuItemInfo.title as Key, Deco.Cap)}
+                        
+                    
+                
+            );
+        });
+        return menuItems;
+    }
+    private _renderDrawer(): React.ReactNode {
+        return (
+            
+                
+                    {this.props.sidebar}
+                
+            
+        );
+    }
+    private _onMenuButtonClick(): void {
+        this.setState({
+            isDrawerOpen: !this.state.isDrawerOpen,
+        });
+    }
+}
diff --git a/packages/website/ts/components/documentation/overview_content.tsx b/packages/website/ts/components/documentation/overview_content.tsx
new file mode 100644
index 0000000000..caabaf8740
--- /dev/null
+++ b/packages/website/ts/components/documentation/overview_content.tsx
@@ -0,0 +1,134 @@
+import { colors, Link, MarkdownLinkBlock, utils as sharedUtils } from '@0x/react-shared';
+import { ObjectMap } from '@0x/types';
+import * as _ from 'lodash';
+import * as React from 'react';
+import * as ReactMarkdown from 'react-markdown';
+import { Element as ScrollElement } from 'react-scroll';
+import { TutorialButton } from 'ts/components/documentation/tutorial_button';
+import { Container } from 'ts/components/ui/container';
+import { Text } from 'ts/components/ui/text';
+import { Deco, Key, Package, TutorialInfo } from 'ts/types';
+import { Translate } from 'ts/utils/translate';
+
+export interface OverviewContentProps {
+    translate: Translate;
+    tutorials: TutorialInfo[];
+    categoryToPackages: ObjectMap;
+}
+
+export interface OverviewContentState {}
+
+export class OverviewContent extends React.Component {
+    public render(): React.ReactNode {
+        return (
+            
+                {this._renderSectionTitle(this.props.translate.get(Key.StartBuildOn0x, Deco.Cap))}
+                
+                    {this._renderSectionDescription(this.props.translate.get(Key.StartBuildOn0xDescription, Deco.Cap))}
+                    
+                        {_.map(this.props.tutorials, tutorialInfo => (
+                            
+                                
+                            
+                        ))}
+                    
+                
+                
+                    {this._renderSectionTitle(this.props.translate.get(Key.LibrariesAndTools, Deco.CapWords))}
+                    
+                        {this._renderSectionDescription(
+                            this.props.translate.get(Key.LibrariesAndToolsDescription, Deco.Cap),
+                        )}
+                        
+                            {_.map(this.props.categoryToPackages, (pkgs, category) =>
+                                this._renderPackageCategory(category, pkgs),
+                            )}
+                        
+                    
+                
+            
+        );
+    }
+    private _renderPackageCategory(category: string, pkgs: Package[]): React.ReactNode {
+        return (
+            
+                {category}
+                {_.map(pkgs, pkg => this._renderPackage(pkg))}
+            
+        );
+    }
+    private _renderPackage(pkg: Package): React.ReactNode {
+        const id = sharedUtils.getIdFromName(pkg.link.title);
+        return (
+            
+                
+                    
+                    
+                        
+                            
+                                
+                                    {pkg.link.title}
+                                
+                            
+                        
+                        
+                            
+                                
+                            
+                        
+                        
+                            
+                                
+                                    
+                                        {this.props.translate.get(Key.More, Deco.Cap)}
+                                        
+                                            
+                                        
+                                    
+                                
+                            
+                        
+                    
+                
+            
+        );
+    }
+    private _renderSectionTitle(text: string): React.ReactNode {
+        return (
+            
+                
+                    {text}
+                
+            
+        );
+    }
+    private _renderSectionDescription(text: string): React.ReactNode {
+        return (
+            
+                {text}
+            
+        );
+    }
+} // tslint:disable:max-file-line-count
diff --git a/packages/website/ts/components/documentation/sidebar_header.tsx b/packages/website/ts/components/documentation/sidebar_header.tsx
new file mode 100644
index 0000000000..fece2704be
--- /dev/null
+++ b/packages/website/ts/components/documentation/sidebar_header.tsx
@@ -0,0 +1,57 @@
+import { colors } from '@0x/react-shared';
+import * as _ from 'lodash';
+import * as React from 'react';
+import { VersionDropDown } from 'ts/components/documentation/version_drop_down';
+import { Container } from 'ts/components/ui/container';
+import { Text } from 'ts/components/ui/text';
+import { ScreenWidths } from 'ts/types';
+
+export interface SidebarHeaderProps {
+    screenWidth: ScreenWidths;
+    title: string;
+    docsVersion?: string;
+    availableDocVersions?: string[];
+    onVersionSelected?: () => void;
+}
+
+export const SidebarHeader: React.StatelessComponent = ({
+    screenWidth,
+    title,
+    docsVersion,
+    availableDocVersions,
+    onVersionSelected,
+}) => {
+    return (
+        
+            
+                
+                    
+                        {title}
+                    
+                
+                {!_.isUndefined(docsVersion) &&
+                    !_.isUndefined(availableDocVersions) &&
+                    !_.isUndefined(onVersionSelected) && (
+                        

+                            
+                        

+                    )}
+            
+            
+        
+    );
+};
diff --git a/packages/website/ts/components/documentation/tutorial_button.tsx b/packages/website/ts/components/documentation/tutorial_button.tsx
new file mode 100644
index 0000000000..b747ef598f
--- /dev/null
+++ b/packages/website/ts/components/documentation/tutorial_button.tsx
@@ -0,0 +1,59 @@
+import { colors, Link } from '@0x/react-shared';
+import * as _ from 'lodash';
+import * as React from 'react';
+import { Container } from 'ts/components/ui/container';
+import { Text } from 'ts/components/ui/text';
+import { Deco, Key, TutorialInfo } from 'ts/types';
+import { Translate } from 'ts/utils/translate';
+
+import { styled } from 'ts/style/theme';
+
+export interface TutorialButtonProps {
+    className?: string;
+    translate: Translate;
+    tutorialInfo: TutorialInfo;
+}
+
+const PlainTutorialButton: React.StatelessComponent = ({ translate, tutorialInfo, className }) => (
+    
+        
+            

+                

+                    
+                

+                

+                    
+                        {translate.get(tutorialInfo.link.title as Key, Deco.Cap)}
+                    
+                    
+                        {translate.get(tutorialInfo.description as Key, Deco.Cap)}
+                    
+                

+                

+                    

+                        
+                    

+                

+            

+        
+    
+);
+
+export const TutorialButton = styled(PlainTutorialButton)`
+    border-radius: 4px;
+    border: 1px solid ${colors.grey325};
+    background-color: ${colors.white};
+    &:hover {
+        border: 1px solid ${colors.lightLinkBlue};
+        background-color: ${colors.lightestBlue};
+    }
+    padding: 20px;
+    margin-bottom: 15px;
+`;
+
+TutorialButton.defaultProps = {};
+
+TutorialButton.displayName = 'TutorialButton';
diff --git a/packages/website/ts/components/documentation/version_drop_down.tsx b/packages/website/ts/components/documentation/version_drop_down.tsx
new file mode 100644
index 0000000000..a1c8b05476
--- /dev/null
+++ b/packages/website/ts/components/documentation/version_drop_down.tsx
@@ -0,0 +1,80 @@
+import { colors } from '@0x/react-shared';
+import * as _ from 'lodash';
+import * as React from 'react';
+import { Button } from 'ts/components/ui/button';
+import { Container } from 'ts/components/ui/container';
+import { DropDown, DropdownMouseEvent } from 'ts/components/ui/drop_down';
+import { Text } from 'ts/components/ui/text';
+import { styled } from 'ts/style/theme';
+
+interface ActiveNodeProps {
+    className?: string;
+    selectedVersion: string;
+}
+
+const PlainActiveNode: React.StatelessComponent = ({ className, selectedVersion }) => (
+    
+        
+            
+                v {selectedVersion}
+            
+            
+                
+            
+        
+    
+);
+
+const ActiveNode = styled(PlainActiveNode)`
+    cursor: pointer;
+    border: 2px solid ${colors.beigeWhite};
+    border-radius: 4px;
+    padding: 4px 6px 4px 8px;
+`;
+
+interface VersionDropDownProps {
+    selectedVersion: string;
+    versions: string[];
+    onVersionSelected: (semver: string) => void;
+}
+
+interface VersionDropDownState {}
+
+export class VersionDropDown extends React.Component {
+    public render(): React.ReactNode {
+        const activeNode = ;
+        return (
+            
+        );
+    }
+    private _renderDropdownMenu(): React.ReactNode {
+        const items = _.map(this.props.versions, version => {
+            const isSelected = version === this.props.selectedVersion;
+            return (
+                
+                    
+                
+            );
+        });
+        const dropdownMenu = {items};
+        return dropdownMenu;
+    }
+    private _onClick(selectedVersion: string): void {
+        this.props.onVersionSelected(selectedVersion);
+    }
+}
diff --git a/packages/website/ts/components/dropdowns/developers_drop_down.tsx b/packages/website/ts/components/dropdowns/developers_drop_down.tsx
new file mode 100644
index 0000000000..f5d21535a9
--- /dev/null
+++ b/packages/website/ts/components/dropdowns/developers_drop_down.tsx
@@ -0,0 +1,164 @@
+import { ALink, colors, Link } from '@0x/react-shared';
+import * as _ from 'lodash';
+import * as React from 'react';
+import { Container } from 'ts/components/ui/container';
+import { DropDown } from 'ts/components/ui/drop_down';
+import { Text } from 'ts/components/ui/text';
+import { Deco, Key, WebsitePaths } from 'ts/types';
+import { constants } from 'ts/utils/constants';
+import { Translate } from 'ts/utils/translate';
+
+const gettingStartedKeyToLinkInfo1: ALink[] = [
+    {
+        title: Key.BuildARelayer,
+        to: `${WebsitePaths.Wiki}#Build-A-Relayer`,
+    },
+    {
+        title: Key.OrderBasics,
+        to: `${WebsitePaths.Wiki}#Create,-Validate,-Fill-Order`,
+    },
+];
+const gettingStartedKeyToLinkInfo2: ALink[] = [
+    {
+        title: Key.DevelopOnEthereum,
+        to: `${WebsitePaths.Wiki}#Ethereum-Development`,
+    },
+    {
+        title: Key.UseSharedLiquidity,
+        to: `${WebsitePaths.Wiki}#Find,-Submit,-Fill-Order-From-Relayer`,
+    },
+];
+const popularDocsToLinkInfos: ALink[] = [
+    {
+        title: Key.ZeroExJs,
+        to: WebsitePaths.ZeroExJs,
+    },
+    {
+        title: Key.Connect,
+        to: WebsitePaths.Connect,
+    },
+    {
+        title: Key.SmartContract,
+        to: WebsitePaths.SmartContracts,
+    },
+];
+const usefulLinksToLinkInfo: ALink[] = [
+    {
+        title: Key.Wiki,
+        to: WebsitePaths.Wiki,
+    },
+    {
+        title: Key.Github,
+        to: constants.URL_GITHUB_ORG,
+        shouldOpenInNewTab: true,
+    },
+    {
+        title: Key.Whitepaper,
+        to: WebsitePaths.Whitepaper,
+        shouldOpenInNewTab: true,
+    },
+];
+
+interface DevelopersDropDownProps {
+    location: Location;
+    translate: Translate;
+    menuItemStyles: React.CSSProperties;
+    menuIconStyle: React.CSSProperties;
+}
+
+interface DevelopersDropDownState {}
+
+export class DevelopersDropDown extends React.Component {
+    public render(): React.ReactNode {
+        const activeNode = (
+            
+                
+                    {this.props.translate.get(Key.Developers, Deco.Cap)}
+                
+            
+        );
+        return (
+            
+        );
+    }
+    private _renderDropdownMenu(): React.ReactNode {
+        const dropdownMenu = (
+            
+                
+                    {this._renderTitle('Getting started')}
+                    
+                        
+                            {this._renderLinkSection(gettingStartedKeyToLinkInfo1)}
+                        
+                        {this._renderLinkSection(gettingStartedKeyToLinkInfo2)}
+                    
+                
+                
+                
+                    
+                        {this._renderTitle('Popular docs')}
+                        {this._renderLinkSection(popularDocsToLinkInfos)}
+                    
+                    
+                        {this._renderTitle('Useful links')}
+                        {this._renderLinkSection(usefulLinksToLinkInfo)}
+                    
+                
+                
+                    
+                        
+                            {this.props.translate.get(Key.ViewAllDocumentation, Deco.Upper)}
+                        
+                    
+                
+            
+        );
+        return dropdownMenu;
+    }
+    private _renderTitle(title: string): React.ReactNode {
+        return (
+            
+                
+                    {title.toUpperCase()}
+                
+            
+        );
+    }
+    private _renderLinkSection(links: ALink[]): React.ReactNode {
+        const numLinks = links.length;
+        let i = 0;
+        const renderLinks = _.map(links, (link: ALink) => {
+            const isWikiLink = _.startsWith(link.to, WebsitePaths.Wiki) && _.includes(link.to, '#');
+            const isOnWiki = this.props.location.pathname === WebsitePaths.Wiki;
+            let to = link.to;
+            if (isWikiLink && isOnWiki) {
+                to = `${link.to.split('#')[1]}`;
+            }
+            i++;
+            const isLast = i === numLinks;
+            const linkText = this.props.translate.get(link.title as Key, Deco.Cap);
+            return (
+                
+                    
+                        
+                            {linkText}
+                        
+                    
+                
+            );
+        });
+        return {renderLinks};
+    }
+}
diff --git a/packages/website/ts/components/dropdowns/network_drop_down.tsx b/packages/website/ts/components/dropdowns/network_drop_down.tsx
index 2fd2785d16..df2d72edc2 100644
--- a/packages/website/ts/components/dropdowns/network_drop_down.tsx
+++ b/packages/website/ts/components/dropdowns/network_drop_down.tsx
@@ -1,4 +1,4 @@
-import { constants as sharedConstants } from '@0xproject/react-shared';
+import { constants as sharedConstants } from '@0x/react-shared';
 import * as _ from 'lodash';
 import DropDownMenu from 'material-ui/DropDownMenu';
 import MenuItem from 'material-ui/MenuItem';
diff --git a/packages/website/ts/components/eth_weth_conversion_button.tsx b/packages/website/ts/components/eth_weth_conversion_button.tsx
index b0091a1c1f..536ba924b2 100644
--- a/packages/website/ts/components/eth_weth_conversion_button.tsx
+++ b/packages/website/ts/components/eth_weth_conversion_button.tsx
@@ -1,5 +1,5 @@
-import { BigNumber, logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { BigNumber, logUtils } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import RaisedButton from 'material-ui/RaisedButton';
 import * as React from 'react';
diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
index 0b282b2a13..2af4252bd3 100644
--- a/packages/website/ts/components/eth_wrappers.tsx
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -1,6 +1,6 @@
-import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0xproject/react-shared';
-import { BigNumber } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared';
+import { BigNumber } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import Divider from 'material-ui/Divider';
 import { Table, TableBody, TableHeader, TableHeaderColumn, TableRow, TableRowColumn } from 'material-ui/Table';
diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx
index 3c3155349d..ec73e41993 100644
--- a/packages/website/ts/components/fill_order.tsx
+++ b/packages/website/ts/components/fill_order.tsx
@@ -1,14 +1,13 @@
-import { assetDataUtils, orderHashUtils } from '@0xproject/order-utils';
-import { colors } from '@0xproject/react-shared';
-import { BigNumber, logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { assetDataUtils, orderHashUtils } from '@0x/order-utils';
+import { colors, Link } from '@0x/react-shared';
+import { BigNumber, logUtils } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as accounting from 'accounting';
 import * as _ from 'lodash';
 import { Card, CardHeader, CardText } from 'material-ui/Card';
 import Divider from 'material-ui/Divider';
 import RaisedButton from 'material-ui/RaisedButton';
 import * as React from 'react';
-import { Link } from 'react-router-dom';
 import { Blockchain } from 'ts/blockchain';
 import { TrackTokenConfirmationDialog } from 'ts/components/dialogs/track_token_confirmation_dialog';
 import { FillOrderJSON } from 'ts/components/fill_order_json';
@@ -324,7 +323,7 @@ export class FillOrder extends React.Component {
         return (
             

                 Order successfully filled. See the trade details in your{' '}
-                
+                
                     trade history
                 
             

diff --git a/packages/website/ts/components/fill_order_json.tsx b/packages/website/ts/components/fill_order_json.tsx
index 1ecc426bda..41413eac2a 100644
--- a/packages/website/ts/components/fill_order_json.tsx
+++ b/packages/website/ts/components/fill_order_json.tsx
@@ -1,5 +1,5 @@
-import { generatePseudoRandomSalt } from '@0xproject/order-utils';
-import { BigNumber } from '@0xproject/utils';
+import { generatePseudoRandomSalt } from '@0x/order-utils';
+import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 import Paper from 'material-ui/Paper';
 import TextField from 'material-ui/TextField';
diff --git a/packages/website/ts/components/fill_warning_dialog.tsx b/packages/website/ts/components/fill_warning_dialog.tsx
index 4821aaabe9..430abd0133 100644
--- a/packages/website/ts/components/fill_warning_dialog.tsx
+++ b/packages/website/ts/components/fill_warning_dialog.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
 import * as React from 'react';
diff --git a/packages/website/ts/components/flash_messages/asset_send_completed.tsx b/packages/website/ts/components/flash_messages/asset_send_completed.tsx
index f76e05fe12..b895126dcd 100644
--- a/packages/website/ts/components/flash_messages/asset_send_completed.tsx
+++ b/packages/website/ts/components/flash_messages/asset_send_completed.tsx
@@ -1,6 +1,6 @@
-import { colors } from '@0xproject/react-shared';
-import { BigNumber } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { colors } from '@0x/react-shared';
+import { BigNumber } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { utils } from 'ts/utils/utils';
diff --git a/packages/website/ts/components/flash_messages/transaction_submitted.tsx b/packages/website/ts/components/flash_messages/transaction_submitted.tsx
index 2a6d2a64b8..b1d909baa1 100644
--- a/packages/website/ts/components/flash_messages/transaction_submitted.tsx
+++ b/packages/website/ts/components/flash_messages/transaction_submitted.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 
diff --git a/packages/website/ts/components/footer.tsx b/packages/website/ts/components/footer.tsx
index 6dcb5a0e98..dfedcba55a 100644
--- a/packages/website/ts/components/footer.tsx
+++ b/packages/website/ts/components/footer.tsx
@@ -1,31 +1,17 @@
-import { colors } from '@0xproject/react-shared';
+import { ALink, colors, Link } from '@0x/react-shared';
+import { ObjectMap } from '@0x/types';
 import * as _ from 'lodash';
 import DropDownMenu from 'material-ui/DropDownMenu';
 import MenuItem from 'material-ui/MenuItem';
 import * as React from 'react';
-import { Link } from 'react-router-dom';
+
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { Deco, Key, Language, WebsitePaths } from 'ts/types';
 import { constants } from 'ts/utils/constants';
 import { Translate } from 'ts/utils/translate';
 
-interface MenuItemsBySection {
-    [sectionName: string]: FooterMenuItem[];
-}
-
-interface FooterMenuItem {
-    title: string;
-    path?: string;
-    isExternal?: boolean;
-}
-
 const ICON_DIMENSION = 16;
 
-const linkStyle = {
-    color: colors.white,
-    cursor: 'pointer',
-};
-
 const languageToMenuTitle = {
     [Language.English]: 'English',
     [Language.Russian]: 'Русский',
@@ -51,76 +37,74 @@ export class Footer extends React.Component {
         };
     }
     public render(): React.ReactNode {
-        const menuItemsBySection: MenuItemsBySection = {
+        const sectionNameToLinks: ObjectMap = {
             [Key.Documentation]: [
+                {
+                    title: 'Developer Home',
+                    to: WebsitePaths.Docs,
+                },
                 {
                     title: '0x.js',
-                    path: WebsitePaths.ZeroExJs,
+                    to: WebsitePaths.ZeroExJs,
                 },
                 {
                     title: this.props.translate.get(Key.SmartContracts, Deco.Cap),
-                    path: WebsitePaths.SmartContracts,
+                    to: WebsitePaths.SmartContracts,
                 },
                 {
                     title: this.props.translate.get(Key.Connect, Deco.Cap),
-                    path: WebsitePaths.Connect,
+                    to: WebsitePaths.Connect,
                 },
                 {
                     title: this.props.translate.get(Key.Whitepaper, Deco.Cap),
-                    path: WebsitePaths.Whitepaper,
-                    isExternal: true,
+                    to: WebsitePaths.Whitepaper,
+                    shouldOpenInNewTab: true,
                 },
                 {
                     title: this.props.translate.get(Key.Wiki, Deco.Cap),
-                    path: WebsitePaths.Wiki,
-                },
-                {
-                    title: this.props.translate.get(Key.Faq, Deco.Cap),
-                    path: WebsitePaths.FAQ,
+                    to: WebsitePaths.Wiki,
                 },
             ],
             [Key.Community]: [
                 {
                     title: this.props.translate.get(Key.RocketChat, Deco.Cap),
-                    isExternal: true,
-                    path: constants.URL_ZEROEX_CHAT,
+                    to: constants.URL_ZEROEX_CHAT,
+                    shouldOpenInNewTab: true,
                 },
                 {
                     title: this.props.translate.get(Key.Blog, Deco.Cap),
-                    isExternal: true,
-                    path: constants.URL_BLOG,
+                    to: constants.URL_BLOG,
+                    shouldOpenInNewTab: true,
                 },
                 {
                     title: 'Twitter',
-                    isExternal: true,
-                    path: constants.URL_TWITTER,
+                    to: constants.URL_TWITTER,
+                    shouldOpenInNewTab: true,
                 },
                 {
                     title: 'Reddit',
-                    isExternal: true,
-                    path: constants.URL_REDDIT,
+                    to: constants.URL_REDDIT,
+                    shouldOpenInNewTab: true,
                 },
                 {
                     title: this.props.translate.get(Key.Forum, Deco.Cap),
-                    isExternal: true,
-                    path: constants.URL_DISCOURSE_FORUM,
+                    to: constants.URL_DISCOURSE_FORUM,
+                    shouldOpenInNewTab: true,
                 },
             ],
             [Key.Organization]: [
                 {
                     title: this.props.translate.get(Key.About, Deco.Cap),
-                    isExternal: false,
-                    path: WebsitePaths.About,
+                    to: WebsitePaths.About,
                 },
                 {
                     title: this.props.translate.get(Key.Careers, Deco.Cap),
-                    isExternal: false,
-                    path: WebsitePaths.Careers,
+                    to: WebsitePaths.Careers,
                 },
                 {
                     title: this.props.translate.get(Key.Contact, Deco.Cap),
-                    isExternal: true,
-                    path: 'mailto:team@0xproject.com',
+                    to: 'mailto:team@0xproject.com',
+                    shouldOpenInNewTab: true,
                 },
             ],
         };
@@ -160,19 +144,19 @@ export class Footer extends React.Component {
                         

                             

                                 {this._renderHeader(Key.Documentation)}
-                                {_.map(menuItemsBySection[Key.Documentation], this._renderMenuItem.bind(this))}
+                                {_.map(sectionNameToLinks[Key.Documentation], this._renderMenuItem.bind(this))}
                             

                         

                         

                             

                                 {this._renderHeader(Key.Community)}
-                                {_.map(menuItemsBySection[Key.Community], this._renderMenuItem.bind(this))}
+                                {_.map(sectionNameToLinks[Key.Community], this._renderMenuItem.bind(this))}
                             

                         

                         

                             

                                 {this._renderHeader(Key.Organization)}
-                                {_.map(menuItemsBySection[Key.Organization], this._renderMenuItem.bind(this))}
+                                {_.map(sectionNameToLinks[Key.Organization], this._renderMenuItem.bind(this))}
                             

                         

                     

@@ -187,7 +171,7 @@ export class Footer extends React.Component {
             

         );
     }
-    private _renderMenuItem(item: FooterMenuItem): React.ReactNode {
+    private _renderMenuItem(link: ALink): React.ReactNode {
         const titleToIcon: { [title: string]: string } = {
             [this.props.translate.get(Key.RocketChat, Deco.Cap)]: 'rocketchat.png',
             [this.props.translate.get(Key.Blog, Deco.Cap)]: 'medium.png',
@@ -195,30 +179,26 @@ export class Footer extends React.Component {
             Reddit: 'reddit.png',
             [this.props.translate.get(Key.Forum, Deco.Cap)]: 'discourse.png',
         };
-        const iconIfExists = titleToIcon[item.title];
+        const iconIfExists = titleToIcon[link.title];
         return (
-            

-                {item.isExternal ? (
-                    
+            

+                
+                    

                         {!_.isUndefined(iconIfExists) ? (
                             

                                 
{this._renderIcon(iconIfExists)}

-                                
{item.title}

+                                
{link.title}

                             

                         ) : (
-                            item.title
+                            link.title
                         )}
-                    
-                ) : (
-                    
-                        

-                            {!_.isUndefined(iconIfExists) && (
-                                
{this._renderIcon(iconIfExists)}

-                            )}
-                            {item.title}
-                        

-                    
-                )}
+                    

+                
             

         );
     }
diff --git a/packages/website/ts/components/forms/subscribe_form.tsx b/packages/website/ts/components/forms/subscribe_form.tsx
index 761db7517b..f5560cfa74 100644
--- a/packages/website/ts/components/forms/subscribe_form.tsx
+++ b/packages/website/ts/components/forms/subscribe_form.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 
diff --git a/packages/website/ts/components/generate_order/generate_order_form.tsx b/packages/website/ts/components/generate_order/generate_order_form.tsx
index ec153c0058..8afbee9772 100644
--- a/packages/website/ts/components/generate_order/generate_order_form.tsx
+++ b/packages/website/ts/components/generate_order/generate_order_form.tsx
@@ -1,7 +1,7 @@
-import { assetDataUtils, generatePseudoRandomSalt, orderHashUtils } from '@0xproject/order-utils';
-import { colors } from '@0xproject/react-shared';
-import { Order as ZeroExOrder } from '@0xproject/types';
-import { BigNumber, logUtils } from '@0xproject/utils';
+import { assetDataUtils, generatePseudoRandomSalt, orderHashUtils } from '@0x/order-utils';
+import { colors } from '@0x/react-shared';
+import { Order as ZeroExOrder } from '@0x/types';
+import { BigNumber, logUtils } from '@0x/utils';
 import * as _ from 'lodash';
 import Dialog from 'material-ui/Dialog';
 import Divider from 'material-ui/Divider';
diff --git a/packages/website/ts/components/generate_order/new_token_form.tsx b/packages/website/ts/components/generate_order/new_token_form.tsx
index 3d7eda84c5..b8cd88b186 100644
--- a/packages/website/ts/components/generate_order/new_token_form.tsx
+++ b/packages/website/ts/components/generate_order/new_token_form.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as _ from 'lodash';
 import TextField from 'material-ui/TextField';
 import * as moment from 'moment';
diff --git a/packages/website/ts/components/inputs/address_input.tsx b/packages/website/ts/components/inputs/address_input.tsx
index 39ec72f8ad..1a71f80817 100644
--- a/packages/website/ts/components/inputs/address_input.tsx
+++ b/packages/website/ts/components/inputs/address_input.tsx
@@ -1,5 +1,5 @@
-import { colors } from '@0xproject/react-shared';
-import { addressUtils } from '@0xproject/utils';
+import { colors } from '@0x/react-shared';
+import { addressUtils } from '@0x/utils';
 import * as _ from 'lodash';
 import TextField from 'material-ui/TextField';
 import * as React from 'react';
diff --git a/packages/website/ts/components/inputs/allowance_state_toggle.tsx b/packages/website/ts/components/inputs/allowance_state_toggle.tsx
index 39d2e30302..fd7d3b1743 100644
--- a/packages/website/ts/components/inputs/allowance_state_toggle.tsx
+++ b/packages/website/ts/components/inputs/allowance_state_toggle.tsx
@@ -1,5 +1,5 @@
-import { colors } from '@0xproject/react-shared';
-import { BigNumber, logUtils } from '@0xproject/utils';
+import { colors } from '@0x/react-shared';
+import { BigNumber, logUtils } from '@0x/utils';
 import * as _ from 'lodash';
 import * as React from 'react';
 import ReactTooltip = require('react-tooltip');
diff --git a/packages/website/ts/components/inputs/balance_bounded_input.tsx b/packages/website/ts/components/inputs/balance_bounded_input.tsx
index eb01e3ea64..83f2638426 100644
--- a/packages/website/ts/components/inputs/balance_bounded_input.tsx
+++ b/packages/website/ts/components/inputs/balance_bounded_input.tsx
@@ -1,5 +1,5 @@
-import { colors } from '@0xproject/react-shared';
-import { BigNumber } from '@0xproject/utils';
+import { colors } from '@0x/react-shared';
+import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 import TextField from 'material-ui/TextField';
 import * as React from 'react';
diff --git a/packages/website/ts/components/inputs/eth_amount_input.tsx b/packages/website/ts/components/inputs/eth_amount_input.tsx
index 3a7905442a..6799e54bf0 100644
--- a/packages/website/ts/components/inputs/eth_amount_input.tsx
+++ b/packages/website/ts/components/inputs/eth_amount_input.tsx
@@ -1,5 +1,5 @@
-import { BigNumber } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { BigNumber } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { BalanceBoundedInput } from 'ts/components/inputs/balance_bounded_input';
diff --git a/packages/website/ts/components/inputs/expiration_input.tsx b/packages/website/ts/components/inputs/expiration_input.tsx
index 5417ce7157..3e43c1c077 100644
--- a/packages/website/ts/components/inputs/expiration_input.tsx
+++ b/packages/website/ts/components/inputs/expiration_input.tsx
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 import DatePicker from 'material-ui/DatePicker';
 import TimePicker from 'material-ui/TimePicker';
diff --git a/packages/website/ts/components/inputs/hash_input.tsx b/packages/website/ts/components/inputs/hash_input.tsx
index 5125ec4ded..73b6615d45 100644
--- a/packages/website/ts/components/inputs/hash_input.tsx
+++ b/packages/website/ts/components/inputs/hash_input.tsx
@@ -1,6 +1,6 @@
-import { assetDataUtils, orderHashUtils } from '@0xproject/order-utils';
-import { Styles } from '@0xproject/react-shared';
-import { Order } from '@0xproject/types';
+import { assetDataUtils, orderHashUtils } from '@0x/order-utils';
+import { Styles } from '@0x/react-shared';
+import { Order } from '@0x/types';
 import * as _ from 'lodash';
 import * as React from 'react';
 import ReactTooltip = require('react-tooltip');
diff --git a/packages/website/ts/components/inputs/token_amount_input.tsx b/packages/website/ts/components/inputs/token_amount_input.tsx
index db093fb68c..fded3a9ddb 100644
--- a/packages/website/ts/components/inputs/token_amount_input.tsx
+++ b/packages/website/ts/components/inputs/token_amount_input.tsx
@@ -1,9 +1,8 @@
-import { colors } from '@0xproject/react-shared';
-import { BigNumber } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { colors, Link } from '@0x/react-shared';
+import { BigNumber } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import * as React from 'react';
-import { Link } from 'react-router-dom';
 import { Blockchain } from 'ts/blockchain';
 import { BalanceBoundedInput } from 'ts/components/inputs/balance_bounded_input';
 import { Token, ValidatedBigNumberCallback, WebsitePaths } from 'ts/types';
@@ -112,7 +111,8 @@ export class TokenAmountInput extends React.Component
                         Set allowance
                     
diff --git a/packages/website/ts/components/inputs/token_input.tsx b/packages/website/ts/components/inputs/token_input.tsx
index 0bd36781e9..c3c2d8b37b 100644
--- a/packages/website/ts/components/inputs/token_input.tsx
+++ b/packages/website/ts/components/inputs/token_input.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import Paper from 'material-ui/Paper';
 import * as React from 'react';
 import { Blockchain } from 'ts/blockchain';
diff --git a/packages/website/ts/components/onboarding/add_eth_onboarding_step.tsx b/packages/website/ts/components/onboarding/add_eth_onboarding_step.tsx
index ca71fcd505..1d21e5a85d 100644
--- a/packages/website/ts/components/onboarding/add_eth_onboarding_step.tsx
+++ b/packages/website/ts/components/onboarding/add_eth_onboarding_step.tsx
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import * as React from 'react';
 import { Balance } from 'ts/components/ui/balance';
 import { Container } from 'ts/components/ui/container';
diff --git a/packages/website/ts/components/onboarding/install_wallet_onboarding_step.tsx b/packages/website/ts/components/onboarding/install_wallet_onboarding_step.tsx
index 1035d4ad90..173ba9a973 100644
--- a/packages/website/ts/components/onboarding/install_wallet_onboarding_step.tsx
+++ b/packages/website/ts/components/onboarding/install_wallet_onboarding_step.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import { Container } from 'ts/components/ui/container';
 import { Image } from 'ts/components/ui/image';
diff --git a/packages/website/ts/components/onboarding/onboarding_card.tsx b/packages/website/ts/components/onboarding/onboarding_card.tsx
index e1b0f304b1..384bf71540 100644
--- a/packages/website/ts/components/onboarding/onboarding_card.tsx
+++ b/packages/website/ts/components/onboarding/onboarding_card.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 
 import * as _ from 'lodash';
diff --git a/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx b/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx
index 522687758a..6adcec0b1c 100644
--- a/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx
+++ b/packages/website/ts/components/onboarding/portal_onboarding_flow.tsx
@@ -2,7 +2,7 @@ import * as _ from 'lodash';
 import * as React from 'react';
 import { RouteComponentProps, withRouter } from 'react-router';
 
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import { Blockchain } from 'ts/blockchain';
 import { AddEthOnboardingStep } from 'ts/components/onboarding/add_eth_onboarding_step';
 import { CongratsOnboardingStep } from 'ts/components/onboarding/congrats_onboarding_step';
diff --git a/packages/website/ts/components/onboarding/wrap_eth_onboarding_step.tsx b/packages/website/ts/components/onboarding/wrap_eth_onboarding_step.tsx
index e4332de756..37eef867bc 100644
--- a/packages/website/ts/components/onboarding/wrap_eth_onboarding_step.tsx
+++ b/packages/website/ts/components/onboarding/wrap_eth_onboarding_step.tsx
@@ -1,5 +1,5 @@
-import { colors } from '@0xproject/react-shared';
-import { BigNumber } from '@0xproject/utils';
+import { colors } from '@0x/react-shared';
+import { BigNumber } from '@0x/utils';
 import * as React from 'react';
 import { Balance } from 'ts/components/ui/balance';
 import { Container } from 'ts/components/ui/container';
diff --git a/packages/website/ts/components/order_json.tsx b/packages/website/ts/components/order_json.tsx
index a2a53a5236..f336818355 100644
--- a/packages/website/ts/components/order_json.tsx
+++ b/packages/website/ts/components/order_json.tsx
@@ -1,4 +1,4 @@
-import { BigNumber, fetchAsync, logUtils } from '@0xproject/utils';
+import { BigNumber, fetchAsync, logUtils } from '@0x/utils';
 import * as _ from 'lodash';
 import Paper from 'material-ui/Paper';
 import TextField from 'material-ui/TextField';
diff --git a/packages/website/ts/components/portal/back_button.tsx b/packages/website/ts/components/portal/back_button.tsx
index ca35abc2b8..bea69bb95d 100644
--- a/packages/website/ts/components/portal/back_button.tsx
+++ b/packages/website/ts/components/portal/back_button.tsx
@@ -1,7 +1,5 @@
-import { Styles } from '@0xproject/react-shared';
+import { Link, Styles } from '@0x/react-shared';
 import * as React from 'react';
-import { Link } from 'react-router-dom';
-
 import { Island } from 'ts/components/ui/island';
 import { colors } from 'ts/style/colors';
 
@@ -27,7 +25,7 @@ const styles: Styles = {
 export const BackButton = (props: BackButtonProps) => {
     return (
         

-            
+            
                 
                     

                         
diff --git a/packages/website/ts/components/portal/drawer_menu.tsx b/packages/website/ts/components/portal/drawer_menu.tsx
index a6707e86c8..7280a61022 100644
--- a/packages/website/ts/components/portal/drawer_menu.tsx
+++ b/packages/website/ts/components/portal/drawer_menu.tsx
@@ -1,4 +1,4 @@
-import { Styles } from '@0xproject/react-shared';
+import { Styles } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 
@@ -39,7 +39,7 @@ export interface DrawerMenuProps {
 }
 export const DrawerMenu = (props: DrawerMenuProps) => {
     const relayerItemEntry = {
-        to: `${WebsitePaths.Portal}`,
+        to: WebsitePaths.Portal,
         labelText: 'Relayer ecosystem',
         iconName: 'zmdi-portable-wifi',
     };
diff --git a/packages/website/ts/components/portal/menu.tsx b/packages/website/ts/components/portal/menu.tsx
index 39dab77f5e..d591016869 100644
--- a/packages/website/ts/components/portal/menu.tsx
+++ b/packages/website/ts/components/portal/menu.tsx
@@ -1,7 +1,7 @@
-import { Styles } from '@0xproject/react-shared';
+import { Styles } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
-import { MenuItem } from 'ts/components/ui/menu_item';
+import { CustomMenuItem } from 'ts/components/ui/custom_menu_item';
 import { colors } from 'ts/style/colors';
 import { WebsitePaths } from 'ts/types';
 
@@ -67,14 +67,14 @@ export const Menu: React.StatelessComponent = (props: MenuProps) => {
             {_.map(props.menuItemEntries, entry => {
                 const isSelected = entry.to === props.selectedPath;
                 return (
-                    
+                    
                         
-                    
+                    
                 );
             })}
         

diff --git a/packages/website/ts/components/portal/portal.tsx b/packages/website/ts/components/portal/portal.tsx
index b42954f606..2299881c42 100644
--- a/packages/website/ts/components/portal/portal.tsx
+++ b/packages/website/ts/components/portal/portal.tsx
@@ -1,9 +1,9 @@
-import { colors } from '@0xproject/react-shared';
-import { BigNumber } from '@0xproject/utils';
+import { colors, Link } from '@0x/react-shared';
+import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 import * as React from 'react';
 import * as DocumentTitle from 'react-document-title';
-import { Link, Route, RouteComponentProps, Switch } from 'react-router-dom';
+import { Route, RouteComponentProps, Switch } from 'react-router-dom';
 
 import { Blockchain } from 'ts/blockchain';
 import { BlockchainErrDialog } from 'ts/components/dialogs/blockchain_err_dialog';
@@ -18,7 +18,7 @@ import { Loading } from 'ts/components/portal/loading';
 import { Menu, MenuTheme } from 'ts/components/portal/menu';
 import { Section } from 'ts/components/portal/section';
 import { TextHeader } from 'ts/components/portal/text_header';
-import { RelayerIndex } from 'ts/components/relayer_index/relayer_index';
+import { RelayerIndex, RelayerIndexCellStyle } from 'ts/components/relayer_index/relayer_index';
 import { TokenBalances } from 'ts/components/token_balances';
 import { TopBar, TopBarDisplayType } from 'ts/components/top_bar/top_bar';
 import { TradeHistory } from 'ts/components/trade_history/trade_history';
@@ -317,7 +317,7 @@ export class Portal extends React.Component {
         };
         return (
             
}
+                header={}
                 body={}
             />
         );
@@ -389,9 +389,7 @@ export class Portal extends React.Component {
             
         );
         return !shouldStartOnboarding ? (
-            
-                {startOnboarding}
-            
+            {startOnboarding}
         ) : (
             startOnboarding
         );
@@ -541,6 +539,7 @@ export class Portal extends React.Component {
     }
     private _renderRelayerIndexSection(): React.ReactNode {
         const isMobile = utils.isMobileWidth(this.props.screenWidth);
+        // TODO(bmillman): revert RelayerIndex cellStyle to Expanded once data pipeline is tracking v2 volume
         return (
             
}
@@ -551,7 +550,11 @@ export class Portal extends React.Component {
                                 {this._renderStartOnboarding()}
                             
                         )}
-                        
+                        
                     
                 }
             />
diff --git a/packages/website/ts/components/portal/text_header.tsx b/packages/website/ts/components/portal/text_header.tsx
index 853da3a29a..b6045b8323 100644
--- a/packages/website/ts/components/portal/text_header.tsx
+++ b/packages/website/ts/components/portal/text_header.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 
 import { Text } from 'ts/components/ui/text';
diff --git a/packages/website/ts/components/relayer_index/relayer_grid_tile.tsx b/packages/website/ts/components/relayer_index/relayer_grid_tile.tsx
index 193dd237a0..7f1b4ebb45 100644
--- a/packages/website/ts/components/relayer_index/relayer_grid_tile.tsx
+++ b/packages/website/ts/components/relayer_index/relayer_grid_tile.tsx
@@ -1,4 +1,4 @@
-import { Styles } from '@0xproject/react-shared';
+import { Styles } from '@0x/react-shared';
 import * as _ from 'lodash';
 import { GridTile as PlainGridTile } from 'material-ui/GridList';
 import * as React from 'react';
@@ -14,9 +14,15 @@ import { styled } from 'ts/style/theme';
 import { WebsiteBackendRelayerInfo } from 'ts/types';
 import { utils } from 'ts/utils/utils';
 
+export enum RelayerGridTileStyle {
+    Expanded = 0,
+    Minimized,
+}
+
 export interface RelayerGridTileProps {
     relayerInfo: WebsiteBackendRelayerInfo;
     networkId: number;
+    style: RelayerGridTileStyle;
 }
 
 const styles: Styles = {
@@ -30,10 +36,14 @@ const styles: Styles = {
         height: '100%',
         boxSizing: 'border-box',
     },
-    header: {
+    expandedHeader: {
         height: '50%',
         width: '100%',
     },
+    minimizedHeader: {
+        height: '100%',
+        width: '100%',
+    },
     body: {
         height: '50%',
         width: '100%',
@@ -75,10 +85,12 @@ export const RelayerGridTile: React.StatelessComponent = (
         !_.isUndefined(headerImageUrl) && !_.isUndefined(props.relayerInfo.primaryColor)
             ? props.relayerInfo.primaryColor
             : FALLBACK_PRIMARY_COLOR;
+    const isExpanded = props.style === RelayerGridTileStyle.Expanded;
+    const headerStyle = isExpanded ? styles.expandedHeader : styles.minimizedHeader;
     return (
         
             

-                

+                

                      = (
                         height={RELAYER_ICON_HEIGHT}
                     />
                 

-                

-                    

-                        {props.relayerInfo.name}
-                    

-                    

-                        {!_.isUndefined(weeklyTxnVolume) && (
-                            
{props.relayerInfo.weeklyTxnVolume}

-                        )}
-                    

-                    
-                        

-                            {!_.isEmpty(topTokens) && }
+                {isExpanded && (
+                    

+                        

+                            {props.relayerInfo.name}
+                        

+                        

+                            {!_.isUndefined(weeklyTxnVolume) && (
+                                
{props.relayerInfo.weeklyTxnVolume}

+                            )}
                         

-                    
-                

+                        
+                            

+                                {!_.isEmpty(topTokens) && }
+                            

+                        
+                    

+                )}
             

         
     );
diff --git a/packages/website/ts/components/relayer_index/relayer_index.tsx b/packages/website/ts/components/relayer_index/relayer_index.tsx
index 91dbeb27a6..e88c20d7e9 100644
--- a/packages/website/ts/components/relayer_index/relayer_index.tsx
+++ b/packages/website/ts/components/relayer_index/relayer_index.tsx
@@ -3,14 +3,20 @@ import CircularProgress from 'material-ui/CircularProgress';
 import { GridList } from 'material-ui/GridList';
 import * as React from 'react';
 
-import { RelayerGridTile } from 'ts/components/relayer_index/relayer_grid_tile';
+import { RelayerGridTile, RelayerGridTileStyle } from 'ts/components/relayer_index/relayer_grid_tile';
 import { Retry } from 'ts/components/ui/retry';
 import { ScreenWidths, WebsiteBackendRelayerInfo } from 'ts/types';
 import { backendClient } from 'ts/utils/backend_client';
 
+export enum RelayerIndexCellStyle {
+    Expanded = 0,
+    Minimized,
+}
+
 export interface RelayerIndexProps {
     networkId: number;
     screenWidth: ScreenWidths;
+    cellStyle: RelayerIndexCellStyle;
 }
 
 interface RelayerIndexState {
@@ -18,7 +24,8 @@ interface RelayerIndexState {
     error?: Error;
 }
 
-const CELL_HEIGHT = 290;
+const CELL_HEIGHT_EXPANDED = 290;
+const CELL_HEIGHT_MINIMIZED = 225;
 const NUMBER_OF_COLUMNS_LARGE = 3;
 const NUMBER_OF_COLUMNS_MEDIUM = 2;
 const NUMBER_OF_COLUMNS_SMALL = 2;
@@ -61,15 +68,23 @@ export class RelayerIndex extends React.Component
                     {this.state.relayerInfos.map((relayerInfo: WebsiteBackendRelayerInfo, index) => (
-                        
+                        
                     ))}
                 
             );
diff --git a/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx b/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx
index f3787bd272..558d998556 100644
--- a/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx
+++ b/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx
@@ -1,4 +1,4 @@
-import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0xproject/react-shared';
+import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 
diff --git a/packages/website/ts/components/send_button.tsx b/packages/website/ts/components/send_button.tsx
index 107983deee..27438e5d5a 100644
--- a/packages/website/ts/components/send_button.tsx
+++ b/packages/website/ts/components/send_button.tsx
@@ -1,4 +1,4 @@
-import { BigNumber, logUtils } from '@0xproject/utils';
+import { BigNumber, logUtils } from '@0x/utils';
 import * as _ from 'lodash';
 import RaisedButton from 'material-ui/RaisedButton';
 import * as React from 'react';
diff --git a/packages/website/ts/components/sidebar_header.tsx b/packages/website/ts/components/sidebar_header.tsx
deleted file mode 100644
index a14ab54f5c..0000000000
--- a/packages/website/ts/components/sidebar_header.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { colors } from '@0xproject/react-shared';
-import * as React from 'react';
-
-interface SidebarHeaderProps {
-    title: string;
-    iconUrl: string;
-}
-
-interface SidebarHeaderState {}
-
-export class SidebarHeader extends React.Component {
-    public render(): React.ReactNode {
-        return (
-            

-                

-                    
0x

-                    

-                        docs
-                    

-                

-                

-                    |
-                

-                

-                    

-                        
-                    

-                    

-                        {this.props.title}
-                    

-                

-            

-        );
-    }
-}
diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx
index 5965ad9bd8..9ba2bad84e 100644
--- a/packages/website/ts/components/token_balances.tsx
+++ b/packages/website/ts/components/token_balances.tsx
@@ -4,9 +4,9 @@ import {
     Networks,
     Styles,
     utils as sharedUtils,
-} from '@0xproject/react-shared';
-import { BigNumber, errorUtils, fetchAsync, logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+} from '@0x/react-shared';
+import { BigNumber, errorUtils, fetchAsync, logUtils } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import Dialog from 'material-ui/Dialog';
 import Divider from 'material-ui/Divider';
diff --git a/packages/website/ts/components/top_bar/provider_display.tsx b/packages/website/ts/components/top_bar/provider_display.tsx
index 806eaeea50..c88c29b8e0 100644
--- a/packages/website/ts/components/top_bar/provider_display.tsx
+++ b/packages/website/ts/components/top_bar/provider_display.tsx
@@ -1,4 +1,4 @@
-import { Styles } from '@0xproject/react-shared';
+import { Styles } from '@0x/react-shared';
 import * as _ from 'lodash';
 import CircularProgress from 'material-ui/CircularProgress';
 import ActionAccountBalanceWallet from 'material-ui/svg-icons/action/account-balance-wallet';
diff --git a/packages/website/ts/components/top_bar/top_bar.tsx b/packages/website/ts/components/top_bar/top_bar.tsx
index fe2c1fcf91..d5967cd1db 100644
--- a/packages/website/ts/components/top_bar/top_bar.tsx
+++ b/packages/website/ts/components/top_bar/top_bar.tsx
@@ -1,23 +1,16 @@
-import { DocsInfo, DocsMenu } from '@0xproject/react-docs';
-import {
-    colors,
-    constants as sharedConstants,
-    MenuSubsectionsBySection,
-    NestedSidebarMenu,
-    Styles,
-} from '@0xproject/react-shared';
+import { DocsInfo } from '@0x/react-docs';
+import { ALink, colors, Link, Styles } from '@0x/react-shared';
+import { ObjectMap } from '@0x/types';
 import * as _ from 'lodash';
 import Drawer from 'material-ui/Drawer';
-import Menu from 'material-ui/Menu';
 import MenuItem from 'material-ui/MenuItem';
 import * as React from 'react';
-import { Link } from 'react-router-dom';
 import { Blockchain } from 'ts/blockchain';
+import { DevelopersDropDown } from 'ts/components/dropdowns/developers_drop_down';
 import { DrawerMenu } from 'ts/components/portal/drawer_menu';
 import { ProviderDisplay } from 'ts/components/top_bar/provider_display';
 import { TopBarMenuItem } from 'ts/components/top_bar/top_bar_menu_item';
 import { Container } from 'ts/components/ui/container';
-import { DropDown } from 'ts/components/ui/drop_down';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { Deco, Key, ProviderType, WebsitePaths } from 'ts/types';
 import { constants } from 'ts/utils/constants';
@@ -41,8 +34,7 @@ export interface TopBarProps {
     translate: Translate;
     docsVersion?: string;
     availableDocVersions?: string[];
-    menu?: DocsMenu;
-    menuSubsectionsBySection?: MenuSubsectionsBySection;
+    sectionNameToLinks?: ObjectMap;
     displayType?: TopBarDisplayType;
     docsInfo?: DocsInfo;
     style?: React.CSSProperties;
@@ -80,21 +72,6 @@ const styles: Styles = {
     },
 };
 
-const DOC_WEBSITE_PATHS_TO_KEY = {
-    [WebsitePaths.SolCov]: Key.SolCov,
-    [WebsitePaths.SmartContracts]: Key.SmartContracts,
-    [WebsitePaths.Web3Wrapper]: Key.Web3Wrapper,
-    [WebsitePaths.SolCompiler]: Key.SolCompiler,
-    [WebsitePaths.JSONSchemas]: Key.JsonSchemas,
-    [WebsitePaths.Subproviders]: Key.Subproviders,
-    [WebsitePaths.ContractWrappers]: Key.ContractWrappers,
-    [WebsitePaths.Connect]: Key.Connect,
-    [WebsitePaths.ZeroExJs]: Key.ZeroExJs,
-    [WebsitePaths.OrderUtils]: Key.OrderUtils,
-    [WebsitePaths.OrderWatcher]: Key.OrderWatcher,
-    [WebsitePaths.AssetBuyer]: Key.AssetBuyer,
-};
-
 const DEFAULT_HEIGHT = 68;
 const EXPANDED_HEIGHT = 75;
 
@@ -130,117 +107,6 @@ export class TopBar extends React.Component {
             ? 'flex mx-auto items-center max-width-4'
             : 'flex mx-auto items-center';
         const height = isExpandedDisplayType ? EXPANDED_HEIGHT : DEFAULT_HEIGHT;
-        const developerSectionMenuItems = [
-            
-                
-            ,
-            
-                
-            ,
-            
-                
-            ,
-            
-                
-            ,
-            
-                
-            ,
-            
-                
-            ,
-            
-                
-            ,
-            
-                
-            ,
-            
-                
-            ,
-            
-                
-            ,
-            
-                
-            ,
-            
-                
-            ,
-            
-                
-            ,
-            
-                
-            ,
-            
-                
-            ,
-            
-                
-            ,
-        ];
         const bottomBorderStyle = this._shouldDisplayBottomBar() ? styles.bottomBar : {};
         const fullWidthClasses = isExpandedDisplayType ? 'pr4' : '';
         const logoUrl = isNightVersion ? '/images/protocol_logo_white.png' : '/images/protocol_logo_black.png';
@@ -252,15 +118,6 @@ export class TopBar extends React.Component {
             color: isNightVersion ? 'white' : 'black',
             cursor: 'pointer',
         };
-        const activeNode = (
-            

-                
{this.props.translate.get(Key.Developers, Deco.Cap)}

-                

-                    
-                

-            

-        );
-        const popoverContent = {developerSectionMenuItems};
         return (
             
 {
                     paddingLeft={this.props.paddingLeft}
                     paddingRight={this.props.paddingRight}
                 >
-                    
+                    
                         
                     
                     

                     {!this._isViewingPortal() && (
                         

                             

-                                
-                                
                                 
                                 
                                 
                                 
                             

                         

@@ -379,54 +225,35 @@ export class TopBar extends React.Component {
                 onRequestChange={this._onMenuButtonClick.bind(this)}
             >
                 

-                    {this._renderDocsMenu()}
-                    {this._renderWiki()}
                     

                         {this.props.translate.get(Key.Website, Deco.Cap)}
                     

-                    
+                    
                         {this.props.translate.get(Key.Home, Deco.Cap)}
                     
-                    
-                        {this.props.translate.get(Key.Wiki, Deco.Cap)}
+                    
+                        {this.props.translate.get(Key.Docs, Deco.Cap)}
                     
-                    {_.map(DOC_WEBSITE_PATHS_TO_KEY, (key, websitePath) => {
-                        if (!this._doesUrlInclude(websitePath)) {
-                            return (
-                                
-                                    
-                                        {this.props.translate.get(key, Deco.Cap)}{' '}
-                                        {this.props.translate.get(Key.Docs, Deco.Cap)}
-                                    
-                                
-                            );
-                        }
-                        return null;
-                    })}
                     {!this._isViewingPortal() && (
-                        
+                        
                             
                                 {this.props.translate.get(Key.PortalDApp, Deco.CapWords)}
                             
                         
                     )}
-                    
+                    
                         {this.props.translate.get(Key.Whitepaper, Deco.Cap)}
-                    
-                    
+                    
+                    
                         {this.props.translate.get(Key.About, Deco.Cap)}
                     
-                    
+                    
                         {this.props.translate.get(Key.Careers, Deco.Cap)}
                     
-                    
+                    
                         {this.props.translate.get(Key.Blog, Deco.Cap)}
-                    
-                    
+                    
+                    
                         
                             {this.props.translate.get(Key.Faq, Deco.Cap)}
                         
@@ -435,49 +262,6 @@ export class TopBar extends React.Component {
             
         );
     }
-    private _renderDocsMenu(): React.ReactNode {
-        const isViewingDocsPage = _.some(DOC_WEBSITE_PATHS_TO_KEY, (_key, websitePath) => {
-            return this._doesUrlInclude(websitePath);
-        });
-        // HACK: We need to make sure the SCROLL_CONTAINER is loaded before rendering the Sidebar
-        // because the sidebar renders `react-scroll` links which depend on the scroll container already
-        // being rendered.
-        const documentationContainer = document.getElementById(sharedConstants.SCROLL_CONTAINER_ID);
-        if (!isViewingDocsPage || _.isUndefined(this.props.menu) || _.isNull(documentationContainer)) {
-            return undefined;
-        }
-        return (
-            

-                
-            

-        );
-    }
-    private _renderWiki(): React.ReactNode {
-        if (!this._isViewingWiki()) {
-            return undefined;
-        }
-
-        return (
-            

-                
-            

-        );
-    }
     private _onMenuButtonClick(): void {
         this.setState({
             isDrawerOpen: !this.state.isDrawerOpen,
@@ -486,28 +270,10 @@ export class TopBar extends React.Component {
     private _isViewingPortal(): boolean {
         return _.includes(this.props.location.pathname, WebsitePaths.Portal);
     }
-    private _isViewingDocs(): boolean {
-        return _.includes(this.props.location.pathname, WebsitePaths.Docs);
-    }
     private _isViewingFAQ(): boolean {
         return _.includes(this.props.location.pathname, WebsitePaths.FAQ);
     }
-    private _doesUrlInclude(aPath: string): boolean {
-        return _.includes(this.props.location.pathname, aPath);
-    }
-    private _isViewingWiki(): boolean {
-        return _.includes(this.props.location.pathname, WebsitePaths.Wiki);
-    }
     private _shouldDisplayBottomBar(): boolean {
-        const isViewingDocsPage = _.some(DOC_WEBSITE_PATHS_TO_KEY, (_key, websitePath) => {
-            return this._doesUrlInclude(websitePath);
-        });
-        return (
-            isViewingDocsPage ||
-            this._isViewingWiki() ||
-            this._isViewingFAQ() ||
-            this._isViewingDocs() ||
-            this._isViewingPortal()
-        );
+        return this._isViewingFAQ() || this._isViewingPortal();
     }
 } // tslint:disable:max-file-line-count
diff --git a/packages/website/ts/components/top_bar/top_bar_menu_item.tsx b/packages/website/ts/components/top_bar/top_bar_menu_item.tsx
index 25fab2868f..9f15cffbb4 100644
--- a/packages/website/ts/components/top_bar/top_bar_menu_item.tsx
+++ b/packages/website/ts/components/top_bar/top_bar_menu_item.tsx
@@ -1,7 +1,6 @@
-import { colors } from '@0xproject/react-shared';
+import { colors, Link } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
-import { Link } from 'react-router-dom';
 
 import { CallToAction } from 'ts/components/ui/button';
 
@@ -13,7 +12,7 @@ interface TopBarMenuItemProps {
     title: string;
     path?: string;
     isPrimary?: boolean;
-    isExternal: boolean;
+    shouldOpenInNewTab?: boolean;
     style?: React.CSSProperties;
     className?: string;
     isNightVersion?: boolean;
@@ -26,6 +25,7 @@ export class TopBarMenuItem extends React.Component
-                {this.props.isExternal ? (
-                    
-                        {itemContent}
-                    
-                ) : (
-                    
-                        {itemContent}
-                    
-                )}
+                
+                    {itemContent}
+                
             

         );
     }
diff --git a/packages/website/ts/components/track_token_confirmation.tsx b/packages/website/ts/components/track_token_confirmation.tsx
index 294fb85905..e701686b0a 100644
--- a/packages/website/ts/components/track_token_confirmation.tsx
+++ b/packages/website/ts/components/track_token_confirmation.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { Party } from 'ts/components/ui/party';
diff --git a/packages/website/ts/components/trade_history/trade_history_item.tsx b/packages/website/ts/components/trade_history/trade_history_item.tsx
index 321a8b0e12..667027dce6 100644
--- a/packages/website/ts/components/trade_history/trade_history_item.tsx
+++ b/packages/website/ts/components/trade_history/trade_history_item.tsx
@@ -1,6 +1,6 @@
-import { colors, EtherscanLinkSuffixes } from '@0xproject/react-shared';
-import { BigNumber } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { colors, EtherscanLinkSuffixes } from '@0x/react-shared';
+import { BigNumber } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import Paper from 'material-ui/Paper';
 import * as moment from 'moment';
diff --git a/packages/website/ts/components/ui/alert.tsx b/packages/website/ts/components/ui/alert.tsx
index b571d8c1c6..32e0f1be86 100644
--- a/packages/website/ts/components/ui/alert.tsx
+++ b/packages/website/ts/components/ui/alert.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import { AlertTypes } from 'ts/types';
 
diff --git a/packages/website/ts/components/ui/allowance_state_view.tsx b/packages/website/ts/components/ui/allowance_state_view.tsx
index 93d6b0ebb0..fc754421ab 100644
--- a/packages/website/ts/components/ui/allowance_state_view.tsx
+++ b/packages/website/ts/components/ui/allowance_state_view.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import { Container } from 'ts/components/ui/container';
 import { Spinner } from 'ts/components/ui/spinner';
diff --git a/packages/website/ts/components/ui/balance.tsx b/packages/website/ts/components/ui/balance.tsx
index 9e5a256b65..a1a8ff89b2 100644
--- a/packages/website/ts/components/ui/balance.tsx
+++ b/packages/website/ts/components/ui/balance.tsx
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import * as React from 'react';
 import { Container } from 'ts/components/ui/container';
 import { Text } from 'ts/components/ui/text';
diff --git a/packages/website/ts/components/ui/button.tsx b/packages/website/ts/components/ui/button.tsx
index 75ba7bcff4..92f9278432 100644
--- a/packages/website/ts/components/ui/button.tsx
+++ b/packages/website/ts/components/ui/button.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import { darken, saturate } from 'polished';
 import * as React from 'react';
 import { styled } from 'ts/style/theme';
@@ -10,11 +10,13 @@ export interface ButtonProps {
     fontFamily?: string;
     backgroundColor?: string;
     borderColor?: string;
+    borderRadius?: string;
     width?: string;
     padding?: string;
     type?: string;
     isDisabled?: boolean;
     onClick?: (event: React.MouseEvent) => void;
+    textAlign?: string;
 }
 
 const PlainButton: React.StatelessComponent = ({ children, isDisabled, onClick, type, className }) => (
@@ -29,11 +31,12 @@ export const Button = styled(PlainButton)`
     color: ${props => props.fontColor};
     transition: background-color, opacity 0.5s ease;
     padding: ${props => props.padding};
-    border-radius: 6px;
+    border-radius: ${props => props.borderRadius};
     font-weight: 500;
     outline: none;
     font-family: ${props => props.fontFamily};
     width: ${props => props.width};
+    text-align: ${props => props.textAlign};
     background-color: ${props => props.backgroundColor};
     border: ${props => (props.borderColor ? `1px solid ${props.borderColor}` : 'none')};
     &:hover {
@@ -52,11 +55,13 @@ export const Button = styled(PlainButton)`
 
 Button.defaultProps = {
     fontSize: '12px',
+    borderRadius: '6px',
     backgroundColor: colors.white,
     width: 'auto',
     fontFamily: 'Roboto',
     isDisabled: false,
     padding: '0.8em 2.2em',
+    textAlign: 'center',
 };
 
 Button.displayName = 'Button';
diff --git a/packages/website/ts/components/ui/container.tsx b/packages/website/ts/components/ui/container.tsx
index f2ae68b706..ece077563d 100644
--- a/packages/website/ts/components/ui/container.tsx
+++ b/packages/website/ts/components/ui/container.tsx
@@ -15,7 +15,11 @@ export interface ContainerProps {
     paddingRight?: StringOrNum;
     paddingLeft?: StringOrNum;
     backgroundColor?: string;
+    background?: string;
     borderRadius?: StringOrNum;
+    borderBottomLeftRadius?: StringOrNum;
+    borderBottomRightRadius?: StringOrNum;
+    borderBottom?: StringOrNum;
     maxWidth?: StringOrNum;
     maxHeight?: StringOrNum;
     width?: StringOrNum;
diff --git a/packages/website/ts/components/ui/copy_icon.tsx b/packages/website/ts/components/ui/copy_icon.tsx
index 0330d18439..59e398cb64 100644
--- a/packages/website/ts/components/ui/copy_icon.tsx
+++ b/packages/website/ts/components/ui/copy_icon.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import * as CopyToClipboard from 'react-copy-to-clipboard';
 import * as ReactDOM from 'react-dom';
diff --git a/packages/website/ts/components/ui/menu_item.tsx b/packages/website/ts/components/ui/custom_menu_item.tsx
similarity index 72%
rename from packages/website/ts/components/ui/menu_item.tsx
rename to packages/website/ts/components/ui/custom_menu_item.tsx
index 0cb4b387c7..87ce32126e 100644
--- a/packages/website/ts/components/ui/menu_item.tsx
+++ b/packages/website/ts/components/ui/custom_menu_item.tsx
@@ -1,24 +1,23 @@
+import { Link } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
-import { Link } from 'react-router-dom';
 
-interface MenuItemProps {
+interface CustomMenuItemProps {
     to: string;
-    style?: React.CSSProperties;
     onClick?: () => void;
     className?: string;
 }
 
-interface MenuItemState {
+interface CustomMenuItemState {
     isHovering: boolean;
 }
 
-export class MenuItem extends React.Component {
-    public static defaultProps: Partial = {
+export class CustomMenuItem extends React.Component {
+    public static defaultProps: Partial = {
         onClick: _.noop.bind(_),
         className: '',
     };
-    public constructor(props: MenuItemProps) {
+    public constructor(props: CustomMenuItemProps) {
         super(props);
         this.state = {
             isHovering: false,
@@ -30,7 +29,7 @@ export class MenuItem extends React.Component {
             opacity: this.state.isHovering ? 0.5 : 1,
         };
         return (
-            
+            
                 
 {
         zDepth: 1,
         activateEvent: DropdownMouseEvent.Hover,
         closeEvent: DropdownMouseEvent.Hover,
+        popoverStyle: {},
     };
     private _isHovering: boolean;
     private _popoverCloseCheckIntervalId: number;
@@ -73,10 +76,15 @@ export class DropDown extends React.Component {
                     anchorEl={this.state.anchorEl}
                     anchorOrigin={this.props.anchorOrigin}
                     targetOrigin={this.props.targetOrigin}
-                    onRequestClose={this._closePopover.bind(this)}
+                    onRequestClose={
+                        this.props.closeEvent === DropdownMouseEvent.Click
+                            ? this._closePopover.bind(this)
+                            : _.noop.bind(_)
+                    }
                     useLayerForClickAway={this.props.closeEvent === DropdownMouseEvent.Click}
                     animated={false}
                     zDepth={this.props.zDepth}
+                    style={this.props.popoverStyle}
                 >
                     
 {
     private _onActiveNodeClick(event: React.FormEvent): void {
         if (this.props.activateEvent === DropdownMouseEvent.Click) {
             this.setState({
-                isDropDownOpen: true,
+                isDropDownOpen: !this.state.isDropDownOpen,
                 anchorEl: event.currentTarget,
             });
         }
diff --git a/packages/website/ts/components/ui/ethereum_address.tsx b/packages/website/ts/components/ui/ethereum_address.tsx
index f449a8e752..71d98af561 100644
--- a/packages/website/ts/components/ui/ethereum_address.tsx
+++ b/packages/website/ts/components/ui/ethereum_address.tsx
@@ -1,4 +1,4 @@
-import { EtherscanLinkSuffixes } from '@0xproject/react-shared';
+import { EtherscanLinkSuffixes } from '@0x/react-shared';
 import * as React from 'react';
 import ReactTooltip = require('react-tooltip');
 import { EtherScanIcon } from 'ts/components/ui/etherscan_icon';
diff --git a/packages/website/ts/components/ui/etherscan_icon.tsx b/packages/website/ts/components/ui/etherscan_icon.tsx
index 0beb691230..57ab91ba2e 100644
--- a/packages/website/ts/components/ui/etherscan_icon.tsx
+++ b/packages/website/ts/components/ui/etherscan_icon.tsx
@@ -1,4 +1,4 @@
-import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0xproject/react-shared';
+import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import ReactTooltip = require('react-tooltip');
diff --git a/packages/website/ts/components/ui/fake_text_field.tsx b/packages/website/ts/components/ui/fake_text_field.tsx
index ac3c30fec4..7c3a482a4c 100644
--- a/packages/website/ts/components/ui/fake_text_field.tsx
+++ b/packages/website/ts/components/ui/fake_text_field.tsx
@@ -1,4 +1,4 @@
-import { Styles } from '@0xproject/react-shared';
+import { Styles } from '@0x/react-shared';
 import * as React from 'react';
 import { InputLabel } from 'ts/components/ui/input_label';
 
diff --git a/packages/website/ts/components/ui/icon_button.tsx b/packages/website/ts/components/ui/icon_button.tsx
index 13cd239da2..9f469ec69d 100644
--- a/packages/website/ts/components/ui/icon_button.tsx
+++ b/packages/website/ts/components/ui/icon_button.tsx
@@ -1,4 +1,4 @@
-import { colors, Styles } from '@0xproject/react-shared';
+import { colors, Styles } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 
diff --git a/packages/website/ts/components/ui/input.tsx b/packages/website/ts/components/ui/input.tsx
index e01a71a530..e5f4f6c70f 100644
--- a/packages/website/ts/components/ui/input.tsx
+++ b/packages/website/ts/components/ui/input.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import { styled } from 'ts/style/theme';
 
diff --git a/packages/website/ts/components/ui/input_label.tsx b/packages/website/ts/components/ui/input_label.tsx
index 8eda45a5d6..e7afb5a170 100644
--- a/packages/website/ts/components/ui/input_label.tsx
+++ b/packages/website/ts/components/ui/input_label.tsx
@@ -1,4 +1,4 @@
-import { colors, Styles } from '@0xproject/react-shared';
+import { colors, Styles } from '@0x/react-shared';
 import * as React from 'react';
 
 export interface InputLabelProps {
diff --git a/packages/website/ts/components/ui/lifecycle_raised_button.tsx b/packages/website/ts/components/ui/lifecycle_raised_button.tsx
index 0bb99b9d8b..a8daf4102d 100644
--- a/packages/website/ts/components/ui/lifecycle_raised_button.tsx
+++ b/packages/website/ts/components/ui/lifecycle_raised_button.tsx
@@ -1,5 +1,5 @@
-import { colors } from '@0xproject/react-shared';
-import { errorUtils } from '@0xproject/utils';
+import { colors } from '@0x/react-shared';
+import { errorUtils } from '@0x/utils';
 import RaisedButton from 'material-ui/RaisedButton';
 import * as React from 'react';
 
diff --git a/packages/website/ts/components/ui/party.tsx b/packages/website/ts/components/ui/party.tsx
index a255504757..6c05724374 100644
--- a/packages/website/ts/components/ui/party.tsx
+++ b/packages/website/ts/components/ui/party.tsx
@@ -1,4 +1,4 @@
-import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0xproject/react-shared';
+import { colors, EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import ReactTooltip = require('react-tooltip');
diff --git a/packages/website/ts/components/ui/pointer.tsx b/packages/website/ts/components/ui/pointer.tsx
index db0a4188d5..c97b1e7000 100644
--- a/packages/website/ts/components/ui/pointer.tsx
+++ b/packages/website/ts/components/ui/pointer.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import { styled } from 'ts/style/theme';
 
diff --git a/packages/website/ts/components/ui/required_label.tsx b/packages/website/ts/components/ui/required_label.tsx
index 0f96586ec1..5080462fa9 100644
--- a/packages/website/ts/components/ui/required_label.tsx
+++ b/packages/website/ts/components/ui/required_label.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 
 export interface RequiredLabelProps {
diff --git a/packages/website/ts/components/ui/simple_menu.tsx b/packages/website/ts/components/ui/simple_menu.tsx
index 8a9349c6d2..45ee752e33 100644
--- a/packages/website/ts/components/ui/simple_menu.tsx
+++ b/packages/website/ts/components/ui/simple_menu.tsx
@@ -1,7 +1,7 @@
+import { Link } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import * as CopyToClipboard from 'react-copy-to-clipboard';
-import { Link } from 'react-router-dom';
 
 import { Container } from 'ts/components/ui/container';
 import { Text } from 'ts/components/ui/text';
@@ -72,7 +72,7 @@ export const GoToAccountManagementSimpleMenuItem: React.StatelessComponent<
     GoToAccountManagementSimpleMenuItemProps
 > = ({ onClick }) => {
     return (
-        
+        
             
         
     );
diff --git a/packages/website/ts/components/ui/spinner.tsx b/packages/website/ts/components/ui/spinner.tsx
index e8670cc3ee..dc73e74e32 100644
--- a/packages/website/ts/components/ui/spinner.tsx
+++ b/packages/website/ts/components/ui/spinner.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 import { styled } from 'ts/style/theme';
 
diff --git a/packages/website/ts/components/ui/swap_icon.tsx b/packages/website/ts/components/ui/swap_icon.tsx
index f1d1ae7d4b..406da8fe1d 100644
--- a/packages/website/ts/components/ui/swap_icon.tsx
+++ b/packages/website/ts/components/ui/swap_icon.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import * as React from 'react';
 
 interface SwapIconProps {
diff --git a/packages/website/ts/components/ui/text.tsx b/packages/website/ts/components/ui/text.tsx
index cd8f290e3e..c13e219132 100644
--- a/packages/website/ts/components/ui/text.tsx
+++ b/packages/website/ts/components/ui/text.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import { darken } from 'polished';
 import * as React from 'react';
 import { styled } from 'ts/style/theme';
@@ -19,7 +19,9 @@ export interface TextProps {
     textDecorationLine?: string;
     onClick?: (event: React.MouseEvent) => void;
     hoverColor?: string;
+    letterSpacing?: string | number;
     noWrap?: boolean;
+    textAlign?: string;
     display?: string;
 }
 
@@ -34,6 +36,8 @@ export const Text = styled(PlainText)`
     font-style: ${props => props.fontStyle};
     font-weight: ${props => props.fontWeight};
     font-size: ${props => props.fontSize};
+    text-align: ${props => props.textAlign};
+    letter-spacing: ${props => props.letterSpacing};
     text-decoration-line: ${props => props.textDecorationLine};
     ${props => (props.lineHeight ? `line-height: ${props.lineHeight}` : '')};
     ${props => (props.center ? 'text-align: center' : '')};
diff --git a/packages/website/ts/components/visual_order.tsx b/packages/website/ts/components/visual_order.tsx
index a8d18006e5..d723757d20 100644
--- a/packages/website/ts/components/visual_order.tsx
+++ b/packages/website/ts/components/visual_order.tsx
@@ -1,4 +1,4 @@
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { Party } from 'ts/components/ui/party';
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx
index 6abaa840b7..326cd3cfac 100644
--- a/packages/website/ts/components/wallet/wallet.tsx
+++ b/packages/website/ts/components/wallet/wallet.tsx
@@ -1,5 +1,5 @@
-import { EtherscanLinkSuffixes, utils as sharedUtils } from '@0xproject/react-shared';
-import { BigNumber, errorUtils } from '@0xproject/utils';
+import { EtherscanLinkSuffixes, utils as sharedUtils } from '@0x/react-shared';
+import { BigNumber, errorUtils } from '@0x/utils';
 import * as _ from 'lodash';
 
 import ActionAccountBalanceWallet from 'material-ui/svg-icons/action/account-balance-wallet';
diff --git a/packages/website/ts/components/wallet/wrap_ether_item.tsx b/packages/website/ts/components/wallet/wrap_ether_item.tsx
index 54ace7ae20..7de3afbf81 100644
--- a/packages/website/ts/components/wallet/wrap_ether_item.tsx
+++ b/packages/website/ts/components/wallet/wrap_ether_item.tsx
@@ -1,6 +1,6 @@
-import { Styles } from '@0xproject/react-shared';
-import { BigNumber, logUtils } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { Styles } from '@0x/react-shared';
+import { BigNumber, logUtils } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 import FlatButton from 'material-ui/FlatButton';
 import * as React from 'react';
diff --git a/packages/website/ts/containers/asset_buyer_documentation.ts b/packages/website/ts/containers/asset_buyer_documentation.ts
index f794625de2..c93b9332d2 100644
--- a/packages/website/ts/containers/asset_buyer_documentation.ts
+++ b/packages/website/ts/containers/asset_buyer_documentation.ts
@@ -1,11 +1,11 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
-import { DocPackages } from 'ts/types';
+import { DocPackages, ScreenWidths } from 'ts/types';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
@@ -22,7 +22,7 @@ const markdownSections = {
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.AssetBuyer,
-    packageName: '@0xproject/asset-buyer',
+    packageName: '@0x/asset-buyer',
     type: SupportedDocJson.TypeDoc,
     displayName: 'AssetBuyer',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
@@ -47,6 +47,7 @@ interface ConnectedState {
     availableDocVersions: string[];
     docsInfo: DocsInfo;
     translate: Translate;
+    screenWidth: ScreenWidths;
 }
 
 interface ConnectedDispatch {
@@ -58,6 +59,7 @@ const mapStateToProps = (state: State, _ownProps: DocPageProps): ConnectedState
     availableDocVersions: state.availableDocVersions,
     translate: state.translate,
     docsInfo,
+    screenWidth: state.screenWidth,
 });
 
 const mapDispatchToProps = (dispatch: Dispatch): ConnectedDispatch => ({
diff --git a/packages/website/ts/containers/connect_documentation.ts b/packages/website/ts/containers/connect_documentation.ts
index a728abe2c9..0f11e0809f 100644
--- a/packages/website/ts/containers/connect_documentation.ts
+++ b/packages/website/ts/containers/connect_documentation.ts
@@ -1,17 +1,18 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
-import { DocPackages } from 'ts/types';
+import { DocPackages, ScreenWidths } from 'ts/types';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
-const IntroMarkdownV1 = require('md/docs/connect/1.0.0/introduction');
-const IntroMarkdownV2 = require('md/docs/connect/2.0.0/introduction');
-const InstallationMarkdownV1 = require('md/docs/connect/1.0.0/installation');
+const IntroMarkdown1 = require('md/docs/connect/1/introduction');
+const IntroMarkdown2 = require('md/docs/connect/2/introduction');
+const InstallationMarkdown1 = require('md/docs/connect/1/installation');
+const InstallationMarkdown3 = require('md/docs/connect/3/installation');
 /* tslint:enable:no-var-requires */
 
 const markdownSections = {
@@ -21,22 +22,25 @@ const markdownSections = {
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.Connect,
-    packageName: '@0xproject/connect',
+    packageName: '@0x/connect',
     type: SupportedDocJson.TypeDoc,
     displayName: '0x Connect',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
     markdownMenu: {
-        introduction: [markdownSections.introduction],
-        install: [markdownSections.installation],
+        'getting-started': [markdownSections.introduction, markdownSections.installation],
     },
     sectionNameToMarkdownByVersion: {
         '0.0.1': {
-            [markdownSections.introduction]: IntroMarkdownV1,
-            [markdownSections.installation]: InstallationMarkdownV1,
+            [markdownSections.introduction]: IntroMarkdown1,
+            [markdownSections.installation]: InstallationMarkdown1,
         },
         '2.0.0-rc.1': {
-            [markdownSections.introduction]: IntroMarkdownV2,
-            [markdownSections.installation]: InstallationMarkdownV1,
+            [markdownSections.introduction]: IntroMarkdown2,
+            [markdownSections.installation]: InstallationMarkdown1,
+        },
+        '3.0.2': {
+            [markdownSections.introduction]: IntroMarkdown2,
+            [markdownSections.installation]: InstallationMarkdown3,
         },
     },
     markdownSections,
@@ -48,6 +52,7 @@ interface ConnectedState {
     availableDocVersions: string[];
     docsInfo: DocsInfo;
     translate: Translate;
+    screenWidth: ScreenWidths;
 }
 
 interface ConnectedDispatch {
@@ -59,6 +64,7 @@ const mapStateToProps = (state: State, _ownProps: DocPageProps): ConnectedState
     availableDocVersions: state.availableDocVersions,
     translate: state.translate,
     docsInfo,
+    screenWidth: state.screenWidth,
 });
 
 const mapDispatchToProps = (dispatch: Dispatch): ConnectedDispatch => ({
diff --git a/packages/website/ts/containers/contract_wrappers_documentation.ts b/packages/website/ts/containers/contract_wrappers_documentation.ts
index 1e1735846b..4c05605e36 100644
--- a/packages/website/ts/containers/contract_wrappers_documentation.ts
+++ b/packages/website/ts/containers/contract_wrappers_documentation.ts
@@ -1,16 +1,17 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
-import { DocPackages } from 'ts/types';
+import { DocPackages, ScreenWidths } from 'ts/types';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
-const IntroMarkdown = require('md/docs/contract_wrappers/introduction');
-const InstallMarkdown = require('md/docs/contract_wrappers/installation');
+const IntroMarkdown1 = require('md/docs/contract_wrappers/1/introduction');
+const InstallMarkdownV1 = require('md/docs/contract_wrappers/1/installation');
+const InstallMarkdownV2 = require('md/docs/contract_wrappers/2/installation');
 /* tslint:enable:no-var-requires */
 
 const markdownSections = {
@@ -20,18 +21,21 @@ const markdownSections = {
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.ContractWrappers,
-    packageName: '@0xproject/contract-wrappers',
+    packageName: '@0x/contract-wrappers',
     type: SupportedDocJson.TypeDoc,
     displayName: 'Contract Wrappers',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
     markdownMenu: {
-        introduction: [markdownSections.introduction],
-        install: [markdownSections.installation],
+        'getting-started': [markdownSections.introduction, markdownSections.installation],
     },
     sectionNameToMarkdownByVersion: {
         '0.0.1': {
-            [markdownSections.introduction]: IntroMarkdown,
-            [markdownSections.installation]: InstallMarkdown,
+            [markdownSections.introduction]: IntroMarkdown1,
+            [markdownSections.installation]: InstallMarkdownV1,
+        },
+        '3.0.0': {
+            [markdownSections.introduction]: IntroMarkdown1,
+            [markdownSections.installation]: InstallMarkdownV2,
         },
     },
     markdownSections,
@@ -43,6 +47,7 @@ interface ConnectedState {
     availableDocVersions: string[];
     docsInfo: DocsInfo;
     translate: Translate;
+    screenWidth: ScreenWidths;
 }
 
 interface ConnectedDispatch {
@@ -54,6 +59,7 @@ const mapStateToProps = (state: State, _ownProps: DocPageProps): ConnectedState
     availableDocVersions: state.availableDocVersions,
     docsInfo,
     translate: state.translate,
+    screenWidth: state.screenWidth,
 });
 
 const mapDispatchToProps = (dispatch: Dispatch): ConnectedDispatch => ({
diff --git a/packages/website/ts/containers/docs_home.ts b/packages/website/ts/containers/docs_home.ts
new file mode 100644
index 0000000000..e0ca439a6e
--- /dev/null
+++ b/packages/website/ts/containers/docs_home.ts
@@ -0,0 +1,31 @@
+import * as _ from 'lodash';
+import * as React from 'react';
+import { connect } from 'react-redux';
+import { Dispatch } from 'redux';
+import { DocsHome as DocsHomeComponent, DocsHomeProps } from 'ts/pages/documentation/docs_home';
+import { Dispatcher } from 'ts/redux/dispatcher';
+import { State } from 'ts/redux/reducer';
+import { ScreenWidths } from 'ts/types';
+import { Translate } from 'ts/utils/translate';
+
+interface ConnectedState {
+    translate: Translate;
+    screenWidth: ScreenWidths;
+}
+
+interface ConnectedDispatch {
+    dispatcher: Dispatcher;
+}
+
+const mapStateToProps = (state: State, _ownProps: DocsHomeProps): ConnectedState => ({
+    translate: state.translate,
+    screenWidth: state.screenWidth,
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): ConnectedDispatch => ({
+    dispatcher: new Dispatcher(dispatch),
+});
+
+export const DocsHome: React.ComponentClass = connect(mapStateToProps, mapDispatchToProps)(
+    DocsHomeComponent,
+);
diff --git a/packages/website/ts/containers/ethereum_types_documentation.ts b/packages/website/ts/containers/ethereum_types_documentation.ts
index 2b6d6e64da..9d1df1d1f7 100644
--- a/packages/website/ts/containers/ethereum_types_documentation.ts
+++ b/packages/website/ts/containers/ethereum_types_documentation.ts
@@ -1,11 +1,11 @@
-import { constants as docConstants, DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { constants as docConstants, DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
-import { DocPackages } from 'ts/types';
+import { DocPackages, ScreenWidths } from 'ts/types';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
@@ -26,9 +26,7 @@ const docsInfoConfig: DocsInfoConfig = {
     displayName: 'Ethereum Types',
     packageUrl: 'https://github.com/0xProject/0x-monorepo/packages/ethereum-types',
     markdownMenu: {
-        introduction: [markdownSections.introduction],
-        install: [markdownSections.installation],
-        types: [markdownSections.types],
+        'getting-started': [markdownSections.introduction, markdownSections.installation],
     },
     sectionNameToMarkdownByVersion: {
         '0.0.1': {
@@ -45,6 +43,7 @@ interface ConnectedState {
     availableDocVersions: string[];
     docsInfo: DocsInfo;
     translate: Translate;
+    screenWidth: ScreenWidths;
 }
 
 interface ConnectedDispatch {
@@ -56,6 +55,7 @@ const mapStateToProps = (state: State, _ownProps: DocPageProps): ConnectedState
     availableDocVersions: state.availableDocVersions,
     translate: state.translate,
     docsInfo,
+    screenWidth: state.screenWidth,
 });
 
 const mapDispatchToProps = (dispatch: Dispatch): ConnectedDispatch => ({
diff --git a/packages/website/ts/containers/generate_order_form.ts b/packages/website/ts/containers/generate_order_form.ts
index bc9d6f524d..98b2831ce2 100644
--- a/packages/website/ts/containers/generate_order_form.ts
+++ b/packages/website/ts/containers/generate_order_form.ts
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Blockchain } from 'ts/blockchain';
diff --git a/packages/website/ts/containers/inputs/eth_amount_input.ts b/packages/website/ts/containers/inputs/eth_amount_input.ts
index 9ef903b555..45d3ddebdf 100644
--- a/packages/website/ts/containers/inputs/eth_amount_input.ts
+++ b/packages/website/ts/containers/inputs/eth_amount_input.ts
@@ -1,5 +1,5 @@
-import { BigNumber } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { BigNumber } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { State } from 'ts/redux/reducer';
diff --git a/packages/website/ts/containers/json_schemas_documentation.ts b/packages/website/ts/containers/json_schemas_documentation.ts
index f32a50ea9c..cb59187842 100644
--- a/packages/website/ts/containers/json_schemas_documentation.ts
+++ b/packages/website/ts/containers/json_schemas_documentation.ts
@@ -1,54 +1,59 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
-import { DocPackages } from 'ts/types';
+import { DocPackages, ScreenWidths } from 'ts/types';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
-const IntroMarkdownV1 = require('md/docs/json_schemas/1.0.0/introduction');
-const InstallationMarkdownV1 = require('md/docs/json_schemas/1.0.0/installation');
-const UsageMarkdownV1 = require('md/docs/json_schemas/1.0.0/usage');
-const SchemasMarkdownV1 = require('md/docs/json_schemas/1.0.0/schemas');
-const SchemasMarkdownV2 = require('md/docs/json_schemas/2.0.0/schemas');
+const IntroMarkdown1 = require('md/docs/json_schemas/1/introduction');
+const IntroMarkdown3 = require('md/docs/json_schemas/3/introduction');
+const InstallationMarkdown1 = require('md/docs/json_schemas/1/installation');
+const InstallationMarkdown3 = require('md/docs/json_schemas/3/installation');
+const usageMarkdown1 = require('md/docs/json_schemas/1/usage');
+const usageMarkdown3 = require('md/docs/json_schemas/3/usage');
+const SchemasMarkdownV1 = require('md/docs/json_schemas/1/schemas');
+const SchemasMarkdownV2 = require('md/docs/json_schemas/2/schemas');
 /* tslint:enable:no-var-requires */
 
 const markdownSections = {
     introduction: 'introduction',
     installation: 'installation',
     usage: 'usage',
-    schemaValidator: 'schemaValidator',
     schemas: 'schemas',
 };
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.JSONSchemas,
-    packageName: '@0xproject/json-schemas',
+    packageName: '@0x/json-schemas',
     type: SupportedDocJson.TypeDoc,
     displayName: 'JSON Schemas',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
     markdownMenu: {
-        introduction: [markdownSections.introduction],
-        install: [markdownSections.installation],
-        usage: [markdownSections.usage],
-        schemaValidator: [markdownSections.schemaValidator],
+        'getting-started': [markdownSections.introduction, markdownSections.installation, markdownSections.usage],
         schemas: [markdownSections.schemas],
     },
     sectionNameToMarkdownByVersion: {
         '0.0.1': {
-            [markdownSections.introduction]: IntroMarkdownV1,
-            [markdownSections.installation]: InstallationMarkdownV1,
+            [markdownSections.introduction]: IntroMarkdown1,
+            [markdownSections.installation]: InstallationMarkdown1,
             [markdownSections.schemas]: SchemasMarkdownV1,
-            [markdownSections.usage]: UsageMarkdownV1,
+            [markdownSections.usage]: usageMarkdown1,
         },
         '1.0.0': {
-            [markdownSections.introduction]: IntroMarkdownV1,
-            [markdownSections.installation]: InstallationMarkdownV1,
+            [markdownSections.introduction]: IntroMarkdown1,
+            [markdownSections.installation]: InstallationMarkdown1,
             [markdownSections.schemas]: SchemasMarkdownV2,
-            [markdownSections.usage]: UsageMarkdownV1,
+            [markdownSections.usage]: usageMarkdown1,
+        },
+        '2.0.0': {
+            [markdownSections.introduction]: IntroMarkdown3,
+            [markdownSections.installation]: InstallationMarkdown3,
+            [markdownSections.schemas]: SchemasMarkdownV2,
+            [markdownSections.usage]: usageMarkdown3,
         },
     },
     markdownSections,
@@ -60,6 +65,7 @@ interface ConnectedState {
     availableDocVersions: string[];
     docsInfo: DocsInfo;
     translate: Translate;
+    screenWidth: ScreenWidths;
 }
 
 interface ConnectedDispatch {
@@ -71,6 +77,7 @@ const mapStateToProps = (state: State, _ownProps: DocPageProps): ConnectedState
     availableDocVersions: state.availableDocVersions,
     translate: state.translate,
     docsInfo,
+    screenWidth: state.screenWidth,
 });
 
 const mapDispatchToProps = (dispatch: Dispatch): ConnectedDispatch => ({
diff --git a/packages/website/ts/containers/order_utils_documentation.ts b/packages/website/ts/containers/order_utils_documentation.ts
index b54c30a1e3..f1d7949885 100644
--- a/packages/website/ts/containers/order_utils_documentation.ts
+++ b/packages/website/ts/containers/order_utils_documentation.ts
@@ -1,16 +1,18 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
-import { DocPackages } from 'ts/types';
+import { DocPackages, ScreenWidths } from 'ts/types';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
-const IntroMarkdownV1 = require('md/docs/order_utils/1.0.0/introduction');
-const InstallationMarkdownV1 = require('md/docs/order_utils/1.0.0/installation');
+const IntroMarkdown1 = require('md/docs/order_utils/1/introduction');
+const InstallationMarkdown1 = require('md/docs/order_utils/1/installation');
+const IntroMarkdown2 = require('md/docs/order_utils/2/introduction');
+const InstallationMarkdown2 = require('md/docs/order_utils/2/installation');
 /* tslint:enable:no-var-requires */
 
 const markdownSections = {
@@ -20,18 +22,21 @@ const markdownSections = {
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.OrderUtils,
-    packageName: '@0xproject/order-utils',
+    packageName: '@0x/order-utils',
     type: SupportedDocJson.TypeDoc,
     displayName: 'Order utils',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
     markdownMenu: {
-        introduction: [markdownSections.introduction],
-        install: [markdownSections.installation],
+        'getting-started': [markdownSections.introduction, markdownSections.installation],
     },
     sectionNameToMarkdownByVersion: {
         '0.0.1': {
-            [markdownSections.introduction]: IntroMarkdownV1,
-            [markdownSections.installation]: InstallationMarkdownV1,
+            [markdownSections.introduction]: IntroMarkdown1,
+            [markdownSections.installation]: InstallationMarkdown1,
+        },
+        '2.0.0': {
+            [markdownSections.introduction]: IntroMarkdown2,
+            [markdownSections.installation]: InstallationMarkdown2,
         },
     },
     markdownSections,
@@ -43,6 +48,7 @@ interface ConnectedState {
     availableDocVersions: string[];
     docsInfo: DocsInfo;
     translate: Translate;
+    screenWidth: ScreenWidths;
 }
 
 interface ConnectedDispatch {
@@ -54,6 +60,7 @@ const mapStateToProps = (state: State, _ownProps: DocPageProps): ConnectedState
     availableDocVersions: state.availableDocVersions,
     translate: state.translate,
     docsInfo,
+    screenWidth: state.screenWidth,
 });
 
 const mapDispatchToProps = (dispatch: Dispatch): ConnectedDispatch => ({
diff --git a/packages/website/ts/containers/order_watcher_documentation.ts b/packages/website/ts/containers/order_watcher_documentation.ts
index 59a0188476..ac92e6a228 100644
--- a/packages/website/ts/containers/order_watcher_documentation.ts
+++ b/packages/website/ts/containers/order_watcher_documentation.ts
@@ -1,16 +1,18 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
-import { DocPackages } from 'ts/types';
+import { DocPackages, ScreenWidths } from 'ts/types';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
-const IntroMarkdown = require('md/docs/order_watcher/introduction');
-const InstallationMarkdown = require('md/docs/order_watcher/installation');
+const IntroMarkdown1 = require('md/docs/order_watcher/1/introduction');
+const InstallationMarkdown1 = require('md/docs/order_watcher/1/installation');
+const IntroMarkdown2 = require('md/docs/order_watcher/2/introduction');
+const InstallationMarkdown2 = require('md/docs/order_watcher/2/installation');
 /* tslint:enable:no-var-requires */
 
 const markdownSections = {
@@ -20,18 +22,21 @@ const markdownSections = {
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.OrderWatcher,
-    packageName: '@0xproject/order-watcher',
+    packageName: '@0x/order-watcher',
     type: SupportedDocJson.TypeDoc,
     displayName: 'OrderWatcher',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
     markdownMenu: {
-        introduction: [markdownSections.introduction],
-        install: [markdownSections.installation],
+        'getting-started': [markdownSections.introduction, markdownSections.installation],
     },
     sectionNameToMarkdownByVersion: {
         '0.0.1': {
-            [markdownSections.introduction]: IntroMarkdown,
-            [markdownSections.installation]: InstallationMarkdown,
+            [markdownSections.introduction]: IntroMarkdown1,
+            [markdownSections.installation]: InstallationMarkdown1,
+        },
+        '2.2.0': {
+            [markdownSections.introduction]: IntroMarkdown2,
+            [markdownSections.installation]: InstallationMarkdown2,
         },
     },
     markdownSections,
@@ -43,6 +48,7 @@ interface ConnectedState {
     availableDocVersions: string[];
     docsInfo: DocsInfo;
     translate: Translate;
+    screenWidth: ScreenWidths;
 }
 
 interface ConnectedDispatch {
@@ -54,6 +60,7 @@ const mapStateToProps = (state: State, _ownProps: DocPageProps): ConnectedState
     availableDocVersions: state.availableDocVersions,
     translate: state.translate,
     docsInfo,
+    screenWidth: state.screenWidth,
 });
 
 const mapDispatchToProps = (dispatch: Dispatch): ConnectedDispatch => ({
diff --git a/packages/website/ts/containers/portal.ts b/packages/website/ts/containers/portal.ts
index 4d7ff2f557..5661e0a978 100644
--- a/packages/website/ts/containers/portal.ts
+++ b/packages/website/ts/containers/portal.ts
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { connect } from 'react-redux';
diff --git a/packages/website/ts/containers/portal_onboarding_flow.ts b/packages/website/ts/containers/portal_onboarding_flow.ts
index a813205b1d..66473733c6 100644
--- a/packages/website/ts/containers/portal_onboarding_flow.ts
+++ b/packages/website/ts/containers/portal_onboarding_flow.ts
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
diff --git a/packages/website/ts/containers/smart_contracts_documentation.ts b/packages/website/ts/containers/smart_contracts_documentation.ts
index 05b2a50c38..57c98fa3b9 100644
--- a/packages/website/ts/containers/smart_contracts_documentation.ts
+++ b/packages/website/ts/containers/smart_contracts_documentation.ts
@@ -1,17 +1,17 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
-import { Networks } from '@0xproject/react-shared';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
+import { Networks } from '@0x/react-shared';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
-import { DocPackages, SmartContractDocSections as Sections } from 'ts/types';
+import { DocPackages, ScreenWidths, SmartContractDocSections as Sections } from 'ts/types';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
-const IntroMarkdownV1 = require('md/docs/smart_contracts/1.0.0/introduction');
-const IntroMarkdownV2 = require('md/docs/smart_contracts/2.0.0/introduction');
+const IntroMarkdown1 = require('md/docs/smart_contracts/1/introduction');
+const IntroMarkdown2 = require('md/docs/smart_contracts/2/introduction');
 /* tslint:enable:no-var-requires */
 
 const docsInfoConfig: DocsInfoConfig = {
@@ -25,10 +25,10 @@ const docsInfoConfig: DocsInfoConfig = {
     },
     sectionNameToMarkdownByVersion: {
         '0.0.1': {
-            [Sections.Introduction]: IntroMarkdownV1,
+            [Sections.Introduction]: IntroMarkdown1,
         },
         '2.0.0': {
-            [Sections.Introduction]: IntroMarkdownV2,
+            [Sections.Introduction]: IntroMarkdown2,
         },
     },
     markdownSections: {
@@ -97,6 +97,7 @@ interface ConnectedState {
     docsVersion: string;
     availableDocVersions: string[];
     translate: Translate;
+    screenWidth: ScreenWidths;
 }
 
 interface ConnectedDispatch {
@@ -108,6 +109,7 @@ const mapStateToProps = (state: State, _ownProps: DocPageProps): ConnectedState
     docsVersion: state.docsVersion,
     availableDocVersions: state.availableDocVersions,
     translate: state.translate,
+    screenWidth: state.screenWidth,
 });
 
 const mapDispatchToProps = (dispatch: Dispatch): ConnectedDispatch => ({
diff --git a/packages/website/ts/containers/sol_compiler_documentation.ts b/packages/website/ts/containers/sol_compiler_documentation.ts
index 20f26ed1d3..f3a793e801 100644
--- a/packages/website/ts/containers/sol_compiler_documentation.ts
+++ b/packages/website/ts/containers/sol_compiler_documentation.ts
@@ -1,17 +1,19 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
-import { DocPackages } from 'ts/types';
+import { DocPackages, ScreenWidths } from 'ts/types';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
-const IntroMarkdownV1 = require('md/docs/sol-compiler/introduction');
-const InstallationMarkdownV1 = require('md/docs/sol-compiler/installation');
-const UsageMarkdown = require('md/docs/sol-compiler/usage');
+const IntroMarkdown1 = require('md/docs/sol-compiler/1/introduction');
+const InstallationMarkdown1 = require('md/docs/sol-compiler/1/installation');
+const InstallationMarkdown2 = require('md/docs/sol-compiler/2/installation');
+const UsageMarkdown1 = require('md/docs/sol-compiler/1/usage');
+const UsageMarkdown2 = require('md/docs/sol-compiler/2/usage');
 /* tslint:enable:no-var-requires */
 
 const markdownSections = {
@@ -22,20 +24,23 @@ const markdownSections = {
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.SolCompiler,
-    packageName: '@0xproject/sol-compiler',
+    packageName: '@0x/sol-compiler',
     type: SupportedDocJson.TypeDoc,
     displayName: 'Solidity Compiler',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
     markdownMenu: {
-        introduction: [markdownSections.introduction],
-        install: [markdownSections.installation],
-        usage: [markdownSections.usage],
+        'getting-started': [markdownSections.introduction, markdownSections.installation, markdownSections.usage],
     },
     sectionNameToMarkdownByVersion: {
         '0.0.1': {
-            [markdownSections.introduction]: IntroMarkdownV1,
-            [markdownSections.installation]: InstallationMarkdownV1,
-            [markdownSections.usage]: UsageMarkdown,
+            [markdownSections.introduction]: IntroMarkdown1,
+            [markdownSections.installation]: InstallationMarkdown1,
+            [markdownSections.usage]: UsageMarkdown1,
+        },
+        '1.1.8': {
+            [markdownSections.introduction]: IntroMarkdown1,
+            [markdownSections.installation]: InstallationMarkdown2,
+            [markdownSections.usage]: UsageMarkdown2,
         },
     },
     markdownSections,
@@ -47,6 +52,7 @@ interface ConnectedState {
     availableDocVersions: string[];
     docsInfo: DocsInfo;
     translate: Translate;
+    screenWidth: ScreenWidths;
 }
 
 interface ConnectedDispatch {
@@ -58,6 +64,7 @@ const mapStateToProps = (state: State, _ownProps: DocPageProps): ConnectedState
     availableDocVersions: state.availableDocVersions,
     translate: state.translate,
     docsInfo,
+    screenWidth: state.screenWidth,
 });
 
 const mapDispatchToProps = (dispatch: Dispatch): ConnectedDispatch => ({
diff --git a/packages/website/ts/containers/sol_cov_documentation.ts b/packages/website/ts/containers/sol_cov_documentation.ts
index 27efd641eb..8944ec70ae 100644
--- a/packages/website/ts/containers/sol_cov_documentation.ts
+++ b/packages/website/ts/containers/sol_cov_documentation.ts
@@ -1,17 +1,20 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
-import { DocPackages } from 'ts/types';
+import { DocPackages, ScreenWidths } from 'ts/types';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
-const IntroMarkdownV1 = require('md/docs/sol_cov/introduction');
-const InstallationMarkdownV1 = require('md/docs/sol_cov/installation');
-const UsageMarkdown = require('md/docs/sol_cov/usage');
+const IntroMarkdown1 = require('md/docs/sol_cov/1/introduction');
+const InstallationMarkdown1 = require('md/docs/sol_cov/1/installation');
+const UsageMarkdown1 = require('md/docs/sol_cov/1/usage');
+const IntroMarkdown2 = require('md/docs/sol_cov/2/introduction');
+const InstallationMarkdown2 = require('md/docs/sol_cov/2/installation');
+const UsageMarkdown2 = require('md/docs/sol_cov/2/usage');
 /* tslint:enable:no-var-requires */
 
 const markdownSections = {
@@ -22,20 +25,23 @@ const markdownSections = {
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.SolCov,
-    packageName: '@0xproject/sol-cov',
+    packageName: '@0x/sol-cov',
     type: SupportedDocJson.TypeDoc,
     displayName: 'Sol-cov',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
     markdownMenu: {
-        introduction: [markdownSections.introduction],
-        install: [markdownSections.installation],
-        usage: [markdownSections.usage],
+        'getting-started': [markdownSections.introduction, markdownSections.installation, markdownSections.usage],
     },
     sectionNameToMarkdownByVersion: {
         '0.0.1': {
-            [markdownSections.introduction]: IntroMarkdownV1,
-            [markdownSections.installation]: InstallationMarkdownV1,
-            [markdownSections.usage]: UsageMarkdown,
+            [markdownSections.introduction]: IntroMarkdown1,
+            [markdownSections.installation]: InstallationMarkdown1,
+            [markdownSections.usage]: UsageMarkdown1,
+        },
+        '2.1.8': {
+            [markdownSections.introduction]: IntroMarkdown2,
+            [markdownSections.installation]: InstallationMarkdown2,
+            [markdownSections.usage]: UsageMarkdown2,
         },
     },
     markdownSections,
@@ -47,6 +53,7 @@ interface ConnectedState {
     availableDocVersions: string[];
     docsInfo: DocsInfo;
     translate: Translate;
+    screenWidth: ScreenWidths;
 }
 
 interface ConnectedDispatch {
@@ -58,6 +65,7 @@ const mapStateToProps = (state: State, _ownProps: DocPageProps): ConnectedState
     availableDocVersions: state.availableDocVersions,
     translate: state.translate,
     docsInfo,
+    screenWidth: state.screenWidth,
 });
 
 const mapDispatchToProps = (dispatch: Dispatch): ConnectedDispatch => ({
diff --git a/packages/website/ts/containers/subproviders_documentation.ts b/packages/website/ts/containers/subproviders_documentation.ts
index 28b2e95080..0e421777b7 100644
--- a/packages/website/ts/containers/subproviders_documentation.ts
+++ b/packages/website/ts/containers/subproviders_documentation.ts
@@ -1,17 +1,18 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
-import { DocPackages } from 'ts/types';
+import { DocPackages, ScreenWidths } from 'ts/types';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
-const IntroMarkdownV1 = require('md/docs/subproviders/introduction');
-const InstallationMarkdownV1 = require('md/docs/subproviders/installation');
-const LedgerNodeHidMarkdown = require('md/docs/subproviders/ledger_node_hid');
+const IntroMarkdown1 = require('md/docs/subproviders/1/introduction');
+const InstallationMarkdown1 = require('md/docs/subproviders/1/installation');
+const InstallationMarkdown2 = require('md/docs/subproviders/2/installation');
+const LedgerNodeHidMarkdown1 = require('md/docs/subproviders/1/ledger_node_hid');
 /* tslint:enable:no-var-requires */
 
 const docSections = {
@@ -22,20 +23,23 @@ const docSections = {
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.Subproviders,
-    packageName: '@0xproject/subproviders',
+    packageName: '@0x/subproviders',
     type: SupportedDocJson.TypeDoc,
     displayName: 'Subproviders',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
     markdownMenu: {
-        introduction: [docSections.introduction],
-        install: [docSections.installation],
-        ['ledger-node-hid-issue']: [docSections.ledgerNodeHid],
+        'getting-started': [docSections.introduction, docSections.installation, docSections.ledgerNodeHid],
     },
     sectionNameToMarkdownByVersion: {
         '0.0.1': {
-            [docSections.introduction]: IntroMarkdownV1,
-            [docSections.installation]: InstallationMarkdownV1,
-            [docSections.ledgerNodeHid]: LedgerNodeHidMarkdown,
+            [docSections.introduction]: IntroMarkdown1,
+            [docSections.installation]: InstallationMarkdown1,
+            [docSections.ledgerNodeHid]: LedgerNodeHidMarkdown1,
+        },
+        '2.1.0': {
+            [docSections.introduction]: IntroMarkdown1,
+            [docSections.installation]: InstallationMarkdown2,
+            [docSections.ledgerNodeHid]: LedgerNodeHidMarkdown1,
         },
     },
     markdownSections: docSections,
@@ -47,6 +51,7 @@ interface ConnectedState {
     availableDocVersions: string[];
     docsInfo: DocsInfo;
     translate: Translate;
+    screenWidth: ScreenWidths;
 }
 
 interface ConnectedDispatch {
@@ -58,6 +63,7 @@ const mapStateToProps = (state: State, _ownProps: DocPageProps): ConnectedState
     availableDocVersions: state.availableDocVersions,
     translate: state.translate,
     docsInfo,
+    screenWidth: state.screenWidth,
 });
 
 const mapDispatchToProps = (dispatch: Dispatch): ConnectedDispatch => ({
diff --git a/packages/website/ts/containers/web3_wrapper_documentation.ts b/packages/website/ts/containers/web3_wrapper_documentation.ts
index dc9d233049..9c8c346211 100644
--- a/packages/website/ts/containers/web3_wrapper_documentation.ts
+++ b/packages/website/ts/containers/web3_wrapper_documentation.ts
@@ -1,40 +1,44 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
-import { DocPackages } from 'ts/types';
+import { DocPackages, ScreenWidths } from 'ts/types';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
-const IntroMarkdownV1 = require('md/docs/web3_wrapper/introduction');
-const InstallationMarkdownV1 = require('md/docs/web3_wrapper/installation');
+const IntroMarkdown1 = require('md/docs/web3_wrapper/1/introduction');
+const InstallationMarkdown1 = require('md/docs/web3_wrapper/1/installation');
+const InstallationMarkdown2 = require('md/docs/web3_wrapper/2/installation');
 /* tslint:enable:no-var-requires */
 
-const docSections = {
+const markdownSections = {
     introduction: 'introduction',
     installation: 'installation',
 };
 
 const docsInfoConfig: DocsInfoConfig = {
     id: DocPackages.Web3Wrapper,
-    packageName: '@0xproject/web3-wrapper',
+    packageName: '@0x/web3-wrapper',
     type: SupportedDocJson.TypeDoc,
     displayName: 'Web3Wrapper',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
     markdownMenu: {
-        introduction: [docSections.introduction],
-        install: [docSections.installation],
+        'getting-started': [markdownSections.introduction, markdownSections.installation],
     },
     sectionNameToMarkdownByVersion: {
         '0.0.1': {
-            [docSections.introduction]: IntroMarkdownV1,
-            [docSections.installation]: InstallationMarkdownV1,
+            [markdownSections.introduction]: IntroMarkdown1,
+            [markdownSections.installation]: InstallationMarkdown1,
+        },
+        '3.1.0': {
+            [markdownSections.introduction]: IntroMarkdown1,
+            [markdownSections.installation]: InstallationMarkdown2,
         },
     },
-    markdownSections: docSections,
+    markdownSections,
 };
 const docsInfo = new DocsInfo(docsInfoConfig);
 
@@ -43,6 +47,7 @@ interface ConnectedState {
     availableDocVersions: string[];
     docsInfo: DocsInfo;
     translate: Translate;
+    screenWidth: ScreenWidths;
 }
 
 interface ConnectedDispatch {
@@ -54,6 +59,7 @@ const mapStateToProps = (state: State, _ownProps: DocPageProps): ConnectedState
     availableDocVersions: state.availableDocVersions,
     translate: state.translate,
     docsInfo,
+    screenWidth: state.screenWidth,
 });
 
 const mapDispatchToProps = (dispatch: Dispatch): ConnectedDispatch => ({
diff --git a/packages/website/ts/containers/wiki.ts b/packages/website/ts/containers/wiki.ts
index 357f8bbf46..069b0ae548 100644
--- a/packages/website/ts/containers/wiki.ts
+++ b/packages/website/ts/containers/wiki.ts
@@ -4,10 +4,12 @@ import { Dispatch } from 'redux';
 import { Wiki as WikiComponent, WikiProps } from 'ts/pages/wiki/wiki';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
+import { ScreenWidths } from 'ts/types';
 import { Translate } from 'ts/utils/translate';
 
 interface ConnectedState {
     translate: Translate;
+    screenWidth: ScreenWidths;
 }
 
 interface ConnectedDispatch {
@@ -16,6 +18,7 @@ interface ConnectedDispatch {
 
 const mapStateToProps = (state: State, _ownProps: WikiProps): ConnectedState => ({
     translate: state.translate,
+    screenWidth: state.screenWidth,
 });
 
 const mapDispatchToProps = (dispatch: Dispatch): ConnectedDispatch => ({
diff --git a/packages/website/ts/containers/zero_ex_js_documentation.ts b/packages/website/ts/containers/zero_ex_js_documentation.ts
index 2a3afd86cd..e0ea6e2757 100644
--- a/packages/website/ts/containers/zero_ex_js_documentation.ts
+++ b/packages/website/ts/containers/zero_ex_js_documentation.ts
@@ -1,11 +1,11 @@
-import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0xproject/react-docs';
+import { DocsInfo, DocsInfoConfig, SupportedDocJson } from '@0x/react-docs';
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 import { DocPage as DocPageComponent, DocPageProps } from 'ts/pages/documentation/doc_page';
 import { Dispatcher } from 'ts/redux/dispatcher';
 import { State } from 'ts/redux/reducer';
-import { DocPackages } from 'ts/types';
+import { DocPackages, ScreenWidths } from 'ts/types';
 import { Translate } from 'ts/utils/translate';
 
 /* tslint:disable:no-var-requires */
@@ -15,8 +15,8 @@ const AsyncMarkdownV0 = require('md/docs/0xjs/0.0.1/async');
 const ErrorsMarkdownV0 = require('md/docs/0xjs/0.0.1/errors');
 const versioningMarkdownV0 = require('md/docs/0xjs/0.0.1/versioning');
 
-const IntroMarkdownV1 = require('md/docs/0xjs/1.0.1/introduction');
-const InstallationMarkdownV1 = require('md/docs/0xjs/1.0.1/installation');
+const IntroMarkdown1 = require('md/docs/0xjs/1.0.1/introduction');
+const InstallationMarkdown1 = require('md/docs/0xjs/1.0.1/installation');
 const AsyncMarkdownV1 = require('md/docs/0xjs/1.0.1/async');
 const ErrorsMarkdownV1 = ErrorsMarkdownV0;
 const versioningMarkdownV1 = require('md/docs/0xjs/1.0.1/versioning');
@@ -39,9 +39,13 @@ const docsInfoConfig: DocsInfoConfig = {
     displayName: '0x.js',
     packageUrl: 'https://github.com/0xProject/0x-monorepo',
     markdownMenu: {
-        introduction: [markdownSections.introduction],
-        install: [markdownSections.installation],
-        topics: [markdownSections.async, markdownSections.errors, markdownSections.versioning],
+        'getting-started': [
+            markdownSections.introduction,
+            markdownSections.installation,
+            markdownSections.async,
+            markdownSections.errors,
+            markdownSections.versioning,
+        ],
     },
     sectionNameToMarkdownByVersion: {
         '0.0.1': {
@@ -52,8 +56,15 @@ const docsInfoConfig: DocsInfoConfig = {
             [markdownSections.errors]: ErrorsMarkdownV0,
         },
         '1.0.1': {
-            [markdownSections.introduction]: IntroMarkdownV1,
-            [markdownSections.installation]: InstallationMarkdownV1,
+            [markdownSections.introduction]: IntroMarkdown1,
+            [markdownSections.installation]: InstallationMarkdown1,
+            [markdownSections.versioning]: versioningMarkdownV1,
+            [markdownSections.async]: AsyncMarkdownV1,
+            [markdownSections.errors]: ErrorsMarkdownV1,
+        },
+        '2.0.0': {
+            [markdownSections.introduction]: IntroMarkdown1,
+            [markdownSections.installation]: InstallationMarkdown1,
             [markdownSections.versioning]: versioningMarkdownV1,
             [markdownSections.async]: AsyncMarkdownV1,
             [markdownSections.errors]: ErrorsMarkdownV1,
@@ -68,6 +79,7 @@ interface ConnectedState {
     availableDocVersions: string[];
     docsInfo: DocsInfo;
     translate: Translate;
+    screenWidth: ScreenWidths;
 }
 
 interface ConnectedDispatch {
@@ -79,6 +91,7 @@ const mapStateToProps = (state: State, _ownProps: DocPageProps): ConnectedState
     availableDocVersions: state.availableDocVersions,
     docsInfo,
     translate: state.translate,
+    screenWidth: state.screenWidth,
 });
 
 const mapDispatchToProps = (dispatch: Dispatch): ConnectedDispatch => ({
diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx
index bb218eac17..21157e4272 100644
--- a/packages/website/ts/index.tsx
+++ b/packages/website/ts/index.tsx
@@ -5,6 +5,7 @@ import { Provider } from 'react-redux';
 import { BrowserRouter as Router, Redirect, Route, Switch } from 'react-router-dom';
 import { MetaTags } from 'ts/components/meta_tags';
 import { About } from 'ts/containers/about';
+import { DocsHome } from 'ts/containers/docs_home';
 import { FAQ } from 'ts/containers/faq';
 import { Jobs } from 'ts/containers/jobs';
 import { Landing } from 'ts/containers/landing';
@@ -140,6 +141,7 @@ render(
                                     path={`${WebsitePaths.AssetBuyer}/:version?`}
                                     component={LazyAssetBuyerDocumentation}
                                 />
+                                
                                 {/* Legacy endpoints */}
                                  {
                             }}
                         >
                             We are seeking outstanding candidates to{' '}
-                            
+                            
                                 join our team
                             
                             . We value passion, diversity and unique perspectives.
diff --git a/packages/website/ts/pages/about/profile.tsx b/packages/website/ts/pages/about/profile.tsx
index bcbeb02720..2361c64185 100644
--- a/packages/website/ts/pages/about/profile.tsx
+++ b/packages/website/ts/pages/about/profile.tsx
@@ -1,4 +1,4 @@
-import { colors, Styles } from '@0xproject/react-shared';
+import { colors, Styles } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { ProfileInfo } from 'ts/types';
diff --git a/packages/website/ts/pages/documentation/developers_page.tsx b/packages/website/ts/pages/documentation/developers_page.tsx
new file mode 100644
index 0000000000..934a4cc367
--- /dev/null
+++ b/packages/website/ts/pages/documentation/developers_page.tsx
@@ -0,0 +1,182 @@
+import { colors, constants as sharedConstants } from '@0x/react-shared';
+import * as _ from 'lodash';
+import * as React from 'react';
+import DocumentTitle = require('react-document-title');
+import { DocsLogo } from 'ts/components/documentation/docs_logo';
+import { DocsTopBar } from 'ts/components/documentation/docs_top_bar';
+import { Container } from 'ts/components/ui/container';
+import { Dispatcher } from 'ts/redux/dispatcher';
+import { ScreenWidths } from 'ts/types';
+import { Translate } from 'ts/utils/translate';
+import { utils } from 'ts/utils/utils';
+
+const THROTTLE_TIMEOUT = 100;
+const TOP_BAR_HEIGHT = 80;
+const SCROLLER_WIDTH = 4;
+
+export interface DevelopersPageProps {
+    location: Location;
+    translate: Translate;
+    screenWidth: ScreenWidths;
+    dispatcher: Dispatcher;
+    mainContent: React.ReactNode;
+    sidebar: React.ReactNode;
+}
+
+export interface DevelopersPageState {
+    isHoveringSidebar: boolean;
+    isHoveringMainContent: boolean;
+    isSidebarScrolling: boolean;
+}
+
+export class DevelopersPage extends React.Component {
+    private readonly _throttledScreenWidthUpdate: () => void;
+    private readonly _throttledSidebarScrolling: () => void;
+    private _sidebarScrollClearingInterval: number;
+    constructor(props: DevelopersPageProps) {
+        super(props);
+        this._throttledScreenWidthUpdate = _.throttle(this._updateScreenWidth.bind(this), THROTTLE_TIMEOUT);
+        this._throttledSidebarScrolling = _.throttle(this._onSidebarScroll.bind(this), THROTTLE_TIMEOUT);
+        this.state = {
+            isHoveringSidebar: false,
+            isHoveringMainContent: false,
+            isSidebarScrolling: false,
+        };
+    }
+    public componentDidMount(): void {
+        window.addEventListener('resize', this._throttledScreenWidthUpdate);
+        window.scrollTo(0, 0);
+        this._sidebarScrollClearingInterval = window.setInterval(() => {
+            this.setState({
+                isSidebarScrolling: false,
+            });
+        }, 1000);
+    }
+    public componentWillUnmount(): void {
+        window.removeEventListener('resize', this._throttledScreenWidthUpdate);
+        window.clearInterval(this._sidebarScrollClearingInterval);
+    }
+    public render(): React.ReactNode {
+        const scrollableContainerStyles: React.CSSProperties = {
+            position: 'absolute',
+            top: 80,
+            left: 0,
+            bottom: 0,
+            right: 0,
+            overflowX: 'hidden',
+            overflowY: 'scroll',
+            minHeight: `calc(100vh - ${TOP_BAR_HEIGHT}px)`,
+            WebkitOverflowScrolling: 'touch',
+        };
+        const isSmallScreen = this.props.screenWidth === ScreenWidths.Sm;
+        const mainContentPadding = isSmallScreen ? 20 : 50;
+        const sidebarPadding = 22;
+        return (
+            
+                
+                
+                    
+                        
+                            
+                                
+                            
+                        
+                        

+                            

+                                {this.props.screenWidth !== ScreenWidths.Sm && this.props.sidebar}
+                            

+                        

+                    
+                    
+                        
+                            
+                        
+                        

+                            {this.props.mainContent}
+                        

+                    
+                
+            
+        );
+    }
+    private _onSidebarHover(isHovering: boolean, _event: React.FormEvent): void {
+        if (isHovering !== this.state.isHoveringSidebar) {
+            this.setState({
+                isHoveringSidebar: isHovering,
+            });
+        }
+    }
+    private _onMainContentHover(isHovering: boolean, _event: React.FormEvent): void {
+        if (isHovering !== this.state.isHoveringMainContent) {
+            this.setState({
+                isHoveringMainContent: isHovering,
+            });
+        }
+    }
+    private _onSidebarScroll(_event: React.FormEvent): void {
+        this.setState({
+            isSidebarScrolling: true,
+        });
+    }
+    private _updateScreenWidth(): void {
+        const newScreenWidth = utils.getScreenWidth();
+        this.props.dispatcher.updateScreenWidth(newScreenWidth);
+    }
+} // tslint:disable:max-file-line-count
diff --git a/packages/website/ts/pages/documentation/doc_page.tsx b/packages/website/ts/pages/documentation/doc_page.tsx
index 135581fc90..7157abfc92 100644
--- a/packages/website/ts/pages/documentation/doc_page.tsx
+++ b/packages/website/ts/pages/documentation/doc_page.tsx
@@ -1,35 +1,30 @@
 import {
     DocAgnosticFormat,
+    DocReference,
     DocsInfo,
-    Documentation,
     GeneratedDocJson,
     SupportedDocJson,
     TypeDocUtils,
-} from '@0xproject/react-docs';
+} from '@0x/react-docs';
+import { NestedSidebarMenu } from '@0x/react-shared';
 import findVersions = require('find-versions');
 import * as _ from 'lodash';
+import CircularProgress from 'material-ui/CircularProgress';
 import * as React from 'react';
-import DocumentTitle = require('react-document-title');
 import semverSort = require('semver-sort');
-import { SidebarHeader } from 'ts/components/sidebar_header';
-import { TopBar } from 'ts/components/top_bar/top_bar';
+import { SidebarHeader } from 'ts/components/documentation/sidebar_header';
+import { Container } from 'ts/components/ui/container';
+import { DevelopersPage } from 'ts/pages/documentation/developers_page';
 import { Dispatcher } from 'ts/redux/dispatcher';
-import { DocPackages } from 'ts/types';
+import { DocPackages, ScreenWidths } from 'ts/types';
 import { constants } from 'ts/utils/constants';
 import { docUtils } from 'ts/utils/doc_utils';
 import { Translate } from 'ts/utils/translate';
 import { utils } from 'ts/utils/utils';
 
 const isDevelopmentOrStaging = utils.isDevelopment() || utils.isStaging();
-const DEFAULT_ICON = 'docs.png';
 const ZERO_EX_JS_VERSION_MISSING_TOPLEVEL_PATH = '0.32.4';
 
-const idToIcon: { [id: string]: string } = {
-    [DocPackages.ZeroExJs]: 'zeroExJs.png',
-    [DocPackages.Connect]: 'connect.png',
-    [DocPackages.SmartContracts]: 'contracts.png',
-};
-
 const docIdToSubpackageName: { [id: string]: string } = {
     [DocPackages.ZeroExJs]: '0x.js',
     [DocPackages.Connect]: 'connect',
@@ -53,6 +48,7 @@ export interface DocPageProps {
     availableDocVersions: string[];
     docsInfo: DocsInfo;
     translate: Translate;
+    screenWidth: ScreenWidths;
 }
 
 interface DocPageState {
@@ -80,38 +76,58 @@ export class DocPage extends React.Component {
         this._isUnmounted = true;
     }
     public render(): React.ReactNode {
-        const menuSubsectionsBySection = _.isUndefined(this.state.docAgnosticFormat)
-            ? {}
-            : this.props.docsInfo.getMenuSubsectionsBySection(this.state.docAgnosticFormat);
         const sourceUrl = this._getSourceUrl();
-        const iconFileName = idToIcon[this.props.docsInfo.id] || DEFAULT_ICON;
-        const iconUrl = `/images/doc_icons/${iconFileName}`;
+        const sectionNameToLinks = _.isUndefined(this.state.docAgnosticFormat)
+            ? {}
+            : this.props.docsInfo.getSectionNameToLinks(this.state.docAgnosticFormat);
+        const mainContent = _.isUndefined(this.state.docAgnosticFormat) ? (
+            
{this._renderLoading()}

+        ) : (
+            
+        );
+        const sidebar = _.isUndefined(this.state.docAgnosticFormat) ? (
+            

+        ) : (
+            
+        );
         return (
-            

-                
-                }
-                />
-                }
-                    sourceUrl={sourceUrl}
-                    topBarHeight={60}
-                    onVersionSelected={this._onVersionSelected.bind(this)}
-                />
-            

+            
+        );
+    }
+    private _renderSidebarHeader(): React.ReactNode {
+        return (
+            
+        );
+    }
+    private _renderLoading(): React.ReactNode {
+        return (
+            
+                
+                    
+                
+                
+                    Loading documentation...
+                
+            
         );
     }
     private async _fetchJSONDocsFireAndForgetAsync(preferredVersionIfExists?: string): Promise {
@@ -146,10 +162,10 @@ export class DocPage extends React.Component {
             // documenting solidity.
             docAgnosticFormat = versionDocObj as DocAgnosticFormat;
             // HACK: need to modify docsInfo like convertToDocAgnosticFormat() would do
-            this.props.docsInfo.menu.Contracts = [];
+            this.props.docsInfo.markdownMenu.Contracts = [];
             _.each(docAgnosticFormat, (_docObj, sectionName) => {
                 this.props.docsInfo.sections[sectionName] = sectionName;
-                this.props.docsInfo.menu.Contracts.push(sectionName);
+                this.props.docsInfo.markdownMenu.Contracts.push(sectionName);
             });
         }
 
@@ -165,7 +181,7 @@ export class DocPage extends React.Component {
         let tagPrefix = pkg;
         const packagesWithNamespace = ['connect'];
         if (_.includes(packagesWithNamespace, pkg)) {
-            tagPrefix = `@0xproject/${pkg}`;
+            tagPrefix = `@0x/${pkg}`;
         }
         // HACK: The following three lines exist for backward compatibility reasons
         // Before exporting types from other packages as part of the 0x.js interface,
diff --git a/packages/website/ts/pages/documentation/docs_home.tsx b/packages/website/ts/pages/documentation/docs_home.tsx
new file mode 100644
index 0000000000..74fd0135c5
--- /dev/null
+++ b/packages/website/ts/pages/documentation/docs_home.tsx
@@ -0,0 +1,384 @@
+import { ALink, colors, Link, NestedSidebarMenu } from '@0x/react-shared';
+import { ObjectMap } from '@0x/types';
+import * as _ from 'lodash';
+import * as React from 'react';
+import { OverviewContent } from 'ts/components/documentation/overview_content';
+import { Button } from 'ts/components/ui/button';
+import { DevelopersPage } from 'ts/pages/documentation/developers_page';
+import { Dispatcher } from 'ts/redux/dispatcher';
+import { Categories, Deco, Key, Package, ScreenWidths, TutorialInfo, WebsitePaths } from 'ts/types';
+import { constants } from 'ts/utils/constants';
+import { Translate } from 'ts/utils/translate';
+
+const TUTORIALS: TutorialInfo[] = [
+    {
+        iconUrl: '/images/developers/tutorials/develop_on_ethereum.svg',
+        description: Key.DevelopOnEthereumDescription,
+        link: {
+            title: Key.DevelopOnEthereum,
+            to: `${WebsitePaths.Wiki}#Ethereum-Development`,
+        },
+    },
+    {
+        iconUrl: '/images/developers/tutorials/build_a_relayer.svg',
+        description: Key.BuildARelayerDescription,
+        link: {
+            title: Key.BuildARelayer,
+            to: `${WebsitePaths.Wiki}#Build-A-Relayer`,
+        },
+    },
+    {
+        iconUrl: '/images/developers/tutorials/0x_order_basics.svg',
+        description: Key.OrderBasicsDescription,
+        link: {
+            title: Key.OrderBasics,
+            to: `${WebsitePaths.Wiki}#Create,-Validate,-Fill-Order`,
+        },
+    },
+    {
+        iconUrl: '/images/developers/tutorials/use_shared_liquidity.svg',
+        description: Key.UseSharedLiquidityDescription,
+        link: {
+            title: Key.UseSharedLiquidity,
+            to: `${WebsitePaths.Wiki}#Find,-Submit,-Fill-Order-From-Relayer`,
+        },
+    },
+];
+
+const CATEGORY_TO_PACKAGES: ObjectMap = {
+    [Categories.ZeroExProtocol]: [
+        {
+            description:
+                'A library for interacting with the 0x protocol. It is a high level package which combines a number of smaller specific-purpose packages such as [order-utils](https://0xproject.com/docs/order-utils) and [contract-wrappers](https://0xproject.com/docs/contract-wrappers).',
+            link: {
+                title: '0x.js',
+                to: WebsitePaths.ZeroExJs,
+            },
+        },
+        {
+            description:
+                'A Typescript starter project that will walk you through the basics of how to interact with 0x Protocol and trade of an SRA relayer',
+            link: {
+                title: '0x starter project',
+                to: 'https://github.com/0xProject/0x-starter-project',
+                shouldOpenInNewTab: true,
+            },
+        },
+        {
+            description:
+                'An http & websocket client for interacting with relayers that have implemented the [Standard Relayer API](https://github.com/0xProject/standard-relayer-api)',
+            link: {
+                title: '@0x/connect',
+                to: WebsitePaths.Connect,
+            },
+        },
+        {
+            description:
+                'Typescript/Javascript wrappers of the 0x protocol Ethereum smart contracts. Use this library to call methods on the 0x smart contracts, subscribe to contract events and to fetch information stored in contracts.',
+            link: {
+                title: '@0x/contract-wrappers',
+                to: WebsitePaths.ContractWrappers,
+            },
+        },
+        {
+            description:
+                'A collection of 0x-related JSON-schemas (incl. SRA request/response schemas, 0x order message format schema, etc...)',
+            link: {
+                title: '@0x/json-schemas',
+                to: WebsitePaths.JSONSchemas,
+            },
+        },
+        {
+            description:
+                'A set of utils for working with 0x orders. It includes utilities for creating, signing, validating 0x orders, encoding/decoding assetData and much more.',
+            link: {
+                title: '@0x/order-utils',
+                to: WebsitePaths.OrderUtils,
+            },
+        },
+        {
+            description:
+                "A daemon that watches a set of 0x orders and emits events when an order's fillability has changed. Can be used by a relayer to prune their orderbook or by a trader to keep their view of the market up-to-date.",
+            link: {
+                title: '@0x/order-watcher',
+                to: WebsitePaths.OrderWatcher,
+            },
+        },
+        {
+            description:
+                'Contains the Standard Relayer API OpenAPI Spec. The package distributes both a javascript object version and a json version.',
+            link: {
+                title: '@0x/sra-spec',
+                to: 'https://github.com/0xProject/0x-monorepo/tree/development/packages/sra-spec',
+                shouldOpenInNewTab: true,
+            },
+        },
+        {
+            description:
+                'Convenience package for buying assets represented on the Ethereum blockchain using 0x. In its simplest form, the package helps in the usage of the [0x forwarder contract](https://github.com/0xProject/0x-protocol-specification/blob/master/v2/forwarder-specification.md), which allows users to execute [Wrapped Ether](https://weth.io/) based 0x orders without having to set allowances, wrap Ether or own ZRX, meaning they can buy tokens with Ether alone. Given some liquidity (0x signed orders), it helps estimate the Ether cost of buying a certain asset (giving a range) and then buying that asset.',
+            link: {
+                title: '@0x/asset-buyer',
+                to: WebsitePaths.AssetBuyer,
+            },
+        },
+    ],
+    [Categories.Ethereum]: [
+        {
+            description:
+                "This package allows you to generate TypeScript contract wrappers from ABI files. It's heavily inspired by Geth abigen but takes a different approach. You can write your custom handlebars templates which will allow you to seamlessly integrate the generated code into your existing codebase with existing conventions.",
+            link: {
+                title: 'abi-gen',
+                to: 'https://github.com/0xProject/0x-monorepo/tree/development/packages/abi-gen',
+                shouldOpenInNewTab: true,
+            },
+        },
+        {
+            description:
+                'A collection of Typescript types that are useful when working on an Ethereum-based project (e.g RawLog, Transaction, TxData, SolidityTypes, etc...).',
+            link: {
+                title: 'ethereum-types',
+                to: WebsitePaths.EthereumTypes,
+            },
+        },
+        {
+            description:
+                'A wrapper around [solc-js](https://github.com/ethereum/solc-js) that adds smart re-compilation, ability to compile an entire project, Solidity version specific compilation, standard input description support and much more.',
+            link: {
+                title: '@0x/sol-compiler',
+                to: WebsitePaths.SolCompiler,
+            },
+        },
+        {
+            description:
+                'A Solidity code coverage tool. Sol-cov uses transaction traces to figure out which lines of your code has been covered by your tests.',
+            link: {
+                title: '@0x/sol-cov',
+                to: WebsitePaths.SolCov,
+            },
+        },
+        {
+            description:
+                'A collection of subproviders to use with [web3-provider-engine](https://www.npmjs.com/package/web3-provider-engine) (e.g subproviders for interfacing with Ledger hardware wallet, Mnemonic wallet, private key wallet, etc...)',
+            link: {
+                title: '@0x/subproviders',
+                to: WebsitePaths.Subproviders,
+            },
+        },
+        {
+            description:
+                'A raw Ethereum JSON RPC client to simplify interfacing with Ethereum nodes. Also includes some convenience functions for awaiting transactions to be mined, converting between token units, etc...',
+            link: {
+                title: '@0x/web3-wrapper',
+                to: WebsitePaths.Web3Wrapper,
+            },
+        },
+    ],
+    [Categories.CommunityMaintained]: [
+        {
+            description:
+                'Node.js worker originally built for 0x Tracker which extracts 0x fill events from the Ethereum blockchain and persists them to MongoDB. Support for both V1 and V2 of the 0x protocol is included with events tagged against the protocol version they belong to.',
+            link: {
+                title: '0x Event Extractor',
+                to: 'https://github.com/0xTracker/0x-event-extractor',
+                shouldOpenInNewTab: true,
+            },
+        },
+        {
+            description:
+                'Node.js worker built for 0x Tracker which performs various ETL tasks related to the 0x protocol trading data and other information used on 0x Tracker.',
+            link: {
+                title: '0x Tracker Worker',
+                to: 'https://github.com/0xTracker/0x-tracker-worker',
+                shouldOpenInNewTab: true,
+            },
+        },
+        {
+            description:
+                "ERCdex's Javascript SDK for trading on their relayer, as well as other Aquaduct partner relayers",
+            link: {
+                title: 'Aquaduct',
+                to: 'https://www.npmjs.com/package/aqueduct',
+                shouldOpenInNewTab: true,
+            },
+        },
+        {
+            description:
+                'SDKs for automation using Aqueduct & ERC dEX. Aqueduct Server is a lightweight, portable and secure server that runs locally on any workstation. The server exposes a small number of foundational endpoints that enable working with the decentralized Aqueduct liquidity pool from any context or programming language.',
+            link: {
+                title: 'Aquaduct Server SDK',
+                to: 'https://github.com/ERCdEX/aqueduct-server-sdk',
+                shouldOpenInNewTab: true,
+            },
+        },
+        {
+            description: 'A node.js SDK for trading on the DDEX relayer',
+            link: {
+                to: 'https://www.npmjs.com/package/ddex-api',
+                title: 'DDEX Node.js SDK',
+                shouldOpenInNewTab: true,
+            },
+        },
+        {
+            description: "The ERC dEX Trade Widget let's any website provide token liquidity to it's users",
+            link: {
+                to: 'https://github.com/ERCdEX/widget',
+                title: 'ERCdex Widget',
+                shouldOpenInNewTab: true,
+            },
+        },
+        {
+            description: "ERCdex's Java SDK for trading on their relayer, as well as other Aquaduct partner relayers",
+            link: {
+                to: 'https://github.com/ERCdEX/java',
+                title: 'ERCdex Java SDK',
+                shouldOpenInNewTab: true,
+            },
+        },
+        {
+            description: "ERCdex's Python SDK for trading on their relayer, as well as other Aquaduct partner relayers",
+            link: {
+                to: 'https://github.com/ERCdEX/python',
+                title: 'ERCdex Python SDK',
+                shouldOpenInNewTab: true,
+            },
+        },
+        {
+            description:
+                'A set of command-line tools for creating command-line scripts for interacting with the Ethereum blockchain in general, and 0x in particular',
+            link: {
+                title: 'Massive',
+                to: 'https://github.com/NoteGio/massive',
+                shouldOpenInNewTab: true,
+            },
+        },
+        {
+            description: 'An open-source API-only Relayer written in Go',
+            link: {
+                to: 'https://github.com/NoteGio/openrelay',
+                title: 'OpenRelay',
+                shouldOpenInNewTab: true,
+            },
+        },
+        {
+            description:
+                'A JavaScript Library for Interacting with OpenRelay.xyz and other 0x Standard Relayer API Implementations',
+            link: {
+                title: 'OpenRelay.js',
+                to: 'https://github.com/NoteGio/openrelay.js',
+                shouldOpenInNewTab: true,
+            },
+        },
+        {
+            description:
+                'The Radar Relay SDK is a software development kit that simplifies the interactions with Radar Relay’s APIs',
+            link: {
+                title: 'Radar SDK',
+                to: 'https://github.com/RadarRelay/sdk',
+                shouldOpenInNewTab: true,
+            },
+        },
+        {
+            description:
+                'The Ocean provides a simple REST API, WebSockets API, and JavaScript library to help you integrate decentralized trading into your existing trading strategy.',
+            link: {
+                title: 'The Ocean Javascript SDK',
+                to: 'https://github.com/TheOceanTrade/theoceanx-javascript',
+                shouldOpenInNewTab: true,
+            },
+        },
+        {
+            description: "Tokenlon SDK provides APIs for developers to trade of imToken's relayer",
+            link: {
+                to: 'https://www.npmjs.com/package/tokenlon-sdk',
+                title: 'Tokenlon Javascript SDK',
+                shouldOpenInNewTab: true,
+            },
+        },
+        {
+            description: 'A small library that implements the 0x order assetData encoding/decoding in Java',
+            link: {
+                to: 'https://github.com/wildnothing/asset-data-decoder',
+                title: 'AssetData decoder library in Java',
+                shouldOpenInNewTab: true,
+            },
+        },
+    ],
+};
+
+export interface DocsHomeProps {
+    location: Location;
+    translate: Translate;
+    screenWidth: ScreenWidths;
+    tutorials: TutorialInfo[];
+    categoryToPackages: ObjectMap;
+    dispatcher: Dispatcher;
+}
+
+export interface DocsHomeState {}
+
+export class DocsHome extends React.Component {
+    public render(): React.ReactNode {
+        const sectionNameToLinks: ObjectMap = {
+            'Starter guides': _.map(TUTORIALS, tutorialInfo => {
+                return {
+                    ...tutorialInfo.link,
+                    title: this.props.translate.get(tutorialInfo.link.title as Key, Deco.Cap),
+                };
+            }),
+            [Categories.ZeroExProtocol]: _.map(CATEGORY_TO_PACKAGES[Categories.ZeroExProtocol], pkg => pkg.link),
+            [Categories.Ethereum]: _.map(CATEGORY_TO_PACKAGES[Categories.Ethereum], pkg => pkg.link),
+            [Categories.CommunityMaintained]: _.map(
+                CATEGORY_TO_PACKAGES[Categories.CommunityMaintained],
+                pkg => pkg.link,
+            ),
+        };
+        const mainContent = (
+            
+        );
+        const isSmallScreen = this.props.screenWidth === ScreenWidths.Sm;
+        const sidebar = (
+            
+        );
+        return (
+            
+        );
+    }
+    private _renderSidebarHeader(): React.ReactNode {
+        const menuItems = _.map(constants.DEVELOPER_TOPBAR_LINKS, menuItemInfo => {
+            return (
+                
+                    
+                
+            );
+        });
+        return menuItems;
+    }
+}
diff --git a/packages/website/ts/pages/faq/faq.tsx b/packages/website/ts/pages/faq/faq.tsx
index c9295d806d..10d91bae8f 100644
--- a/packages/website/ts/pages/faq/faq.tsx
+++ b/packages/website/ts/pages/faq/faq.tsx
@@ -1,4 +1,4 @@
-import { colors, Styles } from '@0xproject/react-shared';
+import { colors, Styles } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import * as DocumentTitle from 'react-document-title';
diff --git a/packages/website/ts/pages/faq/question.tsx b/packages/website/ts/pages/faq/question.tsx
index f809852576..413ffb6cef 100644
--- a/packages/website/ts/pages/faq/question.tsx
+++ b/packages/website/ts/pages/faq/question.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import { Card, CardHeader, CardText } from 'material-ui/Card';
 import * as React from 'react';
 
diff --git a/packages/website/ts/pages/fullscreen_message.tsx b/packages/website/ts/pages/fullscreen_message.tsx
index 6fcf7b32c5..675f27a01d 100644
--- a/packages/website/ts/pages/fullscreen_message.tsx
+++ b/packages/website/ts/pages/fullscreen_message.tsx
@@ -1,4 +1,4 @@
-import { Styles } from '@0xproject/react-shared';
+import { Styles } from '@0x/react-shared';
 import * as React from 'react';
 
 export interface FullscreenMessageProps {
diff --git a/packages/website/ts/pages/jobs/jobs.tsx b/packages/website/ts/pages/jobs/jobs.tsx
index cc4b1f04b3..728e17f9e5 100644
--- a/packages/website/ts/pages/jobs/jobs.tsx
+++ b/packages/website/ts/pages/jobs/jobs.tsx
@@ -1,4 +1,4 @@
-import { colors, utils as sharedUtils } from '@0xproject/react-shared';
+import { colors, utils as sharedUtils } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import * as DocumentTitle from 'react-document-title';
diff --git a/packages/website/ts/pages/jobs/join_0x.tsx b/packages/website/ts/pages/jobs/join_0x.tsx
index ec8afbd933..e869cd455f 100644
--- a/packages/website/ts/pages/jobs/join_0x.tsx
+++ b/packages/website/ts/pages/jobs/join_0x.tsx
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 
 import * as React from 'react';
 
diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index 388e83d51e..c56ed4ebeb 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -1,8 +1,7 @@
-import { colors } from '@0xproject/react-shared';
+import { colors, Link } from '@0x/react-shared';
 import * as _ from 'lodash';
 import * as React from 'react';
 import DocumentTitle = require('react-document-title');
-import { Link } from 'react-router-dom';
 import { Footer } from 'ts/components/footer';
 import { SubscribeForm } from 'ts/components/forms/subscribe_form';
 import { TopBar } from 'ts/components/top_bar/top_bar';
@@ -213,14 +212,14 @@ export class Landing extends React.Component {
                                     className={`pt3 flex clearfix sm-mx-auto ${isSmallScreen ? 'justify-center' : ''}`}
                                 >
                                     
-                                        
+                                        
                                             
                                                 {this.props.translate.get(Key.BuildCallToAction, Deco.Cap)}
                                             
                                         
                                     
                                     

-                                        
+                                        
                                             
                                                 {this.props.translate.get(Key.TradeCallToAction, Deco.Cap)}
                                             
@@ -318,11 +317,7 @@ export class Landing extends React.Component {
                         }}
                     >
                         {this.props.translate.get(Key.FullListPrompt)}{' '}
-                        
+                        
                             {this.props.translate.get(Key.FullListLink)}
                         
                     

@@ -603,7 +598,7 @@ export class Landing extends React.Component {
                             {this.props.translate.get(Key.FinalCallToAction, Deco.Cap)}
                         

                         

-                            
+                            
                                 
                                     {this.props.translate.get(Key.BuildCallToAction, Deco.Cap)}
                                 
diff --git a/packages/website/ts/pages/wiki/wiki.tsx b/packages/website/ts/pages/wiki/wiki.tsx
index 55f532b110..fdca61e391 100644
--- a/packages/website/ts/pages/wiki/wiki.tsx
+++ b/packages/website/ts/pages/wiki/wiki.tsx
@@ -1,27 +1,28 @@
 import {
+    ALink,
     colors,
     constants as sharedConstants,
     HeaderSizes,
+    Link,
     MarkdownSection,
     NestedSidebarMenu,
-    Styles,
     utils as sharedUtils,
-} from '@0xproject/react-shared';
+} from '@0x/react-shared';
+import { ObjectMap } from '@0x/types';
 import * as _ from 'lodash';
 import CircularProgress from 'material-ui/CircularProgress';
-import RaisedButton from 'material-ui/RaisedButton';
 import * as React from 'react';
-import DocumentTitle = require('react-document-title');
-import { SidebarHeader } from 'ts/components/sidebar_header';
-import { TopBar } from 'ts/components/top_bar/top_bar';
+import { SidebarHeader } from 'ts/components/documentation/sidebar_header';
+import { Button } from 'ts/components/ui/button';
+import { Container } from 'ts/components/ui/container';
+import { DevelopersPage } from 'ts/pages/documentation/developers_page';
 import { Dispatcher } from 'ts/redux/dispatcher';
-import { Article, ArticlesBySection } from 'ts/types';
+import { Article, ArticlesBySection, Deco, Key, ScreenWidths } from 'ts/types';
 import { backendClient } from 'ts/utils/backend_client';
 import { constants } from 'ts/utils/constants';
 import { Translate } from 'ts/utils/translate';
 import { utils } from 'ts/utils/utils';
 
-const TOP_BAR_HEIGHT = 60;
 const WIKI_NOT_READY_BACKOUT_TIMEOUT_MS = 5000;
 
 export interface WikiProps {
@@ -29,6 +30,7 @@ export interface WikiProps {
     location: Location;
     dispatcher: Dispatcher;
     translate: Translate;
+    screenWidth: ScreenWidths;
 }
 
 interface WikiState {
@@ -36,24 +38,6 @@ interface WikiState {
     isHoveringSidebar: boolean;
 }
 
-const styles: Styles = {
-    mainContainers: {
-        position: 'absolute',
-        top: 1,
-        left: 0,
-        bottom: 0,
-        right: 0,
-        overflow: 'hidden',
-        height: `calc(100vh - ${TOP_BAR_HEIGHT}px)`,
-        WebkitOverflowScrolling: 'touch',
-    },
-    menuContainer: {
-        borderColor: colors.grey300,
-        maxWidth: 330,
-        backgroundColor: colors.gray40,
-    },
-};
-
 export class Wiki extends React.Component {
     private _wikiBackoffTimeoutId: number;
     private _isUnmounted: boolean;
@@ -78,89 +62,73 @@ export class Wiki extends React.Component {
         window.removeEventListener('hashchange', this._onHashChanged.bind(this), false);
     }
     public render(): React.ReactNode {
-        const menuSubsectionsBySection = _.isUndefined(this.state.articlesBySection)
+        const sectionNameToLinks = _.isUndefined(this.state.articlesBySection)
             ? {}
-            : this._getMenuSubsectionsBySection(this.state.articlesBySection);
-        const mainContainersStyle: React.CSSProperties = {
-            ...styles.mainContainers,
-            overflow: this.state.isHoveringSidebar ? 'auto' : 'hidden',
-        };
-        const sidebarHeader = ;
-        return (
-            

-                
-                
-                {_.isUndefined(this.state.articlesBySection) ? (
-                    

-                        

-                            

-                                
-                            

-                            

-                                Loading wiki...
-                            

-                        

-                    

-                ) : (
-                    

-                        

-                            

-                                

-                                    
-                                

-                            

-                            

-                                

-                                    

-                                    

-                                        {this._renderWikiArticles()}
-                                    

-                                

-                            

-                        

-                    

-                )}
+            : this._getSectionNameToLinks(this.state.articlesBySection);
+
+        const mainContent = _.isUndefined(this.state.articlesBySection) ? (
+            
{this._renderLoading()}

+        ) : (
+            

+                {this._renderWikiArticles()}
             

         );
+        const sidebar = _.isUndefined(this.state.articlesBySection) ? (
+            

+        ) : (
+            
+        );
+        return (
+            
+        );
+    }
+    private _renderSidebarHeader(): React.ReactNode {
+        const menuItems = _.map(constants.DEVELOPER_TOPBAR_LINKS, menuItemInfo => {
+            return (
+                
+                    
+                
+            );
+        });
+        const wikiTitle = this.props.translate.get(Key.Wiki, Deco.Cap);
+        return (
+            
+                
+                {menuItems}
+            
+        );
+    }
+    private _renderLoading(): React.ReactNode {
+        return (
+            
+                
+                    
+                
+                
+                    Loading wiki...
+                
+            
+        );
     }
     private _renderWikiArticles(): React.ReactNode {
         const sectionNames = _.keys(this.state.articlesBySection);
@@ -179,22 +147,10 @@ export class Wiki extends React.Component {
                         headerSize={HeaderSizes.H2}
                         githubLink={githubLink}
                     />
-                    

-                        

-                            See a way to improve this article?
-                        

-                        

-                            
-                        

-                    

                 

             );
         });
-        return (
-            

-                {renderedArticles}
-            

-        );
+        return 
{renderedArticles}
;
     }
     private async _fetchArticlesBySectionAsync(): Promise {
         try {
@@ -223,25 +179,20 @@ export class Wiki extends React.Component {
             }
         }
     }
-    private _getMenuSubsectionsBySection(articlesBySection: ArticlesBySection): { [section: string]: string[] } {
+    private _getSectionNameToLinks(articlesBySection: ArticlesBySection): ObjectMap {
         const sectionNames = _.keys(articlesBySection);
-        const menuSubsectionsBySection: { [section: string]: string[] } = {};
+        const sectionNameToLinks: ObjectMap = {};
         for (const sectionName of sectionNames) {
             const articles = articlesBySection[sectionName];
-            const articleNames = _.map(articles, article => article.title);
-            menuSubsectionsBySection[sectionName] = articleNames;
+            const articleLinks = _.map(articles, article => {
+                return {
+                    to: sharedUtils.getIdFromName(article.title),
+                    title: article.title,
+                };
+            });
+            sectionNameToLinks[sectionName] = articleLinks;
         }
-        return menuSubsectionsBySection;
-    }
-    private _onSidebarHover(_event: React.FormEvent): void {
-        this.setState({
-            isHoveringSidebar: true,
-        });
-    }
-    private _onSidebarHoverOff(): void {
-        this.setState({
-            isHoveringSidebar: false,
-        });
+        return sectionNameToLinks;
     }
     private _onHashChanged(_event: any): void {
         const hash = window.location.hash.slice(1);
diff --git a/packages/website/ts/redux/dispatcher.ts b/packages/website/ts/redux/dispatcher.ts
index c418cab3f6..e85afd3b1a 100644
--- a/packages/website/ts/redux/dispatcher.ts
+++ b/packages/website/ts/redux/dispatcher.ts
@@ -1,4 +1,4 @@
-import { BigNumber } from '@0xproject/utils';
+import { BigNumber } from '@0x/utils';
 import { Dispatch } from 'redux';
 import { State } from 'ts/redux/reducer';
 import {
diff --git a/packages/website/ts/redux/reducer.ts b/packages/website/ts/redux/reducer.ts
index f548016393..51c77ba471 100644
--- a/packages/website/ts/redux/reducer.ts
+++ b/packages/website/ts/redux/reducer.ts
@@ -1,5 +1,5 @@
-import { generatePseudoRandomSalt } from '@0xproject/order-utils';
-import { BigNumber } from '@0xproject/utils';
+import { generatePseudoRandomSalt } from '@0x/order-utils';
+import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 import * as moment from 'moment';
 import {
diff --git a/packages/website/ts/schemas/validator.ts b/packages/website/ts/schemas/validator.ts
index 3fd0130027..128d943e12 100644
--- a/packages/website/ts/schemas/validator.ts
+++ b/packages/website/ts/schemas/validator.ts
@@ -1,4 +1,4 @@
-import { SchemaValidator } from '@0xproject/json-schemas';
+import { SchemaValidator } from '@0x/json-schemas';
 import { orderMetadataSchema } from 'ts/schemas/metadata_schema';
 import { portalOrderSchema } from 'ts/schemas/portal_order_schema';
 import { portalTokenMetadataSchema } from 'ts/schemas/portal_token_metadata';
diff --git a/packages/website/ts/style/colors.ts b/packages/website/ts/style/colors.ts
index 349845a099..0620bae0f7 100644
--- a/packages/website/ts/style/colors.ts
+++ b/packages/website/ts/style/colors.ts
@@ -1,4 +1,4 @@
-import { colors as sharedColors } from '@0xproject/react-shared';
+import { colors as sharedColors } from '@0x/react-shared';
 
 const appColors = {
     walletBoxShadow: 'rgba(0, 0, 0, 0.05)',
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index 7e140c951f..f85317c7bf 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -1,5 +1,6 @@
-import { ObjectMap, SignedOrder } from '@0xproject/types';
-import { BigNumber } from '@0xproject/utils';
+import { ALink } from '@0x/react-shared';
+import { ObjectMap, SignedOrder } from '@0x/types';
+import { BigNumber } from '@0x/utils';
 import { Provider } from 'ethereum-types';
 import * as React from 'react';
 
@@ -461,6 +462,23 @@ export enum Key {
     RocketChat = 'ROCKETCHAT',
     TradeCallToAction = 'TRADE_CALL_TO_ACTION',
     OurMissionAndValues = 'OUR_MISSION_AND_VALUES',
+    BuildARelayer = 'BUILD_A_RELAYER',
+    BuildARelayerDescription = 'BUILD_A_RELAYER_DESCRIPTION',
+    DevelopOnEthereum = 'DEVELOP_ON_ETHEREUM',
+    DevelopOnEthereumDescription = 'DEVELOP_ON_ETHEREUM_DESCRIPTION',
+    OrderBasics = 'ORDER_BASICS',
+    OrderBasicsDescription = 'ORDER_BASICS_DESCRIPTION',
+    UseSharedLiquidity = 'USE_SHARED_LIQUIDITY',
+    UseSharedLiquidityDescription = 'USE_SHARED_LIQUIDITY_DESCRIPTION',
+    ViewAllDocumentation = 'VIEW_ALL_DOCUMENTATION',
+    Sandbox = 'SANDBOX',
+    Github = 'GITHUB',
+    LiveChat = 'LIVE_CHAT',
+    LibrariesAndTools = 'LIBRARIES_AND_TOOLS',
+    LibrariesAndToolsDescription = 'LIBRARIES_AND_TOOLS_DESCRIPTION',
+    More = 'MORE',
+    StartBuildOn0x = 'START_BUILDING_ON_0X',
+    StartBuildOn0xDescription = 'START_BUILDING_ON_0X_DESCRIPTION',
 }
 
 export enum SmartContractDocSections {
@@ -603,4 +621,21 @@ export interface InjectedWeb3 {
         getNetwork(cd: (err: Error, networkId: string) => void): void;
     };
 }
+
+export interface TutorialInfo {
+    iconUrl: string;
+    description: string;
+    link: ALink;
+}
+
+export enum Categories {
+    ZeroExProtocol = '0x Protocol',
+    Ethereum = 'Ethereum',
+    CommunityMaintained = 'Community Maintained',
+}
+
+export interface Package {
+    description: string;
+    link: ALink;
+}
 // tslint:disable:max-file-line-count
diff --git a/packages/website/ts/utils/analytics.ts b/packages/website/ts/utils/analytics.ts
index 3aae317b03..e990b4fc79 100644
--- a/packages/website/ts/utils/analytics.ts
+++ b/packages/website/ts/utils/analytics.ts
@@ -1,5 +1,5 @@
-import { assetDataUtils } from '@0xproject/order-utils';
-import { ObjectMap } from '@0xproject/types';
+import { assetDataUtils } from '@0x/order-utils';
+import { ObjectMap } from '@0x/types';
 import * as _ from 'lodash';
 import { PortalOrder } from 'ts/types';
 import { utils } from 'ts/utils/utils';
diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts
index 18a4d8100a..0a8a86c506 100644
--- a/packages/website/ts/utils/constants.ts
+++ b/packages/website/ts/utils/constants.ts
@@ -1,4 +1,9 @@
-import { BigNumber } from '@0xproject/utils';
+import { ALink } from '@0x/react-shared';
+import { BigNumber } from '@0x/utils';
+import { Key, WebsitePaths } from 'ts/types';
+
+const URL_FORUM = 'https://forum.0xproject.com';
+const URL_ZEROEX_CHAT = 'https://chat.0xproject.com';
 
 export const constants = {
     DECIMAL_PLACES_ETH: 18,
@@ -74,6 +79,7 @@ export const constants = {
     URL_TESTNET_FAUCET: 'https://faucet.0xproject.com',
     URL_GITHUB_ORG: 'https://github.com/0xProject',
     URL_GITHUB_WIKI: 'https://github.com/0xProject/wiki',
+    URL_FORUM,
     URL_METAMASK_CHROME_STORE: 'https://chrome.google.com/webstore/detail/metamask/nkbihfbeogaeaoehlefnkodbefgpgknn',
     URL_METAMASK_FIREFOX_STORE: 'https://addons.mozilla.org/en-US/firefox/addon/ether-metamask/',
     URL_COINBASE_WALLET_IOS_APP_STORE: 'https://itunes.apple.com/us/app/coinbase-wallet/id1278383455?mt=8',
@@ -84,10 +90,11 @@ export const constants = {
     URL_PARITY_CHROME_STORE:
         'https://chrome.google.com/webstore/detail/parity-ethereum-integrati/himekenlppkgeaoeddcliojfddemadig',
     URL_REDDIT: 'https://reddit.com/r/0xproject',
+    URL_SANDBOX: 'https://codesandbox.io/s/1qmjyp7p5j',
     URL_STANDARD_RELAYER_API_GITHUB: 'https://github.com/0xProject/standard-relayer-api/blob/master/README.md',
     URL_TWITTER: 'https://twitter.com/0xproject',
     URL_WETH_IO: 'https://weth.io/',
-    URL_ZEROEX_CHAT: 'https://chat.0xproject.com',
+    URL_ZEROEX_CHAT,
     URL_WEB3_DOCS: 'https://github.com/ethereum/wiki/wiki/JavaScript-API',
     URL_WEB3_DECODED_LOG_ENTRY_EVENT:
         'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L123',
@@ -95,4 +102,24 @@ export const constants = {
     URL_WEB3_PROVIDER_DOCS: 'https://github.com/0xProject/web3-typescript-typings/blob/f5bcb96/index.d.ts#L150',
     URL_BIGNUMBERJS_GITHUB: 'http://mikemcl.github.io/bignumber.js',
     URL_MISSION_AND_VALUES_BLOG_POST: 'https://blog.0xproject.com/the-0x-mission-and-values-181a58706f9f',
+    DEVELOPER_TOPBAR_LINKS: [
+        {
+            title: Key.Home,
+            to: WebsitePaths.Home,
+        },
+        {
+            title: Key.Wiki,
+            to: WebsitePaths.Wiki,
+        },
+        {
+            title: Key.Forum,
+            to: URL_FORUM,
+            shouldOpenInNewTab: true,
+        },
+        {
+            title: Key.LiveChat,
+            to: URL_ZEROEX_CHAT,
+            shouldOpenInNewTab: true,
+        },
+    ] as ALink[],
 };
diff --git a/packages/website/ts/utils/doc_utils.ts b/packages/website/ts/utils/doc_utils.ts
index 0e1d9ea6e6..e0b883ace6 100644
--- a/packages/website/ts/utils/doc_utils.ts
+++ b/packages/website/ts/utils/doc_utils.ts
@@ -1,5 +1,5 @@
-import { DocAgnosticFormat, GeneratedDocJson } from '@0xproject/react-docs';
-import { fetchAsync, logUtils } from '@0xproject/utils';
+import { DocAgnosticFormat, GeneratedDocJson } from '@0x/react-docs';
+import { fetchAsync, logUtils } from '@0x/utils';
 import * as _ from 'lodash';
 import { S3FileObject, VersionToFilePath } from 'ts/types';
 import convert = require('xml-js');
diff --git a/packages/website/ts/utils/error_reporter.ts b/packages/website/ts/utils/error_reporter.ts
index bec92e8291..6fc1216c30 100644
--- a/packages/website/ts/utils/error_reporter.ts
+++ b/packages/website/ts/utils/error_reporter.ts
@@ -1,4 +1,4 @@
-import { logUtils } from '@0xproject/utils';
+import { logUtils } from '@0x/utils';
 import Rollbar = require('rollbar');
 import { configs } from 'ts/utils/configs';
 import { constants } from 'ts/utils/constants';
diff --git a/packages/website/ts/utils/fake_token_registry.ts b/packages/website/ts/utils/fake_token_registry.ts
new file mode 100644
index 0000000000..607dd25532
--- /dev/null
+++ b/packages/website/ts/utils/fake_token_registry.ts
@@ -0,0 +1,879 @@
+export interface FakeTokenRegistryEntry {
+    address: string;
+    name: string;
+    symbol: string;
+    decimals: number;
+}
+
+export const fakeTokenRegistry: { [networkId: string]: FakeTokenRegistryEntry[] } = {
+    '1': [
+        {
+            address: '0xe41d2489571d322189246dafa5ebde1f4699f498',
+            name: '0x Protocol Token',
+            symbol: 'ZRX',
+            decimals: 18,
+        },
+        {
+            address: '0x4156d3342d5c385a87d264f90653733592000581',
+            name: 'Salt',
+            symbol: 'SALT',
+            decimals: 8,
+        },
+        {
+            address: '0x05f4a42e251f2d52b8ed15e9fedaacfcef1fad27',
+            name: 'Zilliqa',
+            symbol: 'ZIL',
+            decimals: 12,
+        },
+        {
+            address: '0xe0b7927c4af23765cb51314a0e0521a9645f0e2a',
+            name: 'Digix DAO Token',
+            symbol: 'DGD',
+            decimals: 9,
+        },
+        {
+            address: '0xfa05a73ffe78ef8f1a739473e462c54bae6567d9',
+            name: 'Lunyr',
+            symbol: 'LUN',
+            decimals: 18,
+        },
+        {
+            address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+            name: 'Wrapped Ether',
+            symbol: 'WETH',
+            decimals: 18,
+        },
+        {
+            address: '0xbeb9ef514a379b997e0798fdcc901ee474b6d9a1',
+            name: 'Melon Token',
+            symbol: 'MLN',
+            decimals: 18,
+        },
+        {
+            address: '0x9a642d6b3368ddc662ca244badf32cda716005bc',
+            name: 'Qtum',
+            symbol: 'QTUM',
+            decimals: 18,
+        },
+        {
+            address: '0xd26114cd6ee289accf82350c8d8487fedb8a0c07',
+            name: 'OmiseGO',
+            symbol: 'OMG',
+            decimals: 18,
+        },
+        {
+            address: '0xb97048628db6b661d4c2aa833e95dbe1a905b280',
+            name: 'TenXPay',
+            symbol: 'PAY',
+            decimals: 18,
+        },
+        {
+            address: '0x86fa049857e0209aa7d9e616f7eb3b3b78ecfdb0',
+            name: 'Eos',
+            symbol: 'EOS',
+            decimals: 18,
+        },
+        {
+            address: '0x888666ca69e0f178ded6d75b5726cee99a87d698',
+            name: 'Iconomi',
+            symbol: 'ICN',
+            decimals: 18,
+        },
+        {
+            address: '0x744d70fdbe2ba4cf95131626614a1763df805b9e',
+            name: 'StatusNetwork',
+            symbol: 'SNT',
+            decimals: 18,
+        },
+        {
+            address: '0x6810e776880c02933d47db1b9fc05908e5386b96',
+            name: 'Gnosis',
+            symbol: 'GNO',
+            decimals: 18,
+        },
+        {
+            address: '0x0d8775f648430679a709e98d2b0cb6250d2887ef',
+            name: 'Basic Attention Token',
+            symbol: 'BAT',
+            decimals: 18,
+        },
+        {
+            address: '0xb64ef51c888972c908cfacf59b47c1afbc0ab8ac',
+            name: 'Storj',
+            symbol: 'STORJ',
+            decimals: 8,
+        },
+        {
+            address: '0x1f573d6fb3f13d689ff844b4ce37794d79a7ff1c',
+            name: 'Bancor',
+            symbol: 'BNT',
+            decimals: 18,
+        },
+        {
+            address: '0x960b236a07cf122663c4303350609a66a7b288c0',
+            name: 'Aragon',
+            symbol: 'ANT',
+            decimals: 18,
+        },
+        {
+            address: '0x0abdace70d3790235af448c88547603b945604ea',
+            name: 'district0x',
+            symbol: 'DNT',
+            decimals: 18,
+        },
+        {
+            address: '0xaec2e87e0a235266d9c5adc9deb4b2e29b54d009',
+            name: 'SingularDTV',
+            symbol: 'SNGLS',
+            decimals: 0,
+        },
+        {
+            address: '0x419d0d8bdd9af5e606ae2232ed285aff190e711b',
+            name: 'FunFair',
+            symbol: 'FUN',
+            decimals: 8,
+        },
+        {
+            address: '0xaf30d2a7e90d7dc361c8c4585e9bb7d2f6f15bc7',
+            name: 'FirstBlood',
+            symbol: '1ST',
+            decimals: 18,
+        },
+        {
+            address: '0x08711d3b02c8758f2fb3ab4e80228418a7f8e39c',
+            name: 'Edgeless',
+            symbol: 'EDG',
+            decimals: 0,
+        },
+        {
+            address: '0x9992ec3cf6a55b00978cddf2b27bc6882d88d1ec',
+            name: 'Polymath',
+            symbol: 'POLY',
+            decimals: 18,
+        },
+        {
+            address: '0x607f4c5bb672230e8672085532f7e901544a7375',
+            name: 'iExec',
+            symbol: 'RLC',
+            decimals: 9,
+        },
+        {
+            address: '0x667088b212ce3d06a1b553a7221e1fd19000d9af',
+            name: 'Wings',
+            symbol: 'WINGS',
+            decimals: 18,
+        },
+        {
+            address: '0x41e5560054824ea6b0732e656e3ad64e20e94e45',
+            name: 'Civic',
+            symbol: 'CVC',
+            decimals: 8,
+        },
+        {
+            address: '0xb63b606ac810a52cca15e44bb630fd42d8d1d83d',
+            name: 'Monaco',
+            symbol: 'MCO',
+            decimals: 8,
+        },
+        {
+            address: '0xf433089366899d83a9f26a773d59ec7ecf30355e',
+            name: 'Metal',
+            symbol: 'MTL',
+            decimals: 8,
+        },
+        {
+            address: '0x12fef5e57bf45873cd9b62e9dbd7bfb99e32d73e',
+            name: 'Cofoundit',
+            symbol: 'CFI',
+            decimals: 18,
+        },
+        {
+            address: '0xaaaf91d9b90df800df4f55c205fd6989c977e73a',
+            name: 'Monolith TKN',
+            symbol: 'TKN',
+            decimals: 8,
+        },
+        {
+            address: '0xe7775a6e9bcf904eb39da2b68c5efb4f9360e08c',
+            name: 'Token-as-a-Service',
+            symbol: 'TAAS',
+            decimals: 6,
+        },
+        {
+            address: '0x2e071d2966aa7d8decb1005885ba1977d6038a65',
+            name: 'DICE',
+            symbol: 'ROL',
+            decimals: 16,
+        },
+        {
+            address: '0xcb94be6f13a1182e4a4b6140cb7bf2025d28e41b',
+            name: 'Trustcoin',
+            symbol: 'TRST',
+            decimals: 6,
+        },
+        {
+            address: '0x1776e1f26f98b1a5df9cd347953a26dd3cb46671',
+            name: 'Numeraire',
+            symbol: 'NMR',
+            decimals: 18,
+        },
+        {
+            address: '0x7c5a0ce9267ed19b22f8cae653f198e3e8daf098',
+            name: 'Santiment Network Token',
+            symbol: 'SAN',
+            decimals: 18,
+        },
+        {
+            address: '0xdd974d5c2e2928dea5f71b9825b8b646686bd200',
+            name: 'Kyber Network Crystal',
+            symbol: 'KNC',
+            decimals: 18,
+        },
+        {
+            address: '0xb7cb1c96db6b22b0d3d9536e0108d062bd488f74',
+            name: 'Walton',
+            symbol: 'WTC',
+            decimals: 18,
+        },
+        {
+            address: '0xd0d6d6c5fe4a677d343cc433536bb717bae167dd',
+            name: 'adToken',
+            symbol: 'ADT',
+            decimals: 9,
+        },
+        {
+            address: '0x42d6622dece394b54999fbd73d108123806f6a18',
+            name: 'SpankChain',
+            symbol: 'SPANK',
+            decimals: 18,
+        },
+        {
+            address: '0x701c244b988a513c945973defa05de933b23fe1d',
+            name: 'openANX',
+            symbol: 'OAX',
+            decimals: 18,
+        },
+        {
+            address: '0x514910771af9ca656af840dff83e8264ecf986ca',
+            name: 'ChainLink',
+            symbol: 'LINK',
+            decimals: 18,
+        },
+        {
+            address: '0x8f8221afbb33998d8584a2b05749ba73c37a938a',
+            name: 'Request Network',
+            symbol: 'REQ',
+            decimals: 18,
+        },
+        {
+            address: '0x27054b13b1b798b345b591a4d22e6562d47ea75a',
+            name: 'AirSwap',
+            symbol: 'AST',
+            decimals: 4,
+        },
+        {
+            address: '0xf0ee6b27b759c9893ce4f094b49ad28fd15a23e4',
+            name: 'Enigma',
+            symbol: 'ENG',
+            decimals: 8,
+        },
+        {
+            address: '0x818fc6c2ec5986bc6e2cbf00939d90556ab12ce5',
+            name: 'Kin',
+            symbol: 'KIN',
+            decimals: 18,
+        },
+        {
+            address: '0x27dce1ec4d3f72c3e457cc50354f1f975ddef488',
+            name: 'AirToken',
+            symbol: 'AIR',
+            decimals: 8,
+        },
+        {
+            address: '0x12480e24eb5bec1a9d4369cab6a80cad3c0a377a',
+            name: 'Substratum',
+            symbol: 'SUB',
+            decimals: 2,
+        },
+        {
+            address: '0x0e8d6b471e332f140e7d9dbb99e5e3822f728da6',
+            name: 'ABYSS',
+            symbol: 'ABYSS',
+            decimals: 18,
+        },
+        {
+            address: '0x4ceda7906a5ed2179785cd3a40a69ee8bc99c466',
+            name: 'AION',
+            symbol: 'AION',
+            decimals: 8,
+        },
+        {
+            address: '0xd8912c10681d8b21fd3742244f44658dba12264e',
+            name: 'Pluton',
+            symbol: 'PLU',
+            decimals: 18,
+        },
+        {
+            address: '0x1a7a8bd9106f2b8d977e08582dc7d24c723ab0db',
+            name: 'AppCoins',
+            symbol: 'APPC',
+            decimals: 18,
+        },
+        {
+            address: '0xba5f11b16b155792cf3b2e6880e8706859a8aeb6',
+            name: 'Aeron',
+            symbol: 'ARN',
+            decimals: 8,
+        },
+        {
+            address: '0xfec0cf7fe078a500abf15f1284958f22049c2c7e',
+            name: 'Maecenas ART Token',
+            symbol: 'ART',
+            decimals: 18,
+        },
+        {
+            address: '0x0f5d2fb29fb7d3cfee444a200298f468908cc942',
+            name: 'Decentraland',
+            symbol: 'MANA',
+            decimals: 18,
+        },
+        {
+            address: '0x1c4481750daa5ff521a2a7490d9981ed46465dbd',
+            name: 'BlockMason Credit Protocol Token',
+            symbol: 'BCPT',
+            decimals: 18,
+        },
+        {
+            address: '0x55296f69f40ea6d20e478533c15a6b08b654e758',
+            name: 'XY Oracle',
+            symbol: 'XYO',
+            decimals: 18,
+        },
+        {
+            address: '0xd7732e3783b0047aa251928960063f863ad022d8',
+            name: 'BrahmaOS',
+            symbol: 'BRM',
+            decimals: 18,
+        },
+        {
+            address: '0x7d4b8cce0591c9044a22ee543533b72e976e36c3',
+            name: 'Change Coin',
+            symbol: 'CAG',
+            decimals: 18,
+        },
+        {
+            address: '0x1d462414fe14cf489c7a21cac78509f4bf8cd7c0',
+            name: 'CanYaCoin',
+            symbol: 'CAN',
+            decimals: 6,
+        },
+        {
+            address: '0x1234567461d3f8db7496581774bd869c83d51c93',
+            name: 'BitClave',
+            symbol: 'CAT',
+            decimals: 18,
+        },
+        {
+            address: '0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359',
+            name: 'Dai Stablecoin v1.0',
+            symbol: 'DAI',
+            decimals: 18,
+        },
+        {
+            address: '0x0cf0ee63788a0849fe5297f3407f701e122cc023',
+            name: 'Streamr DATAcoin',
+            symbol: 'DATA',
+            decimals: 18,
+        },
+        {
+            address: '0x151202c9c18e495656f372281f493eb7698961d5',
+            name: 'DEBITUM',
+            symbol: 'DEB',
+            decimals: 18,
+        },
+        {
+            address: '0xba2184520a1cc49a6159c57e61e1844e085615b6',
+            name: 'HelloGold Token',
+            symbol: 'HGT',
+            decimals: 8,
+        },
+        {
+            address: '0x13f11c9905a08ca76e3e853be63d4f0944326c72',
+            name: 'Divi Exchange Token',
+            symbol: 'DIVX',
+            decimals: 18,
+        },
+        {
+            address: '0x5b26c5d0772e5bbac8b3182ae9a13f9bb2d03765',
+            name: 'EDU Token',
+            symbol: 'EDU',
+            decimals: 8,
+        },
+        {
+            address: '0xd49ff13661451313ca1553fd6954bd1d9b6e02b9',
+            name: 'ElectrifyAsia',
+            symbol: 'ELEC',
+            decimals: 18,
+        },
+        {
+            address: '0x95daaab98046846bf4b2853e23cba236fa394a31',
+            name: 'EtheremonToken',
+            symbol: 'EMONT',
+            decimals: 8,
+        },
+        {
+            address: '0x5bc7e5f0ab8b2e10d2d0a3f21739fce62459aef3',
+            name: 'Hut34 Entropy Token',
+            symbol: 'ENTR',
+            decimals: 18,
+        },
+        {
+            address: '0x923108a439c4e8c2315c4f6521e5ce95b44e9b4c',
+            name: 'Devery.io',
+            symbol: 'EVE',
+            decimals: 18,
+        },
+        {
+            address: '0xf8e386eda857484f5a12e4b5daa9984e06e73705',
+            name: 'Indorse Token',
+            symbol: 'IND',
+            decimals: 18,
+        },
+        {
+            address: '0x4f4f0db4de903b88f2b1a2847971e231d54f8fd3',
+            name: 'Geens Platform Token',
+            symbol: 'GEE',
+            decimals: 8,
+        },
+        {
+            address: '0x543ff227f64aa17ea132bf9886cab5db55dcaddf',
+            name: 'DAOstack',
+            symbol: 'GEN',
+            decimals: 18,
+        },
+        {
+            address: '0x8a854288a5976036a725879164ca3e91d30c6a1b',
+            name: 'Guaranteed Entrance Token',
+            symbol: 'GET',
+            decimals: 18,
+        },
+        {
+            address: '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2',
+            name: 'Maker',
+            symbol: 'MKR',
+            decimals: 18,
+        },
+        {
+            address: '0x9af839687f6c94542ac5ece2e317daae355493a1',
+            name: 'Hydro Protocol Token',
+            symbol: 'HOT',
+            decimals: 18,
+        },
+        {
+            address: '0x0d262e5dc4a06a0f1c90ce79c7a60c09dfc884e4',
+            name: 'JET8 Token',
+            symbol: 'J8T',
+            decimals: 8,
+        },
+        {
+            address: '0x8727c112c712c4a03371ac87a74dd6ab104af768',
+            name: 'Jetcoin Institute Token',
+            symbol: 'JET',
+            decimals: 18,
+        },
+        {
+            address: '0xa4e8c3ec456107ea67d3075bf9e3df3a75823db0',
+            name: 'Loom Network Token',
+            symbol: 'LOOM',
+            decimals: 18,
+        },
+        {
+            address: '0x957c30ab0426e0c93cd8241e2c60392d08c6ac8e',
+            name: 'Modum Token',
+            symbol: 'MOD',
+            decimals: 0,
+        },
+        {
+            address: '0x2ef27bf41236bd859a95209e17a43fbd26851f92',
+            name: 'MORPH',
+            symbol: 'MORPH',
+            decimals: 4,
+        },
+        {
+            address: '0x263c618480dbe35c300d8d5ecda19bbb986acaed',
+            name: 'MOT',
+            symbol: 'MOT',
+            decimals: 18,
+        },
+        {
+            address: '0xffe02ee4c69edf1b340fcad64fbd6b37a7b9e265',
+            name: 'NANJCOIN',
+            symbol: 'NANJ',
+            decimals: 8,
+        },
+        {
+            address: '0xc15a399c4ea7815fe36857c9e290ee452a5d6b21',
+            name: 'BoatPilot Token',
+            symbol: 'NAVI',
+            decimals: 18,
+        },
+        {
+            address: '0x9e46a38f5daabe8683e10793b06749eef7d733d1',
+            name: 'PolySwarm Nectar',
+            symbol: 'NCT',
+            decimals: 18,
+        },
+        {
+            address: '0xa54ddc7b3cce7fc8b1e3fa0256d0db80d2c10970',
+            name: 'NEVERDIE Coin',
+            symbol: 'NDC',
+            decimals: 18,
+        },
+        {
+            address: '0xb62132e35a6c13ee1ee0f84dc5d40bad8d815206',
+            name: 'Nexo',
+            symbol: 'NEXO',
+            decimals: 18,
+        },
+        {
+            address: '0x0235fe624e044a05eed7a43e16e3083bc8a4287a',
+            name: 'Original Crypto Coin',
+            symbol: 'OCC',
+            decimals: 18,
+        },
+        {
+            address: '0xb5dbc6d3cf380079df3b27135664b6bcf45d1869',
+            name: 'Omix',
+            symbol: 'OMX',
+            decimals: 8,
+        },
+        {
+            address: '0xfedae5642668f8636a11987ff386bfd215f942ee',
+            name: 'PolicyPal Network Token',
+            symbol: 'PAL',
+            decimals: 18,
+        },
+        {
+            address: '0x2604fa406be957e542beb89e6754fcde6815e83f',
+            name: 'Playkey Token',
+            symbol: 'PKT',
+            decimals: 18,
+        },
+        {
+            address: '0xe477292f1b3268687a29376116b0ed27a9c76170',
+            name: 'Herocoin',
+            symbol: 'PLAY',
+            decimals: 18,
+        },
+        {
+            address: '0x1985365e9f78359a9b6ad760e32412f4a445e862',
+            name: 'Augur',
+            symbol: 'REP',
+            decimals: 18,
+        },
+        {
+            address: '0x408e41876cccdc0f92210600ef50372656052a38',
+            name: 'Republic Protocol',
+            symbol: 'REN',
+            decimals: 18,
+        },
+        {
+            address: '0xd0929d411954c47438dc1d871dd6081f5c5e149c',
+            name: 'Refereum',
+            symbol: 'RFR',
+            decimals: 4,
+        },
+        {
+            address: '0x3d1ba9be9f66b8ee101911bc36d3fb562eac2244',
+            name: 'Rivetz',
+            symbol: 'RVT',
+            decimals: 18,
+        },
+        {
+            address: '0x6888a16ea9792c15a4dcf2f6c623d055c8ede792',
+            name: 'Spectiv Signal Token',
+            symbol: 'SIG',
+            decimals: 18,
+        },
+        {
+            address: '0x20f7a3ddf244dc9299975b4da1c39f8d5d75f05a',
+            name: 'Sapien Network Token',
+            symbol: 'SPN',
+            decimals: 6,
+        },
+        {
+            address: '0xbbff862d906e348e9946bfb2132ecb157da3d4b4',
+            name: 'Sharder',
+            symbol: 'SS',
+            decimals: 18,
+        },
+        {
+            address: '0x12b306fa98f4cbb8d4457fdff3a0a0a56f07ccdf',
+            name: 'Spectre.ai D-Token',
+            symbol: 'SXDT',
+            decimals: 18,
+        },
+        {
+            address: '0xff3519eeeea3e76f1f699ccce5e23ee0bdda41ac',
+            name: 'Blockchain Capital',
+            symbol: 'BCAP',
+            decimals: 0,
+        },
+        {
+            address: '0xced1a8529125d1bd06b54a7b01210df357d00885',
+            name: 'Too Real Badge',
+            symbol: 'TRL',
+            decimals: 0,
+        },
+        {
+            address: '0xc86d054809623432210c107af2e3f619dcfbf652',
+            name: 'SENTINEL PROTOCOL',
+            symbol: 'UPP',
+            decimals: 18,
+        },
+        {
+            address: '0x27f610bf36eca0939093343ac28b1534a721dbb4',
+            name: 'Wand Token',
+            symbol: 'WAND',
+            decimals: 18,
+        },
+        {
+            address: '0x056017c55ae7ae32d12aef7c679df83a85ca75ff',
+            name: 'WyvernToken',
+            symbol: 'WYV',
+            decimals: 18,
+        },
+        {
+            address: '0x5ca9a71b1d01849c0a95490cc00559717fcf0d1d',
+            name: 'Aeternity',
+            symbol: 'AE',
+            decimals: 18,
+        },
+        {
+            address: '0xbc86727e770de68b1060c91f6bb6945c73e10388',
+            name: 'Ink Protocol',
+            symbol: 'XNK',
+            decimals: 18,
+        },
+        {
+            address: '0x0f513ffb4926ff82d7f60a05069047aca295c413',
+            name: 'CrowdstartCoin',
+            symbol: 'XSC',
+            decimals: 18,
+        },
+        {
+            address: '0xb9e7f8568e08d5659f5d29c4997173d84cdf2607',
+            name: 'Swarm City Token',
+            symbol: 'SWT',
+            decimals: 18,
+        },
+        {
+            address: '0x6531f133e6deebe7f2dce5a0441aa7ef330b4e53',
+            name: 'Chronobank TIME',
+            symbol: 'TIME',
+            decimals: 8,
+        },
+        {
+            address: '0xf230b790e05390fc8295f4d3f60332c93bed42e2',
+            name: 'Tronix',
+            symbol: 'TRX',
+            decimals: 6,
+        },
+        {
+            address: '0x5c543e7ae0a1104f78406c340e9c64fd9fce5170',
+            name: 'vSlice',
+            symbol: 'VSL',
+            decimals: 0,
+        },
+        {
+            address: '0x4df812f6064def1e5e029f1ca858777cc98d2d81',
+            name: 'Xaurum',
+            symbol: 'XAUR',
+            decimals: 8,
+        },
+    ],
+    '42': [
+        {
+            address: '0x6ff6c0ff1d68b964901f986d4c9fa3ac68346570',
+            name: '0x Protocol Token',
+            symbol: 'ZRX',
+            decimals: 18,
+        },
+        {
+            address: '0x323b5d4c32345ced77393b3530b1eed0f346429d',
+            name: 'Melon Token',
+            symbol: 'MLN',
+            decimals: 18,
+        },
+        {
+            address: '0x1dad4783cf3fe3085c1426157ab175a6119a04ba',
+            name: 'Maker DAO',
+            symbol: 'MKR',
+            decimals: 18,
+        },
+        {
+            address: '0xeee3870657e4716670f185df08652dd848fe8f7e',
+            name: 'Digix DAO Token',
+            symbol: 'DGD',
+            decimals: 18,
+        },
+        {
+            address: '0xb18845c260f680d5b9d84649638813e342e4f8c9',
+            name: 'Augur Reputation Token',
+            symbol: 'REP',
+            decimals: 18,
+        },
+        {
+            address: '0xef7fff64389b814a946f3e92105513705ca6b990',
+            name: 'Golem Network Token',
+            symbol: 'GNT',
+            decimals: 18,
+        },
+        {
+            address: '0xd0a1e359811322d97991e03f863a0c30c2cf029c',
+            name: 'Wrapped Ether',
+            symbol: 'WETH',
+            decimals: 18,
+        },
+    ],
+    '3': [
+        {
+            address: '0xdf18648f5b4357d6cc1e27f7699af4f77ff44558',
+            name: 'token0',
+            symbol: 'TKN0',
+            decimals: 0,
+        },
+        {
+            address: '0xd7cdcde4302a60c4d74a11eee21fbf455f476021',
+            name: 'token1',
+            symbol: 'TKN1',
+            decimals: 1,
+        },
+        {
+            address: '0xf080f68c2113d40ff6a8528863f431908680900a',
+            name: 'token2',
+            symbol: 'TKN2',
+            decimals: 2,
+        },
+        {
+            address: '0xe982b5c62434c98e27d15fed40447dda6b75c4eb',
+            name: 'token3',
+            symbol: 'TKN3',
+            decimals: 3,
+        },
+        {
+            address: '0x2427d136751c1ca70480d3b2091261d639090a50',
+            name: 'token4',
+            symbol: 'TKN4',
+            decimals: 4,
+        },
+        {
+            address: '0x7d3eca8ec55bb32bd0056edb9485b07a53d3fbfd',
+            name: 'token5',
+            symbol: 'TKN5',
+            decimals: 5,
+        },
+        {
+            address: '0xff3c22e0a9014e9b4b1cf7a54bf39ab3107f6123',
+            name: 'token6',
+            symbol: 'TKN6',
+            decimals: 6,
+        },
+        {
+            address: '0xdec283d9e188397c841ab59d9d9160fd47bc56f8',
+            name: 'token7',
+            symbol: 'TKN7',
+            decimals: 7,
+        },
+        {
+            address: '0xedf5fd2f60d8fefbfa8011f2769b39657c54c3fd',
+            name: 'token8',
+            symbol: 'TKN8',
+            decimals: 8,
+        },
+        {
+            address: '0xcd59fe7fa1a1a0ff536966a599b631d9cd5f2914',
+            name: 'token9',
+            symbol: 'TKN9',
+            decimals: 9,
+        },
+        {
+            address: '0xaece1ee1813d56a5897f19ad50164565203b459f',
+            name: 'token10',
+            symbol: 'TKN10',
+            decimals: 10,
+        },
+        {
+            address: '0xaab3f0619e529b1f1823be291daa7fcd38a15927',
+            name: 'token11',
+            symbol: 'TKN11',
+            decimals: 11,
+        },
+        {
+            address: '0x2c46ad0b19cb1c1f3e51ae90d80654a227b08d30',
+            name: 'token12',
+            symbol: 'TKN12',
+            decimals: 12,
+        },
+        {
+            address: '0x68977f3286a503f2b3930506f1b3a17dafbd9524',
+            name: 'token13',
+            symbol: 'TKN13',
+            decimals: 13,
+        },
+        {
+            address: '0xe5c400b9ee56b823c6193a662041389624609db6',
+            name: 'token14',
+            symbol: 'TKN14',
+            decimals: 14,
+        },
+        {
+            address: '0xf16ea9b23ddbeb6b16d253edf6b595da4009bb8b',
+            name: 'token16',
+            symbol: 'TKN16',
+            decimals: 16,
+        },
+        {
+            address: '0x739a83860971e900c4bbbb92be6cfb9d459ef94a',
+            name: 'token15',
+            symbol: 'TKN15',
+            decimals: 15,
+        },
+        {
+            address: '0x5eba21470cf683fe91b594afe7106039e38f3312',
+            name: 'token17',
+            symbol: 'TKN17',
+            decimals: 17,
+        },
+        {
+            address: '0xc0ddd5df448907bb3f50350f3fe7a1da3fb2a2ee',
+            name: 'token18',
+            symbol: 'TKN18',
+            decimals: 18,
+        },
+        {
+            address: '0x30fa25e53f8031014166fbd5e4bbeac0cd25df74',
+            name: 'token19',
+            symbol: 'TKN19',
+            decimals: 19,
+        },
+        {
+            address: '0xa8e9fa8f91e5ae138c74648c9c304f1c75003a8d',
+            name: '0x Protocol Token',
+            symbol: 'ZRX',
+            decimals: 18,
+        },
+        {
+            address: '0xc778417e063141139fce010982780140aa0cd5ab',
+            name: 'Ether Token',
+            symbol: 'WETH',
+            decimals: 18,
+        },
+        {
+            address: '0x14823db576c11e4a54ca9e01ca0b28b18d3d1187',
+            name: 'b0x Protocol Token',
+            symbol: 'B0X',
+            decimals: 18,
+        },
+    ],
+}; // tslint:disable:max-file-line-count
diff --git a/packages/website/ts/utils/fetch_utils.ts b/packages/website/ts/utils/fetch_utils.ts
index e9a88b6b35..9afc5904d3 100644
--- a/packages/website/ts/utils/fetch_utils.ts
+++ b/packages/website/ts/utils/fetch_utils.ts
@@ -1,4 +1,4 @@
-import { fetchAsync, logUtils } from '@0xproject/utils';
+import { fetchAsync, logUtils } from '@0x/utils';
 import * as _ from 'lodash';
 import * as queryString from 'query-string';
 
diff --git a/packages/website/ts/utils/mui_theme.ts b/packages/website/ts/utils/mui_theme.ts
index f677b46253..3f32254de9 100644
--- a/packages/website/ts/utils/mui_theme.ts
+++ b/packages/website/ts/utils/mui_theme.ts
@@ -1,4 +1,4 @@
-import { colors } from '@0xproject/react-shared';
+import { colors } from '@0x/react-shared';
 import { getMuiTheme } from 'material-ui/styles';
 
 export const muiTheme = getMuiTheme({
diff --git a/packages/website/ts/utils/order_parser.ts b/packages/website/ts/utils/order_parser.ts
index 816200e3ba..8938fbc534 100644
--- a/packages/website/ts/utils/order_parser.ts
+++ b/packages/website/ts/utils/order_parser.ts
@@ -1,5 +1,5 @@
-import { orderParsingUtils } from '@0xproject/order-utils';
-import { logUtils } from '@0xproject/utils';
+import { orderParsingUtils } from '@0x/order-utils';
+import { logUtils } from '@0x/utils';
 import * as _ from 'lodash';
 
 import { portalOrderSchema } from 'ts/schemas/portal_order_schema';
diff --git a/packages/website/ts/utils/token_address_overrides.ts b/packages/website/ts/utils/token_address_overrides.ts
index e7e9162737..5e72759640 100644
--- a/packages/website/ts/utils/token_address_overrides.ts
+++ b/packages/website/ts/utils/token_address_overrides.ts
@@ -1,4 +1,4 @@
-import { ObjectMap } from '@0xproject/types';
+import { ObjectMap } from '@0x/types';
 import { constants } from 'ts/utils/constants';
 
 // Map of networkId -> tokenSymbol -> tokenAddress
diff --git a/packages/website/ts/utils/translate.ts b/packages/website/ts/utils/translate.ts
index 1ee1a59c52..5595e6e0fb 100644
--- a/packages/website/ts/utils/translate.ts
+++ b/packages/website/ts/utils/translate.ts
@@ -80,7 +80,12 @@ export class Translate {
 
                 case Deco.CapWords:
                     const words = text.split(' ');
-                    const capitalizedWords = _.map(words, w => this._capitalize(w));
+                    const capitalizedWords = _.map(words, (w: string, i: number) => {
+                        if (w.length === 1) {
+                            return w;
+                        }
+                        return this._capitalize(w);
+                    });
                     text = capitalizedWords.join(' ');
                     break;
 
diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts
index d1628bc529..d4ad5f611c 100644
--- a/packages/website/ts/utils/utils.ts
+++ b/packages/website/ts/utils/utils.ts
@@ -1,9 +1,9 @@
-import { ContractWrappersError } from '@0xproject/contract-wrappers';
-import { assetDataUtils, OrderError } from '@0xproject/order-utils';
-import { constants as sharedConstants, Networks } from '@0xproject/react-shared';
-import { ExchangeContractErrs } from '@0xproject/types';
-import { BigNumber } from '@0xproject/utils';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { ContractWrappersError } from '@0x/contract-wrappers';
+import { assetDataUtils, OrderError } from '@0x/order-utils';
+import { constants as sharedConstants, Networks } from '@0x/react-shared';
+import { ExchangeContractErrs } from '@0x/types';
+import { BigNumber } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as bowser from 'bowser';
 import deepEqual = require('deep-equal');
 import * as _ from 'lodash';
diff --git a/packages/website/tslint.json b/packages/website/tslint.json
index b55ffe90f4..50f5be4f69 100644
--- a/packages/website/tslint.json
+++ b/packages/website/tslint.json
@@ -1,5 +1,5 @@
 {
-    "extends": ["@0xproject/tslint-config"],
+    "extends": ["@0x/tslint-config"],
     "rules": {
         "no-implicit-dependencies": false,
         "no-object-literal-type-assertion": false,
diff --git a/tsconfig.json b/tsconfig.json
index 119b855721..bbcb0a6d2b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -8,7 +8,7 @@
         "noImplicitReturns": true,
         "pretty": true,
         "skipLibCheck": true,
-        "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+        "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"],
         "strict": true,
         // These settings are required for TypeScript project references
         "composite": true,
@@ -45,7 +45,6 @@
         { "path": "./packages/sol-compiler" },
         { "path": "./packages/sol-cov" },
         { "path": "./packages/sol-resolver" },
-        { "path": "./packages/sra-report" },
         { "path": "./packages/sra-spec" },
         { "path": "./packages/subproviders" },
         { "path": "./packages/testnet-faucets" },
diff --git a/typedoc-tsconfig.json b/typedoc-tsconfig.json
index 32efdb4cfd..1d3a15a33b 100644
--- a/typedoc-tsconfig.json
+++ b/typedoc-tsconfig.json
@@ -11,7 +11,7 @@
         "resolveJsonModule": true,
         "pretty": true,
         "skipLibCheck": true,
-        "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+        "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"],
         "strict": true
     }
 }
diff --git a/yarn.lock b/yarn.lock
index d046ffd08c..e8e9400002 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,27 +2,6 @@
 # yarn lockfile v1
 
 
-"0x.js@^0.38.6":
-  version "0.38.6"
-  resolved "https://registry.yarnpkg.com/0x.js/-/0x.js-0.38.6.tgz#f6cb2b6ef9aea2ff7696c923095e0b794c1d84fc"
-  dependencies:
-    "@0xproject/assert" "^0.2.14"
-    "@0xproject/base-contract" "^0.3.6"
-    "@0xproject/contract-wrappers" "^0.1.1"
-    "@0xproject/order-utils" "^0.0.9"
-    "@0xproject/order-watcher" "^0.0.8"
-    "@0xproject/sol-compiler" "^0.5.4"
-    "@0xproject/types" "^0.8.2"
-    "@0xproject/typescript-typings" "^0.4.3"
-    "@0xproject/utils" "^0.7.3"
-    "@0xproject/web3-wrapper" "^0.7.3"
-    ethers "3.0.22"
-    lodash "4.17.10"
-
-"8fold-marked@0.3.9":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/8fold-marked/-/8fold-marked-0.3.9.tgz#bb89c645612f8ccfaffac1ca6e3c11f168c9cf59"
-
 "@0x-lerna-fork/add@^3.0.0-beta.22":
   version "3.0.0-beta.22"
   resolved "https://registry.yarnpkg.com/@0x-lerna-fork/add/-/add-3.0.0-beta.22.tgz#b69d7cbf6a28af6abb3aabb47fb617e7c6c7ac2c"
@@ -493,247 +472,12 @@
     npmlog "^4.1.2"
     write-file-atomic "^2.3.0"
 
-"@0xproject/assert@^0.2.14":
-  version "0.2.14"
-  resolved "https://registry.yarnpkg.com/@0xproject/assert/-/assert-0.2.14.tgz#7d5a373fedc8eb482716b730f4dddf3ef33bfa29"
-  dependencies:
-    "@0xproject/json-schemas" "^0.8.3"
-    "@0xproject/typescript-typings" "^0.4.3"
-    "@0xproject/utils" "^0.7.3"
-    lodash "4.17.10"
-    valid-url "1.0.9"
-
-"@0xproject/base-contract@^0.3.6":
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/@0xproject/base-contract/-/base-contract-0.3.6.tgz#c6d742ce2904bdd9e77524d99ba2438d3aae8a40"
-  dependencies:
-    "@0xproject/types" "^0.8.2"
-    "@0xproject/typescript-typings" "^0.4.3"
-    "@0xproject/utils" "^0.7.3"
-    "@0xproject/web3-wrapper" "^0.7.3"
-    ethers "3.0.22"
-    lodash "4.17.10"
-
-"@0xproject/connect@1.0.4":
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/@0xproject/connect/-/connect-1.0.4.tgz#1d5f27f4aa69920dde50178ed7179240f81d1c54"
-  dependencies:
-    "@0xproject/assert" "^0.2.14"
-    "@0xproject/json-schemas" "^0.8.3"
-    "@0xproject/types" "^0.8.2"
-    "@0xproject/typescript-typings" "^1.0.3"
-    "@0xproject/utils" "^1.0.4"
-    lodash "^4.17.4"
-    query-string "^5.0.1"
-    sinon "^4.0.0"
-    websocket "^1.0.25"
-
-"@0xproject/contract-wrappers@^0.1.1":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@0xproject/contract-wrappers/-/contract-wrappers-0.1.1.tgz#8108d7ec051f202ef0cfa77c91c4ef994bf89881"
-  dependencies:
-    "@0xproject/assert" "^0.2.14"
-    "@0xproject/base-contract" "^0.3.6"
-    "@0xproject/fill-scenarios" "^0.0.6"
-    "@0xproject/json-schemas" "^0.8.3"
-    "@0xproject/order-utils" "^0.0.9"
-    "@0xproject/sol-compiler" "^0.5.4"
-    "@0xproject/types" "^0.8.2"
-    "@0xproject/typescript-typings" "^0.4.3"
-    "@0xproject/utils" "^0.7.3"
-    "@0xproject/web3-wrapper" "^0.7.3"
-    ethereumjs-blockstream "5.0.0"
-    ethereumjs-util "5.1.5"
-    ethers "3.0.22"
-    js-sha3 "0.7.0"
-    lodash "4.17.10"
-    uuid "3.2.1"
-
-"@0xproject/fill-scenarios@^0.0.6":
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/@0xproject/fill-scenarios/-/fill-scenarios-0.0.6.tgz#969a2c49122650af5a1bf7fe7c6d286a0e6f2de2"
-  dependencies:
-    "@0xproject/base-contract" "^0.3.6"
-    "@0xproject/order-utils" "^0.0.9"
-    "@0xproject/types" "^0.8.2"
-    "@0xproject/typescript-typings" "^0.4.3"
-    "@0xproject/utils" "^0.7.3"
-    "@0xproject/web3-wrapper" "^0.7.3"
-    ethers "3.0.22"
-    lodash "4.17.10"
-
-"@0xproject/json-schemas@^0.8.3":
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/@0xproject/json-schemas/-/json-schemas-0.8.3.tgz#455e6219a6bd05e990392165192a983a9ab89f26"
-  dependencies:
-    "@0xproject/typescript-typings" "^0.4.3"
-    "@types/node" "9.6.0"
-    jsonschema "1.2.2"
-    lodash.values "4.3.0"
-
 "@0xproject/npm-cli-login@^0.0.11":
   version "0.0.11"
   resolved "https://registry.yarnpkg.com/@0xproject/npm-cli-login/-/npm-cli-login-0.0.11.tgz#3f1ec06112ce62aad300ff0575358f68aeecde2e"
   dependencies:
     npm-registry-client "7.0.9"
 
-"@0xproject/order-utils@^0.0.9":
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/@0xproject/order-utils/-/order-utils-0.0.9.tgz#75225dfbd87335d18810abf995d8e077b9a84868"
-  dependencies:
-    "@0xproject/assert" "^0.2.14"
-    "@0xproject/json-schemas" "^0.8.3"
-    "@0xproject/types" "^0.8.2"
-    "@0xproject/typescript-typings" "^0.4.3"
-    "@0xproject/utils" "^0.7.3"
-    "@0xproject/web3-wrapper" "^0.7.3"
-    "@types/node" "9.6.0"
-    bn.js "4.11.7"
-    ethereumjs-abi "0.6.5"
-    ethereumjs-util "5.1.5"
-    lodash "4.17.10"
-
-"@0xproject/order-watcher@^0.0.8":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@0xproject/order-watcher/-/order-watcher-0.0.8.tgz#cfba4c39ca8c5d39e076276479383d0aae022c6d"
-  dependencies:
-    "@0xproject/assert" "^0.2.14"
-    "@0xproject/base-contract" "^0.3.6"
-    "@0xproject/contract-wrappers" "^0.1.1"
-    "@0xproject/fill-scenarios" "^0.0.6"
-    "@0xproject/json-schemas" "^0.8.3"
-    "@0xproject/order-utils" "^0.0.9"
-    "@0xproject/types" "^0.8.2"
-    "@0xproject/typescript-typings" "^0.4.3"
-    "@0xproject/utils" "^0.7.3"
-    "@0xproject/web3-wrapper" "^0.7.3"
-    bintrees "1.0.2"
-    ethereum-types "^0.0.2"
-    ethereumjs-blockstream "5.0.0"
-    ethers "3.0.22"
-    lodash "4.17.10"
-
-"@0xproject/sol-compiler@^0.5.4":
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/@0xproject/sol-compiler/-/sol-compiler-0.5.4.tgz#3e0b04b0c02c5ec046ebb962b5ed20978c6b4cdd"
-  dependencies:
-    "@0xproject/json-schemas" "^0.8.3"
-    "@0xproject/sol-resolver" "^0.0.8"
-    "@0xproject/types" "^0.8.2"
-    "@0xproject/typescript-typings" "^0.4.3"
-    "@0xproject/utils" "^0.7.3"
-    "@0xproject/web3-wrapper" "^0.7.3"
-    "@types/yargs" "10.0.2"
-    chalk "2.3.2"
-    ethereumjs-util "5.1.5"
-    isomorphic-fetch "2.2.1"
-    lodash "4.17.10"
-    mkdirp "0.5.1"
-    require-from-string "2.0.1"
-    semver "5.5.0"
-    solc "0.4.23"
-    web3 "0.20.6"
-    web3-eth-abi "1.0.0-beta.33"
-    yargs "11.1.0"
-
-"@0xproject/sol-resolver@^0.0.8":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@0xproject/sol-resolver/-/sol-resolver-0.0.8.tgz#5496ccebc9afa9eedfb5b62104f6478aa852bf66"
-  dependencies:
-    "@0xproject/types" "^0.8.2"
-    "@0xproject/typescript-typings" "^0.0.3"
-    lodash "4.17.10"
-
-"@0xproject/types@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@0xproject/types/-/types-0.5.0.tgz#ba3cfbc11a8c6344b57c9680aa7df2ea84b9bf05"
-  dependencies:
-    bignumber.js "~4.1.0"
-
-"@0xproject/types@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@0xproject/types/-/types-0.8.2.tgz#6f936b73bfb6f017b5102002d97da0881da92d1b"
-  dependencies:
-    "@types/node" "9.6.0"
-    bignumber.js "~4.1.0"
-
-"@0xproject/typescript-typings@^0.0.3":
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/@0xproject/typescript-typings/-/typescript-typings-0.0.3.tgz#3272080bde00ade0a970b0d236686b483b08a1d0"
-  dependencies:
-    "@0xproject/types" "^0.5.0"
-    bignumber.js "~4.1.0"
-
-"@0xproject/typescript-typings@^0.4.3":
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/@0xproject/typescript-typings/-/typescript-typings-0.4.3.tgz#f99f939a43f2764ad7182fcd78a71212a1d76d96"
-  dependencies:
-    "@0xproject/types" "^0.8.2"
-    bignumber.js "~4.1.0"
-    ethereum-types "^0.0.2"
-
-"@0xproject/typescript-typings@^1.0.3":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@0xproject/typescript-typings/-/typescript-typings-1.0.5.tgz#a808443419f26a7b90d63d1afd3efbfb48644184"
-  dependencies:
-    "@types/bn.js" "^4.11.0"
-    "@types/react" "*"
-    bignumber.js "~4.1.0"
-    ethereum-types "^1.0.5"
-    popper.js "1.14.3"
-
-"@0xproject/typescript-typings@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@0xproject/typescript-typings/-/typescript-typings-2.0.2.tgz#1812f64e341f1d24c09b8b5a951cbde0e5fff9c2"
-  dependencies:
-    "@types/bn.js" "^4.11.0"
-    "@types/react" "*"
-    bignumber.js "~4.1.0"
-    ethereum-types "^1.0.8"
-    popper.js "1.14.3"
-
-"@0xproject/utils@^0.7.3":
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/@0xproject/utils/-/utils-0.7.3.tgz#ffa7c6da9bf0dd3e13694f185dcfc48a8981ff05"
-  dependencies:
-    "@0xproject/typescript-typings" "^0.4.3"
-    "@types/node" "9.6.0"
-    bignumber.js "~4.1.0"
-    ethereum-types "^0.0.2"
-    ethereumjs-util "^5.1.1"
-    ethers "3.0.22"
-    js-sha3 "0.7.0"
-    lodash "4.17.10"
-    web3 "0.20.6"
-
-"@0xproject/utils@^1.0.4":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@0xproject/utils/-/utils-1.0.11.tgz#5b53e7d9d4dbe68e219049218c9db04e97c37429"
-  dependencies:
-    "@0xproject/types" "^1.1.1"
-    "@0xproject/typescript-typings" "^2.0.2"
-    "@types/node" "*"
-    abortcontroller-polyfill "^1.1.9"
-    bignumber.js "~4.1.0"
-    detect-node "2.0.3"
-    ethereum-types "^1.0.8"
-    ethereumjs-util "^5.1.1"
-    ethers "3.0.22"
-    isomorphic-fetch "^2.2.1"
-    js-sha3 "^0.7.0"
-    lodash "^4.17.5"
-
-"@0xproject/web3-wrapper@^0.7.3":
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/@0xproject/web3-wrapper/-/web3-wrapper-0.7.3.tgz#9bd50b034b92fd505b6766b6e225f014b6d08b08"
-  dependencies:
-    "@0xproject/types" "^0.8.2"
-    "@0xproject/typescript-typings" "^0.4.3"
-    "@0xproject/utils" "^0.7.3"
-    ethers "3.0.22"
-    lodash "4.17.10"
-    web3 "0.20.6"
-
 "@babel/code-frame@^7.0.0-beta.35":
   version "7.0.0"
   resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
@@ -786,6 +530,21 @@
   dependencies:
     events "^2.0.0"
 
+"@lerna/add@^3.4.1":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.4.1.tgz#d41068317e30f530df48220d256b5e79690b1877"
+  dependencies:
+    "@lerna/bootstrap" "^3.4.1"
+    "@lerna/command" "^3.3.0"
+    "@lerna/filter-options" "^3.3.2"
+    "@lerna/npm-conf" "^3.4.1"
+    "@lerna/validation-error" "^3.0.0"
+    dedent "^0.7.0"
+    npm-package-arg "^6.0.0"
+    p-map "^1.2.0"
+    pacote "^9.1.0"
+    semver "^5.5.0"
+
 "@lerna/batch-packages@^3.0.0-beta.18":
   version "3.0.0-beta.18"
   resolved "http://registry.yarnpkg.com/@lerna%2fbatch-packages/-/batch-packages-3.0.0-beta.18.tgz#69d5e3f5003e454a1615c38d9f0b65b10853625a"
@@ -794,6 +553,326 @@
     "@lerna/validation-error" "^3.0.0-beta.10"
     npmlog "^4.1.2"
 
+"@lerna/batch-packages@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@lerna/batch-packages/-/batch-packages-3.1.2.tgz#74b5312a01a8916204cbc71237ffbe93144b99df"
+  dependencies:
+    "@lerna/package-graph" "^3.1.2"
+    "@lerna/validation-error" "^3.0.0"
+    npmlog "^4.1.2"
+
+"@lerna/bootstrap@^3.4.1":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-3.4.1.tgz#10635e9b547fb7d685949ac78e0923f73da2f52a"
+  dependencies:
+    "@lerna/batch-packages" "^3.1.2"
+    "@lerna/command" "^3.3.0"
+    "@lerna/filter-options" "^3.3.2"
+    "@lerna/has-npm-version" "^3.3.0"
+    "@lerna/npm-conf" "^3.4.1"
+    "@lerna/npm-install" "^3.3.0"
+    "@lerna/rimraf-dir" "^3.3.0"
+    "@lerna/run-lifecycle" "^3.4.1"
+    "@lerna/run-parallel-batches" "^3.0.0"
+    "@lerna/symlink-binary" "^3.3.0"
+    "@lerna/symlink-dependencies" "^3.3.0"
+    "@lerna/validation-error" "^3.0.0"
+    dedent "^0.7.0"
+    get-port "^3.2.0"
+    multimatch "^2.1.0"
+    npm-package-arg "^6.0.0"
+    npmlog "^4.1.2"
+    p-finally "^1.0.0"
+    p-map "^1.2.0"
+    p-map-series "^1.0.0"
+    p-waterfall "^1.0.0"
+    read-package-tree "^5.1.6"
+    semver "^5.5.0"
+
+"@lerna/changed@^3.4.1":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.4.1.tgz#84a049359a53b8812c3a07a664bd41b1768f5938"
+  dependencies:
+    "@lerna/collect-updates" "^3.3.2"
+    "@lerna/command" "^3.3.0"
+    "@lerna/listable" "^3.0.0"
+    "@lerna/output" "^3.0.0"
+    "@lerna/version" "^3.4.1"
+
+"@lerna/check-working-tree@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-3.3.0.tgz#2118f301f28ccb530812e5b27a341b1e6b3c84e2"
+  dependencies:
+    "@lerna/describe-ref" "^3.3.0"
+    "@lerna/validation-error" "^3.0.0"
+
+"@lerna/child-process@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-3.3.0.tgz#71184a763105b6c8ece27f43f166498d90fe680f"
+  dependencies:
+    chalk "^2.3.1"
+    execa "^1.0.0"
+    strong-log-transformer "^2.0.0"
+
+"@lerna/clean@^3.3.2":
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-3.3.2.tgz#9a7e8a1e400e580de260fa124945b2939a025069"
+  dependencies:
+    "@lerna/command" "^3.3.0"
+    "@lerna/filter-options" "^3.3.2"
+    "@lerna/prompt" "^3.3.1"
+    "@lerna/rimraf-dir" "^3.3.0"
+    p-map "^1.2.0"
+    p-map-series "^1.0.0"
+    p-waterfall "^1.0.0"
+
+"@lerna/cli@^3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@lerna/cli/-/cli-3.2.0.tgz#3ed25bcbc0b8f0878bc6a102ee0296f01476cfdf"
+  dependencies:
+    "@lerna/global-options" "^3.1.3"
+    dedent "^0.7.0"
+    npmlog "^4.1.2"
+    yargs "^12.0.1"
+
+"@lerna/collect-updates@^3.3.2":
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-3.3.2.tgz#54df5ce59ca05e8aa04ff8a9299f89cc253a9304"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/describe-ref" "^3.3.0"
+    minimatch "^3.0.4"
+    npmlog "^4.1.2"
+    slash "^1.0.0"
+
+"@lerna/command@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/command/-/command-3.3.0.tgz#e81c4716a676b02dbe9d3f548d5f45b4ba32c25a"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/package-graph" "^3.1.2"
+    "@lerna/project" "^3.0.0"
+    "@lerna/validation-error" "^3.0.0"
+    "@lerna/write-log-file" "^3.0.0"
+    dedent "^0.7.0"
+    execa "^1.0.0"
+    is-ci "^1.0.10"
+    lodash "^4.17.5"
+    npmlog "^4.1.2"
+
+"@lerna/conventional-commits@^3.4.1":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-3.4.1.tgz#0b47f9fc0c4a10951883e949d939188da1b527bc"
+  dependencies:
+    "@lerna/validation-error" "^3.0.0"
+    conventional-changelog-angular "^5.0.1"
+    conventional-changelog-core "^3.1.0"
+    conventional-recommended-bump "^4.0.1"
+    fs-extra "^7.0.0"
+    get-stream "^4.0.0"
+    npm-package-arg "^6.0.0"
+    npmlog "^4.1.2"
+    semver "^5.5.0"
+
+"@lerna/create-symlink@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-3.3.0.tgz#91de00fd576018ba4251f0c6a5b4b7f768f22a82"
+  dependencies:
+    cmd-shim "^2.0.2"
+    fs-extra "^7.0.0"
+    npmlog "^4.1.2"
+
+"@lerna/create@^3.4.1":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-3.4.1.tgz#7cad78a5701d7666a0f5d0fe0e325acd8d8f5b63"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/command" "^3.3.0"
+    "@lerna/npm-conf" "^3.4.1"
+    "@lerna/validation-error" "^3.0.0"
+    camelcase "^4.1.0"
+    dedent "^0.7.0"
+    fs-extra "^7.0.0"
+    globby "^8.0.1"
+    init-package-json "^1.10.3"
+    npm-package-arg "^6.0.0"
+    pify "^3.0.0"
+    semver "^5.5.0"
+    slash "^1.0.0"
+    validate-npm-package-license "^3.0.3"
+    validate-npm-package-name "^3.0.0"
+    whatwg-url "^7.0.0"
+
+"@lerna/describe-ref@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-3.3.0.tgz#d373adb530d5428ab91e303ccbfcf51a98374a3a"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    npmlog "^4.1.2"
+
+"@lerna/diff@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-3.3.0.tgz#c8130a5f508b47fad5fec81404498bc3acdf9cb5"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/command" "^3.3.0"
+    "@lerna/validation-error" "^3.0.0"
+    npmlog "^4.1.2"
+
+"@lerna/exec@^3.3.2":
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-3.3.2.tgz#95ecaca617fd85abdb91e9a378ed06ec1763d665"
+  dependencies:
+    "@lerna/batch-packages" "^3.1.2"
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/command" "^3.3.0"
+    "@lerna/filter-options" "^3.3.2"
+    "@lerna/run-parallel-batches" "^3.0.0"
+    "@lerna/validation-error" "^3.0.0"
+
+"@lerna/filter-options@^3.3.2":
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-3.3.2.tgz#ac90702b7876ff4980dcdeaeac049c433dd01773"
+  dependencies:
+    "@lerna/collect-updates" "^3.3.2"
+    "@lerna/filter-packages" "^3.0.0"
+    dedent "^0.7.0"
+
+"@lerna/filter-packages@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-3.0.0.tgz#5eb25ad1610f3e2ab845133d1f8d7d40314e838f"
+  dependencies:
+    "@lerna/validation-error" "^3.0.0"
+    multimatch "^2.1.0"
+    npmlog "^4.1.2"
+
+"@lerna/get-npm-exec-opts@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.0.0.tgz#8fc7866e8d8e9a2f2dc385287ba32eb44de8bdeb"
+  dependencies:
+    npmlog "^4.1.2"
+
+"@lerna/global-options@^3.1.3":
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-3.1.3.tgz#cf85e24655a91d04d4efc9a80c1f83fc768d08ae"
+
+"@lerna/has-npm-version@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-3.3.0.tgz#8a73c2c437a0e1e68a19ccbd0dd3c014d4d39135"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    semver "^5.5.0"
+
+"@lerna/import@^3.3.1":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.3.1.tgz#deca8c93c9cc03c5844b975c6da9937dd7530440"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/command" "^3.3.0"
+    "@lerna/prompt" "^3.3.1"
+    "@lerna/validation-error" "^3.0.0"
+    dedent "^0.7.0"
+    fs-extra "^7.0.0"
+    p-map-series "^1.0.0"
+
+"@lerna/init@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/init/-/init-3.3.0.tgz#998f3497da3d891867c593b808b6db4b8fc4ccb9"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/command" "^3.3.0"
+    fs-extra "^7.0.0"
+    p-map "^1.2.0"
+    write-json-file "^2.3.0"
+
+"@lerna/link@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/link/-/link-3.3.0.tgz#c0c05ff52d0f0c659fcf221627edfcd58e477a5c"
+  dependencies:
+    "@lerna/command" "^3.3.0"
+    "@lerna/package-graph" "^3.1.2"
+    "@lerna/symlink-dependencies" "^3.3.0"
+    p-map "^1.2.0"
+    slash "^1.0.0"
+
+"@lerna/list@^3.3.2":
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/@lerna/list/-/list-3.3.2.tgz#1412b3cce2a83b1baa4ff6fb962d50b46c28ec98"
+  dependencies:
+    "@lerna/command" "^3.3.0"
+    "@lerna/filter-options" "^3.3.2"
+    "@lerna/listable" "^3.0.0"
+    "@lerna/output" "^3.0.0"
+
+"@lerna/listable@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-3.0.0.tgz#27209b1382c87abdbc964220e75c247d803d4199"
+  dependencies:
+    chalk "^2.3.1"
+    columnify "^1.5.4"
+
+"@lerna/log-packed@^3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-3.0.4.tgz#6d1f6ce5ca68b9971f2a27f0ecf3c50684be174a"
+  dependencies:
+    byte-size "^4.0.3"
+    columnify "^1.5.4"
+    has-unicode "^2.0.1"
+    npmlog "^4.1.2"
+
+"@lerna/npm-conf@^3.4.1":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-3.4.1.tgz#859e931b0bc9a5eed86309cc09508810c1e7d121"
+  dependencies:
+    config-chain "^1.1.11"
+    pify "^3.0.0"
+
+"@lerna/npm-dist-tag@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-3.3.0.tgz#e1c5ab67674216d901266a16846b21cc81ff6afd"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/get-npm-exec-opts" "^3.0.0"
+    npmlog "^4.1.2"
+
+"@lerna/npm-install@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-3.3.0.tgz#16d00ffd668d11b2386b3ac68bdac2cf8320e533"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/get-npm-exec-opts" "^3.0.0"
+    fs-extra "^7.0.0"
+    npm-package-arg "^6.0.0"
+    npmlog "^4.1.2"
+    signal-exit "^3.0.2"
+    write-pkg "^3.1.0"
+
+"@lerna/npm-publish@^3.3.1":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-3.3.1.tgz#30384665d7ee387343332ece62ca231207bbabea"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/get-npm-exec-opts" "^3.0.0"
+    "@lerna/has-npm-version" "^3.3.0"
+    "@lerna/log-packed" "^3.0.4"
+    fs-extra "^7.0.0"
+    npmlog "^4.1.2"
+    p-map "^1.2.0"
+
+"@lerna/npm-run-script@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-3.3.0.tgz#3c79601c27c67121155b20e039be53130217db72"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/get-npm-exec-opts" "^3.0.0"
+    npmlog "^4.1.2"
+
+"@lerna/output@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/output/-/output-3.0.0.tgz#4ed4a30ed2f311046b714b3840a090990ba3ce35"
+  dependencies:
+    npmlog "^4.1.2"
+
 "@lerna/package-graph@^3.0.0-beta.18":
   version "3.0.0-beta.18"
   resolved "http://registry.yarnpkg.com/@lerna%2fpackage-graph/-/package-graph-3.0.0-beta.18.tgz#8c33a6a10453d310e14fc9d317dc51e845e11963"
@@ -801,12 +880,188 @@
     npm-package-arg "^6.0.0"
     semver "^5.5.0"
 
+"@lerna/package-graph@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-3.1.2.tgz#b70298a3a8c82e12090da33233bf242223a38f20"
+  dependencies:
+    "@lerna/validation-error" "^3.0.0"
+    npm-package-arg "^6.0.0"
+    semver "^5.5.0"
+
+"@lerna/package@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/package/-/package-3.0.0.tgz#14afc9a6cb1f7f7b23c1d7c7aa81bdac7d44c0e5"
+  dependencies:
+    npm-package-arg "^6.0.0"
+    write-pkg "^3.1.0"
+
+"@lerna/project@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/project/-/project-3.0.0.tgz#4320d2a2b4080cabcf95161d9c48475217d8a545"
+  dependencies:
+    "@lerna/package" "^3.0.0"
+    "@lerna/validation-error" "^3.0.0"
+    cosmiconfig "^5.0.2"
+    dedent "^0.7.0"
+    dot-prop "^4.2.0"
+    glob-parent "^3.1.0"
+    globby "^8.0.1"
+    load-json-file "^4.0.0"
+    npmlog "^4.1.2"
+    p-map "^1.2.0"
+    resolve-from "^4.0.0"
+    write-json-file "^2.3.0"
+
+"@lerna/prompt@^3.3.1":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/@lerna/prompt/-/prompt-3.3.1.tgz#ec53f9034a7a02a671627241682947f65078ab88"
+  dependencies:
+    inquirer "^6.2.0"
+    npmlog "^4.1.2"
+
+"@lerna/publish@^3.4.3":
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.4.3.tgz#fb956ca2a871729982022889f90d0e8eb8528340"
+  dependencies:
+    "@lerna/batch-packages" "^3.1.2"
+    "@lerna/check-working-tree" "^3.3.0"
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/collect-updates" "^3.3.2"
+    "@lerna/command" "^3.3.0"
+    "@lerna/describe-ref" "^3.3.0"
+    "@lerna/get-npm-exec-opts" "^3.0.0"
+    "@lerna/npm-conf" "^3.4.1"
+    "@lerna/npm-dist-tag" "^3.3.0"
+    "@lerna/npm-publish" "^3.3.1"
+    "@lerna/output" "^3.0.0"
+    "@lerna/prompt" "^3.3.1"
+    "@lerna/run-lifecycle" "^3.4.1"
+    "@lerna/run-parallel-batches" "^3.0.0"
+    "@lerna/validation-error" "^3.0.0"
+    "@lerna/version" "^3.4.1"
+    fs-extra "^7.0.0"
+    libnpmaccess "^3.0.0"
+    npm-package-arg "^6.0.0"
+    npm-registry-fetch "^3.8.0"
+    npmlog "^4.1.2"
+    p-finally "^1.0.0"
+    p-map "^1.2.0"
+    p-pipe "^1.2.0"
+    p-reduce "^1.0.0"
+    semver "^5.5.0"
+
+"@lerna/resolve-symlink@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-3.3.0.tgz#c5d99a60cb17e2ea90b3521a0ba445478d194a44"
+  dependencies:
+    fs-extra "^7.0.0"
+    npmlog "^4.1.2"
+    read-cmd-shim "^1.0.1"
+
+"@lerna/rimraf-dir@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-3.3.0.tgz#687e9bb3668a9e540e281302a52d9a573860f5db"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    npmlog "^4.1.2"
+    path-exists "^3.0.0"
+    rimraf "^2.6.2"
+
+"@lerna/run-lifecycle@^3.4.1":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-3.4.1.tgz#6d7e44eada31cb4ec78b18ef050da0d86f6c892b"
+  dependencies:
+    "@lerna/npm-conf" "^3.4.1"
+    npm-lifecycle "^2.0.0"
+    npmlog "^4.1.2"
+
+"@lerna/run-parallel-batches@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/run-parallel-batches/-/run-parallel-batches-3.0.0.tgz#468704934084c74991d3124d80607857d4dfa840"
+  dependencies:
+    p-map "^1.2.0"
+    p-map-series "^1.0.0"
+
+"@lerna/run@^3.3.2":
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/@lerna/run/-/run-3.3.2.tgz#f521f4a22585c90758f34a584cb1871f8bb2a83e"
+  dependencies:
+    "@lerna/batch-packages" "^3.1.2"
+    "@lerna/command" "^3.3.0"
+    "@lerna/filter-options" "^3.3.2"
+    "@lerna/npm-run-script" "^3.3.0"
+    "@lerna/output" "^3.0.0"
+    "@lerna/run-parallel-batches" "^3.0.0"
+    "@lerna/validation-error" "^3.0.0"
+    p-map "^1.2.0"
+
+"@lerna/symlink-binary@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-3.3.0.tgz#99ea570b21baabd61ecab27582eeb1d7b2c5f9cf"
+  dependencies:
+    "@lerna/create-symlink" "^3.3.0"
+    "@lerna/package" "^3.0.0"
+    fs-extra "^7.0.0"
+    p-map "^1.2.0"
+    read-pkg "^3.0.0"
+
+"@lerna/symlink-dependencies@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-3.3.0.tgz#13bcaed3e37986ab01b13498a459c7f609397dc3"
+  dependencies:
+    "@lerna/create-symlink" "^3.3.0"
+    "@lerna/resolve-symlink" "^3.3.0"
+    "@lerna/symlink-binary" "^3.3.0"
+    fs-extra "^7.0.0"
+    p-finally "^1.0.0"
+    p-map "^1.2.0"
+    p-map-series "^1.0.0"
+
+"@lerna/validation-error@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/validation-error/-/validation-error-3.0.0.tgz#a27e90051c3ba71995e2a800a43d94ad04b3e3f4"
+  dependencies:
+    npmlog "^4.1.2"
+
 "@lerna/validation-error@^3.0.0-beta.10":
   version "3.0.0-beta.10"
   resolved "http://registry.yarnpkg.com/@lerna%2fvalidation-error/-/validation-error-3.0.0-beta.10.tgz#cf5cbc39c4d27b89c6080e326de745f6fb7451ab"
   dependencies:
     npmlog "^4.1.2"
 
+"@lerna/version@^3.4.1":
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.4.1.tgz#029448cccd3ccefb4d5f666933bd13cfb37edab0"
+  dependencies:
+    "@lerna/batch-packages" "^3.1.2"
+    "@lerna/check-working-tree" "^3.3.0"
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/collect-updates" "^3.3.2"
+    "@lerna/command" "^3.3.0"
+    "@lerna/conventional-commits" "^3.4.1"
+    "@lerna/output" "^3.0.0"
+    "@lerna/prompt" "^3.3.1"
+    "@lerna/run-lifecycle" "^3.4.1"
+    "@lerna/validation-error" "^3.0.0"
+    chalk "^2.3.1"
+    dedent "^0.7.0"
+    minimatch "^3.0.4"
+    npmlog "^4.1.2"
+    p-map "^1.2.0"
+    p-pipe "^1.2.0"
+    p-reduce "^1.0.0"
+    p-waterfall "^1.0.0"
+    semver "^5.5.0"
+    slash "^1.0.0"
+    temp-write "^3.4.0"
+
+"@lerna/write-log-file@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/write-log-file/-/write-log-file-3.0.0.tgz#2f95fee80c6821fe1ee6ccf8173d2b4079debbd2"
+  dependencies:
+    npmlog "^4.1.2"
+    write-file-atomic "^2.3.0"
+
 "@loopback/dist-util@^0.3.6":
   version "0.3.6"
   resolved "https://registry.npmjs.org/@loopback/dist-util/-/dist-util-0.3.6.tgz#bd1d5887aa0f2bec41722f1d74fc19319d04e975"
@@ -1109,7 +1364,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/mocha@^2.2.42", "@types/mocha@^2.2.48":
+"@types/mocha@^2.2.42":
   version "2.2.48"
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.48.tgz#3523b126a0b049482e1c3c11877460f76622ffab"
 
@@ -1117,24 +1372,10 @@
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.3.tgz#11f3a5629d67cd444fa6c94536576244e6a52ea9"
 
-"@types/newman@^3.9.0":
-  version "3.9.0"
-  resolved "https://registry.npmjs.org/@types/newman/-/newman-3.9.0.tgz#f46427e8f633545dd94e8df0c251e22145f88227"
-
-"@types/nock@^9.1.2":
-  version "9.1.3"
-  resolved "https://registry.yarnpkg.com/@types/nock/-/nock-9.1.3.tgz#1d445679375b9e25afd449dc56585f81729454e8"
-  dependencies:
-    "@types/node" "*"
-
 "@types/node@*":
   version "9.6.5"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.5.tgz#ee700810fdf49ac1c399fc5980b7559b3e5a381d"
 
-"@types/node@9.6.0":
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.0.tgz#d3480ee666df9784b1001a1872a2f6ccefb6c2d7"
-
 "@types/node@^10.3.2":
   version "10.9.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"
@@ -1143,10 +1384,6 @@
   version "10.5.7"
   resolved "https://registry.npmjs.org/@types/node/-/node-10.5.7.tgz#960d9feb3ade2233bcc9843c918d740b4f78a7cf"
 
-"@types/node@^8.0.53":
-  version "8.10.8"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.8.tgz#794cba23cc9f8d9715f6543fa8827433b5f5cd3b"
-
 "@types/numeral@^0.0.22":
   version "0.0.22"
   resolved "https://registry.yarnpkg.com/@types/numeral/-/numeral-0.0.22.tgz#86bef1f0a2d743afdc2ef3168d45f2905e1a0b93"
@@ -1346,7 +1583,7 @@
     "@types/events" "*"
     "@types/node" "*"
 
-"@types/yargs@10.0.2", "@types/yargs@^10.0.0":
+"@types/yargs@^10.0.0":
   version "10.0.2"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-10.0.2.tgz#cc4ea921877874d1261e2c44b89807bc836e1b12"
 
@@ -1494,6 +1731,13 @@ JSONStream@^1.0.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
+JSONStream@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
+  dependencies:
+    jsonparse "^1.2.0"
+    through ">=2.2.7 <3"
+
 abab@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
@@ -1602,6 +1846,22 @@ aes-js@^0.2.3:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-0.2.4.tgz#94b881ab717286d015fa219e08fb66709dda5a3d"
 
+aes-js@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.npmjs.org/aes-js/-/aes-js-3.1.1.tgz#89fd1f94ae51b4c72d62466adc1a7323ff52f072"
+
+agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  dependencies:
+    es6-promisify "^5.0.0"
+
+agentkeepalive@^3.4.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.1.tgz#4eba75cf2ad258fc09efd506cdb8d8c2971d35a4"
+  dependencies:
+    humanize-ms "^1.2.1"
+
 ajv-errors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
@@ -1751,6 +2011,10 @@ aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
 
+aproba@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+
 archy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
@@ -1936,16 +2200,16 @@ async@1.x, async@^1.4.0, async@^1.4.2, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@2.6.0, async@^2.0.1, async@^2.1.2, async@^2.4.0, async@^2.5.0, async@^2.6.0:
+async@^0.9.0, async@~0.9.0:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
+
+async@^2.0.1, async@^2.1.2, async@^2.4.0, async@^2.5.0, async@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
   dependencies:
     lodash "^4.14.0"
 
-async@^0.9.0, async@~0.9.0:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
-
 async@^2.1.4:
   version "2.6.1"
   resolved "https://registry.npmjs.org/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
@@ -2014,10 +2278,6 @@ aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
 
-aws4@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-
 aws4@^1.2.1, aws4@^1.6.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
@@ -2703,7 +2963,7 @@ bindings@^1.2.1, bindings@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"
 
-bintrees@1.0.2, bintrees@^1.0.2:
+bintrees@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.2.tgz#49f896d6e858a4a499df85c38fb399b9aff840f8"
 
@@ -2780,7 +3040,7 @@ blockies@^0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/blockies/-/blockies-0.0.2.tgz#22ad58da4f6b382bc79bf4386c5820c70047e4ed"
 
-bluebird@^2.6.2, bluebird@^2.9.24, bluebird@^2.9.34:
+bluebird@^2.9.24, bluebird@^2.9.34:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
 
@@ -3002,7 +3262,7 @@ bs-logger@0.x:
   dependencies:
     fast-json-stable-stringify "^2.0.0"
 
-bs58@=4.0.1:
+bs58@=4.0.1, bs58@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a"
   dependencies:
@@ -3025,16 +3285,20 @@ bs58check@^1.0.8:
     bs58 "^3.1.0"
     create-hash "^1.1.0"
 
+bs58check@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz#53b018291228d82a5aa08e7d796fdafda54aebfc"
+  dependencies:
+    bs58 "^4.0.0"
+    create-hash "^1.1.0"
+    safe-buffer "^5.1.2"
+
 bser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
   dependencies:
     node-int64 "^0.4.0"
 
-btoa@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/btoa/-/btoa-1.1.2.tgz#3e40b81663f81d2dd6596a4cb714a8dc16cfabe0"
-
 buffer-compare@=1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-compare/-/buffer-compare-1.1.1.tgz#5be7be853af89198d1f4ddc090d1d66a48aef596"
@@ -3131,6 +3395,10 @@ byline@^5.0.0:
   version "5.0.0"
   resolved "http://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
 
+byte-size@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-4.0.3.tgz#b7c095efc68eadf82985fccd9a2df43a74fa2ccd"
+
 bytes@3.0.0, bytes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -3166,7 +3434,7 @@ cacache@^10.0.4:
     unique-filename "^1.1.0"
     y18n "^4.0.0"
 
-cacache@^11.0.2, cacache@^11.2.0:
+cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0:
   version "11.2.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.2.0.tgz#617bdc0b02844af56310e411c0878941d5739965"
   dependencies:
@@ -3341,15 +3609,7 @@ chain-function@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.0.tgz#0d4ab37e7e18ead0bdc47b920764118ce58733dc"
 
-chalk@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -3418,9 +3678,9 @@ chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
 
-charset@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/charset/-/charset-1.0.1.tgz#8d59546c355be61049a8fa9164747793319852bd"
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
 
 check-error@^1.0.1, check-error@^1.0.2:
   version "1.0.2"
@@ -3508,10 +3768,6 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-circular-json@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
-
 circular-json@^0.3.1:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
@@ -3555,25 +3811,10 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-progress@1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-1.7.0.tgz#401cdfeacc1a34afc281b4bdf88829236724c92f"
-  dependencies:
-    colors "^1.1.2"
-
 cli-spinners@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c"
 
-cli-table2@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/cli-table2/-/cli-table2-0.2.0.tgz#2d1ef7f218a0e786e214540562d4bd177fe32d97"
-  dependencies:
-    lodash "^3.10.1"
-    string-width "^1.0.1"
-  optionalDependencies:
-    colors "^1.1.2"
-
 cli-truncate@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
@@ -3736,14 +3977,14 @@ colors@1.0.x:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
 
-colors@1.1.2, colors@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-
 colors@^1.1.2:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.1.tgz#f4a3d302976aaf042356ba1ade3b1a2c62d9d794"
 
+colors@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+
 columnify@^1.5.4:
   version "1.5.4"
   resolved "http://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
@@ -3761,14 +4002,6 @@ commander@2.11.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
 
-commander@2.12.2:
-  version "2.12.2"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
-
-commander@2.13.0, commander@~2.13.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
-
 commander@2.15.1, commander@^2.12.1, commander@^2.8.1:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
@@ -3781,6 +4014,10 @@ commander@^2.7.1, commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
 
+commander@~2.13.0:
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
+
 commander@~2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
@@ -3907,6 +4144,13 @@ conventional-changelog-angular@^1.6.6:
     compare-func "^1.3.1"
     q "^1.5.1"
 
+conventional-changelog-angular@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.1.tgz#f96431b76de453333a909decd02b15cb5bd2d364"
+  dependencies:
+    compare-func "^1.3.1"
+    q "^1.5.1"
+
 conventional-changelog-core@^2.0.5:
   version "2.0.11"
   resolved "http://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz#19b5fbd55a9697773ed6661f4e32030ed7e30287"
@@ -3925,10 +4169,32 @@ conventional-changelog-core@^2.0.5:
     read-pkg-up "^1.0.1"
     through2 "^2.0.0"
 
+conventional-changelog-core@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.1.0.tgz#96a81bb3301b4b2a3dc2851cc54c5fb674ac1942"
+  dependencies:
+    conventional-changelog-writer "^4.0.0"
+    conventional-commits-parser "^3.0.0"
+    dateformat "^3.0.0"
+    get-pkg-repo "^1.0.0"
+    git-raw-commits "^2.0.0"
+    git-remote-origin-url "^2.0.0"
+    git-semver-tags "^2.0.0"
+    lodash "^4.2.1"
+    normalize-package-data "^2.3.5"
+    q "^1.5.1"
+    read-pkg "^1.1.0"
+    read-pkg-up "^1.0.1"
+    through2 "^2.0.0"
+
 conventional-changelog-preset-loader@^1.1.8:
   version "1.1.8"
   resolved "http://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz#40bb0f142cd27d16839ec6c74ee8db418099b373"
 
+conventional-changelog-preset-loader@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.1.tgz#d134734e0cc1b91b88b30586c5991f31442029f1"
+
 conventional-changelog-writer@^3.0.9:
   version "3.0.9"
   resolved "http://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-3.0.9.tgz#4aecdfef33ff2a53bb0cf3b8071ce21f0e994634"
@@ -3944,6 +4210,21 @@ conventional-changelog-writer@^3.0.9:
     split "^1.0.0"
     through2 "^2.0.0"
 
+conventional-changelog-writer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.0.tgz#3ed983c8ef6a3aa51fe44e82c9c75e86f1b5aa42"
+  dependencies:
+    compare-func "^1.3.1"
+    conventional-commits-filter "^2.0.0"
+    dateformat "^3.0.0"
+    handlebars "^4.0.2"
+    json-stringify-safe "^5.0.1"
+    lodash "^4.2.1"
+    meow "^4.0.0"
+    semver "^5.5.0"
+    split "^1.0.0"
+    through2 "^2.0.0"
+
 conventional-commits-filter@^1.1.6:
   version "1.1.6"
   resolved "http://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz#4389cd8e58fe89750c0b5fb58f1d7f0cc8ad3831"
@@ -3951,6 +4232,13 @@ conventional-commits-filter@^1.1.6:
     is-subset "^0.1.1"
     modify-values "^1.0.0"
 
+conventional-commits-filter@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.0.tgz#a0ce1d1ff7a1dd7fab36bee8e8256d348d135651"
+  dependencies:
+    is-subset "^0.1.1"
+    modify-values "^1.0.0"
+
 conventional-commits-parser@^2.1.7:
   version "2.1.7"
   resolved "http://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz#eca45ed6140d72ba9722ee4132674d639e644e8e"
@@ -3963,6 +4251,18 @@ conventional-commits-parser@^2.1.7:
     through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
 
+conventional-commits-parser@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.0.tgz#7f604549a50bd8f60443fbe515484b1c2f06a5c4"
+  dependencies:
+    JSONStream "^1.0.4"
+    is-text-path "^1.0.0"
+    lodash "^4.2.1"
+    meow "^4.0.0"
+    split2 "^2.0.0"
+    through2 "^2.0.0"
+    trim-off-newlines "^1.0.0"
+
 conventional-recommended-bump@^2.0.6:
   version "2.0.9"
   resolved "http://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-2.0.9.tgz#7392421e7d0e3515f3df2040572a23cc73a68a93"
@@ -3976,6 +4276,19 @@ conventional-recommended-bump@^2.0.6:
     meow "^4.0.0"
     q "^1.5.1"
 
+conventional-recommended-bump@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-4.0.1.tgz#304a45a412cfec050a10ea2e7e4a89320eaf3991"
+  dependencies:
+    concat-stream "^1.6.0"
+    conventional-changelog-preset-loader "^2.0.1"
+    conventional-commits-filter "^2.0.0"
+    conventional-commits-parser "^3.0.0"
+    git-raw-commits "^2.0.0"
+    git-semver-tags "^2.0.0"
+    meow "^4.0.0"
+    q "^1.5.1"
+
 convert-source-map@^1.4.0:
   version "1.6.0"
   resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
@@ -4164,14 +4477,14 @@ crypto-browserify@3.12.0, crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-crypto-js@3.1.9-1, crypto-js@^3.1.9-1:
-  version "3.1.9-1"
-  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.9-1.tgz#fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8"
-
 crypto-js@^3.1.4, crypto-js@^3.1.5:
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.8.tgz#715f070bf6014f2ae992a98b3929258b713f08d5"
 
+crypto-js@^3.1.9-1:
+  version "3.1.9-1"
+  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.9-1.tgz#fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8"
+
 crypto-random-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
@@ -4315,10 +4628,6 @@ csstype@^2.2.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.4.2.tgz#158e36c69566bf968da63d0ba14eda1c20e8643a"
 
-csv-parse@1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-1.2.4.tgz#cbf676e355226625888c6432400b83f07e75cc2e"
-
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -4379,10 +4688,6 @@ dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
 
-dbug@~0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/dbug/-/dbug-0.4.2.tgz#32b4b3105e8861043a6f9ac755d80e542d365b31"
-
 debounce@^1.1.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/debounce/-/debounce-1.2.0.tgz#44a540abc0ea9943018dc0eaa95cce87f65cd131"
@@ -4514,7 +4819,7 @@ deep-eql@^3.0.0:
   dependencies:
     type-detect "^4.0.0"
 
-deep-equal@^1.0.0, deep-equal@^1.0.1, deep-equal@~1.0.1:
+deep-equal@^1.0.1, deep-equal@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
 
@@ -5053,6 +5358,10 @@ enzyme@^3.6.0:
     rst-selector-parser "^2.2.3"
     string.prototype.trim "^1.1.2"
 
+err-code@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
+
 errno@^0.1.1, errno@^0.1.3, errno@~0.1.1, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
@@ -5136,7 +5445,7 @@ es6-symbol@^3.1.1, es6-symbol@~3.1.1:
     d "1"
     es5-ext "~0.10.14"
 
-escape-html@1.0.3, escape-html@~1.0.3:
+escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
 
@@ -5422,13 +5731,6 @@ ethereum-common@^0.0.18:
   version "0.0.18"
   resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.0.18.tgz#2fdc3576f232903358976eb39da783213ff9523f"
 
-ethereum-types@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/ethereum-types/-/ethereum-types-0.0.2.tgz#6ef6faf46a24697cbf66b6c8a0ecf2095ce58c38"
-  dependencies:
-    "@types/node" "^8.0.53"
-    bignumber.js "~4.1.0"
-
 ethereumjs-abi@0.6.5, ethereumjs-abi@^0.6.5:
   version "0.6.5"
   resolved "https://registry.yarnpkg.com/ethereumjs-abi/-/ethereumjs-abi-0.6.5.tgz#5a637ef16ab43473fa72a29ad90871405b3f5241"
@@ -5470,14 +5772,6 @@ ethereumjs-block@~1.2.2:
     ethereumjs-util "^4.0.1"
     merkle-patricia-tree "^2.1.2"
 
-ethereumjs-blockstream@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ethereumjs-blockstream/-/ethereumjs-blockstream-5.0.0.tgz#63bfe9185757329a32822d5815562eb1dcd75d71"
-  dependencies:
-    immutable "3.8.2"
-    source-map-support "0.5.6"
-    uuid "3.2.1"
-
 ethereumjs-blockstream@6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/ethereumjs-blockstream/-/ethereumjs-blockstream-6.0.0.tgz#79d726d1f358935eb65195e91d40344c31e87eff"
@@ -5500,7 +5794,17 @@ ethereumjs-tx@^1.0.0, ethereumjs-tx@^1.1.1, ethereumjs-tx@^1.2.0, ethereumjs-tx@
     ethereum-common "^0.0.18"
     ethereumjs-util "^5.0.0"
 
-ethereumjs-util@5.1.5, ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2, ethereumjs-util@^5.1.3, ethereumjs-util@^5.1.5:
+ethereumjs-util@^4.0.1, ethereumjs-util@^4.3.0, ethereumjs-util@^4.4.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz#3e9428b317eebda3d7260d854fddda954b1f1bc6"
+  dependencies:
+    bn.js "^4.8.0"
+    create-hash "^1.1.2"
+    keccakjs "^0.2.0"
+    rlp "^2.0.0"
+    secp256k1 "^3.0.1"
+
+ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2, ethereumjs-util@^5.1.3, ethereumjs-util@^5.1.5:
   version "5.1.5"
   resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-5.1.5.tgz#2f02575852627d45622426f25ee4a0b5f377f27a"
   dependencies:
@@ -5512,16 +5816,6 @@ ethereumjs-util@5.1.5, ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumj
     safe-buffer "^5.1.1"
     secp256k1 "^3.0.1"
 
-ethereumjs-util@^4.0.1, ethereumjs-util@^4.3.0, ethereumjs-util@^4.4.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz#3e9428b317eebda3d7260d854fddda954b1f1bc6"
-  dependencies:
-    bn.js "^4.8.0"
-    create-hash "^1.1.2"
-    keccakjs "^0.2.0"
-    rlp "^2.0.0"
-    secp256k1 "^3.0.1"
-
 ethereumjs-util@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz#3e0c0d1741471acf1036052d048623dee54ad642"
@@ -5578,35 +5872,18 @@ ethereumjs-wallet@0.6.0:
     utf8 "^2.1.1"
     uuid "^2.0.1"
 
-ethers@3.0.22:
-  version "3.0.22"
-  resolved "https://registry.yarnpkg.com/ethers/-/ethers-3.0.22.tgz#7fab1ea16521705837aa43c15831877b2716b436"
+ethereumjs-wallet@~0.6.0:
+  version "0.6.2"
+  resolved "https://registry.npmjs.org/ethereumjs-wallet/-/ethereumjs-wallet-0.6.2.tgz#67244b6af3e8113b53d709124b25477b64aeccda"
   dependencies:
-    aes-js "3.0.0"
-    bn.js "^4.4.0"
-    elliptic "6.3.3"
-    hash.js "^1.0.0"
-    inherits "2.0.1"
-    js-sha3 "0.5.7"
-    scrypt-js "2.0.3"
-    setimmediate "1.0.4"
-    uuid "2.0.1"
-    xmlhttprequest "1.8.0"
-
-ethers@4.0.0-beta.14:
-  version "4.0.0-beta.14"
-  resolved "https://registry.npmjs.org/ethers/-/ethers-4.0.0-beta.14.tgz#76aa9257b9c93a7604ff4dc11f2a445d07f6459d"
-  dependencies:
-    "@types/node" "^10.3.2"
-    aes-js "3.0.0"
-    bn.js "^4.4.0"
-    elliptic "6.3.3"
-    hash.js "1.1.3"
-    js-sha3 "0.5.7"
-    scrypt-js "2.0.3"
-    setimmediate "1.0.4"
-    uuid "2.0.1"
-    xmlhttprequest "1.8.0"
+    aes-js "^3.1.1"
+    bs58check "^2.1.2"
+    ethereumjs-util "^5.2.0"
+    hdkey "^1.0.0"
+    safe-buffer "^5.1.2"
+    scrypt.js "^0.2.0"
+    utf8 "^3.0.0"
+    uuid "^3.3.2"
 
 ethers@~4.0.4:
   version "4.0.4"
@@ -5673,10 +5950,6 @@ eventemitter3@1.x.x:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
 
-eventemitter3@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.0.0.tgz#fc29ecf233bd19fbd527bb4089bbf665dc90c1e3"
-
 eventemitter3@^3.0.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
@@ -5744,6 +6017,18 @@ execa@^0.9.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
 exenv@^1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d"
@@ -5865,6 +6150,14 @@ external-editor@^2.0.4, external-editor@^2.1.0:
     iconv-lite "^0.4.17"
     tmp "^0.0.33"
 
+external-editor@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
+  dependencies:
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
+
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
@@ -5986,7 +6279,7 @@ fetch-ponyfill@^4.0.0:
   dependencies:
     node-fetch "~1.7.1"
 
-figgy-pudding@^3.1.0, figgy-pudding@^3.5.1:
+figgy-pudding@^3.1.0, figgy-pudding@^3.2.1, figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
 
@@ -6010,7 +6303,7 @@ file-entry-cache@^2.0.0:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
 
-file-type@3.9.0, file-type@^3.6.0, file-type@^3.8.0:
+file-type@^3.6.0, file-type@^3.8.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
 
@@ -6033,10 +6326,6 @@ fileset@^2.0.2:
     glob "^7.0.3"
     minimatch "^3.0.3"
 
-filesize@3.5.11:
-  version "3.5.11"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.11.tgz#1919326749433bb3cf77368bd158caabcc19e9ee"
-
 fill-range@^2.1.0:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
@@ -6494,6 +6783,10 @@ generic-pool@~2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.0.4.tgz#f9718deda82fa125ed5c43e341c9a215a766d9a3"
 
+genfun@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/genfun/-/genfun-4.0.1.tgz#ed10041f2e4a7f1b0a38466d17a5c3e27df1dfc1"
+
 get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
@@ -6535,6 +6828,12 @@ get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
+get-stream@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  dependencies:
+    pump "^3.0.0"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -6565,6 +6864,16 @@ git-raw-commits@^1.3.6:
     split2 "^2.0.0"
     through2 "^2.0.0"
 
+git-raw-commits@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.0.tgz#d92addf74440c14bcc5c83ecce3fb7f8a79118b5"
+  dependencies:
+    dargs "^4.0.1"
+    lodash.template "^4.0.2"
+    meow "^4.0.0"
+    split2 "^2.0.0"
+    through2 "^2.0.0"
+
 git-remote-origin-url@^2.0.0:
   version "2.0.0"
   resolved "http://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
@@ -6579,6 +6888,13 @@ git-semver-tags@^1.3.6:
     meow "^4.0.0"
     semver "^5.5.0"
 
+git-semver-tags@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-2.0.0.tgz#c218fd895bdf8e8e02f6bde555b2c3893ac73cd7"
+  dependencies:
+    meow "^4.0.0"
+    semver "^5.5.0"
+
 gitconfiglocal@^1.0.0:
   version "1.0.0"
   resolved "http://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
@@ -6918,7 +7234,7 @@ handle-thing@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
 
-handlebars@4.0.11, handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.2, handlebars@^4.0.3, handlebars@^4.0.6:
+handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.2, handlebars@^4.0.3, handlebars@^4.0.6:
   version "4.0.11"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
   dependencies:
@@ -6943,7 +7259,7 @@ har-validator@~4.2.1:
     ajv "^4.9.1"
     har-schema "^1.0.5"
 
-har-validator@~5.0.2, har-validator@~5.0.3:
+har-validator@~5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
   dependencies:
@@ -6999,7 +7315,7 @@ has-to-string-tag-x@^1.2.0:
   dependencies:
     has-symbol-support-x "^1.4.1"
 
-has-unicode@^2.0.0:
+has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
 
@@ -7087,6 +7403,14 @@ hdkey@^0.7.0, hdkey@^0.7.1:
     coinstring "^2.0.0"
     secp256k1 "^3.0.1"
 
+hdkey@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/hdkey/-/hdkey-1.1.0.tgz#e74e7b01d2c47f797fa65d1d839adb7a44639f29"
+  dependencies:
+    coinstring "^2.0.0"
+    safe-buffer "^5.1.1"
+    secp256k1 "^3.0.1"
+
 he@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
@@ -7188,7 +7512,7 @@ html-entities@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
 
-htmlparser2@^3.9.0, htmlparser2@^3.9.1:
+htmlparser2@^3.9.1:
   version "3.9.2"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
   dependencies:
@@ -7199,6 +7523,10 @@ htmlparser2@^3.9.0, htmlparser2@^3.9.1:
     inherits "^2.0.1"
     readable-stream "^2.0.2"
 
+http-cache-semantics@^3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+
 http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
@@ -7229,6 +7557,13 @@ http-parser-js@>=0.4.0:
   version "0.4.11"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.11.tgz#5b720849c650903c27e521633d94696ee95f3529"
 
+http-proxy-agent@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  dependencies:
+    agent-base "4"
+    debug "3.1.0"
+
 http-proxy-middleware@~0.18.0:
   version "0.18.0"
   resolved "http://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
@@ -7245,10 +7580,6 @@ http-proxy@^1.16.2:
     eventemitter3 "1.x.x"
     requires-port "1.x.x"
 
-http-reasons@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/http-reasons/-/http-reasons-0.1.0.tgz#a953ca670078669dde142ce899401b9d6e85d3b4"
-
 http-signature@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
@@ -7265,21 +7596,23 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-httpntlm@1.7.5:
-  version "1.7.5"
-  resolved "https://registry.yarnpkg.com/httpntlm/-/httpntlm-1.7.5.tgz#cd1558ed93125418ece5bf824c1335675feedecc"
-  dependencies:
-    httpreq ">=0.4.22"
-    underscore "~1.7.0"
-
-httpreq@>=0.4.22:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/httpreq/-/httpreq-0.4.24.tgz#4335ffd82cd969668a39465c929ac61d6393627f"
-
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
 
+https-proxy-agent@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
+  dependencies:
+    agent-base "^4.1.0"
+    debug "^3.1.0"
+
+humanize-ms@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  dependencies:
+    ms "^2.0.0"
+
 humble-localstorage@^1.4.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/humble-localstorage/-/humble-localstorage-1.4.2.tgz#d05ab0d526c4edbddbf7c6a60df6ff5805283469"
@@ -7306,9 +7639,9 @@ iconv-lite@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
-iconv-lite@0.4.24:
+iconv-lite@0.4.24, iconv-lite@^0.4.24:
   version "0.4.24"
-  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
@@ -7509,16 +7842,23 @@ inquirer@^5.1.0:
     strip-ansi "^4.0.0"
     through "^2.3.6"
 
-intel@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/intel/-/intel-1.2.0.tgz#11d1147eb6b3f4582bdf5337b37d541584e9e41e"
+inquirer@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
   dependencies:
-    chalk "^1.1.0"
-    dbug "~0.4.2"
-    stack-trace "~0.0.9"
-    strftime "~0.10.0"
-    symbol "~0.3.1"
-    utcstring "~0.1.0"
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.0"
+    figures "^2.0.0"
+    lodash "^4.17.10"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^6.1.0"
+    string-width "^2.1.0"
+    strip-ansi "^4.0.0"
+    through "^2.3.6"
 
 internal-ip@^3.0.1:
   version "3.0.1"
@@ -7561,10 +7901,6 @@ ipaddr.js@^1.5.2:
   version "1.8.1"
   resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427"
 
-irregular-plurals@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.4.0.tgz#2ca9b033651111855412f16be5d77c62a458a766"
-
 is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
@@ -8453,14 +8789,14 @@ js-sha3@0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.7.tgz#0d4ffd8002d5333aabaf4a23eed2f6374c9f28e7"
 
-js-sha3@0.7.0, js-sha3@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.7.0.tgz#0a5c57b36f79882573b2d84051f8bb85dd1bd63a"
-
 js-sha3@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.3.1.tgz#86122802142f0828502a0d1dee1d95e253bb0243"
 
+js-sha3@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.7.0.tgz#0a5c57b36f79882573b2d84051f8bb85dd1bd63a"
+
 js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
@@ -8533,7 +8869,7 @@ jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
 
-json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
+json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
 
@@ -8640,10 +8976,6 @@ jsonschema@*, jsonschema@1.2.4, jsonschema@^1.2.0:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.2.4.tgz#a46bac5d3506a254465bc548876e267c6d0d6464"
 
-jsonschema@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.2.2.tgz#83ab9c63d65bf4d596f91d81195e78772f6452bc"
-
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -8836,6 +9168,28 @@ left-pad@^1.3.0:
   version "1.3.0"
   resolved "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
 
+lerna@^3.0.0-beta.25:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.4.3.tgz#501454efb453c65c305802d370ee337f7298787e"
+  dependencies:
+    "@lerna/add" "^3.4.1"
+    "@lerna/bootstrap" "^3.4.1"
+    "@lerna/changed" "^3.4.1"
+    "@lerna/clean" "^3.3.2"
+    "@lerna/cli" "^3.2.0"
+    "@lerna/create" "^3.4.1"
+    "@lerna/diff" "^3.3.0"
+    "@lerna/exec" "^3.3.2"
+    "@lerna/import" "^3.3.1"
+    "@lerna/init" "^3.3.0"
+    "@lerna/link" "^3.3.0"
+    "@lerna/list" "^3.3.2"
+    "@lerna/publish" "^3.4.3"
+    "@lerna/run" "^3.3.2"
+    "@lerna/version" "^3.4.1"
+    import-local "^1.0.0"
+    npmlog "^4.1.2"
+
 less-loader@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e"
@@ -8942,6 +9296,15 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+libnpmaccess@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-3.0.0.tgz#33cc9c8a5cb53e87d06bf2e547c2eba974f619af"
+  dependencies:
+    aproba "^2.0.0"
+    get-stream "^4.0.0"
+    npm-package-arg "^6.1.0"
+    npm-registry-fetch "^3.8.0"
+
 liftoff@^2.1.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec"
@@ -8955,10 +9318,6 @@ liftoff@^2.1.0:
     rechoir "^0.6.2"
     resolve "^1.1.7"
 
-liquid-json@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/liquid-json/-/liquid-json-0.3.1.tgz#9155a18136d8a6b2615e5f16f9a2448ab6b50eea"
-
 listr-silent-renderer@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
@@ -9162,10 +9521,6 @@ lodash.escape@^4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
 
-lodash.escaperegexp@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
-
 lodash.find@^4.3.0:
   version "4.6.0"
   resolved "https://registry.npmjs.org/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1"
@@ -9284,7 +9639,7 @@ lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-lodash.values@4.3.0, lodash.values@^4.3.0:
+lodash.values@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"
 
@@ -9294,19 +9649,11 @@ lodash.words@^3.0.0:
   dependencies:
     lodash._root "^3.0.0"
 
-lodash@4.17.10, lodash@^4.17.10:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-
-lodash@4.17.2:
-  version "4.17.2"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42"
-
-lodash@4.17.4, lodash@=4.17.4:
+lodash@=4.17.4:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
-lodash@^3.10.1, lodash@^3.3.1, lodash@^3.6.0, lodash@^3.7.0:
+lodash@^3.3.1, lodash@^3.6.0, lodash@^3.7.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
@@ -9318,6 +9665,10 @@ lodash@^4.14.0, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lo
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
+lodash@^4.17.10:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+
 lodash@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
@@ -9416,7 +9767,7 @@ lru-cache@^4.0.1, lru-cache@^4.1.1:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
-lru-cache@^4.1.3:
+lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
   dependencies:
@@ -9457,6 +9808,22 @@ make-error@^1.1.1:
   version "1.3.4"
   resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.4.tgz#19978ed575f9e9545d2ff8c13e33b5d18a67d535"
 
+make-fetch-happen@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083"
+  dependencies:
+    agentkeepalive "^3.4.1"
+    cacache "^11.0.1"
+    http-cache-semantics "^3.8.1"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+    lru-cache "^4.1.2"
+    mississippi "^3.0.0"
+    node-fetch-npm "^2.0.2"
+    promise-retry "^1.1.1"
+    socks-proxy-agent "^4.0.0"
+    ssri "^6.0.0"
+
 make-iterator@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
@@ -9715,26 +10082,10 @@ miller-rabin@^4.0.0:
   version "1.33.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
 
-mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-
 mime-db@~1.35.0:
   version "1.35.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.35.0.tgz#0569d657466491283709663ad379a99b90d9ab47"
 
-mime-format@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mime-format/-/mime-format-2.0.0.tgz#e29f8891e284d78270246f0050d6834bdbbe1332"
-  dependencies:
-    charset "^1.0.0"
-
-mime-types@2.1.17:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
-  dependencies:
-    mime-db "~1.30.0"
-
 mime-types@^2.1.12, mime-types@^2.1.16, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7:
   version "2.1.18"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
@@ -9970,6 +10321,10 @@ ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
+ms@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+
 multicast-dns-service-types@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
@@ -10075,33 +10430,6 @@ neo-async@^2.5.0:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee"
 
-newman@^3.9.3:
-  version "3.9.3"
-  resolved "https://registry.yarnpkg.com/newman/-/newman-3.9.3.tgz#939356026942474ba15482bd37a15c60bb200ca0"
-  dependencies:
-    async "2.6.0"
-    cli-progress "1.7.0"
-    cli-table2 "0.2.0"
-    colors "1.1.2"
-    commander "2.13.0"
-    csv-parse "1.2.4"
-    eventemitter3 "3.0.0"
-    filesize "3.5.11"
-    handlebars "4.0.11"
-    lodash "4.17.2"
-    mkdirp "0.5.1"
-    parse-json "3.0.0"
-    postman-collection "3.0.7"
-    postman-collection-transformer "2.5.4"
-    postman-request "2.81.1-postman.4"
-    postman-runtime "7.1.3"
-    pretty-ms "3.1.0"
-    semver "5.5.0"
-    serialised-error "1.1.2"
-    shelljs "0.8.0"
-    word-wrap "1.2.3"
-    xmlbuilder "9.0.4"
-
 next-tick@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
@@ -10126,26 +10454,20 @@ no-case@^2.2.0, no-case@^2.3.2:
   dependencies:
     lower-case "^1.1.1"
 
-nock@^9.2.3:
-  version "9.2.5"
-  resolved "https://registry.yarnpkg.com/nock/-/nock-9.2.5.tgz#c131fc8d3c4723f386be0269739638be84733f2f"
-  dependencies:
-    chai "^4.1.2"
-    debug "^3.1.0"
-    deep-equal "^1.0.0"
-    json-stringify-safe "^5.0.1"
-    lodash "^4.17.5"
-    mkdirp "^0.5.0"
-    propagate "^1.0.0"
-    qs "^6.5.1"
-    semver "^5.5.0"
-
 node-abi@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.3.0.tgz#f3d554d6ac72a9ee16f0f4dc9548db7c08de4986"
   dependencies:
     semver "^5.4.1"
 
+node-fetch-npm@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
+  dependencies:
+    encoding "^0.1.11"
+    json-parse-better-errors "^1.0.0"
+    safe-buffer "^5.1.1"
+
 node-fetch@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.1.tgz#369ca70b82f50c86496104a6c776d274f4e4a2d4"
@@ -10227,12 +10549,6 @@ node-notifier@^5.2.1:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-oauth1@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/node-oauth1/-/node-oauth1-1.2.2.tgz#fffb2813a88c2770711332ad0e5487b4927644a4"
-  dependencies:
-    crypto-js "3.1.9-1"
-
 node-pre-gyp@^0.10.0:
   version "0.10.3"
   resolved "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
@@ -10264,10 +10580,6 @@ node-pre-gyp@^0.6.39:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
-node-uuid@^1.4.7:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
-
 nodemon@^1.11.0:
   version "1.17.3"
   resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.17.3.tgz#3b0bbc2ee05ccb43b1aef15ba05c63c7bc9b8530"
@@ -10320,7 +10632,7 @@ nopt@~1.0.10:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, "normalize-package-data@~1.0.1 || ^2.0.0":
+normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, "normalize-package-data@~1.0.1 || ^2.0.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   dependencies:
@@ -10382,7 +10694,7 @@ npm-lifecycle@^2.0.0:
     hosted-git-info "^2.1.5"
     semver "^5.1.0"
 
-"npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0:
+"npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
   version "6.1.0"
   resolved "http://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
   dependencies:
@@ -10391,6 +10703,13 @@ npm-lifecycle@^2.0.0:
     semver "^5.5.0"
     validate-npm-package-name "^3.0.0"
 
+npm-packlist@^1.1.10:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a"
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
 npm-packlist@^1.1.6:
   version "1.1.11"
   resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
@@ -10398,6 +10717,13 @@ npm-packlist@^1.1.6:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
+npm-pick-manifest@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.1.0.tgz#dc381bdd670c35d81655e1d5a94aa3dd4d87fce5"
+  dependencies:
+    npm-package-arg "^6.0.0"
+    semver "^5.4.1"
+
 npm-registry-client@7.0.9:
   version "7.0.9"
   resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-7.0.9.tgz#1baf86ee5285c4e6d38d4556208ded56049231bb"
@@ -10417,6 +10743,17 @@ npm-registry-client@7.0.9:
   optionalDependencies:
     npmlog "~2.0.0"
 
+npm-registry-fetch@^3.0.0, npm-registry-fetch@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.8.0.tgz#aa7d9a7c92aff94f48dba0984bdef4bd131c88cc"
+  dependencies:
+    JSONStream "^1.3.4"
+    bluebird "^3.5.1"
+    figgy-pudding "^3.4.1"
+    lru-cache "^4.1.3"
+    make-fetch-happen "^4.0.1"
+    npm-package-arg "^6.1.0"
+
 npm-run-all@^4.1.2, npm-run-all@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.3.tgz#49f15b55a66bb4101664ce270cb18e7103f8f185"
@@ -10539,10 +10876,6 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-hash@^1.1.2:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.0.tgz#76d9ba6ff113cf8efc0d996102851fe6723963e2"
-
 object-inspect@^1.6.0:
   version "1.6.0"
   resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
@@ -10863,6 +11196,10 @@ p-map@^1.1.1, p-map@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
 
+p-pipe@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-1.2.0.tgz#4b1a11399a11520a67790ee5a0c1d5881d6befe9"
+
 p-reduce@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
@@ -10896,6 +11233,38 @@ package-json@^4.0.0, package-json@^4.0.1:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
+pacote@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.1.0.tgz#59810859bbd72984dcb267269259375d32f391e5"
+  dependencies:
+    bluebird "^3.5.1"
+    cacache "^11.0.2"
+    figgy-pudding "^3.2.1"
+    get-stream "^3.0.0"
+    glob "^7.1.2"
+    lru-cache "^4.1.3"
+    make-fetch-happen "^4.0.1"
+    minimatch "^3.0.4"
+    minipass "^2.3.3"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    normalize-package-data "^2.4.0"
+    npm-package-arg "^6.1.0"
+    npm-packlist "^1.1.10"
+    npm-pick-manifest "^2.1.0"
+    npm-registry-fetch "^3.0.0"
+    osenv "^0.1.5"
+    promise-inflight "^1.0.1"
+    promise-retry "^1.1.1"
+    protoduck "^5.0.0"
+    rimraf "^2.6.2"
+    safe-buffer "^5.1.2"
+    semver "^5.5.0"
+    ssri "^6.0.0"
+    tar "^4.4.3"
+    unique-filename "^1.1.0"
+    which "^1.3.0"
+
 pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
@@ -10963,12 +11332,6 @@ parse-headers@^2.0.0:
     for-each "^0.3.2"
     trim "0.0.1"
 
-parse-json@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-3.0.0.tgz#fa6f47b18e23826ead32f263e744d0e1e847fb13"
-  dependencies:
-    error-ex "^1.3.1"
-
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
@@ -10982,10 +11345,6 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
-parse-ms@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-1.0.1.tgz#56346d4749d78f23430ca0c713850aef91aa361d"
-
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
@@ -11175,12 +11534,6 @@ pkginfo@0.x.x:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff"
 
-plur@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
-  dependencies:
-    irregular-plurals "^1.0.0"
-
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
@@ -11465,117 +11818,6 @@ postcss@^6.0.1:
     source-map "^0.6.1"
     supports-color "^5.3.0"
 
-postman-collection-transformer@2.5.4:
-  version "2.5.4"
-  resolved "https://registry.yarnpkg.com/postman-collection-transformer/-/postman-collection-transformer-2.5.4.tgz#4e715a9913340621a9fc0e9a5a0373b22e9a9d9a"
-  dependencies:
-    commander "2.12.2"
-    inherits "2.0.3"
-    intel "1.2.0"
-    lodash "4.17.4"
-    semver "5.4.1"
-    strip-json-comments "2.0.1"
-
-postman-collection@3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/postman-collection/-/postman-collection-3.0.6.tgz#3bc2307158a783964a473cac82f20d26ffdf5500"
-  dependencies:
-    "8fold-marked" "0.3.9"
-    escape-html "1.0.3"
-    file-type "3.9.0"
-    http-reasons "0.1.0"
-    iconv-lite "0.4.19"
-    liquid-json "0.3.1"
-    lodash "4.17.4"
-    mime-format "2.0.0"
-    mime-types "2.1.17"
-    postman-url-encoder "1.0.1"
-    sanitize-html "1.15.0"
-    semver "5.4.1"
-    uuid "3.1.0"
-
-postman-collection@3.0.7:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/postman-collection/-/postman-collection-3.0.7.tgz#699496583ff61443da8a4e0314e58ee6d10442a3"
-  dependencies:
-    "8fold-marked" "0.3.9"
-    escape-html "1.0.3"
-    file-type "3.9.0"
-    http-reasons "0.1.0"
-    iconv-lite "0.4.19"
-    liquid-json "0.3.1"
-    lodash "4.17.4"
-    mime-format "2.0.0"
-    mime-types "2.1.17"
-    postman-url-encoder "1.0.1"
-    sanitize-html "1.15.0"
-    semver "5.4.1"
-    uuid "3.1.0"
-
-postman-request@2.81.1-postman.4:
-  version "2.81.1-postman.4"
-  resolved "https://registry.yarnpkg.com/postman-request/-/postman-request-2.81.1-postman.4.tgz#be8f60541539da13739d77b670b9fca6f1aecf83"
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.2.1"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~5.0.2"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    performance-now "^0.2.0"
-    postman-url-encoder "1.0.1"
-    qs "~6.4.0"
-    safe-buffer "^5.0.1"
-    stream-length "^1.0.2"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.0.0"
-
-postman-runtime@7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/postman-runtime/-/postman-runtime-7.1.3.tgz#e0c5dfc40dd7d39a2f71519705c97afde35d6f8c"
-  dependencies:
-    async "2.6.0"
-    aws4 "1.6.0"
-    btoa "1.1.2"
-    crypto-js "3.1.9-1"
-    eventemitter3 "3.0.0"
-    hawk "3.1.3"
-    http-reasons "0.1.0"
-    httpntlm "1.7.5"
-    inherits "2.0.3"
-    lodash "4.17.4"
-    node-oauth1 "1.2.2"
-    postman-collection "3.0.6"
-    postman-request "2.81.1-postman.4"
-    postman-sandbox "3.0.4"
-    resolve-from "4.0.0"
-    serialised-error "1.1.2"
-    uuid "3.1.0"
-
-postman-sandbox@3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/postman-sandbox/-/postman-sandbox-3.0.4.tgz#d011b50d3ec8a8075405d219e1659dbdec354997"
-  dependencies:
-    inherits "2.0.3"
-    lodash "4.17.4"
-    uuid "3.1.0"
-    uvm "1.7.0"
-
-postman-url-encoder@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/postman-url-encoder/-/postman-url-encoder-1.0.1.tgz#a094a42e9415ff0bbfdce0eaa8e6011d449ee83c"
-
 prebuild-install@^2.2.2:
   version "2.5.3"
   resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.5.3.tgz#9f65f242782d370296353710e9bc843490c19f69"
@@ -11640,13 +11882,6 @@ pretty-hrtime@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
 
-pretty-ms@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-3.1.0.tgz#e9cac9c76bf6ee52fe942dd9c6c4213153b12881"
-  dependencies:
-    parse-ms "^1.0.0"
-    plur "^2.1.2"
-
 prismjs@^1.15.0:
   version "1.15.0"
   resolved "https://registry.npmjs.org/prismjs/-/prismjs-1.15.0.tgz#8801d332e472091ba8def94976c8877ad60398d9"
@@ -11684,6 +11919,13 @@ promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
 
+promise-retry@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
+  dependencies:
+    err-code "^1.0.0"
+    retry "^0.10.0"
+
 promise-to-callback@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/promise-to-callback/-/promise-to-callback-1.0.0.tgz#5d2a749010bfb67d963598fcd3960746a68feef7"
@@ -11740,14 +11982,16 @@ prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8,
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
-propagate@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/propagate/-/propagate-1.0.0.tgz#00c2daeedda20e87e3782b344adba1cddd6ad709"
-
 proto-list@~1.2.1:
   version "1.2.4"
   resolved "http://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
 
+protoduck@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.0.tgz#752145e6be0ad834cb25716f670a713c860dce70"
+  dependencies:
+    genfun "^4.0.1"
+
 proxy-addr@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341"
@@ -11901,7 +12145,7 @@ q@^1.1.2, q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
 
-qs@6.5.1, qs@^6.5.1, qs@~6.5.1:
+qs@6.5.1, qs@~6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
 
@@ -12183,9 +12427,9 @@ react-router@^4.2.0:
     prop-types "^15.5.4"
     warning "^3.0.0"
 
-react-scroll@0xproject/react-scroll#similar-to-pr-330:
+react-scroll@0xproject/react-scroll#similar-to-pr-330-but-with-replace-state:
   version "1.7.10"
-  resolved "https://codeload.github.com/0xproject/react-scroll/tar.gz/f28a6c51800152fde11e7362383992aa60a15703"
+  resolved "https://codeload.github.com/0xproject/react-scroll/tar.gz/0f625b270d7e966313cac8b811c0ae807b37e170"
   dependencies:
     lodash.throttle "^4.1.1"
     prop-types "^15.5.8"
@@ -12502,6 +12746,10 @@ redux-devtools-extension@^2.13.2:
   version "2.13.2"
   resolved "https://registry.yarnpkg.com/redux-devtools-extension/-/redux-devtools-extension-2.13.2.tgz#e0f9a8e8dfca7c17be92c7124958a3b94eb2911d"
 
+redux-devtools-extension@^2.13.5:
+  version "2.13.5"
+  resolved "https://registry.yarnpkg.com/redux-devtools-extension/-/redux-devtools-extension-2.13.5.tgz#3ff34f7227acfeef3964194f5f7fc2765e5c5a39"
+
 redux@*, redux@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.0.tgz#aa698a92b729315d22b34a0553d7e6533555cc03"
@@ -12787,10 +13035,6 @@ require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
 
-require-from-string@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.1.tgz#c545233e9d7da6616e9d59adfb39fc9f588676ff"
-
 require-from-string@^1.1.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
@@ -12831,10 +13075,6 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
 
-resolve-from@4.0.0, resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-
 resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
@@ -12847,6 +13087,10 @@ resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
 
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+
 resolve-options@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131"
@@ -12901,6 +13145,10 @@ ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
 
+retry@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
+
 retry@^0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.8.0.tgz#2367628dc0edb247b1eab649dc53ac8628ac2d5f"
@@ -13033,6 +13281,12 @@ rxjs@^5.5.2:
   dependencies:
     symbol-observable "1.0.1"
 
+rxjs@^6.1.0:
+  version "6.3.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
@@ -13070,15 +13324,6 @@ sane@^2.0.0:
   optionalDependencies:
     fsevents "^1.2.3"
 
-sanitize-html@1.15.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.15.0.tgz#d101a62c9fe0347486badc6cd6ed72daa0a82ced"
-  dependencies:
-    htmlparser2 "^3.9.0"
-    lodash.escaperegexp "^4.1.2"
-    srcset "^1.0.0"
-    xtend "^4.0.0"
-
 sax@1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
@@ -13119,10 +13364,6 @@ scrypt-async@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/scrypt-async/-/scrypt-async-1.3.1.tgz#a11fd6fac981b4b823ee01dee0221169500ddae9"
 
-scrypt-js@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-2.0.3.tgz#bb0040be03043da9a012a2cea9fc9f852cfc87d4"
-
 scrypt-js@2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-2.0.4.tgz#32f8c5149f0797672e551c07e230f834b6af5f16"
@@ -13212,7 +13453,7 @@ semver-sort@0.0.4:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
 
-"semver@2 || 3 || 4 || 5", semver@5.4.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@~5.4.1:
+"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@~5.4.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
@@ -13261,14 +13502,6 @@ sequencify@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c"
 
-serialised-error@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/serialised-error/-/serialised-error-1.1.2.tgz#b5c3822196f873feb0c76587e1d6dfa6790ade97"
-  dependencies:
-    node-uuid "^1.4.7"
-    object-hash "^1.1.2"
-    stack-trace "0.0.9"
-
 serialize-javascript@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
@@ -13390,14 +13623,6 @@ shell-quote@^1.4.3, shell-quote@^1.6.1:
     array-reduce "~0.0.0"
     jsonify "~0.0.0"
 
-shelljs@0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.0.tgz#12f561c52ec5d0d3315af15616c011a18ff80d59"
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
 shelljs@^0.7.3:
   version "0.7.8"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
@@ -13498,6 +13723,10 @@ slugify@^1.2.1:
   version "1.3.1"
   resolved "https://registry.npmjs.org/slugify/-/slugify-1.3.1.tgz#f572127e8535329fbc6c1edb74ab856b61ad7de2"
 
+smart-buffer@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3"
+
 snake-case@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f"
@@ -13561,15 +13790,19 @@ sockjs@0.3.19:
     faye-websocket "^0.10.0"
     uuid "^3.0.1"
 
-solc@0.4.23, solc@^0.4.23:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.23.tgz#54a0ff4015827b32fddb62c0a418b5247310a58e"
+socks-proxy-agent@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
   dependencies:
-    fs-extra "^0.30.0"
-    memorystream "^0.3.1"
-    require-from-string "^1.1.0"
-    semver "^5.3.0"
-    yargs "^4.7.1"
+    agent-base "~4.2.0"
+    socks "~2.2.0"
+
+socks@~2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.1.tgz#68ad678b3642fbc5d99c64c165bc561eab0215f9"
+  dependencies:
+    ip "^1.1.5"
+    smart-buffer "^4.0.1"
 
 solc@0.4.24, solc@^0.4.24:
   version "0.4.24"
@@ -13591,6 +13824,16 @@ solc@^0.4.2:
     semver "^5.3.0"
     yargs "^4.7.1"
 
+solc@^0.4.23:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.23.tgz#54a0ff4015827b32fddb62c0a418b5247310a58e"
+  dependencies:
+    fs-extra "^0.30.0"
+    memorystream "^0.3.1"
+    require-from-string "^1.1.0"
+    semver "^5.3.0"
+    yargs "^4.7.1"
+
 solhint@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/solhint/-/solhint-1.2.1.tgz#59a1416cef94da38d587f768a73536d6e3403dd3"
@@ -13785,13 +14028,6 @@ sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
-srcset@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/srcset/-/srcset-1.0.0.tgz#a5669de12b42f3b1d5e83ed03c71046fc48f41ef"
-  dependencies:
-    array-uniq "^1.0.2"
-    number-is-nan "^1.0.0"
-
 sshpk@^1.7.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb"
@@ -13818,11 +14054,7 @@ ssri@^6.0.0:
   dependencies:
     figgy-pudding "^3.5.1"
 
-stack-trace@0.0.9:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.9.tgz#a8f6eaeca90674c333e7c43953f275b451510695"
-
-stack-trace@0.0.x, stack-trace@~0.0.9:
+stack-trace@0.0.x:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
 
@@ -13895,12 +14127,6 @@ stream-http@^2.7.2:
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
-stream-length@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/stream-length/-/stream-length-1.0.2.tgz#8277f3cbee49a4daabcfdb4e2f4a9b5e9f2c9f00"
-  dependencies:
-    bluebird "^2.6.2"
-
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
@@ -13916,10 +14142,6 @@ stream-to-pull-stream@^1.7.1:
     looper "^3.0.0"
     pull-stream "^3.2.3"
 
-strftime@~0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/strftime/-/strftime-0.10.0.tgz#b3f0fa419295202a5a289f6d6be9f4909a617193"
-
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
@@ -14047,7 +14269,7 @@ strip-indent@^2.0.0:
   version "2.0.0"
   resolved "http://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
 
-strip-json-comments@2.0.1, strip-json-comments@~2.0.1:
+strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
@@ -14061,6 +14283,15 @@ strong-log-transformer@^1.0.6:
     moment "^2.6.0"
     through "^2.3.4"
 
+strong-log-transformer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.0.0.tgz#fa6d8e0a9e62b3c168c3cad5ae5d00dc97ba26cc"
+  dependencies:
+    byline "^5.0.0"
+    duplexer "^0.1.1"
+    minimist "^1.2.0"
+    through "^2.3.4"
+
 style-loader@0.23.x:
   version "0.23.0"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.0.tgz#8377fefab68416a2e05f1cabd8c3a3acfcce74f1"
@@ -14231,10 +14462,6 @@ symbol-tree@^3.2.2:
   version "3.2.2"
   resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
-symbol@~0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/symbol/-/symbol-0.3.1.tgz#b6f9a900d496a57f02408f22198c109dda063041"
-
 table@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
@@ -14321,9 +14548,9 @@ tar@^2.0.0, tar@^2.1.1, tar@^2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
-tar@^4:
+tar@^4, tar@^4.4.3:
   version "4.4.6"
-  resolved "https://registry.npmjs.org/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
   dependencies:
     chownr "^1.0.1"
     fs-minipass "^1.2.5"
@@ -15007,10 +15234,6 @@ underscore@~1.4.4:
   version "1.4.4"
   resolved "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"
 
-underscore@~1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
-
 unherit@^1.0.4:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.0.tgz#6b9aaedfbf73df1756ad9e316dd981885840cd7d"
@@ -15216,10 +15439,6 @@ user-home@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
 
-utcstring@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/utcstring/-/utcstring-0.1.0.tgz#430fd510ab7fc95b5d5910c902d79880c208436b"
-
 utf8@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.1.tgz#2e01db02f7d8d0944f77104f1609eb0c304cf768"
@@ -15228,6 +15447,10 @@ utf8@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.2.tgz#1fa0d9270e9be850d9b05027f63519bf46457d96"
 
+utf8@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz#f052eed1364d696e769ef058b183df88c87f69d1"
+
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -15264,7 +15487,7 @@ uuid@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.1.tgz#c2a30dedb3e535d72ccf82e343941a50ba8533ac"
 
-uuid@3.0.1, uuid@3.0.x, uuid@~3.0.0:
+uuid@3.0.x, uuid@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
 
@@ -15284,15 +15507,6 @@ uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
 
-uvm@1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/uvm/-/uvm-1.7.0.tgz#685d3a149ec7118fb73a73dfdc158ab46b0f0634"
-  dependencies:
-    circular-json "0.3.1"
-    inherits "2.0.3"
-    lodash "4.17.4"
-    uuid "3.0.1"
-
 v8-compile-cache@^2.0.2:
   version "2.0.2"
   resolved "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
@@ -15303,7 +15517,7 @@ v8flags@^2.0.2:
   dependencies:
     user-home "^1.1.1"
 
-valid-url@1.0.9, valid-url@^1.0.9:
+valid-url@^1.0.9:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200"
 
@@ -15509,14 +15723,6 @@ web3-bzz@1.0.0-beta.34:
     swarm-js "0.1.37"
     underscore "1.8.3"
 
-web3-core-helpers@1.0.0-beta.33:
-  version "1.0.0-beta.33"
-  resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.33.tgz#2af733e504db05e7c3648c1dacf577b0ec15dc43"
-  dependencies:
-    underscore "1.8.3"
-    web3-eth-iban "1.0.0-beta.33"
-    web3-utils "1.0.0-beta.33"
-
 web3-core-helpers@1.0.0-beta.34:
   version "1.0.0-beta.34"
   resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.34.tgz#b168da00d3e19e156bc15ae203203dd4dfee2d03"
@@ -15569,15 +15775,6 @@ web3-core@1.0.0-beta.34:
     web3-core-requestmanager "1.0.0-beta.34"
     web3-utils "1.0.0-beta.34"
 
-web3-eth-abi@1.0.0-beta.33:
-  version "1.0.0-beta.33"
-  resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.33.tgz#2221f7151643660032a4df340f612349168c824a"
-  dependencies:
-    bn.js "4.11.6"
-    underscore "1.8.3"
-    web3-core-helpers "1.0.0-beta.33"
-    web3-utils "1.0.0-beta.33"
-
 web3-eth-abi@1.0.0-beta.34, web3-eth-abi@^1.0.0-beta.24:
   version "1.0.0-beta.34"
   resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.34.tgz#034533e3aa2f7e59ff31793eaea685c0ed5af67a"
@@ -15615,13 +15812,6 @@ web3-eth-contract@1.0.0-beta.34:
     web3-eth-abi "1.0.0-beta.34"
     web3-utils "1.0.0-beta.34"
 
-web3-eth-iban@1.0.0-beta.33:
-  version "1.0.0-beta.33"
-  resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.33.tgz#1d73d0c5288a4565b1754a75b5fb3ea0b77a532f"
-  dependencies:
-    bn.js "4.11.6"
-    web3-utils "1.0.0-beta.33"
-
 web3-eth-iban@1.0.0-beta.34:
   version "1.0.0-beta.34"
   resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.34.tgz#9af458605867ccf74ea979aaf326b38ba6a5ba0c"
@@ -15752,18 +15942,6 @@ web3-typescript-typings@^0.10.2:
   dependencies:
     bignumber.js "~4.1.0"
 
-web3-utils@1.0.0-beta.33:
-  version "1.0.0-beta.33"
-  resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.33.tgz#e091b7994f09b714b0198a4057d3ad2eb8cbe238"
-  dependencies:
-    bn.js "4.11.6"
-    eth-lib "0.1.27"
-    ethjs-unit "0.1.6"
-    number-to-bn "1.7.0"
-    randomhex "0.1.5"
-    underscore "1.8.3"
-    utf8 "2.1.1"
-
 web3-utils@1.0.0-beta.34:
   version "1.0.0-beta.34"
   resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.34.tgz#9411fc39aaef39ca4e06169f762297d9ff020970"
@@ -15786,16 +15964,6 @@ web3@0.20.2:
     xhr2 "*"
     xmlhttprequest "*"
 
-web3@0.20.6:
-  version "0.20.6"
-  resolved "https://registry.yarnpkg.com/web3/-/web3-0.20.6.tgz#3e97306ae024fb24e10a3d75c884302562215120"
-  dependencies:
-    bignumber.js "git+https://github.com/frozeman/bignumber.js-nolookahead.git"
-    crypto-js "^3.1.4"
-    utf8 "^2.1.1"
-    xhr2 "*"
-    xmlhttprequest "*"
-
 web3@^0.18.0:
   version "0.18.4"
   resolved "https://registry.yarnpkg.com/web3/-/web3-0.18.4.tgz#81ec1784145491f2eaa8955b31c06049e07c5e7d"
@@ -16065,10 +16233,6 @@ winston@2.1.x:
     pkginfo "0.3.x"
     stack-trace "0.0.x"
 
-word-wrap@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
@@ -16230,10 +16394,6 @@ xml2js@0.4.19:
     sax ">=0.6.0"
     xmlbuilder "~9.0.1"
 
-xmlbuilder@9.0.4:
-  version "9.0.4"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.4.tgz#519cb4ca686d005a8420d3496f3f0caeecca580f"
-
 xmlbuilder@~9.0.1:
   version "9.0.7"
   resolved "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"