aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts/blockchain.ts
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2017-12-09 01:23:44 +0800
committerFabio Berger <me@fabioberger.com>2017-12-09 01:23:44 +0800
commitd5757499bc0f828fbf86ffea2da8ad3941f1c33e (patch)
tree6f429e6f2b3050de6dd7ce16e42c7f387bd5018a /packages/website/ts/blockchain.ts
parent139c8c2e783ffbbf22473604419fe3e5b299be0e (diff)
parentaf8d24d0eb5af781f4731b5559979f2b02579785 (diff)
downloaddexon-sol-tools-d5757499bc0f828fbf86ffea2da8ad3941f1c33e.tar
dexon-sol-tools-d5757499bc0f828fbf86ffea2da8ad3941f1c33e.tar.gz
dexon-sol-tools-d5757499bc0f828fbf86ffea2da8ad3941f1c33e.tar.bz2
dexon-sol-tools-d5757499bc0f828fbf86ffea2da8ad3941f1c33e.tar.lz
dexon-sol-tools-d5757499bc0f828fbf86ffea2da8ad3941f1c33e.tar.xz
dexon-sol-tools-d5757499bc0f828fbf86ffea2da8ad3941f1c33e.tar.zst
dexon-sol-tools-d5757499bc0f828fbf86ffea2da8ad3941f1c33e.zip
Merge branch 'feature/addSubproviders' into feature/portal-ledger-support
* feature/addSubproviders: remove console.log Update README.md Fix unit test Add missing params Debug CircleCi failure Update yarn.lock Inline network module Add todo Stop supporting different file extensions in abi-gen Refactor networkId out of web3Wrapper Update connect types in preperation for publishing Add link to random id generator Remove `prebuild` command and add `test:circleci` Fix CI command Address feedback Refactor web3Wrapper to a separate package
Diffstat (limited to 'packages/website/ts/blockchain.ts')
-rw-r--r--packages/website/ts/blockchain.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 809da7d4f..76640a072 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -23,9 +23,9 @@ import {
LedgerWalletSubprovider,
RedundantRPCSubprovider,
} from '@0xproject/subproviders';
+import {promisify} from '@0xproject/utils';
import BigNumber from 'bignumber.js';
import compareVersions = require('compare-versions');
-import promisify = require('es6-promisify');
import ethUtil = require('ethereumjs-util');
import findVersions = require('find-versions');
import * as _ from 'lodash';
@@ -68,7 +68,7 @@ export class Blockchain {
public nodeVersion: string;
private zeroEx: ZeroEx;
private dispatcher: Dispatcher;
- private web3Wrapper: Web3Wrapper;
+ private web3Wrapper?: Web3Wrapper;
private exchangeAddress: string;
private tokenTransferProxy: ContractInstance;
private tokenRegistry: ContractInstance;
@@ -631,7 +631,7 @@ export class Blockchain {
let networkIdIfExists: number;
if (!_.isUndefined(injectedWeb3)) {
try {
- networkIdIfExists = _.parseInt(await promisify(injectedWeb3.version.getNetwork)());
+ networkIdIfExists = _.parseInt(await promisify<string>(injectedWeb3.version.getNetwork)());
} catch (err) {
// Ignore error and proceed with networkId undefined
}