Merge branch 'development' into feature/addSubproviders

* development:
  Inline function
  Introduce a const
  Make private
  Add version matcher script
  Use same versions of dependencies everywhere
  Add missing await
  Move declaration into proper conditional block
  Fix Party element so that an identicon's height is that which was passed in

# Conflicts:
#	packages/website/package.json
#	yarn.lock

packages/0x.js/package.json

@@ -50,23 +50,23 @@
     "abi-gen-templates": "^0.0.0",
     "@types/bintrees": "^1.0.2",
     "@types/jsonschema": "^1.1.1",
-    "@types/lodash": "^4.14.64",
+    "@types/lodash": "^4.14.86",
-    "@types/mocha": "^2.2.41",
+    "@types/mocha": "^2.2.42",
-    "@types/node": "^8.0.1",
+    "@types/node": "^8.0.53",
     "@types/sinon": "^2.2.2",
     "@types/uuid": "^3.4.2",
     "awesome-typescript-loader": "^3.1.3",
     "chai": "^4.0.1",
     "chai-as-promised": "^7.1.0",
-    "chai-as-promised-typescript-typings": "0.0.3",
+    "chai-as-promised-typescript-typings": "^0.0.3",
     "chai-bignumber": "^2.0.1",
     "chai-typescript-typings": "^0.0.1",
     "copyfiles": "^1.2.0",
     "coveralls": "^3.0.0",
     "dirty-chai": "^2.0.1",
     "json-loader": "^0.5.4",
-    "mocha": "^4.0.0",
+    "mocha": "^4.0.1",
-    "npm-run-all": "^4.0.2",
+    "npm-run-all": "^4.1.2",
     "nyc": "^11.0.1",
     "opn-cli": "^3.1.0",
     "request": "^2.81.0",
@@ -89,7 +89,7 @@
     "@0xproject/json-schemas": "^0.6.9",
     "bignumber.js": "~4.1.0",
     "bintrees": "^1.0.2",
-    "bn.js": "4.11.8",
+    "bn.js": "^4.11.8",
     "compare-versions": "^3.0.1",
     "ethereumjs-abi": "^0.6.4",
     "ethereumjs-blockstream": "^2.0.6",

packages/assert/package.json

