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

[release/1.4.10] cmd, core, eth, miner, params, tests: finalize the DAO fork

Browse Source 
(cherry picked from commit 2c2e389b77)
This commit is contained in:
Péter Szilágyi
2016-07-14 11:22:58 +03:00
parent b8c0883770
commit 1b2941cd56
12 changed files with 7520 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eth/handler.go
View File

@ -511,7 +511,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
}
// If we're seemingly on the same chain, disable the drop timer
if verifyDAO {
glog.V(logger.Info).Infof("%v: seems to be on the same side of the DAO fork", p)
glog.V(logger.Debug).Infof("%v: seems to be on the same side of the DAO fork", p)
p.forkDrop.Stop()
p.forkDrop = nil
return nil
@ -527,11 +527,11 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
p.forkDrop = nil
// Validate the header and either drop the peer or continue
if err := core.ValidateHeaderExtraData(pm.chainconfig, headers[0]); err != nil {
glog.V(logger.Info).Infof("%v: verified to be on the other side of the DAO fork, dropping", p)
if err := core.ValidateDAOHeaderExtraData(pm.chainconfig, headers[0]); err != nil {
glog.V(logger.Debug).Infof("%v: verified to be on the other side of the DAO fork, dropping", p)
return err
}
glog.V(logger.Info).Infof("%v: verified to be on the same side of the DAO fork", p)
glog.V(logger.Debug).Infof("%v: verified to be on the same side of the DAO fork", p)
}
// Irrelevant of the fork checks, send the header to the fetcher just in case
headers = pm.fetcher.FilterHeaders(headers, time.Now())