mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-26 06:36:43 +00:00
allow block with same block time
This commit is contained in:
parent
5ff869fba2
commit
cce928eaaf
1 changed files with 3 additions and 3 deletions
|
|
@ -171,10 +171,10 @@ func (miner *Miner) prepareWork(genParams *generateParams, witness bool) (*envir
|
|||
// to parent+1 if the mutation is allowed.
|
||||
timestamp := genParams.timestamp
|
||||
if parent.Time >= timestamp {
|
||||
if genParams.forceTime {
|
||||
/*if genParams.forceTime {
|
||||
return nil, fmt.Errorf("invalid timestamp, parent %d given %d", parent.Time, timestamp)
|
||||
}
|
||||
timestamp = parent.Time + 1
|
||||
}*/
|
||||
timestamp = parent.Time
|
||||
}
|
||||
// Construct the sealing block header.
|
||||
header := &types.Header{
|
||||
|
|
|
|||
Loading…
Reference in a new issue