Merge branch 'development'

* development: (939 commits)
  Add asset-buyer to published packages section in README
  Publish
  Updated CHANGELOGS
  Update BuyQuote interface
  force re-build
  Add website build to instructions
  Revert format and re-add changes
  Build website in parallel with other tests since no other test relies on it being built to run
  Add back sourceMap support for both dev/prod
  Upgrade webpack
  Add missing default options
  Remove unused constants
  Add fee order with a takerFee
  Add additional order factory methods and refactor test to use them
  Add comments about buy quote calculation
  Update CHANGELOG
  Fix linter
  Add additional test for slippage
  Add buy_quote_calculator_test
  Add 0x Instant to bundle analysis
  ...

Author: BMillman19

.circleci/config.yml

@@ -2,6 +2,7 @@ version: 2
 
 jobs:
   build:
+    resource_class: medium+
     docker:
       - image: circleci/node:9
     environment:
@@ -10,31 +11,26 @@ jobs:
     steps:
       - checkout
       - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV
-      - restore_cache:
-          name: Restore Yarn Package Cache
-          keys:
-            - yarn-packages-{{ .Branch }}-{{ checksum "yarn.lock" }}
-            - yarn-packages-{{ .Branch }}
-            - yarn-packages-master
-            - yarn-packages-
+      - run:
+          name: install-yarn
+          command: sudo npm install --global [email protected]
       - run:
           name: yarn
-          command: yarn --frozen-lockfile install
-      - save_cache:
-          name: Save Yarn Package Cache
-          key: yarn-packages-{{ .Branch }}-{{ checksum "yarn.lock" }}
-          paths:
-            - node_modules/
-      - run: >
-            if [ -z "$(git diff --name-only v2-prototype packages/website)" ]; then
-                yarn build --exclude website
-            else
-                yarn build
-            fi
+          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:
+    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
@@ -47,7 +43,7 @@ jobs:
   test-contracts-geth:
     docker:
       - image: circleci/node:9
-      - image: albrow/0x-devnet
+      - image: 0xorg/devnet
     working_directory: ~/repo
     steps:
       - restore_cache:
@@ -57,15 +53,25 @@ jobs:
       # initialized
       - run: sleep 10 && TEST_PROVIDER=geth yarn wsrun test contracts
   test-publish:
+    resource_class: medium+
     docker:
       - image: circleci/node:9
-      - image: verdaccio/verdaccio
+      - 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
@@ -74,7 +80,6 @@ jobs:
       - restore_cache:
           keys:
             - repo-{{ .Environment.CIRCLE_SHA1 }}
-      - run: yarn wsrun test:circleci 0x.js
       - run: yarn wsrun test:circleci @0xproject/abi-gen
       - run: yarn wsrun test:circleci @0xproject/assert
       - run: yarn wsrun test:circleci @0xproject/base-contract
@@ -87,14 +92,11 @@ jobs:
       - 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
-      - save_cache:
-          key: coverage-0xjs-{{ .Environment.CIRCLE_SHA1 }}
-          paths:
-            - ~/repo/packages/0x.js/coverage/lcov.info
       - save_cache:
           key: coverage-abi-gen-{{ .Environment.CIRCLE_SHA1 }}
           paths:
@@ -143,6 +145,10 @@ jobs:
           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:
@@ -163,8 +169,10 @@ jobs:
       - restore_cache:
           keys:
             - repo-{{ .Environment.CIRCLE_SHA1 }}
-      - run: yarn prettier:ci
       - run: yarn lerna run lint
+      - run: yarn prettier:ci
+      - run: cd packages/0x.js && yarn build:umd:prod
+      - run: yarn bundlesize
   submit-coverage:
     docker:
       - image: circleci/node:9
@@ -173,9 +181,6 @@ jobs:
       - restore_cache:
           keys:
             - repo-{{ .Environment.CIRCLE_SHA1 }}
-      - restore_cache:
-          keys:
-            - coverage-0xjs-{{ .Environment.CIRCLE_SHA1 }}
       - restore_cache:
           keys:
             - coverage-abi-gen-{{ .Environment.CIRCLE_SHA1 }}
@@ -212,6 +217,9 @@ jobs:
       - 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 }}
@@ -230,6 +238,9 @@ workflows:
   main:
     jobs:
       - build
+      - build-website:
+          requires:
+            - build
       - test-contracts-ganache:
           requires:
             - build
