TheDude
/
ciphermask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

network - improve logging and type conversion

Browse Source
feature/default_network_editable
kumavis 6 years ago committed by GitHub
parent 2f6530a494
commit 61c7bbb1c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      app/scripts/controllers/network/network.js

10
app/scripts/controllers/network/network.js
Unescape View File

@ -86,17 +86,19 @@ module.exports = class NetworkController extends EventEmitter {
return log.warn('NetworkController - lookupNetwork aborted due to missing provider') return log.warn('NetworkController - lookupNetwork aborted due to missing provider')
} }
const ethQuery = new EthQuery(this._provider) const ethQuery = new EthQuery(this._provider)
ethQuery.sendAsync({ method: 'eth_chainId' }, (err, chainId) => { ethQuery.sendAsync({ method: 'eth_chainId' }, (err, chainIdHex) => {
if (err) { if (err) {
// if eth_chainId is not supported, fallback to net_verion
ethQuery.sendAsync({ method: 'net_version' }, (err, network) => { ethQuery.sendAsync({ method: 'net_version' }, (err, network) => {
if (err) return this.setNetworkState('loading') if (err) return this.setNetworkState('loading')
log.info('web3.getNetwork returned net_version = ' + network) log.info(`net_version returned ${network}`)
this.setNetworkState(network) this.setNetworkState(network)
}) })
return return
} }
log.info('web3.getNetwork returned chainId = ' + parseInt(chainId)) const chainId = Number.parseInt(chainIdHex, 16)
this.setNetworkState(parseInt(chainId)) log.info(`net_version returned ${chainId}`)
this.setNetworkState(chainId)
}) })
} }

Write Preview
Loading…
Cancel
Save