gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core: ensure the canonical block is written before the canonical hash is set

Browse Source
This commit is contained in:
Bas van Kervel
2016-07-26 16:37:04 +02:00
parent 4c2cc32f2e
commit bb8059f6aa
5 changed files with 69 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
eth/filters/filter.go
View File

@ -74,6 +74,9 @@ func (self *Filter) SetTopics(topics [][]common.Hash) {
func (self *Filter) Find() vm.Logs {
latestHash := core.GetHeadBlockHash(self.db)
latestBlock := core.GetBlock(self.db, latestHash, core.GetBlockNumber(self.db, latestHash))
if latestBlock == nil {
return vm.Logs{}
}
var beginBlockNo uint64 = uint64(self.begin)
if self.begin == -1 {
beginBlockNo = latestBlock.NumberU64()
@ -123,13 +126,13 @@ func (self *Filter) mipFind(start, end uint64, depth int) (logs vm.Logs) {
}
func (self *Filter) getLogs(start, end uint64) (logs vm.Logs) {
var block *types.Block
for i := start; i <= end; i++ {
var block *types.Block
hash := core.GetCanonicalHash(self.db, i)
if hash != (common.Hash{}) {
block = core.GetBlock(self.db, hash, i)
} else { // block not found
}
if block == nil { // block not found/written
return logs
}