diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-29 04:50:10 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-29 04:50:10 +0800 |
| commit | fd5d061d49ae32db3ebf8b8e6a14380742701661 (patch) | |
| tree | 6b991781e4b5c7ebae726195f6b99b0edb807da0 /eth | |
| parent | 5e891ea981aabc1435c54decc1572788d3358954 (diff) | |
| parent | 1337a8dfb11160d67db410b71af92a02d6b232f5 (diff) | |
| download | dexon-fd5d061d49ae32db3ebf8b8e6a14380742701661.tar dexon-fd5d061d49ae32db3ebf8b8e6a14380742701661.tar.gz dexon-fd5d061d49ae32db3ebf8b8e6a14380742701661.tar.bz2 dexon-fd5d061d49ae32db3ebf8b8e6a14380742701661.tar.lz dexon-fd5d061d49ae32db3ebf8b8e6a14380742701661.tar.xz dexon-fd5d061d49ae32db3ebf8b8e6a14380742701661.tar.zst dexon-fd5d061d49ae32db3ebf8b8e6a14380742701661.zip | |
Merge branch 'develop' into Gustav-Simonsson-key_store_and_accounts_integration
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/block_pool.go | 2 | ||||
| -rw-r--r-- | eth/protocol.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/eth/block_pool.go b/eth/block_pool.go index b624d064a..97ae683c1 100644 --- a/eth/block_pool.go +++ b/eth/block_pool.go @@ -1098,7 +1098,7 @@ func (self *BlockPool) requestBlocks(attempts int, hashes [][]byte) { poolLogger.Debugf("request %v missing blocks from %v/%v peers: chosen %v", len(hashes), repetitions, peerCount, indexes) for _, peer := range self.peers { if i == indexes[0] { - poolLogger.Debugf("request %v missing blocks from peer %s", len(hashes), peer.id) + poolLogger.Debugf("request %v missing blocks [%x/%x] from peer %s", len(hashes), hashes[0][:4], hashes[len(hashes)-1][:4], peer.id) peer.requestBlocks(hashes) indexes = indexes[1:] if len(indexes) == 0 { diff --git a/eth/protocol.go b/eth/protocol.go index 24a0f0a8e..68c52b7ce 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -13,7 +13,7 @@ import ( ) const ( - ProtocolVersion = 51 + ProtocolVersion = 52 NetworkId = 0 ProtocolLength = uint64(8) ProtocolMaxMsgSize = 10 * 1024 * 1024 |