diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-07-17 18:06:35 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-07-17 18:06:35 +0800 |
| commit | 03a6a088c5f1a086c1f3f02a0a70edaea3603860 (patch) | |
| tree | bbe67afd2ad3d902444da65964c7401c9d38d63d /packages/testnet-faucets | |
| parent | 1e787a764615bd3df839f2cb117b711be297b9d5 (diff) | |
| parent | a9038f2afc974cecf567a9aef50267d29a995e02 (diff) | |
| download | dexon-sol-tools-03a6a088c5f1a086c1f3f02a0a70edaea3603860.tar dexon-sol-tools-03a6a088c5f1a086c1f3f02a0a70edaea3603860.tar.gz dexon-sol-tools-03a6a088c5f1a086c1f3f02a0a70edaea3603860.tar.bz2 dexon-sol-tools-03a6a088c5f1a086c1f3f02a0a70edaea3603860.tar.lz dexon-sol-tools-03a6a088c5f1a086c1f3f02a0a70edaea3603860.tar.xz dexon-sol-tools-03a6a088c5f1a086c1f3f02a0a70edaea3603860.tar.zst dexon-sol-tools-03a6a088c5f1a086c1f3f02a0a70edaea3603860.zip | |
Merge branch 'v2-prototype' into fix-order-watcher
* v2-prototype: (39 commits)
Add chris to website
Fix ocean link
Move update onboarding step tracking to onboarding flow code
Bump npm-run-all from 4.1.2 to 4.1.3
Move format to helper function
Fix linter
Add assertion to make sure caller to fetchAsync isn't trying to set timeout in a context-specific way
Fix linter issues
Remove unused import
Switch conditional
Update yarn.lock and artifact
Fix abi-gen tests to not rely on sleep, since it causes intermittent failures
Add missing assertion
Move type defs to typescript-typingsd
Fix linter
Make createFinalPayload protected
Replace process.browser with detect-node library
Export Web3ProviderEngine and RPCSubprovider from 0x.js
Export Web3ProviderEngine from subproviders package
Update deps
...
Diffstat (limited to 'packages/testnet-faucets')
| -rw-r--r-- | packages/testnet-faucets/package.json | 5 | ||||
| -rw-r--r-- | packages/testnet-faucets/src/ts/handler.ts | 17 |
2 files changed, 10 insertions, 12 deletions
diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index 72ab8f61b..442f488c9 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", @@ -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 6d26691d6..0f61159fa 100644 --- a/packages/testnet-faucets/src/ts/handler.ts +++ b/packages/testnet-faucets/src/ts/handler.ts @@ -5,9 +5,12 @@ import { Provider } from 'ethereum-types'; import * as express from 'express'; import * as _ from 'lodash'; -import { NonceTrackerSubprovider, PrivateKeyWalletSubprovider } from '@0xproject/subproviders'; -import ProviderEngine = require('web3-provider-engine'); -import RpcSubprovider = require('web3-provider-engine/subproviders/rpc'); +import { + NonceTrackerSubprovider, + PrivateKeyWalletSubprovider, + RPCSubprovider, + Web3ProviderEngine, +} from '@0xproject/subproviders'; import { configs } from './configs'; import { constants } from './constants'; @@ -39,14 +42,10 @@ 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, - }), - ); + engine.addProvider(new RPCSubprovider(rpcUrl)); engine.start(); return engine; } |