diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-07-14 16:22:58 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2016-07-16 19:30:07 +0800 |
| commit | 1b2941cd56d69744e6121b7a590285d0faecbded (patch) | |
| tree | 3c65047a8230fe02333e43b2277f9e69b91b47e3 /eth | |
| parent | b8c088377097f040dc51f56d3e375d039e0e9ebe (diff) | |
| download | go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.tar go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.tar.gz go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.tar.bz2 go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.tar.lz go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.tar.xz go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.tar.zst go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.zip | |
[release/1.4.10] cmd, core, eth, miner, params, tests: finalize the DAO fork
(cherry picked from commit 2c2e389b778b490fcaf14d9cc45a750647ca5c68)
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/handler.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eth/handler.go b/eth/handler.go index d722cbc41..a498cd247 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -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()) |