cerc-io/go-ethereum
13
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

Merge branch 'develop' into qt5.4

Browse Source
This commit is contained in:
obscuren 2015-01-28 21:36:53 +01:00
commit 32fbc0d334
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -13,8 +13,8 @@ RUN apt-get update && apt-get upgrade -y
RUN apt-get install -y git mercurial build-essential software-properties-common pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev RUN apt-get install -y git mercurial build-essential software-properties-common pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev
## Build and install Go ## Build and install Go
RUN hg clone -u release https://code.google.com/p/go RUN git clone https://go.googlesource.com/go
RUN cd go && hg update go1.4 RUN cd go && git checkout go1.4.1
RUN cd go/src && ./all.bash && go version RUN cd go/src && ./all.bash && go version
## Install GUI dependencies ## Install GUI dependencies

8
core/chain_manager.go
View File

@ -251,7 +251,13 @@ func (self *ChainManager) GetBlockHashesFromHash(hash []byte, max uint64) (chain
// XXX Could be optimised by using a different database which only holds hashes (i.e., linked list) // XXX Could be optimised by using a different database which only holds hashes (i.e., linked list)
for i := uint64(0); i < max; i++ { for i := uint64(0); i < max; i++ {
block = self.GetBlock(block.Header().ParentHash) parentHash := block.Header().ParentHash
block = self.GetBlock(parentHash)
if block == nil {
chainlogger.Infof("GetBlockHashesFromHash Parent UNKNOWN %x\n", parentHash)
break
}
chain = append(chain, block.Hash()) chain = append(chain, block.Hash())
if block.Header().Number.Cmp(ethutil.Big0) <= 0 { if block.Header().Number.Cmp(ethutil.Big0) <= 0 {
break break

2
eth/block_pool.go
View File

@ -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) poolLogger.Debugf("request %v missing blocks from %v/%v peers: chosen %v", len(hashes), repetitions, peerCount, indexes)
for _, peer := range self.peers { for _, peer := range self.peers {
if i == indexes[0] { 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) peer.requestBlocks(hashes)
indexes = indexes[1:] indexes = indexes[1:]
if len(indexes) == 0 { if len(indexes) == 0 {

2
eth/protocol.go
View File

@ -13,7 +13,7 @@ import (
) )
const ( const (
ProtocolVersion = 51 ProtocolVersion = 52
NetworkId = 0 NetworkId = 0
ProtocolLength = uint64(8) ProtocolLength = uint64(8)
ProtocolMaxMsgSize = 10 * 1024 * 1024 ProtocolMaxMsgSize = 10 * 1024 * 1024