cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1295 from karalabe/fix-broadcast-order

Browse Source 
eth: fix the propagation/announce order for mined blocks
This commit is contained in:
Péter Szilágyi 2015-06-19 10:15:20 +03:00
commit d5871fc200
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eth/handler.go
View File

@ -6,7 +6,6 @@ import (
"sync" "sync"
"time" "time"
"github.com/ethereum/go-ethereum/pow"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
@ -16,6 +15,7 @@ import (
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/pow"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
) )
@ -307,7 +307,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
blocks = nil blocks = nil
} }
// Update the receive timestamp of each block // Update the receive timestamp of each block
for i:=0; i<len(blocks); i++ { for i := 0; i < len(blocks); i++ {
blocks[i].ReceivedAt = msg.ReceivedAt blocks[i].ReceivedAt = msg.ReceivedAt
} }
// Filter out any explicitly requested blocks, deliver the rest to the downloader // Filter out any explicitly requested blocks, deliver the rest to the downloader
@ -417,8 +417,8 @@ func (self *ProtocolManager) minedBroadcastLoop() {
for obj := range self.minedBlockSub.Chan() { for obj := range self.minedBlockSub.Chan() {
switch ev := obj.(type) { switch ev := obj.(type) {
case core.NewMinedBlockEvent: case core.NewMinedBlockEvent:
self.BroadcastBlock(ev.Block, false) self.BroadcastBlock(ev.Block, true) // First propagate block to peers
self.BroadcastBlock(ev.Block, true) self.BroadcastBlock(ev.Block, false) // Only then announce to the rest
} }
} }
} }