support both eth_chainId and net_version

get the real chainId using eth_chainId and use net_version as a fallback
feature/default_network_editable
hackyminer 6 years ago
parent ea214945cf
commit 2f6530a494
No known key found for this signature in database
GPG Key ID: 46D453DDCA4B766F
  1. 15
      app/scripts/controllers/network/network.js

@ -86,10 +86,17 @@ 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: 'net_version' }, (err, network) => { ethQuery.sendAsync({ method: 'eth_chainId' }, (err, chainId) => {
if (err) return this.setNetworkState('loading') if (err) {
log.info('web3.getNetwork returned ' + network) ethQuery.sendAsync({ method: 'net_version' }, (err, network) => {
this.setNetworkState(network) if (err) return this.setNetworkState('loading')
log.info('web3.getNetwork returned net_version = ' + network)
this.setNetworkState(network)
})
return
}
log.info('web3.getNetwork returned chainId = ' + parseInt(chainId))
this.setNetworkState(parseInt(chainId))
}) })
} }

Loading…
Cancel
Save