@@ -245,6 +256,9 @@ workflows:
       - test-publish:
           requires:
             - build
+      - test-doc-generation:
+          requires:
+            - build
       - submit-coverage:
           requires:
             - test-rest

.gitignore

@@ -84,6 +84,11 @@ packages/order-watcher/test/artifacts/
 packages/contract-wrappers/test/artifacts/
 packages/contract-wrappers/src/artifacts/
 packages/order-watcher/src/artifacts/
+packages/0x.js/src/artifacts/
+packages/order-utils/src/artifacts/
+
+# unstable generated contract artifacts:
+packages/migrations/artifacts/development/
 
 # generated contract watcher
 packages/0x.js/src/generated_contract_wrappers/
@@ -94,8 +99,9 @@ packages/fill-scenarios/src/generated_contract_wrappers/
 packages/order-watcher/src/generated_contract_wrappers/
 packages/order-utils/src/generated_contract_wrappers/
 packages/migrations/src/1.0.0/contract_wrappers
+packages/migrations/src/2.0.0-testnet/contract_wrappers
 packages/migrations/src/2.0.0/contract_wrappers
-packages/migrations/src/2.0.0-beta-testnet/contract_wrappers
+packages/migrations/src/development/contract_wrappers
 
 # solc-bin in sol-compiler
 packages/sol-compiler/solc_bin/

.prettierignore

@@ -8,18 +8,20 @@ lib
 /packages/order-watcher/src/generated_contract_wrappers/
 /packages/order-utils/src/generated_contract_wrappers/
 /packages/migrations/src/1.0.0/contract_wrappers
+/packages/migrations/src/2.0.0-testnet/contract_wrappers
 /packages/migrations/src/2.0.0/contract_wrappers
-/packages/migrations/src/2.0.0-beta-testnet/contract_wrappers
 /packages/0x.js/src/artifacts
 /packages/contracts/src/artifacts
 /packages/contract-wrappers/src/artifacts
 /packages/order-watcher/src/artifacts
 /packages/metacoin/artifacts
-/packages/sra-api/public/
+/packages/sra-spec/public/
 /packages/contract-wrappers/test/artifacts
 /packages/order-watcher/test/artifacts
 /packages/migrations/artifacts/1.0.0
+/packages/migrations/artifacts/2.0.0-testnet
 /packages/migrations/artifacts/2.0.0
-/packages/migrations/artifacts/2.0.0-beta-testnet
+/packages/migrations/artifacts/development
 package.json
 scripts/postpublish_utils.js
+packages/sol-cov/test/fixtures/artifacts

CODEOWNERS

@@ -0,0 +1,8 @@
+# See https://help.github.com/articles/about-codeowners/
+# for more info about CODEOWNERS file
+
+# It uses the same pattern rule for gitignore file
+# https://git-scm.com/docs/gitignore#_pattern_format
+
+# Website
+packages/website/  @BMillman19 @fragosti

README.md

@@ -8,7 +8,7 @@ This repository is a monorepo including the 0x protocol smart contracts and nume
 
 If you're developing on 0x now or are interested in using 0x infrastructure in the future, please join our [developer mailing list][dev-mailing-list-url] for updates.
 
-[website-url]: https://0xproject.com/
+[website-url]: https://0xproject.com
 [whitepaper-url]: https://0xproject.com/pdfs/0x_white_paper.pdf
 [dev-mailing-list-url]: http://eepurl.com/dx4cPf
 
@@ -25,16 +25,19 @@ If you're developing on 0x now or are interested in using 0x infrastructure in t
 | [`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/assert`](/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/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/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/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/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                                                                                                  |
@@ -68,7 +71,7 @@ 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 @0xproject/typescript-typings package to your [`typeRoots`](http://www.typescriptlang.org/docs/handbook/tsconfig-json.html) config.
+You can include those by prepending the `@0xproject/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"],
@@ -82,13 +85,7 @@ We strongly recommend that the community help us make improvements and determine
 
 ### Install dependencies
 
-Make sure you are using Yarn v1.6. To install using brew:
-
-```
-brew unlink yarn
-brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/76215230de5f7f7bee2cfcdd7185cf49d949862d/Formula/yarn.rb
-brew switch yarn 1.6.0_1
-```
+Make sure you are using Yarn v1.9.4. To install using brew:
 
 Then install dependencies