m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

support both eth_chainId and net_version

Browse Source 
get the real chainId using eth_chainId and use net_version as a fallback
This commit is contained in:
hackyminer 2018-10-20 00:45:59 +09:00
parent ea214945cf
commit 2f6530a494
No known key found for this signature in database
GPG Key ID: 46D453DDCA4B766F
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/scripts/controllers/network/network.js
View File

@ -86,10 +86,17 @@ module.exports = class NetworkController extends EventEmitter {
return log.warn('NetworkController - lookupNetwork aborted due to missing provider')
}
const ethQuery = new EthQuery(this._provider)
ethQuery.sendAsync({ method: 'net_version' }, (err, network) => {
if (err) return this.setNetworkState('loading')
log.info('web3.getNetwork returned ' + network)
this.setNetworkState(network)
ethQuery.sendAsync({ method: 'eth_chainId' }, (err, chainId) => {
if (err) {
ethQuery.sendAsync({ method: 'net_version' }, (err, 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))
})
}