roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Re-enabled catching up flag

Browse Source
This commit is contained in:
obscuren 2014-08-21 14:52:21 +02:00
parent eaa2e8900d
commit c44f4f32fe
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
peer.go
View File

@ -435,6 +435,8 @@ func (p *Peer) HandleInbound() {
p.QueueMessage(ethwire.NewMessage(ethwire.MsgBlockTy, blocks)) p.QueueMessage(ethwire.NewMessage(ethwire.MsgBlockTy, blocks))
case ethwire.MsgBlockHashesTy: case ethwire.MsgBlockHashesTy:
p.catchingUp = true
blockPool := p.ethereum.blockPool blockPool := p.ethereum.blockPool
foundCommonHash := false foundCommonHash := false
@ -452,6 +454,8 @@ func (p *Peer) HandleInbound() {
blockPool.AddHash(hash) blockPool.AddHash(hash)
p.lastReceivedHash = hash p.lastReceivedHash = hash
p.lastBlockReceived = time.Now()
} }
if foundCommonHash { if foundCommonHash {
@ -459,14 +463,20 @@ func (p *Peer) HandleInbound() {
} else { } else {
p.FetchHashes() p.FetchHashes()
} }
case ethwire.MsgBlockTy: case ethwire.MsgBlockTy:
p.catchingUp = true
blockPool := p.ethereum.blockPool blockPool := p.ethereum.blockPool
it := msg.Data.NewIterator() it := msg.Data.NewIterator()
for it.Next() { for it.Next() {
block := ethchain.NewBlockFromRlpValue(it.Value()) block := ethchain.NewBlockFromRlpValue(it.Value())
blockPool.SetBlock(block) blockPool.SetBlock(block)
p.lastBlockReceived = time.Now()
} }
linked := blockPool.CheckLinkAndProcess(func(block *ethchain.Block) { linked := blockPool.CheckLinkAndProcess(func(block *ethchain.Block) {