aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2017-12-08 04:51:40 +0800
committerFabio Berger <me@fabioberger.com>2017-12-08 04:51:40 +0800
commit1eaefac12b4911a0a54a7b822be61a9c35d1452e (patch)
tree043b6acac3d0493ad2561a953d398f540adc1e61 /packages
parent598f1dd2d8a89b0e3ab04b2917138997031bafc6 (diff)
downloaddexon-sol-tools-1eaefac12b4911a0a54a7b822be61a9c35d1452e.tar
dexon-sol-tools-1eaefac12b4911a0a54a7b822be61a9c35d1452e.tar.gz
dexon-sol-tools-1eaefac12b4911a0a54a7b822be61a9c35d1452e.tar.bz2
dexon-sol-tools-1eaefac12b4911a0a54a7b822be61a9c35d1452e.tar.lz
dexon-sol-tools-1eaefac12b4911a0a54a7b822be61a9c35d1452e.tar.xz
dexon-sol-tools-1eaefac12b4911a0a54a7b822be61a9c35d1452e.tar.zst
dexon-sol-tools-1eaefac12b4911a0a54a7b822be61a9c35d1452e.zip
Make sure we always pass in the correct networkId even if no injectedWeb3 found
Diffstat (limited to 'packages')
-rw-r--r--packages/website/ts/blockchain.ts15
1 files changed, 10 insertions, 5 deletions
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 31d725a41..aea4f863c 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -621,19 +621,24 @@ export class Blockchain {
// In addition, if the user has an injectedWeb3 instance that is disconnected from a backing
// Ethereum node, this call will throw. We need to handle this case gracefully
const injectedWeb3 = (window as any).web3;
- let networkId: number;
+ let networkIdIfExists: number;
if (!_.isUndefined(injectedWeb3)) {
try {
- networkId = _.parseInt(await promisify(injectedWeb3.version.getNetwork)());
+ networkIdIfExists = _.parseInt(await promisify(injectedWeb3.version.getNetwork)());
} catch (err) {
// Ignore error and proceed with networkId undefined
}
}
- const provider = await Blockchain.getProviderAsync(injectedWeb3, networkId);
- this.zeroEx = new ZeroEx(provider, {
+ const provider = await Blockchain.getProviderAsync(injectedWeb3, networkIdIfExists);
+ const networkId = !_.isUndefined(networkIdIfExists) ? networkIdIfExists :
+ configs.isMainnetEnabled ?
+ constants.MAINNET_NETWORK_ID :
+ constants.TESTNET_NETWORK_ID;
+ const zeroExConfigs = {
networkId,
- });
+ };
+ this.zeroEx = new ZeroEx(provider, zeroExConfigs);
this.updateProviderName(injectedWeb3);
const shouldPollUserAddress = true;
this.web3Wrapper = new Web3Wrapper(this.dispatcher, provider, networkId, shouldPollUserAddress);