grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3602 from ethcore/jg-network-id-match

Browse Source 
Check for network ID for live/test matching
This commit is contained in:
Gav Wood 2016-11-25 12:28:58 +01:00 committed by GitHub
commit d0d01ca39b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/redux/providers/status.js
View File

@ -242,6 +242,7 @@ export default class Status {
Promise
.all([
this._api.web3.clientVersion(),
this._api.net.version(),
this._api.parity.defaultExtraData(),
this._api.parity.netChain(),
this._api.parity.netPort(),
@ -249,9 +250,11 @@ export default class Status {
newConnection ? Promise.resolve(null) : this._api.parity.enode()
])
.then(([
clientVersion, defaultExtraData, netChain, netPort, rpcSettings, enode
clientVersion, netVersion, defaultExtraData, netChain, netPort, rpcSettings, enode
]) => {
const isTest = netChain === 'morden' || netChain === 'ropsten' || netChain === 'testnet';
const isTest =
netVersion === '2' || // morden
netVersion === '3'; // ropsten
const longStatus = {
clientVersion,