@@ -24,17 +24,17 @@
   "homepage": "https://github.com/0xProject/0x.js/packages/assert/README.md",
   "devDependencies": {
     "@0xproject/tslint-config": "^0.2.0",
-    "@types/lodash": "^4.14.78",
+    "@types/lodash": "^4.14.86",
     "@types/mocha": "^2.2.42",
     "@types/valid-url": "^1.0.2",
     "chai": "^4.0.1",
     "chai-typescript-typings": "^0.0.1",
     "dirty-chai": "^2.0.1",
     "mocha": "^4.0.1",
-    "npm-run-all": "^4.1.1",
+    "npm-run-all": "^4.1.2",
     "shx": "^0.2.2",
     "tslint": "5.8.0",
-    "typescript": "^2.4.2"
+    "typescript": "~2.6.1"
   },
   "dependencies": {
     "@0xproject/json-schemas": "^0.6.9",

packages/connect/package.json

@@ -47,19 +47,19 @@
   "devDependencies": {
     "@0xproject/tslint-config": "^0.2.0",
     "@types/fetch-mock": "^5.12.1",
-    "@types/lodash": "^4.14.77",
+    "@types/lodash": "^4.14.86",
     "@types/mocha": "^2.2.42",
     "@types/query-string": "^5.0.1",
     "@types/websocket": "^0.0.34",
     "chai": "^4.0.1",
     "chai-as-promised": "^7.1.0",
-    "chai-as-promised-typescript-typings": "0.0.3",
+    "chai-as-promised-typescript-typings": "^0.0.3",
     "chai-typescript-typings": "^0.0.1",
     "copyfiles": "^1.2.0",
     "dirty-chai": "^2.0.1",
     "fetch-mock": "^5.13.1",
-    "mocha": "^4.0.0",
+    "mocha": "^4.0.1",
-    "npm-run-all": "^4.0.2",
+    "npm-run-all": "^4.1.2",
     "shx": "^0.2.2",
     "tslint": "5.8.0",
     "typedoc": "~0.8.0",

packages/contracts/package.json

@@ -29,8 +29,9 @@
   "devDependencies": {
     "@0xproject/tslint-config": "^0.2.0",
     "@types/bluebird": "^3.5.3",
-    "@types/lodash": "^4.14.64",
+    "@types/isomorphic-fetch": "^0.0.34",
-    "@types/node": "^8.0.1",
+    "@types/lodash": "^4.14.86",
+    "@types/node": "^8.0.53",
     "@types/request-promise-native": "^1.0.2",
     "@types/yargs": "^8.0.2",
     "chai": "^4.0.1",
@@ -40,13 +41,13 @@
     "chai-typescript-typings": "^0.0.1",
     "copyfiles": "^1.2.0",
     "dirty-chai": "^2.0.1",
-    "mocha": "^4.0.0",
+    "mocha": "^4.0.1",
     "solc": "^0.4.18",
     "truffle": "3.4.3",
     "tslint": "5.8.0",
     "types-bn": "^0.0.1",
     "types-ethereumjs-util": "0xProject/types-ethereumjs-util",
-    "typescript": "^2.6.1",
+    "typescript": "~2.6.1",
     "web3-typescript-typings": "^0.7.2",
     "yargs": "^10.0.3"
   },
@@ -55,14 +56,14 @@
     "@0xproject/json-schemas": "^0.6.9",
     "bignumber.js": "~4.1.0",
     "bluebird": "^3.5.0",
-    "bn.js": "^4.11.6",
+    "bn.js": "^4.11.8",
     "es6-promisify": "^5.0.0",
     "ethereumjs-abi": "^0.6.4",
     "ethereumjs-util": "^5.1.1",
     "isomorphic-fetch": "^2.2.1",
     "lodash": "^4.17.4",
     "request": "^2.81.0",
-    "web3": "0.20.0",
+    "web3": "^0.20.0",
     "web3-eth-abi": "^1.0.0-beta.24"
   }
 }

packages/json-schemas/package.json

@@ -32,13 +32,13 @@
     "@types/lodash.foreach": "^4.5.3",
     "@types/lodash.values": "^4.3.3",
     "@types/mocha": "^2.2.42",
-    "bignumber.js": "^4.0.2",
+    "bignumber.js": "~4.1.0",
-    "chai": "^4.1.1",
+    "chai": "^4.0.1",
     "chai-typescript-typings": "^0.0.1",
     "dirty-chai": "^2.0.1",
     "lodash.foreach": "^4.5.0",
     "mocha": "^4.0.1",
-    "npm-run-all": "^4.1.1",
+    "npm-run-all": "^4.1.2",
     "shx": "^0.2.2",
     "tslint": "5.8.0",
     "typescript": "~2.6.1"

packages/monorepo-scripts/package.json

@@ -0,0 +1,34 @@
+{
+  "name": "@0xproject/monorepo-scripts",
+  "version": "0.0.0",
+  "private": true,
+  "description": "Helper scripts for the monorepo",
+  "scripts": {
+    "deps_versions": "node ./lib/deps_versions.js",
+    "lint": "tslint --project . 'src/**/*.ts'",
+    "clean": "shx rm -rf lib",
+    "build": "tsc"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/0xProject/0x.js.git"
+  },
+  "license": "Apache-2.0",
+  "bugs": {
+    "url": "https://github.com/0xProject/0x.js/issues"
+  },
+  "homepage": "https://github.com/0xProject/0x.js/packages/monorepo-scripts/README.md",
+  "devDependencies": {
+    "@0xproject/tslint-config": "^0.2.0",
+    "@types/glob": "^5.0.33",
+    "@types/node": "^8.0.53",
+    "shx": "^0.2.2",
+    "tslint": "5.8.0",
+    "typescript": "~2.6.1"
+  },
+  "dependencies": {
+    "chalk": "^2.3.0",
+    "glob": "^7.1.2",
+    "lodash": "^4.17.4"
+  }
+}

