Commit f9d94c74 authored by obscuren's avatar obscuren

do not include BlockEqualTS as valid uncles

parent 11d90d9b
...@@ -342,7 +342,7 @@ func (sm *BlockProcessor) VerifyUncles(statedb *state.StateDB, block, parent *ty ...@@ -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))
} }
......
...@@ -448,7 +448,8 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error { ...@@ -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
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment