gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[release/1.4.10] accounts, core, eth: pass chain config for chain maker to test DAO

Browse Source 
(cherry picked from commit 3291235711)
This commit is contained in:
Péter Szilágyi
2016-07-14 18:17:03 +03:00
parent 14bad7e212
commit b8c0883770
17 changed files with 182 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eth/handler.go
View File

@ -505,7 +505,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
// If we already have a DAO header, we can check the peer's TD against it. If
// the peer's ahead of this, it too must have a reply to the DAO check
if daoHeader := pm.blockchain.GetHeaderByNumber(pm.chainconfig.DAOForkBlock.Uint64()); daoHeader != nil {
if p.Td().Cmp(pm.blockchain.GetTd(daoHeader.Hash(), daoHeader.Number.Uint64())) >= 0 {
if p.Td().Cmp(pm.blockchain.GetTd(daoHeader.Hash())) >= 0 {
verifyDAO = false
}
}