diff --git a/blockpool/peers.go b/blockpool/peers.go index 1ace01fdf7..80168b206c 100644 --- a/blockpool/peers.go +++ b/blockpool/peers.go @@ -7,6 +7,7 @@ import ( "sync" "time" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/errs" ) @@ -471,6 +472,7 @@ func (self *peer) getBlockHashes() { } } headKey := self.parentHash.Str() + height := self.bp.status.chain[headKey] + 1 self.bp.status.chain[self.currentBlockHash.Str()] = height if height > self.bp.status.values.LongestChain { self.bp.status.values.LongestChain = height diff --git a/blockpool/peers_test.go b/blockpool/peers_test.go index 0e4c40e87c..beeb0ad1db 100644 --- a/blockpool/peers_test.go +++ b/blockpool/peers_test.go @@ -170,8 +170,8 @@ func TestPeerPromotionByOptionalTdOnBlock(t *testing.T) { hashes := blockPoolTester.hashPool.IndexesToHashes([]int{2, 3}) peer1.waitBlocksRequests(3) blockPool.AddBlock(&types.Block{ - HeaderHash: common.Bytes(hashes[1]), - ParentHeaderHash: common.Bytes(hashes[0]), + HeaderHash: common.Hash(hashes[1]), + ParentHeaderHash: common.Hash(hashes[0]), Td: common.Big3, }, "peer1") diff --git a/blockpool/section.go b/blockpool/section.go index 0304c9a04b..18a27377dd 100644 --- a/blockpool/section.go +++ b/blockpool/section.go @@ -117,7 +117,7 @@ func (self *section) addSectionToBlockChain(p *peer) { break } self.poolRootIndex-- - keys = append(keys, node.hash.Str()) + keys = append(keys, n.hash.Str()) blocks = append(blocks, block) nodes = append(nodes, n) }