Merge branch 'master' into gastonponti/fix-decode-rlp

Author: gastonponti

consensus/consensustest/mockprotocol.go

@@ -350,6 +350,13 @@ func (e *MockEngine) Prepare(chain consensus.ChainHeaderReader, header *types.He
 	if parent == nil {
 		return consensus.ErrUnknownAncestor
 	}
+
+	// Matches delay in consensus/istanbul/backend/engine.go:386 in (*Backend).Prepare
+	delay := time.Until(time.Unix(int64(header.Time), 0))
+	if delay > 0 {
+		time.Sleep(delay)
+	}
+
 	return nil
 }
 

consensus/istanbul/backend/engine.go

@@ -383,12 +383,16 @@ func (sb *Backend) Prepare(chain consensus.ChainHeaderReader, header *types.Head
 		header.Time = nowTime
 	}
 
-	// Record what the delay should be, but sleep in the miner, not the consensus engine.
+	// Record what the delay should be and sleep if greater than 0.
+	// TODO(victor): Sleep here was previously removed and added to the miner instead, that change
+	// has been temporarily reverted until it can be reimplemented without causing fewer signatures
+	// to be included by the block producer.
 	delay := time.Until(time.Unix(int64(header.Time), 0))
 	if delay < 0 {
 		sb.sleepGauge.Update(0)
 	} else {
 		sb.sleepGauge.Update(delay.Nanoseconds())
+		time.Sleep(delay)
 	}
 
 	if err := writeEmptyIstanbulExtra(header); err != nil {

miner/worker.go

@@ -246,6 +246,7 @@ func (w *worker) constructAndSubmitNewBlock(ctx context.Context) {
 	start := time.Now()
 
 	// Initialize the block.
+	// Note: In the current implementation, this will sleep until the time of the next block.
 	b, err := prepareBlock(w)
 	defer func() {
 		if b != nil {
@@ -258,15 +259,7 @@ func (w *worker) constructAndSubmitNewBlock(ctx context.Context) {
 	}
 	w.updatePendingBlock(b)
 
-	// TODO: worker based adaptive sleep with this delay
-	// wait for the timestamp of header, use this to adjust the block period
-	delay := time.Until(time.Unix(int64(b.header.Time), 0))
-	select {
-	case <-time.After(delay):
-	case <-ctx.Done():
-		return
-	}
-
+	startConstruction := time.Now()
 	err = b.selectAndApplyTransactions(ctx, w)
 	if err != nil {
 		log.Error("Failed to apply transactions to the block", "err", err)
@@ -286,7 +279,7 @@ func (w *worker) constructAndSubmitNewBlock(ctx context.Context) {
 	// the proposer and the engine has already gotten and is verifying the proposal).  See
 	// https://github.com/celo-org/celo-blockchain/issues/1639#issuecomment-888611039
 	// And we subtract the time we spent sleeping, since we want the time spent actually building the block.
-	w.blockConstructGauge.Update(time.Since(start).Nanoseconds() - delay.Nanoseconds())
+	w.blockConstructGauge.Update(time.Since(startConstruction).Nanoseconds())
 
 	if w.isRunning() {
 		if w.fullTaskHook != nil {