diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-07-16 18:08:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-16 18:08:16 +0800 |
| commit | a4c4125b1155d9276614029163b498a17643f0f2 (patch) | |
| tree | 328c438483cb7c87333190605ec1ef79cfa162a6 /eth/peer.go | |
| parent | aa1e052cb41c39363a9930added46dac5b6db832 (diff) | |
| parent | 993b41216092fa6dc20d3755afe322cd1376b398 (diff) | |
| download | dexon-a4c4125b1155d9276614029163b498a17643f0f2.tar dexon-a4c4125b1155d9276614029163b498a17643f0f2.tar.gz dexon-a4c4125b1155d9276614029163b498a17643f0f2.tar.bz2 dexon-a4c4125b1155d9276614029163b498a17643f0f2.tar.lz dexon-a4c4125b1155d9276614029163b498a17643f0f2.tar.xz dexon-a4c4125b1155d9276614029163b498a17643f0f2.tar.zst dexon-a4c4125b1155d9276614029163b498a17643f0f2.zip | |
Merge pull request #2814 from karalabe/dao-hard-finalcombo
cmd, core, eth, miner, params, tests: finalize the DAO fork
Diffstat (limited to 'eth/peer.go')
| -rw-r--r-- | eth/peer.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/eth/peer.go b/eth/peer.go index 8eb41b0f9..b97825c69 100644 --- a/eth/peer.go +++ b/eth/peer.go @@ -59,10 +59,12 @@ type peer struct { *p2p.Peer rw p2p.MsgReadWriter - version int // Protocol version negotiated - head common.Hash - td *big.Int - lock sync.RWMutex + version int // Protocol version negotiated + forkDrop *time.Timer // Timed connection dropper if forks aren't validated in time + + head common.Hash + td *big.Int + lock sync.RWMutex knownTxs *set.Set // Set of transaction hashes known to be known by this peer knownBlocks *set.Set // Set of block hashes known to be known by this peer |