do not include BlockEqualTS as valid uncles

pull/632/merge
obscuren 10 years ago
parent 11d90d9b22
commit f9d94c7462
  1. 2
      core/block_processor.go
  2. 3
      core/chain_manager.go

@ -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]))
}
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))
}

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

Loading…
Cancel
Save