diff options
author | Fabio Berger <me@fabioberger.com> | 2017-12-08 05:15:23 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2017-12-08 05:15:23 +0800 |
commit | 6c2bf8ed264c8941a0f234f3caceb52e412fda84 (patch) | |
tree | 8558863db2ce6ab1c435c2afc82ca7453faadb6b /packages | |
parent | be17b75ad3e043df6f4ff05ead0627cb9a45d93b (diff) | |
parent | f1ecdcf6029debbd2183511080b302a4fccc6703 (diff) | |
download | dexon-sol-tools-6c2bf8ed264c8941a0f234f3caceb52e412fda84.tar.gz dexon-sol-tools-6c2bf8ed264c8941a0f234f3caceb52e412fda84.tar.zst dexon-sol-tools-6c2bf8ed264c8941a0f234f3caceb52e412fda84.zip |
Merge branch 'development' into feature/addSubproviders
* development:
Make sure we don't pass empty maker into getOrderHashHex
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.ts | 15 | ||||
-rw-r--r-- | packages/website/ts/components/inputs/hash_input.tsx | 3 |
2 files changed, 12 insertions, 6 deletions
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts index f11c014fb..809da7d4f 100644 --- a/packages/website/ts/blockchain.ts +++ b/packages/website/ts/blockchain.ts @@ -628,19 +628,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); diff --git a/packages/website/ts/components/inputs/hash_input.tsx b/packages/website/ts/components/inputs/hash_input.tsx index 7fadc3c15..25e7b5009 100644 --- a/packages/website/ts/components/inputs/hash_input.tsx +++ b/packages/website/ts/components/inputs/hash_input.tsx @@ -1,4 +1,5 @@ import {Order, ZeroEx} from '0x.js'; +import * as _ from 'lodash'; import * as React from 'react'; import ReactTooltip = require('react-tooltip'); import {Blockchain} from 'ts/blockchain'; @@ -49,7 +50,7 @@ export class HashInput extends React.Component<HashInputProps, HashInputState> { exchangeContractAddress, expirationUnixTimestampSec: hashData.orderExpiryTimestamp, feeRecipient: hashData.feeRecipientAddress, - maker: hashData.orderMakerAddress, + maker: _.isEmpty(hashData.orderMakerAddress) ? constants.NULL_ADDRESS : hashData.orderMakerAddress, makerFee: hashData.makerFee, makerTokenAddress: hashData.depositTokenContractAddr, makerTokenAmount: hashData.depositAmount, |