Merge pull request ethereum#60 from lochjin/v1.14.11-qng

feat:Force update pending on miner for qng

miner/miner_qng.go

@@ -1,29 +1,12 @@
 package miner
 
 import (
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
 )
 
-func (payload *Payload) ResolveFullBlock() *types.Block {
-	payload.lock.Lock()
-	defer payload.lock.Unlock()
-
-	if payload.full == nil {
-		select {
-		case <-payload.stop:
-			return nil
-		default:
-		}
-		// Wait the full payload construction. Note it might block
-		// forever if Resolve is called in the meantime which
-		// terminates the background construction process.
-		payload.cond.Wait()
-	}
-	// Terminate the background payload construction
-	select {
-	case <-payload.stop:
-	default:
-		close(payload.stop)
-	}
-	return payload.full
+func (miner *Miner) ForcePending() (*types.Block, types.Receipts, *state.StateDB) {
+	miner.pending.update(common.Hash{}, nil)
+	return miner.Pending()
 }