diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-12-09 01:21:51 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-12-09 01:21:51 +0800 |
| commit | af8d24d0eb5af781f4731b5559979f2b02579785 (patch) | |
| tree | 6f429e6f2b3050de6dd7ce16e42c7f387bd5018a /packages/subproviders/src | |
| parent | ca85a97106ea6d09fbceafac8f9516945ccff399 (diff) | |
| parent | 5eea829be9f5e8669c40dac965231051b668ed37 (diff) | |
| download | dexon-0x-contracts-af8d24d0eb5af781f4731b5559979f2b02579785.tar dexon-0x-contracts-af8d24d0eb5af781f4731b5559979f2b02579785.tar.gz dexon-0x-contracts-af8d24d0eb5af781f4731b5559979f2b02579785.tar.bz2 dexon-0x-contracts-af8d24d0eb5af781f4731b5559979f2b02579785.tar.lz dexon-0x-contracts-af8d24d0eb5af781f4731b5559979f2b02579785.tar.xz dexon-0x-contracts-af8d24d0eb5af781f4731b5559979f2b02579785.tar.zst dexon-0x-contracts-af8d24d0eb5af781f4731b5559979f2b02579785.zip | |
Merge branch 'development' into feature/addSubproviders
* development:
Update README.md
Inline network module
Stop supporting different file extensions in abi-gen
Refactor networkId out of web3Wrapper
Update connect types in preperation for publishing
Fix CI command
Address feedback
Refactor web3Wrapper to a separate package
# Conflicts:
# package.json
# packages/website/ts/blockchain.ts
Diffstat (limited to 'packages/subproviders/src')
| -rw-r--r-- | packages/subproviders/src/subproviders/redundant_rpc.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/subproviders/src/subproviders/redundant_rpc.ts b/packages/subproviders/src/subproviders/redundant_rpc.ts index 6f8d0829b..80462bbfb 100644 --- a/packages/subproviders/src/subproviders/redundant_rpc.ts +++ b/packages/subproviders/src/subproviders/redundant_rpc.ts @@ -1,4 +1,4 @@ -import promisify = require('es6-promisify'); +import {promisify} from '@0xproject/utils'; import * as _ from 'lodash'; import RpcSubprovider = require('web3-provider-engine/subproviders/rpc'); |