poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

return chainId on genesis chainId compatibility check failure

This commit is contained in:
jpmsam 2018-08-23 14:55:10 -04:00
parent 8a25cada96
commit 37956d8039
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
params/config.go
View File

@ -281,7 +281,7 @@ func (c *ChainConfig) checkCompatible(newcfg *ChainConfig, head *big.Int, isQuor
return newCompatError("EIP155 fork block", c.EIP155Block, newcfg.EIP155Block)
}
if isQuorumEIP155Activated && c.ChainId!=nil && c.IsEIP155(head) && !configNumEqual(c.ChainId, newcfg.ChainId) {
return newCompatError("EIP155 chain ID", c.EIP155Block, newcfg.EIP155Block)
return newCompatError("EIP155 chain ID", c.ChainId, newcfg.ChainId)
}
if isForkIncompatible(c.EIP158Block, newcfg.EIP158Block, head) {
return newCompatError("EIP158 fork block", c.EIP158Block, newcfg.EIP158Block)