Merge pull request #932 from 0xProject/fix-ganache-fork

Fix ganache fork

5 files changed, 7 insertions, 12 deletions

diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index 662610357..f4b744304 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -54,7 +54,7 @@
         "ethereum-types": "^1.0.3",
         "ethereumjs-tx": "^1.3.5",
         "ethereumjs-util": "^5.1.1",
-        "ganache-core": "0xProject/ganache-core",
+        "ganache-core": "0xProject/ganache-core#monorepo-dep",
         "hdkey": "^0.7.1",
         "json-rpc-error": "2.0.0",
         "lodash": "^4.17.5",
diff --git a/packages/testnet-faucets/Dockerfile b/packages/testnet-faucets/Dockerfile
index 198087ba6..cfd22aa39 100644
--- a/packages/testnet-faucets/Dockerfile
+++ b/packages/testnet-faucets/Dockerfile
@@ -2,11 +2,6 @@ FROM node
 
 WORKDIR /src
 
-# Ledger Provider (in the Subproviders package) requires node-hid at dependency install time
-# which compiles and expects certain USB developer library packages to be present
-RUN apt-get -qq update && apt-get install -y libhidapi-dev libusb-1.0-0-dev
-# Our fork of ledgerco disables requiring node-hid at run time if CIRCLECI is set to true
-ENV CIRCLECI=true
 COPY package.json .
 RUN npm i
 RUN npm install forever -g
diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json
index 32dd69c30..5863a2d40 100644
--- a/packages/testnet-faucets/package.json
+++ b/packages/testnet-faucets/package.json
@@ -24,6 +24,7 @@
         "@0xproject/utils": "^1.0.4",
         "@0xproject/web3-wrapper": "^1.1.2",
         "body-parser": "^1.17.1",
+        "ethereum-types": "^1.0.3",
         "ethereumjs-tx": "^1.3.5",
         "ethereumjs-util": "^5.1.1",
         "express": "^4.15.2",
@@ -36,7 +37,6 @@
         "@types/express": "^4.0.35",
         "@types/lodash": "4.14.104",
         "awesome-typescript-loader": "^3.1.3",
-        "ethereum-types": "^1.0.3",
         "gulp": "^3.9.1",
         "make-promises-safe": "^1.1.0",
         "nodemon": "^1.11.0",
diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index e1c3245b1..d0dd394b1 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -53,7 +53,7 @@
         "chai-bignumber": "^2.0.1",
         "copyfiles": "^1.2.0",
         "dirty-chai": "^2.0.1",
-        "ganache-core": "0xProject/ganache-core",
+        "ganache-core": "0xProject/ganache-core#monorepo-dep",
         "make-promises-safe": "^1.1.0",
         "mocha": "^4.1.0",
         "npm-run-all": "^4.1.2",
diff --git a/yarn.lock b/yarn.lock
index f596ea62d..598af599b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5263,7 +5263,7 @@ ethereumjs-vm@^2.0.2, ethereumjs-vm@^2.1.0, ethereumjs-vm@^2.3.4:
     rustbn.js "~0.1.1"
     safe-buffer "^5.1.1"
 
-ethereumjs-wallet@~0.6.0:
+ethereumjs-wallet@0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-0.6.0.tgz#82763b1697ee7a796be7155da9dfb49b2f98cfdb"
   dependencies:
@@ -6012,9 +6012,9 @@ ganache-cli@6.1.3:
     source-map-support "^0.5.3"
     webpack-cli "^2.0.9"
 
-ganache-core@0xProject/ganache-core:
+ganache-core@0xProject/ganache-core#monorepo-dep:
   version "2.1.2"
-  resolved "https://codeload.github.com/0xProject/ganache-core/tar.gz/88ce33a4c33a5737ffb84af9bb8affaa4e8bf3a5"
+  resolved "https://codeload.github.com/0xProject/ganache-core/tar.gz/9f86ca3d114ee4395e2d16362f95a8c57ec69bb4"
   dependencies:
     abstract-leveldown "^3.0.0"
     async "^2.5.0"
@@ -6028,7 +6028,7 @@ ganache-core@0xProject/ganache-core:
     ethereumjs-tx "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default"
     ethereumjs-util "^5.2.0"
     ethereumjs-vm "2.3.5"
-    ethereumjs-wallet "~0.6.0"
+    ethereumjs-wallet "0.6.0"
     fake-merkle-patricia-tree "~1.0.1"
     heap "~0.2.6"
     js-scrypt "^0.2.0"