diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-08-09 16:39:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-09 16:39:13 +0800 |
| commit | 893fabd3360b3aeba75477f22c85463b6e3ea2bc (patch) | |
| tree | 3f6478d910c459b06909a6b24f1a83a44cdea916 | |
| parent | 44ea0da2b0bc96505299c083cac44d60814a78eb (diff) | |
| parent | 071af57bcf516d92a0b56c5bb119d9576d32b5cb (diff) | |
| download | dexon-893fabd3360b3aeba75477f22c85463b6e3ea2bc.tar.gz dexon-893fabd3360b3aeba75477f22c85463b6e3ea2bc.tar.zst dexon-893fabd3360b3aeba75477f22c85463b6e3ea2bc.zip | |
Merge pull request #2867 from karalabe/dao-challenge-finish
eth, eth/downloader: don't forward the DAO challenge header
| -rw-r--r-- | eth/downloader/downloader.go | 2 | ||||
| -rw-r--r-- | eth/handler.go | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index 1f9ef598c..2aea30b39 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -542,7 +542,7 @@ func (d *Downloader) fetchHeight(p *peer) (*types.Header, error) { // In the rare scenario when we ended up on a long reorganisation (i.e. none of // the head links match), we do a binary search to find the common ancestor. func (d *Downloader) findAncestor(p *peer, height uint64) (uint64, error) { - glog.V(logger.Debug).Infof("%v: looking for common ancestor", p) + glog.V(logger.Debug).Infof("%v: looking for common ancestor (remote height %d)", p, height) // Figure out the valid ancestor range to prevent rewrite attacks floor, ceil := int64(-1), d.headHeader().Number.Uint64() diff --git a/eth/handler.go b/eth/handler.go index 8723300f5..886d89fd1 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -436,6 +436,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error { return err } glog.V(logger.Debug).Infof("%v: verified to be on the same side of the DAO fork", p) + return nil } // Irrelevant of the fork checks, send the header to the fetcher just in case headers = pm.fetcher.FilterHeaders(headers, time.Now()) |