forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-12 15:03:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cleans

Browse source
This commit is contained in:
Shawn 2023-11-15 12:17:16 -08:00
parent 9bb1a7f003
commit 402e5d2039
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
consensus/clique/clique.go
View file

@ -559,8 +559,6 @@ func (c *Clique) Prepare(chain consensus.ChainHeaderReader, header *types.Header
if parent == nil { if parent == nil {
return consensus.ErrUnknownAncestor return consensus.ErrUnknownAncestor
} }
// TODO: Need to handle that sub 1 second periods will never increment header.Time.
// Or maybe next line handles that?
header.Time = parent.Time + c.config.PeriodMs/1000 header.Time = parent.Time + c.config.PeriodMs/1000
if header.Time < uint64(time.Now().Unix()) { if header.Time < uint64(time.Now().Unix()) {
header.Time = uint64(time.Now().Unix()) header.Time = uint64(time.Now().Unix())
@ -603,7 +601,6 @@ func (c *Clique) Authorize(signer common.Address, signFn SignerFn) {
// Seal implements consensus.Engine, attempting to create a sealed block using // Seal implements consensus.Engine, attempting to create a sealed block using
// the local signing credentials. // the local signing credentials.
func (c *Clique) Seal(chain consensus.ChainHeaderReader, block *types.Block, results chan<- *types.Block, stop <-chan struct{}) error { func (c *Clique) Seal(chain consensus.ChainHeaderReader, block *types.Block, results chan<- *types.Block, stop <-chan struct{}) error {
log.Trace("start of seal")
header := block.Header() header := block.Header()
// Sealing the genesis block is not supported // Sealing the genesis block is not supported
@ -653,13 +650,8 @@ func (c *Clique) Seal(chain consensus.ChainHeaderReader, block *types.Block, res
} }
copy(header.Extra[len(header.Extra)-extraSeal:], sighash) copy(header.Extra[len(header.Extra)-extraSeal:], sighash)
// Don't let delay be longer than target block period // For now, hard code delay to 20ms less than block period.
// if delay.Milliseconds() > int64(c.config.PeriodMs) { // This may cause deadlocks with certain numbers of nodes, more testing is needed.
// log.Trace("old delay", "delay", common.PrettyDuration(delay))
// delay = time.Millisecond*time.Duration(c.config.PeriodMs) - 20*time.Millisecond
// log.Trace("new delay", "delay", common.PrettyDuration(delay))
// }
delay = time.Millisecond * (time.Duration(c.config.PeriodMs - 20)) delay = time.Millisecond * (time.Duration(c.config.PeriodMs - 20))
// Wait until sealing is terminated or delay timeout. // Wait until sealing is terminated or delay timeout.