aboutsummaryrefslogtreecommitdiffstats
path: root/packages/dev-utils
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-07-14 02:12:37 +0800
committerGitHub <noreply@github.com>2018-07-14 02:12:37 +0800
commite2438330f588eba03d50c18943b24d6e7f9e9479 (patch)
tree33ba5ae3919d67c6a5faa7b0ed07249fa5b8d694 /packages/dev-utils
parent9b387b8ec3c543b5c96d1887550797a2bb90fe94 (diff)
parent2f0a9148387b66d75b9ee3856e68f0ed3aa149de (diff)
downloaddexon-sol-tools-e2438330f588eba03d50c18943b24d6e7f9e9479.tar
dexon-sol-tools-e2438330f588eba03d50c18943b24d6e7f9e9479.tar.gz
dexon-sol-tools-e2438330f588eba03d50c18943b24d6e7f9e9479.tar.bz2
dexon-sol-tools-e2438330f588eba03d50c18943b24d6e7f9e9479.tar.lz
dexon-sol-tools-e2438330f588eba03d50c18943b24d6e7f9e9479.tar.xz
dexon-sol-tools-e2438330f588eba03d50c18943b24d6e7f9e9479.tar.zst
dexon-sol-tools-e2438330f588eba03d50c18943b24d6e7f9e9479.zip
Merge pull request #874 from 0xProject/fix/request-timeout-issue
Fix Fetch Timeout Issue
Diffstat (limited to 'packages/dev-utils')
-rw-r--r--packages/dev-utils/package.json3
-rw-r--r--packages/dev-utils/src/web3_factory.ts21
2 files changed, 11 insertions, 13 deletions
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 1808e23e4..f0ef24684 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -51,8 +51,7 @@
"ethereum-types": "^0.0.2",
"@0xproject/typescript-typings": "^0.4.2",
"@0xproject/web3-wrapper": "^0.7.2",
- "lodash": "^4.17.4",
- "web3-provider-engine": "14.0.6"
+ "lodash": "^4.17.4"
},
"publishConfig": {
"access": "public"
diff --git a/packages/dev-utils/src/web3_factory.ts b/packages/dev-utils/src/web3_factory.ts
index 362a6c3c6..8e713fa68 100644
--- a/packages/dev-utils/src/web3_factory.ts
+++ b/packages/dev-utils/src/web3_factory.ts
@@ -1,7 +1,10 @@
-import ProviderEngine = require('web3-provider-engine');
-import RpcSubprovider = require('web3-provider-engine/subproviders/rpc');
-
-import { EmptyWalletSubprovider, FakeGasEstimateSubprovider, GanacheSubprovider } from '@0xproject/subproviders';
+import {
+ EmptyWalletSubprovider,
+ FakeGasEstimateSubprovider,
+ GanacheSubprovider,
+ RPCSubprovider,
+ Web3ProviderEngine,
+} from '@0xproject/subproviders';
import * as fs from 'fs';
import * as _ from 'lodash';
@@ -16,8 +19,8 @@ export interface Web3Config {
}
export const web3Factory = {
- getRpcProvider(config: Web3Config = {}): ProviderEngine {
- const provider = new ProviderEngine();
+ getRpcProvider(config: Web3Config = {}): Web3ProviderEngine {
+ const provider = new Web3ProviderEngine();
const hasAddresses = _.isUndefined(config.hasAddresses) || config.hasAddresses;
config.shouldUseFakeGasEstimate =
_.isUndefined(config.shouldUseFakeGasEstimate) || config.shouldUseFakeGasEstimate;
@@ -49,11 +52,7 @@ export const web3Factory = {
}),
);
} else {
- provider.addProvider(
- new RpcSubprovider({
- rpcUrl: config.rpcUrl || constants.RPC_URL,
- }),
- );
+ provider.addProvider(new RPCSubprovider(config.rpcUrl || constants.RPC_URL));
}
provider.start();
return provider;