packages/monorepo-scripts/src/deps_versions.ts

@@ -0,0 +1,56 @@
+#!/usr/bin/env node
+
+import chalk from 'chalk';
+import * as fs from 'fs';
+import {sync as globSync} from 'glob';
+import * as _ from 'lodash';
+
+interface Dependencies {
+    [depName: string]: string;
+}
+interface Versions {
+    [packageName: string]: string;
+}
+interface VersionsByDependency {
+    [depName: string]: Versions;
+}
+
+const PACKAGE_JSON_GLOB = '../*/package.json';
+
+function log(...args: any[]) {
+    console.log(...args); // tslint:disable-line:no-console
+}
+
+function getDependencies(path: string): Dependencies {
+    const file = fs.readFileSync(path).toString();
+    const parsed = JSON.parse(file);
+    const dependencies = {
+        ...parsed.dependencies,
+        ...parsed.devDependencies,
+    };
+    return dependencies;
+}
+
+const files = globSync(PACKAGE_JSON_GLOB);
+const versionsByDependency: VersionsByDependency = {};
+files.map(path => {
+    const [_1, packageName, _2] = path.split('/');
+    const dependencies = getDependencies(path);
+    _.map(dependencies, (version: string, depName: string) => {
+        if (_.isUndefined(versionsByDependency[depName])) {
+            versionsByDependency[depName] = {};
+        }
+        versionsByDependency[depName][packageName] = version;
+    });
+});
+
+_.map(versionsByDependency, (versions: Versions, depName: string) => {
+    if (_.uniq(_.values(versions)).length === 1) {
+        delete versionsByDependency[depName];
+    } else {
+        log(chalk.bold(depName));
+        _.map(versions, (version: string, packageName: string) => {
+            log(`├── ${packageName} -> ${version}`);
+        });
+    }
+});

packages/monorepo-scripts/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es5",
+    "lib": ["es2015", "dom"],
+    "outDir": "lib",
+    "noImplicitAny": true,
+    "strictNullChecks": true
+  },
+  "include": [
+    "./src/**/*"
+  ]
+}

packages/monorepo-scripts/tslint.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "@0xproject/tslint-config"
+  ]
+}

packages/tslint-config/package.json

@@ -30,7 +30,7 @@
   "homepage": "https://github.com/0xProject/0x.js/packages/tslint-config/README.md",
   "devDependencies": {
     "tslint": "5.8.0",
-    "typescript": "2.6.1"
+    "typescript": "~2.6.1"
   },
   "dependencies": {
     "tslint-react": "^3.2.0"

packages/website/package.json

@@ -34,13 +34,13 @@
     "ethereumjs-util": "^5.1.1",
     "find-versions": "^2.0.0",
     "is-mobile": "^0.2.2",
-    "jsonschema": "^1.1.1",
+    "jsonschema": "^1.2.0",
     "ledgerco": "0xProject/ledger-node-js-api",
     "less": "^2.7.2",
     "lodash": "^4.17.4",
     "material-ui": "^0.17.1",
     "moment": "^2.18.1",
-    "query-string": "^5.0.0",
+    "query-string": "^5.0.1",
     "react": "15.6.1",
     "react-copy-to-clipboard": "^4.2.3",
     "react-document-title": "^2.0.3",
@@ -63,9 +63,8 @@
     "thenby": "^1.2.3",
     "truffle-contract": "2.0.1",
     "tslint-config-0xproject": "^0.0.2",
-    "typescript": "^2.4.1",
     "web3": "^0.20.0",
-    "web3-provider-engine": "^11.0.0",
+    "web3-provider-engine": "^13.0.1",
     "whatwg-fetch": "^2.0.3",
     "xml-js": "^1.3.2"
   },
@@ -74,11 +73,11 @@
     "@types/dateformat": "^1.0.1",
     "@types/deep-equal": "^1.0.0",
     "@types/jsonschema": "^1.1.1",
-    "@types/lodash": "^4.14.55",
+    "@types/lodash": "^4.14.86",
     "@types/material-ui": "0.18.0",
     "@types/moment": "^2.13.0",
