Merge branch 'master' into subscribe-token

README.md

@@ -7,9 +7,10 @@
 This repository contains a Javascript library that makes it easy to build Relayers and other DApps that use the 0x protocol.
 
 [![CircleCI](https://circleci.com/gh/0xProject/0x.js.svg?style=svg&circle-token=61bf7cd8c9b4e11b132089dfcffdd1be277d1e0c)](https://circleci.com/gh/0xProject/0x.js)
+[![npm version](https://badge.fury.io/js/0x.js.svg)](https://badge.fury.io/js/0x.js)
 [![Coverage Status](https://coveralls.io/repos/github/0xProject/0x.js/badge.svg?branch=master&t=fp0cXD)](https://coveralls.io/github/0xProject/0x.js?branch=master)
 [![Slack Status](http://slack.0xProject.com/badge.svg)](http://slack.0xProject.com)
-[![Join the chat at https://gitter.im/0xProject/contracts](https://badges.gitter.im/0xProject/contracts.svg)](https://gitter.im/0xProject/contracts?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join the chat at https://gitter.im/0xProject/Lobby](https://badges.gitter.im/0xProject/Lobby.svg)](https://gitter.im/0xProject/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Greenkeeper badge](https://badges.greenkeeper.io/0xProject/0x.js.svg?token=7c22e5c72acf39d3ead8d29c5d9bb38f9096df3e643024dcedd53ab732847be1&ts=1496426342666)](https://greenkeeper.io/)
 

circle.yml

@@ -1,13 +1,15 @@
 machine:
   node:
     version: 6.1.0
+  environment:
+      CONTRACTS_COMMIT_HASH: cd04d7c
 
 test:
   override:
-    - npm run testrpc:
+    - wget https://s3.amazonaws.com/testrpc-shapshots/${CONTRACTS_COMMIT_HASH}.zip
+    - unzip ${CONTRACTS_COMMIT_HASH}.zip -d testrpc_snapshot
+    - npm run testrpc -- --db testrpc_snapshot:
         background: true
-    - git clone git@github.com:0xProject/contracts.git ../contracts
-    - cd ../contracts; git checkout cd04d7c; npm install && npm run migrate
     - npm run test:coverage
     - npm run report_test_coverage
     - npm run test:umd

package.json

@@ -14,7 +14,7 @@
   "scripts": {
     "prebuild": "npm run clean",
     "build": "run-p build:*:prod",
-    "prepublish": "run-p build:umd:prod build:commonjs:dev",
+    "prepublishOnly": "run-p build:umd:prod build:commonjs:dev",
     "postpublish": "run-s release docs:json upload_docs_json",
     "release": "publish-release --assets _bundles/index.js,_bundles/index.min.js",
     "upload_docs_json": "aws s3 cp docs/index.json s3://0xjs-docs-jsons/$(git describe --tags).json --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type aplication/json",