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

do not include BlockEqualTS as valid uncles

Browse Source
This commit is contained in:
obscuren
2015-04-03 17:19:09 +02:00
parent 11d90d9b22
commit f9d94c7462
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/block_processor.go
View File

@@ -342,7 +342,7 @@ func (sm *BlockProcessor) VerifyUncles(statedb *state.StateDB, block, parent *ty
return UncleError(fmt.Sprintf("Uncle's parent unknown (%x)", uncle.ParentHash[0:4])) return UncleError(fmt.Sprintf("Uncle's parent unknown (%x)", uncle.ParentHash[0:4]))
} }
if err := sm.ValidateHeader(uncle, ancestorHeaders[uncle.ParentHash]); err != nil && err != BlockEqualTSErr { if err := sm.ValidateHeader(uncle, ancestorHeaders[uncle.ParentHash]); err != nil {
return ValidationError(fmt.Sprintf("%v", err)) return ValidationError(fmt.Sprintf("%v", err))
} }

3
core/chain_manager.go
View File

@@ -448,7 +448,8 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error {
} }
if err == BlockEqualTSErr { if err == BlockEqualTSErr {
queue[i] = ChainSideEvent{block, logs} //queue[i] = ChainSideEvent{block, logs}
// XXX silently discard it?
continue continue
} }