-    "@types/node": "^7.0.8",
+    "@types/node": "^8.0.53",
-    "@types/query-string": "^5.0.0",
+    "@types/query-string": "^5.0.1",
     "@types/react": "^15.0.15",
     "@types/react-copy-to-clipboard": "^4.2.0",
     "@types/react-dom": "^0.14.23",
@@ -100,8 +99,9 @@
     "source-map-loader": "^0.1.6",
     "style-loader": "0.13.x",
     "tslint": "5.8.0",
+    "typescript": "~2.6.1",
     "web3-typescript-typings": "^0.7.2",
-    "webpack": "3.1.0",
+    "webpack": "^3.1.0",
     "webpack-dev-middleware": "^1.10.0",
     "webpack-dev-server": "^2.5.0"
   }

packages/website/ts/blockchain.ts

@@ -511,7 +511,6 @@ export class Blockchain {
         const subscriptionId = this.zeroEx.exchange.subscribe(
             ExchangeEvents.LogFill, indexFilterValues,
             async (err: Error, decodedLogEvent: DecodedLogEvent<LogFillContractEventArgs>) => {
-            const decodedLog = decodedLogEvent.log;
             if (err) {
                 // Note: it's not entirely clear from the documentation which
                 // errors will be thrown by `watch`. For now, let's log the error
@@ -522,6 +521,7 @@ export class Blockchain {
                 this.stopWatchingExchangeLogFillEventsAsync(); // fire and forget
                 return;
             } else {
+                const decodedLog = decodedLogEvent.log;
                 if (!this.doesLogEventInvolveUser(decodedLog)) {
                     return; // We aren't interested in the fill event
                 }

packages/website/ts/components/ui/lifecycle_raised_button.tsx

@@ -83,7 +83,7 @@ export class LifeCycleRaisedButton extends
         this.setState({
             buttonState: ButtonState.LOADING,
         });
-        const didSucceed = this.props.onClickAsyncFn();
+        const didSucceed = await this.props.onClickAsyncFn();
         if (this.didUnmount) {
             return; // noop since unmount called before async callback returned.
         }

packages/website/ts/components/ui/party.tsx

@@ -73,7 +73,7 @@ export class Party extends React.Component<PartyProps, PartyState> {
                                 /> :
                                 <div
                                     className="mx-auto"
-                                    style={{height: IMAGE_DIMENSION, width: IMAGE_DIMENSION}}
+                                    style={{height: identiconDiameter, width: identiconDiameter}}
                                 >
                                     <Identicon
                                         address={this.props.address}

yarn.lock

@@ -120,10 +120,14 @@
   dependencies:
     "@types/lodash" "*"
 
-"@types/lodash@*", "@types/lodash@^4.14.37", "@types/lodash@^4.14.55", "@types/lodash@^4.14.64", "@types/lodash@^4.14.77", "@types/lodash@^4.14.78":
+"@types/lodash@*", "@types/lodash@^4.14.37":
   version "4.14.85"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.85.tgz#a16fbf942422f6eca5622b6910492c496c35069b"
 
+"@types/lodash@^4.14.86":
+  version "4.14.86"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.86.tgz#6788d3d75032c46322ff1c144c948cf8117c405b"
+
 "@types/marked@0.0.28":
   version "0.0.28"
   resolved "https://registry.yarnpkg.com/@types/marked/-/marked-0.0.28.tgz#44ba754e9fa51432583e8eb30a7c4dd249b52faa"
@@ -149,7 +153,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/mocha@^2.2.41", "@types/mocha@^2.2.42", "@types/mocha@^2.2.44":
+"@types/mocha@^2.2.42":
   version "2.2.44"
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.44.tgz#1d4a798e53f35212fd5ad4d04050620171cd5b5e"
 
@@ -163,15 +167,11 @@
   version "8.0.51"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.51.tgz#b31d716fb8d58eeb95c068a039b9b6292817d5fb"
 
-"@types/node@^7.0.8":
-  version "7.0.48"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.48.tgz#24bfdc0aa82e8f6dbd017159c58094a2e06d0abb"
-
 "@types/node@^8.0.53":
   version "8.0.53"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.53.tgz#396b35af826fa66aad472c8cb7b8d5e277f4e6d8"
 
-"@types/query-string@^5.0.0", "@types/query-string@^5.0.1":
+"@types/query-string@^5.0.1":
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/@types/query-string/-/query-string-5.0.1.tgz#6cb41c724cb1644d56c2d1dae7c7b204e706b39e"
 
@@ -1277,10 +1277,6 @@ bignumber.js@^4.0.2, bignumber.js@^4.1.0, bignumber.js@~4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.1.0.tgz#db6f14067c140bd46624815a7916c92d9b6c24b1"
 
-bignumber.js@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-5.0.0.tgz#fbce63f09776b3000a83185badcde525daf34833"
-
 "bignumber.js@git+https://github.com/debris/bignumber.js#master":
   version "2.0.7"
   resolved "git+https://github.com/debris/bignumber.js#c7a38de919ed75e6fb6ba38051986e294b328df9"
@@ -1650,7 +1646,7 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chai-as-promised-typescript-typings@0.0.3, chai-as-promised-typescript-typings@^0.0.3:
+chai-as-promised-typescript-typings@^0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/chai-as-promised-typescript-typings/-/chai-as-promised-typescript-typings-0.0.3.tgz#8694287ebe2dd6c18a96667c38151d714d6ecbb6"
   dependencies:
@@ -1674,7 +1670,7 @@ chai-typescript-typings@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/chai-typescript-typings/-/chai-typescript-typings-0.0.1.tgz#433dee303b0b2978ad0dd03129df0a5afb791274"
 
-chai@^4.0.1, chai@^4.1.1:
+chai@^4.0.1:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chai/-/chai-4.1.2.tgz#0f64584ba642f0f2ace2806279f4f06ca23ad73c"
   dependencies:
@@ -2788,7 +2784,7 @@ enhanced-resolve@3.3.0:
     object-assign "^4.0.1"
     tapable "^0.2.5"
 
-enhanced-resolve@^3.3.0, enhanced-resolve@^3.4.0:
+enhanced-resolve@^3.4.0:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
   dependencies:
@@ -2971,7 +2967,7 @@ eth-query@^2.1.0:
     json-rpc-random-id "^1.0.0"
     xtend "^4.0.1"
 
-eth-sig-util@^1.2.1, eth-sig-util@^1.3.0:
+eth-sig-util@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/eth-sig-util/-/eth-sig-util-1.4.0.tgz#ad42fd1d9c60fff19bdef7377b42fb38e92ee7e1"
   dependencies:
@@ -4647,7 +4643,7 @@ jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
 
-jsonschema@*, jsonschema@^1.1.1, jsonschema@^1.2.0:
+jsonschema@*, jsonschema@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.2.0.tgz#d6ebaf70798db7b3a20c544f6c9ef9319b077de2"
 
@@ -5387,7 +5383,7 @@ mocha@^3.4.2:
     mkdirp "0.5.1"
     supports-color "3.1.2"
 
-mocha@^4.0.0, mocha@^4.0.1:
+mocha@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-4.0.1.tgz#0aee5a95cf69a4618820f5e51fa31717117daf1b"
   dependencies:
@@ -5625,7 +5621,7 @@ normalize-url@^1.4.0:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
-npm-run-all@^4.0.2, npm-run-all@^4.1.1, npm-run-all@^4.1.2:
+npm-run-all@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.2.tgz#90d62d078792d20669139e718621186656cea056"
   dependencies:
@@ -6520,7 +6516,7 @@ query-string@^4.1.0:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
-query-string@^5.0.0, query-string@^5.0.1:
+query-string@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.0.1.tgz#6e2b86fe0e08aef682ecbe86e85834765402bd88"
   dependencies:
@@ -7946,7 +7942,7 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3:
+supports-color@^3.1.2, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
@@ -7980,7 +7976,7 @@ symbol-observable@^1.0.3, symbol-observable@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
 
-tapable@^0.2.5, tapable@^0.2.7, tapable@~0.2.5:
+tapable@^0.2.5, tapable@^0.2.7:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
 
@@ -8408,14 +8404,10 @@ typescript@2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.1.tgz#c3ccb16ddaa0b2314de031e7e6fee89e5ba346bc"
 
-typescript@2.6.1, typescript@^2.4.1, typescript@^2.4.2, typescript@~2.6.1:
+typescript@^2.4.1, typescript@~2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.1.tgz#ef39cdea27abac0b500242d6726ab90e0c846631"
 
-typescript@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
-
 ua-parser-js@^0.7.9:
   version "0.7.17"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
@@ -8635,7 +8627,7 @@ warning@^3.0.0:
   dependencies:
     loose-envify "^1.0.0"
 
-watchpack@^1.3.1, watchpack@^1.4.0:
+watchpack@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac"
   dependencies:
@@ -8679,28 +8671,6 @@ web3-eth-iban@^1.0.0-beta.26:
     bn.js "^4.11.6"
     web3-utils "^1.0.0-beta.26"
 
-web3-provider-engine@^11.0.0:
-  version "11.0.2"
-  resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-11.0.2.tgz#d63dae73ecb37d141b4d63431766c22ff406f32f"
-  dependencies:
-    async "^2.1.2"
-    clone "^2.0.0"
-    eth-sig-util "^1.2.1"
-    ethereumjs-block "^1.2.2"
-    ethereumjs-tx "^1.2.0"
-    ethereumjs-util "^5.1.1"
-    ethereumjs-vm "^2.0.2"
-    fetch-ponyfill "^4.0.0"
-    json-rpc-error "^2.0.0"
-    promise-to-callback "^1.0.0"
-    request "^2.67.0"
-    semaphore "^1.0.3"
-    solc "^0.4.2"
-    tape "^4.4.0"
-    web3 "^0.16.0"
-    xhr "^2.2.0"
-    xtend "^4.0.1"
-
 web3-provider-engine@^13.0.1:
   version "13.3.3"
   resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-13.3.3.tgz#1f6df4ec540161125f3e5f501bb0e56af83a01df"
@@ -8762,16 +8732,6 @@ web3-utils@^1.0.0-beta.26:
     underscore "1.8.3"
     utf8 "2.1.1"
 
-web3@0.20.0:
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/web3/-/web3-0.20.0.tgz#aabbbe35fe6cabe811659087a55cc86e99336c74"
-  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.16.0:
   version "0.16.0"
   resolved "https://registry.yarnpkg.com/web3/-/web3-0.16.0.tgz#a4554175cd462943035b1f1d39432f741c6b6019"
@@ -8850,33 +8810,6 @@ webpack-sources@^1.0.1:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.1.0.tgz#ac0675e500db835f9ab2369d29ba096f51ad0731"
-  dependencies:
-    acorn "^5.0.0"
-    acorn-dynamic-import "^2.0.0"
-    ajv "^5.1.5"
-    ajv-keywords "^2.0.0"
-    async "^2.1.2"
-    enhanced-resolve "^3.3.0"
-    escope "^3.6.0"
-    interpret "^1.0.0"
-    json-loader "^0.5.4"
-    json5 "^0.5.1"
-    loader-runner "^2.3.0"
-    loader-utils "^1.1.0"
-    memory-fs "~0.4.1"
-    mkdirp "~0.5.0"
-    node-libs-browser "^2.0.0"
-    source-map "^0.5.3"
-    supports-color "^3.1.0"
-    tapable "~0.2.5"
-    uglifyjs-webpack-plugin "^0.4.6"
-    watchpack "^1.3.1"
-    webpack-sources "^1.0.1"
-    yargs "^6.0.0"
-
 webpack@^3.0.0, webpack@^3.1.0:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.8.1.tgz#b16968a81100abe61608b0153c9159ef8bb2bd83"
@@ -9153,7 +9086,7 @@ yargs@^4.7.1, yargs@~4.8.0:
     y18n "^3.2.1"
     yargs-parser "^2.4.1"
 
-yargs@^6.0.0, yargs@^6.6.0:
+yargs@^6.6.0:
   version "6.6.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
   dependencies: