From 2e5ff53d7271509accc226e83d76d1785350b1d2 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 13 Jul 2018 12:42:01 +0200
Subject: -fetch';

---
 packages/testnet-faucets/src/ts/handler.ts | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'packages/testnet-faucets')

diff --git a/packages/testnet-faucets/src/ts/handler.ts b/packages/testnet-faucets/src/ts/handler.ts
index 6d26691d6..a725a35f5 100644
--- a/packages/testnet-faucets/src/ts/handler.ts
+++ b/packages/testnet-faucets/src/ts/handler.ts
@@ -5,9 +5,8 @@ import { Provider } from 'ethereum-types';
 import * as express from 'express';
 import * as _ from 'lodash';
 
-import { NonceTrackerSubprovider, PrivateKeyWalletSubprovider } from '@0xproject/subproviders';
+import { NonceTrackerSubprovider, PrivateKeyWalletSubprovider, RPCSubprovider } from '@0xproject/subproviders';
 import ProviderEngine = require('web3-provider-engine');
-import RpcSubprovider = require('web3-provider-engine/subproviders/rpc');
 
 import { configs } from './configs';
 import { constants } from './constants';
@@ -42,11 +41,7 @@ export class Handler {
         const engine = new ProviderEngine();
         engine.addProvider(new NonceTrackerSubprovider());
         engine.addProvider(new PrivateKeyWalletSubprovider(configs.DISPENSER_PRIVATE_KEY));
-        engine.addProvider(
-            new RpcSubprovider({
-                rpcUrl,
-            }),
-        );
+        engine.addProvider(new RPCSubprovider(rpcUrl));
         engine.start();
         return engine;
     }
-- 
cgit v1.2.3


From 6ce662c7a4d04540920bc2a11a376c71bc051bb0 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 13 Jul 2018 13:05:38 +0200
Subject: Update deps

---
 packages/testnet-faucets/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/testnet-faucets')

diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json
index 72ab8f61b..2aea0a47b 100644
--- a/packages/testnet-faucets/package.json
+++ b/packages/testnet-faucets/package.json
@@ -18,7 +18,7 @@
     "author": "Fabio Berger",
     "license": "Apache-2.0",
     "dependencies": {
-        "0x.js": "^0.38.0",
+        "0x.js": "0.38.4",
         "@0xproject/subproviders": "^0.10.5",
         "@0xproject/web3-wrapper": "^0.7.2",
         "@0xproject/typescript-typings": "^0.4.2",
-- 
cgit v1.2.3


From 512502ca0873a290accb53777ca9d93f8d28e84b Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Fri, 13 Jul 2018 14:26:02 +0200
Subject: Export Web3ProviderEngine from subproviders package

---
 packages/testnet-faucets/package.json      |  3 +--
 packages/testnet-faucets/src/ts/handler.ts | 10 +++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'packages/testnet-faucets')

diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json
index 2aea0a47b..442f488c9 100644
--- a/packages/testnet-faucets/package.json
+++ b/packages/testnet-faucets/package.json
@@ -28,8 +28,7 @@
         "ethereumjs-util": "^5.1.1",
         "express": "^4.15.2",
         "lodash": "^4.17.4",
-        "rollbar": "^0.6.5",
-        "web3-provider-engine": "14.0.6"
+        "rollbar": "^0.6.5"
     },
     "devDependencies": {
         "@0xproject/tslint-config": "^0.4.21",
diff --git a/packages/testnet-faucets/src/ts/handler.ts b/packages/testnet-faucets/src/ts/handler.ts
index a725a35f5..0f61159fa 100644
--- a/packages/testnet-faucets/src/ts/handler.ts
+++ b/packages/testnet-faucets/src/ts/handler.ts
@@ -5,8 +5,12 @@ import { Provider } from 'ethereum-types';
 import * as express from 'express';
 import * as _ from 'lodash';
 
-import { NonceTrackerSubprovider, PrivateKeyWalletSubprovider, RPCSubprovider } from '@0xproject/subproviders';
-import ProviderEngine = require('web3-provider-engine');
+import {
+    NonceTrackerSubprovider,
+    PrivateKeyWalletSubprovider,
+    RPCSubprovider,
+    Web3ProviderEngine,
+} from '@0xproject/subproviders';
 
 import { configs } from './configs';
 import { constants } from './constants';
@@ -38,7 +42,7 @@ export class Handler {
         if (_.isUndefined(configs.DISPENSER_PRIVATE_KEY)) {
             throw new Error('Dispenser Private key not found');
         }
-        const engine = new ProviderEngine();
+        const engine = new Web3ProviderEngine();
         engine.addProvider(new NonceTrackerSubprovider());
         engine.addProvider(new PrivateKeyWalletSubprovider(configs.DISPENSER_PRIVATE_KEY));
         engine.addProvider(new RPCSubprovider(rpcUrl));
-- 
cgit v1.2.3